Resolve queries by rowid (nrow)

[datasette-pytables.git] / datasette_pytables / __init__.py

diff --git a/datasette_pytables/__init__.py b/datasette_pytables/__init__.py
index 93be0f9a1206208f3667633526baca08b28ae335..50180fdc5c35c1d6ae93d817080dabd6d824ed9d 100644 (file)
--- a/datasette_pytables/__init__.py
+++ b/datasette_pytables/__init__.py
@@ -43,6 +43,8 @@ def _parse_sql(sql):
             else:
                 current_keyword = str(token)
             parsed_sql[current_keyword] = ""
             else:
                 current_keyword = str(token)
             parsed_sql[current_keyword] = ""

+        elif type(token) is sqlparse.sql.Where:
+            parsed_sql['where'] = token

         else:
             if not token.is_whitespace:
                 parsed_sql[current_keyword] += str(token)
         else:
             if not token.is_whitespace:
                 parsed_sql[current_keyword] += str(token)


@@ -65,12 +67,23 @@ class Connection:
 
         # Use 'where' statement or get all the rows
         if 'where' in parsed_sql:
 
         # Use 'where' statement or get all the rows
         if 'where' in parsed_sql:

-            pass
+            query = ''
+            start = 0
+            end = table.nrows
+            for condition in parsed_sql['where'].get_sublists():
+                if str(condition) == '"rowid"=:p0':
+                    start = int(params['p0'])
+                    end = start + 1
+            if query:
+                table_rows = table.where(query, start, end)
+            else:
+                table_rows = table.iterrows(start, end)

         else:
             table_rows = table.iterrows()
 
         else:
             table_rows = table.iterrows()
 

+        # Prepare rows

         if len(fields) == 1 and fields[0] == 'count(*)':
         if len(fields) == 1 and fields[0] == 'count(*)':

-            rows.append(Row({'count(*)': table.nrows}))
+            rows.append(Row({fields[0]: table.nrows}))

         else:
             for table_row in table_rows:
                 row = Row()
         else:
             for table_row in table_rows:
                 row = Row()


@@ -79,15 +92,24 @@ class Connection:
                         row[field] = table_row.nrow
                     elif field == '*':
                         for col in table.colnames:
                         row[field] = table_row.nrow
                     elif field == '*':
                         for col in table.colnames:

-                            row[col] = table_row[col]
+                            value = table_row[col]
+                            if type(value) is bytes:
+                                value = value.decode('utf-8')
+                            row[col] = value

                     else:
                         row[field] = table_row[field]
                 rows.append(row)
 
                     else:
                         row[field] = table_row[field]
                 rows.append(row)
 

-        description = ((col,) for col in table.colnames)
+        # Prepare query description
+        for field in fields:
+            if field == '*':
+                for col in table.colnames:
+                    description.append((col,))
+            else:
+                description.append((field,))

 
         if truncate:
 
         if truncate:

-            return rows, truncated, description
+            return rows, truncated, tuple(description)

         else:
             return rows
 
         else:
             return rows
 


@@ -95,3 +117,8 @@ class Row(OrderedDict):
     def __getitem__(self, label):
         if type(label) is int:
             return super(OrderedDict, self).__getitem__(list(self.keys())[label])
     def __getitem__(self, label):
         if type(label) is int:
             return super(OrderedDict, self).__getitem__(list(self.keys())[label])

+        else:
+            return super(OrderedDict, self).__getitem__(label)
+
+    def __iter__(self):
+        return self.values().__iter__()