Progress

panoramix/models.py

@@ -8,8 +8,8 @@
 from pydruid.utils.filters import Dimension, Filter
 from sqlalchemy import (
     Column, Integer, String, ForeignKey, Text, Boolean, DateTime)
-from sqlalchemy import Table as sqlaTable
-from sqlalchemy import create_engine, MetaData, desc, select, and_, Table
+from sqlalchemy import Table
+from sqlalchemy import create_engine, MetaData, desc, select, and_
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import table, literal_column, text
 from flask import request
@@ -55,7 +55,7 @@ class Slice(Model, AuditMixinNullable):
     params = Column(Text)
 
     table = relationship(
-        'Table', foreign_keys=[table_id], backref='slices')
+        'SqlaTable', foreign_keys=[table_id], backref='slices')
     druid_datasource = relationship(
         'Datasource', foreign_keys=[druid_datasource_id], backref='slices')
 
@@ -184,13 +184,13 @@ def get_sqla_engine(self):
 
     def get_table(self, table_name):
         meta = MetaData()
-        return sqlaTable(
+        return Table(
             table_name, meta,
             autoload=True,
             autoload_with=self.get_sqla_engine())
 
 
-class Table(Model, Queryable, AuditMixinNullable):
+class SqlaTable(Model, Queryable, AuditMixinNullable):
     type = "table"
 
     __tablename__ = 'tables'
@@ -519,7 +519,7 @@ class SqlMetric(Model, AuditMixinNullable):
     metric_type = Column(String(32))
     table_id = Column(Integer, ForeignKey('tables.id'))
     table = relationship(
-        'Table', backref='metrics', foreign_keys=[table_id])
+        'SqlaTable', backref='metrics', foreign_keys=[table_id])
     expression = Column(Text)
     description = Column(Text)
 
@@ -528,7 +528,8 @@ class TableColumn(Model, AuditMixinNullable):
     __tablename__ = 'table_columns'
     id = Column(Integer, primary_key=True)
     table_id = Column(Integer, ForeignKey('tables.id'))
-    table = relationship('Table', backref='columns', foreign_keys=[table_id])
+    table = relationship(
+        'SqlaTable', backref='columns', foreign_keys=[table_id])
     column_name = Column(String(256))
     is_dttm = Column(Boolean, default=True)
     is_active = Column(Boolean, default=True)

panoramix/utils.py

@@ -143,3 +143,8 @@ def init():
                     'muldelete',
                 )):
             sm.add_permission_role(gamma, perm)
+    session = db.session()
+    for i in range(100):
+        print(type(models.Table))
+    for table in session.query(models.Table).all():
+        print table

panoramix/views.py

@@ -116,7 +116,7 @@ class DatabaseView(PanoramixModelView, DeleteMixin):
 
 
 class TableView(PanoramixModelView, DeleteMixin):
-    datamodel = SQLAInterface(models.Table)
+    datamodel = SQLAInterface(models.SqlaTable)
     list_columns = ['table_link', 'database']
     add_columns = ['table_name', 'database', 'default_endpoint']
     edit_columns = [
@@ -268,7 +268,7 @@ def datasource(self, datasource_type, datasource_id):
         if datasource_type == "table":
             datasource = (
                 db.session
-                .query(models.Table)
+                .query(models.SqlaTable)
                 .filter_by(id=datasource_id)
                 .first()
             )