mirror of
https://github.com/apache/superset.git
synced 2024-09-17 11:09:47 -04:00
[sql lab] fixes issues specific to Sqlite (#2606)
This commit is contained in:
parent
959a09cc92
commit
fc7bd63039
@ -149,6 +149,10 @@ class BaseEngineSpec(object):
|
||||
def patch(cls):
|
||||
pass
|
||||
|
||||
@classmethod
|
||||
def get_table_names(cls, schema, inspector):
|
||||
return sorted(inspector.get_table_names(schema))
|
||||
|
||||
@classmethod
|
||||
def where_latest_partition(
|
||||
cls, table_name, schema, database, qry, columns=None):
|
||||
@ -271,6 +275,25 @@ class SqliteEngineSpec(BaseEngineSpec):
|
||||
def epoch_to_dttm(cls):
|
||||
return "datetime({col}, 'unixepoch')"
|
||||
|
||||
@classmethod
|
||||
@cache_util.memoized_func(
|
||||
timeout=600,
|
||||
key=lambda *args, **kwargs: 'db:{}:{}'.format(args[0].id, args[1]))
|
||||
def fetch_result_sets(cls, db, datasource_type, force=False):
|
||||
schemas = db.inspector.get_schema_names()
|
||||
result_sets = {}
|
||||
all_result_sets = []
|
||||
schema = schemas[0]
|
||||
if datasource_type == 'table':
|
||||
result_sets[schema] = sorted(db.inspector.get_table_names())
|
||||
elif datasource_type == 'view':
|
||||
result_sets[schema] = sorted(db.inspector.get_view_names())
|
||||
all_result_sets += [
|
||||
'{}.{}'.format(schema, t) for t in result_sets[schema]]
|
||||
if all_result_sets:
|
||||
result_sets[""] = all_result_sets
|
||||
return result_sets
|
||||
|
||||
@classmethod
|
||||
def convert_dttm(cls, target_type, dttm):
|
||||
iso = dttm.isoformat().replace('T', ' ')
|
||||
@ -278,6 +301,11 @@ class SqliteEngineSpec(BaseEngineSpec):
|
||||
iso += '.000000'
|
||||
return "'{}'".format(iso)
|
||||
|
||||
@classmethod
|
||||
def get_table_names(cls, inspector, schema):
|
||||
"""Need to disregard the schema for Sqlite"""
|
||||
return sorted(inspector.get_table_names())
|
||||
|
||||
|
||||
class MySQLEngineSpec(BaseEngineSpec):
|
||||
engine = 'mysql'
|
||||
|
@ -626,7 +626,8 @@ class Database(Model, AuditMixinNullable):
|
||||
tables_dict = self.db_engine_spec.fetch_result_sets(
|
||||
self, 'table', force=force)
|
||||
return tables_dict.get("", [])
|
||||
return sorted(self.inspector.get_table_names(schema))
|
||||
return sorted(
|
||||
self.db_engine_spec.get_table_names(self.inspector, schema))
|
||||
|
||||
def all_view_names(self, schema=None, force=False):
|
||||
if not schema:
|
||||
|
Loading…
Reference in New Issue
Block a user