openstack/aodh
Code Issues Proposed changes

Merge "Avoid imposing alembic 6.0 requirement on all distros"

Browse Source
This commit is contained in:
Jenkins 2013-09-27 15:46:01 +00:00 committed by Gerrit Code Review
commit d280925aa0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/storage/sqlalchemy/alembic/versions/2c3ccda5a3ad_fix_uniq_name.py
View File

@ -46,12 +46,12 @@ def change_uniq(table_name, uniq_name, columns, downgrade=False):
# before renaming of constraint. # before renaming of constraint.
op.drop_constraint('fk_sourceassoc_meter_id', op.drop_constraint('fk_sourceassoc_meter_id',
table_name, table_name,
type_='foreignkey') type='foreignkey')
op.drop_constraint('fk_sourceassoc_user_id', op.drop_constraint('fk_sourceassoc_user_id',
table_name, table_name,
type_='foreignkey') type='foreignkey')
if downgrade: if downgrade:
op.drop_constraint(uniq_name, table_name=table_name, type_='unique') op.drop_constraint(uniq_name, table_name=table_name, type='unique')
else: else:
op.create_unique_constraint(uniq_name, table_name, columns) op.create_unique_constraint(uniq_name, table_name, columns)
if engine.name == 'mysql': if engine.name == 'mysql':

2
ceilometer/storage/sqlalchemy/alembic/versions/b6ae66d05e3_remove_extra_indexes.py
View File

@ -65,7 +65,7 @@ def index_cleanup(engine_names, table_name, uniq_name, columns, create,
op.create_index(uniq_name, table_name, columns, unique=unique) op.create_index(uniq_name, table_name, columns, unique=unique)
else: else:
if unique: if unique:
op.drop_constraint(uniq_name, table_name, type_='unique') op.drop_constraint(uniq_name, table_name, type='unique')
else: else:
op.drop_index(uniq_name, table_name=table_name) op.drop_index(uniq_name, table_name=table_name)

2
requirements.txt
View File

@ -5,7 +5,7 @@ iso8601>=0.1.4
argparse argparse
SQLAlchemy>=0.7.8,<0.8 SQLAlchemy>=0.7.8,<0.8
sqlalchemy-migrate>=0.7.2 sqlalchemy-migrate>=0.7.2
alembic>=0.6.0 alembic>=0.4.1
netaddr netaddr
pymongo>=2.4 pymongo>=2.4
eventlet>=0.13.0 eventlet>=0.13.0