Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions superset/connectors/sqla/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ def fetch_metadata(self):
M = SqlMetric # noqa
metrics = []
any_date_col = None
db_engine_spec = self.database.db_engine_spec
db_dialect = self.database.get_dialect()
dbcols = (
db.session.query(TableColumn)
Expand All @@ -907,6 +908,7 @@ def fetch_metadata(self):
dbcol.sum = dbcol.is_num
dbcol.avg = dbcol.is_num
dbcol.is_dttm = dbcol.is_time
db_engine_spec.alter_new_orm_column(dbcol)
else:
dbcol.type = datatype
dbcol.groupby = True
Expand Down
14 changes: 14 additions & 0 deletions superset/db_engine_specs.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,15 @@ def fetch_data(cls, cursor, limit):
return cursor.fetchmany(limit)
return cursor.fetchall()

@classmethod
def alter_new_orm_column(cls, orm_col):
"""Allow altering default column attributes when first detected/added

For instance special column like `__time` for Druid can be
set to is_dttm=True. Note that this only gets called when new
columns are detected/created"""
pass

@classmethod
def epoch_to_dttm(cls):
raise NotImplementedError()
Expand Down Expand Up @@ -1708,6 +1717,11 @@ class DruidEngineSpec(BaseEngineSpec):
'P1Y': 'FLOOR({col} TO YEAR)',
}

@classmethod
def alter_new_orm_column(cls, orm_col):
if orm_col.column_name == '__time':
orm_col.is_dttm = True


class GSheetsEngineSpec(SqliteEngineSpec):
"""Engine for Google spreadsheets"""
Expand Down
42 changes: 42 additions & 0 deletions tests/sqla_models_tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from superset.connectors.sqla.models import TableColumn
from superset.db_engine_specs import DruidEngineSpec
from .base_tests import SupersetTestCase


class DatabaseModelTestCase(SupersetTestCase):

def test_is_time_druid_time_col(self):
"""Druid has a special __time column"""
col = TableColumn(column_name='__time', type='INTEGER')
self.assertEquals(col.is_dttm, None)
DruidEngineSpec.alter_new_orm_column(col)
self.assertEquals(col.is_dttm, True)

col = TableColumn(column_name='__not_time', type='INTEGER')
self.assertEquals(col.is_time, False)

def test_is_time_by_type(self):
col = TableColumn(column_name='foo', type='DATE')
self.assertEquals(col.is_time, True)

col = TableColumn(column_name='foo', type='DATETIME')
self.assertEquals(col.is_time, True)

col = TableColumn(column_name='foo', type='STRING')
self.assertEquals(col.is_time, False)