diff --git a/monasca_api/common/repositories/sqla/models.py b/monasca_api/common/repositories/sqla/models.py index dbfcb57f1..0e52b0e46 100644 --- a/monasca_api/common/repositories/sqla/models.py +++ b/monasca_api/common/repositories/sqla/models.py @@ -18,7 +18,7 @@ from sqlalchemy import Column from sqlalchemy.ext import compiler from sqlalchemy.sql import expression -from sqlalchemy import String, DateTime, Boolean, Integer, Binary, Float +from sqlalchemy import String, DateTime, Boolean, Integer, LargeBinary, Float from sqlalchemy import MetaData from sqlalchemy import Table @@ -76,14 +76,14 @@ def create_aa_model(metadata=None): def create_md_model(metadata=None): return Table('metric_dimension', metadata, - Column('dimension_set_id', Binary), + Column('dimension_set_id', LargeBinary), Column('name', String(255)), Column('value', String(255))) def create_mde_model(metadata=None): return Table('metric_definition', metadata, - Column('id', Binary), + Column('id', LargeBinary), Column('name', String(255)), Column('tenant_id', String(255)), Column('region', String(255))) @@ -108,15 +108,15 @@ def create_nmt_model(metadata=None): def create_mdd_model(metadata=None): return Table('metric_definition_dimensions', metadata, - Column('id', Binary), - Column('metric_definition_id', Binary), - Column('metric_dimension_set_id', Binary)) + Column('id', LargeBinary), + Column('metric_definition_id', LargeBinary), + Column('metric_dimension_set_id', LargeBinary)) def create_am_model(metadata=None): return Table('alarm_metric', metadata, Column('alarm_id', String(36)), - Column('metric_definition_dimensions_id', Binary)) + Column('metric_definition_dimensions_id', LargeBinary)) def create_ad_model(metadata=None): diff --git a/monasca_api/common/repositories/sqla/sql_repository.py b/monasca_api/common/repositories/sqla/sql_repository.py index fdd148c78..4bedbbe94 100644 --- a/monasca_api/common/repositories/sqla/sql_repository.py +++ b/monasca_api/common/repositories/sqla/sql_repository.py @@ -33,7 +33,7 @@ def _get_db_conf(conf_group, connection=None): __autocommit=True, expire_on_commit=False, mysql_sql_mode=conf_group.mysql_sql_mode, - idle_timeout=conf_group.idle_timeout, + connection_recycle_time=conf_group.connection_recycle_time, connection_debug=conf_group.connection_debug, max_pool_size=conf_group.max_pool_size, max_overflow=conf_group.max_overflow, diff --git a/monasca_api/db/fingerprint.py b/monasca_api/db/fingerprint.py index 036651f52..6f75e5a56 100644 --- a/monasca_api/db/fingerprint.py +++ b/monasca_api/db/fingerprint.py @@ -48,7 +48,7 @@ class Fingerprint(object): @staticmethod def _get_metadata(engine): - return MetaData(bind=engine, reflect=True) + return MetaData(bind=engine) @staticmethod def _get_schema_raw(metadata):