From cf785b4d03c6b7541b93566c8bcb93d3a037fb7b Mon Sep 17 00:00:00 2001 From: aljones Date: Fri, 22 Jul 2016 12:46:41 -0400 Subject: [PATCH] fix datasources foreign key size (#791) --- caravel/migrations/versions/4e6a06bad7a8_init.py | 4 ++-- caravel/models.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/caravel/migrations/versions/4e6a06bad7a8_init.py b/caravel/migrations/versions/4e6a06bad7a8_init.py index ee11469430..add55f8671 100644 --- a/caravel/migrations/versions/4e6a06bad7a8_init.py +++ b/caravel/migrations/versions/4e6a06bad7a8_init.py @@ -87,7 +87,7 @@ def upgrade(): sa.Column('created_on', sa.DateTime(), nullable=False), sa.Column('changed_on', sa.DateTime(), nullable=False), sa.Column('id', sa.Integer(), nullable=False), - sa.Column('datasource_name', sa.String(length=250), nullable=True), + sa.Column('datasource_name', sa.String(length=255), nullable=True), sa.Column('column_name', sa.String(length=255), nullable=True), sa.Column('is_active', sa.Boolean(), nullable=True), sa.Column('type', sa.String(length=32), nullable=True), @@ -107,7 +107,7 @@ def upgrade(): sa.Column('metric_name', sa.String(length=512), nullable=True), sa.Column('verbose_name', sa.String(length=1024), nullable=True), sa.Column('metric_type', sa.String(length=32), nullable=True), - sa.Column('datasource_name', sa.String(length=250), sa.ForeignKey("datasources.datasource_name"), nullable=True), + sa.Column('datasource_name', sa.String(length=255), sa.ForeignKey("datasources.datasource_name"), nullable=True), sa.Column('json', sa.Text(), nullable=True), sa.Column('description', sa.Text(), nullable=True), sa.ForeignKeyConstraint(['datasource_name'], ['datasources.datasource_name'], ), diff --git a/caravel/models.py b/caravel/models.py index a4c88a79d7..ac0083f535 100644 --- a/caravel/models.py +++ b/caravel/models.py @@ -1495,7 +1495,7 @@ class DruidMetric(Model, AuditMixinNullable): verbose_name = Column(String(1024)) metric_type = Column(String(32)) datasource_name = Column( - String(250), + String(255), ForeignKey('datasources.datasource_name')) # Setting enable_typechecks=False disables polymorphic inheritance. datasource = relationship('DruidDatasource', backref='metrics', @@ -1529,7 +1529,7 @@ class DruidColumn(Model, AuditMixinNullable): __tablename__ = 'columns' id = Column(Integer, primary_key=True) datasource_name = Column( - String(250), + String(255), ForeignKey('datasources.datasource_name')) # Setting enable_typechecks=False disables polymorphic inheritance. datasource = relationship('DruidDatasource', backref='columns',