openstack/glance
Code Issues Proposed changes

Merge "Fix migration on older postgres"

Browse Source
This commit is contained in:
Jenkins 2014-08-18 08:29:17 +00:00 committed by Gerrit Code Review
commit f2e6001c3e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
View File

@ -16,6 +16,7 @@
import re
from migrate.changeset import UniqueConstraint
from oslo.db import exception as db_exception
from sqlalchemy import and_, func, orm
from sqlalchemy import MetaData, Table
from sqlalchemy.exc import OperationalError, ProgrammingError
@ -34,7 +35,7 @@ def upgrade(migrate_engine):
UniqueConstraint('image_id',
name=_get_original_keyname(migrate_engine.name),
table=image_members).drop()
except (OperationalError, ProgrammingError):
except (OperationalError, ProgrammingError, db_exception.DBError):
UniqueConstraint('image_id',
name=_infer_original_keyname(image_members),
table=image_members).drop()