[Asterisk-code-review] alembic: Fix errors during upgrade head. (...asterisk[13])

[Benjamin Keith Ford]

Benjamin Keith Ford has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/11183


Change subject: alembic: Fix errors during upgrade head.
......................................................................

alembic: Fix errors during upgrade head.

When trying to upgrade using alembic, a couple different errors kept
popping up that prevented the upgrade. An additional parameter was
needed when changing the schema for mwi_subscribe_replaces_unsolicited
from an integer to an enum. When changing from a string to an enum, the
type needed to be cast for postgresql. The other issue was a parameter
being used during column creation that did not exist.

Change-Id: Ib4d70cf3ce5080023a50be496272a777b55d6c8e
---
M contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py
M contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py
2 files changed, 3 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/83/11183/1

diff --git a/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py b/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py
index 6a5b9b2..0b500aa 100644
--- a/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py
+++ b/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py
@@ -28,8 +28,7 @@
     op.add_column('ps_globals',
         sa.Column('taskprocessor_overload_trigger',
             sa.Enum(*PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_VALUES,
-            name=PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_NAME,
-            create_type=False)))
+            name=PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_NAME)))
 
 def downgrade():
     if op.get_context().bind.dialect.name == 'mssql':
diff --git a/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py b/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py
index 4ecaaf7..c8005c9 100644
--- a/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py
+++ b/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py
@@ -34,7 +34,7 @@
     op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',
                     type_=sa.String(5))
     op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',
-                    type_=ast_bool_values)
+            type_=ast_bool_values, postgresql_using='mwi_subscribe_replaces_unsolicited::{0}'.format(AST_BOOL_NAME))
 
 
 def downgrade():
@@ -55,7 +55,7 @@
     op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',
                     type_=sa.String(5))
     op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',
-                    type_=sa.Integer)
+            type_=sa.Integer, postgresql_using='mwi_subscribe_replaces_unsolicited::{0}'.format(sa.Integer))
 
     if op.get_context().bind.dialect.name == 'postgresql':
         ENUM(name=AST_BOOL_NAME).drop(op.get_bind(), checkfirst=False)

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11183
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Change-Id: Ib4d70cf3ce5080023a50be496272a777b55d6c8e
Gerrit-Change-Number: 11183
Gerrit-PatchSet: 1
Gerrit-Owner: Benjamin Keith Ford <bford at digium.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190326/5b26a829/attachment.html>