X-Git-Url: https://git.jsancho.org/?p=datasette-pytables.git;a=blobdiff_plain;f=datasette_pytables%2F__init__.py;h=52979829a08a3709629d6e5ffe9c7a3750bbefd7;hp=2e6920eceab3f96c3f28e17a566962023534fb44;hb=af831c7abf27458e94524ba768764aa232a6bb13;hpb=db48f57c02549d132c28e0d382ffbd47c6d980a9 diff --git a/datasette_pytables/__init__.py b/datasette_pytables/__init__.py index 2e6920e..5297982 100644 --- a/datasette_pytables/__init__.py +++ b/datasette_pytables/__init__.py @@ -81,7 +81,7 @@ class Connection: if parsed_sql['from'] == 'sqlite_master': rows = self._execute_datasette_query(sql, params) - description = (('value',)) + description = (('value',),) return rows, truncated, description table = self.h5file.get_node(parsed_sql['from']) @@ -245,23 +245,22 @@ class Connection: def _execute_datasette_query(self, sql, params): "Datasette special queries for getting tables info" - if sql == "SELECT count(*) from sqlite_master WHERE type = 'view' and name=:n": - row = Row() - row['count(*)'] = 0 - return [row] - elif sql == 'select sql from sqlite_master where name = :n and type="table"': - try: - table = self.h5file.get_node(params['n']) - colnames = ['value'] - if type(table) is tables.table.Table: - colnames = table.colnames - row = Row() - row['sql'] = 'CREATE TABLE {} ({})'.format(params['n'], ", ".join(colnames)) - return [row] - except: + if sql == 'select sql from sqlite_master where name = :n and type=:t': + if params['t'] == 'view': return [] + else: + try: + table = self.h5file.get_node(params['n']) + colnames = ['value'] + if type(table) is tables.table.Table: + colnames = table.colnames + row = Row() + row['sql'] = 'CREATE TABLE {} ({})'.format(params['n'], ", ".join(colnames)) + return [row] + except: + return [] else: - raise Exception("SQLite queries cannot be executed with this connector") + raise Exception("SQLite queries cannot be executed with this connector: %s, %s" % (sql, params)) class Row(list):