Basic execute method for queries

diff --git a/datasette_pytables/__init__.py b/datasette_pytables/__init__.py
index dc6823472e8abdf6190009648a83d8a6f79122f6..93be0f9a1206208f3667633526baca08b28ae335 100644 (file)
--- a/datasette_pytables/__init__.py
+++ b/datasette_pytables/__init__.py
@@ -1,4 +1,6 @@
 import tables
+import sqlparse
+from collections import OrderedDict
 
 _connector_type = 'pytables'
 
@@ -27,10 +29,69 @@ def inspect(path):
     h5file.close()
     return h5tables, views, _connector_type
 
+def _parse_sql(sql):
+    parsed = sqlparse.parse(sql)
+    stmt = parsed[0]
+    parsed_sql = {}
+    current_keyword = ""
+    for token in stmt.tokens:
+        if token.is_keyword:
+            if current_keyword in parsed_sql and parsed_sql[current_keyword] == '':
+                # Check composed keywords like 'order by'
+                del parsed_sql[current_keyword]
+                current_keyword += " " + str(token)
+            else:
+                current_keyword = str(token)
+            parsed_sql[current_keyword] = ""
+        else:
+            if not token.is_whitespace:
+                parsed_sql[current_keyword] += str(token)
+    return parsed_sql
+
 class Connection:
     def __init__(self, path):
         self.path = path
         self.h5file = tables.open_file(path)
 
-    def execute(self, sql, params):
-        return [], False, []
+    def execute(self, sql, params=None, truncate=False):
+        rows = []
+        truncated = False
+        description = []
+
+        parsed_sql = _parse_sql(sql)
+        table = self.h5file.get_node(parsed_sql['from'][1:-1])
+        table_rows = []
+        fields = parsed_sql['select'].split(',')
+
+        # Use 'where' statement or get all the rows
+        if 'where' in parsed_sql:
+            pass
+        else:
+            table_rows = table.iterrows()
+
+        if len(fields) == 1 and fields[0] == 'count(*)':
+            rows.append(Row({'count(*)': table.nrows}))
+        else:
+            for table_row in table_rows:
+                row = Row()
+                for field in fields:
+                    if field == 'rowid':
+                        row[field] = table_row.nrow
+                    elif field == '*':
+                        for col in table.colnames:
+                            row[col] = table_row[col]
+                    else:
+                        row[field] = table_row[field]
+                rows.append(row)
+
+        description = ((col,) for col in table.colnames)
+
+        if truncate:
+            return rows, truncated, description
+        else:
+            return rows
+
+class Row(OrderedDict):
+    def __getitem__(self, label):
+        if type(label) is int:
+            return super(OrderedDict, self).__getitem__(list(self.keys())[label])

diff --git a/setup.py b/setup.py
index 4840847735e225c189ad798b0813eaa6d7a4b040..72d16850ad03ea494a457660b143c6f47464a028 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,6 @@ setup(
             'pytables = datasette_pytables'
         ],
     },
-    install_requires=['datasette']
+    install_requires=['datasette', 'tables', 'sqlparse']
 )