From: Kevin Harwell Date: Thu, 6 Feb 2014 17:54:42 +0000 (+0000) Subject: pjsip realtime: already created enum failure for postgresql X-Git-Tag: 12.1.0-rc1~3^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54102cd47923f64c92f6bb2f3c796f2ffff1ca84;p=thirdparty%2Fasterisk.git pjsip realtime: already created enum failure for postgresql If an enum had been previously created the alembic script would attempt to re-create it and an error would be generated while running migrations for a postgresql server. The work around for this is to use the ENUM object type for postgres as opposed to the generic enum type used by sqlalchemy. Using this type in the script seems to work properly for both postgres and mysql. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@407572 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/ast-db-manage/config/versions/2fc7930b41b3_add_pjsip_endpoint_options_for_12_1.py b/contrib/ast-db-manage/config/versions/2fc7930b41b3_add_pjsip_endpoint_options_for_12_1.py index 77d335493c..564897e864 100755 --- a/contrib/ast-db-manage/config/versions/2fc7930b41b3_add_pjsip_endpoint_options_for_12_1.py +++ b/contrib/ast-db-manage/config/versions/2fc7930b41b3_add_pjsip_endpoint_options_for_12_1.py @@ -13,6 +13,7 @@ down_revision = '581a4264e537' from alembic import op from alembic import context import sqlalchemy as sa +from sqlalchemy.dialects.postgresql import ENUM YESNO_NAME = 'yesno_values' YESNO_VALUES = ['yes', 'no'] @@ -27,20 +28,12 @@ PJSIP_TRANSPORT_METHOD_VALUES = ['default', 'unspecified', 'tlsv1', 'sslv2', PJSIP_TRANSPORT_PROTOCOL_NAME = 'pjsip_transport_protocol_values' PJSIP_TRANSPORT_PROTOCOL_VALUES = ['udp', 'tcp', 'tls', 'ws', 'wss'] -def create_enum(name, check_first, *args): - """Create an enumeration with the given name.""" - res = sa.Enum(*args, name=name) - res.create(op.get_bind(), checkfirst=check_first) - return res - -def drop_enum(name): - """Drop the named enumeration from the database.""" - sa.Enum(name=name).drop(op.get_bind(), checkfirst=False) - def upgrade(): ############################# Enums ############################## - yesno_values = sa.Enum(*YESNO_VALUES, name=YESNO_NAME) + # yesno_values have already been created, so use postgres enum object + # type to get around "already created" issue - works okay with mysql + yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False) # for some reason when using 'add_column' if you don't create the enum # first it will think it already exists and fail