From c81ffa9ec83163cb9c1871b399b70cba64ced3e7 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 30 Oct 2018 10:52:28 -0500
Subject: [PATCH] alembic: Fix use_callerid_contact option add script.
ASTERISK-28087
Change-Id: I046d018015427d0916fab571b5a4f5367476f729
---
.../2bb1a85135ad_pjsip_add_use_callerid_contact.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/contrib/ast-db-manage/config/versions/2bb1a85135ad_pjsip_add_use_callerid_contact.py b/contrib/ast-db-manage/config/versions/2bb1a85135ad_pjsip_add_use_callerid_contact.py
index 490e23d399..a2d39f41de 100644
--- a/contrib/ast-db-manage/config/versions/2bb1a85135ad_pjsip_add_use_callerid_contact.py
+++ b/contrib/ast-db-manage/config/versions/2bb1a85135ad_pjsip_add_use_callerid_contact.py
@@ -24,19 +24,16 @@ AST_BOOL_VALUES = [ '0', '1',
def upgrade():
- # Create the new enum
- ast_bool_values = ENUM(*AST_BOOL_VALUES, name=AST_BOOL_NAME, create_type=False)
- if op.get_context().bind.dialect.name == 'postgresql':
- ast_bool_values.create(op.get_bind(), checkfirst=False)
+ ############################# Enums ##############################
+ # ast_bool_values has already been created, so use postgres enum object
+ # type to get around "already created" issue - works okay with mysql
+ ast_bool_values = ENUM(*AST_BOOL_VALUES, name=AST_BOOL_NAME, create_type=False)
op.add_column('ps_globals', sa.Column('use_callerid_contact', ast_bool_values))
def downgrade():
if op.get_context().bind.dialect.name == 'mssql':
- op.drop_constraint('ck_ps_globals_use_callerid_contact_ast_bool_values','ps_globals')
+ op.drop_constraint('ck_ps_globals_use_callerid_contact_ast_bool_values', 'ps_globals')
op.drop_column('ps_globals', 'use_callerid_contact')
-
- if op.get_context().bind.dialect.name == 'postgresql':
- ENUM(name=AST_BOOL_NAME).drop(op.get_bind(), checkfirst=False)
--
GitLab