<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11185">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
mattf: Looks good to me, approved; Verified
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">alembic: Fix errors during upgrade head.<br><br>When trying to upgrade using alembic, a couple different errors kept<br>popping up that prevented the upgrade. An additional parameter was<br>needed when changing the schema for mwi_subscribe_replaces_unsolicited<br>from an integer to an enum. When changing from a string to an enum, the<br>type needed to be cast for postgresql. The other issue was a parameter<br>being used during column creation that did not exist.<br><br>After fixing the upgrade process, it revealed errors with the downgrade<br>process. One was a variable not being defined in the downgrade function,<br>and the other was tables not existing when using MySQL. This was due to<br>a context check that should have encompassed MySQL, but in the end was<br>not doing so.<br><br>Change-Id: Ib4d70cf3ce5080023a50be496272a777b55d6c8e<br>---<br>M contrib/ast-db-manage/config/versions/ef7efc2d3964_ps_contacts_add_endpoint_and_modify_.py<br>M contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py<br>M contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py<br>3 files changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/ast-db-manage/config/versions/ef7efc2d3964_ps_contacts_add_endpoint_and_modify_.py b/contrib/ast-db-manage/config/versions/ef7efc2d3964_ps_contacts_add_endpoint_and_modify_.py</span><br><span>index 0ac63c8..4818185 100644</span><br><span>--- a/contrib/ast-db-manage/config/versions/ef7efc2d3964_ps_contacts_add_endpoint_and_modify_.py</span><br><span>+++ b/contrib/ast-db-manage/config/versions/ef7efc2d3964_ps_contacts_add_endpoint_and_modify_.py</span><br><span>@@ -27,7 +27,8 @@</span><br><span> op.create_index('ps_contacts_qualifyfreq_exp', 'ps_contacts', ['qualify_frequency', 'expiration_time'])</span><br><span> op.create_index('ps_aors_qualifyfreq_contact', 'ps_aors', ['qualify_frequency', 'contact'])</span><br><span> def downgrade():</span><br><span style="color: hsl(0, 100%, 40%);">- if op.get_context().bind.dialect.name != 'mssql':</span><br><span style="color: hsl(120, 100%, 40%);">+ context_name = op.get_context().bind.dialect.name</span><br><span style="color: hsl(120, 100%, 40%);">+ if context_name != 'mssql' and context_name != 'mysql':</span><br><span> op.drop_index('ps_aors_qualifyfreq_contact')</span><br><span> op.drop_index('ps_contacts_qualifyfreq_exp')</span><br><span> else:</span><br><span>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</span><br><span>index 6a5b9b2..fccda35 100644</span><br><span>--- a/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py</span><br><span>+++ b/contrib/ast-db-manage/config/versions/f3c0b8695b66_taskprocessor_overload_trigger.py</span><br><span>@@ -28,11 +28,12 @@</span><br><span> op.add_column('ps_globals',</span><br><span> sa.Column('taskprocessor_overload_trigger',</span><br><span> sa.Enum(*PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_VALUES,</span><br><span style="color: hsl(0, 100%, 40%);">- name=PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_NAME,</span><br><span style="color: hsl(0, 100%, 40%);">- create_type=False)))</span><br><span style="color: hsl(120, 100%, 40%);">+ name=PJSIP_TASKPROCESSOR_OVERLOAD_TRIGGER_NAME)))</span><br><span> </span><br><span> def downgrade():</span><br><span style="color: hsl(0, 100%, 40%);">- if op.get_context().bind.dialect.name == 'mssql':</span><br><span style="color: hsl(120, 100%, 40%);">+ context = op.get_context()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if context.bind.dialect.name == 'mssql':</span><br><span> op.drop_constraint('ck_ps_globals_taskprocessor_overload_trigger_pjsip_taskprocessor_overload_trigger_values', 'ps_globals')</span><br><span> op.drop_column('ps_globals', 'taskprocessor_overload_trigger')</span><br><span> </span><br><span>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</span><br><span>index 4ecaaf7..c0f528a 100644</span><br><span>--- a/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py</span><br><span>+++ b/contrib/ast-db-manage/config/versions/fe6592859b85_fix_mwi_subscribe_replaces_.py</span><br><span>@@ -34,7 +34,7 @@</span><br><span> op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',</span><br><span> type_=sa.String(5))</span><br><span> op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',</span><br><span style="color: hsl(0, 100%, 40%);">- type_=ast_bool_values)</span><br><span style="color: hsl(120, 100%, 40%);">+ type_=ast_bool_values, postgresql_using='mwi_subscribe_replaces_unsolicited::{0}'.format(AST_BOOL_NAME))</span><br><span> </span><br><span> </span><br><span> def downgrade():</span><br><span>@@ -55,7 +55,7 @@</span><br><span> op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',</span><br><span> type_=sa.String(5))</span><br><span> op.alter_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited',</span><br><span style="color: hsl(0, 100%, 40%);">- type_=sa.Integer)</span><br><span style="color: hsl(120, 100%, 40%);">+ type_=sa.Integer, postgresql_using='mwi_subscribe_replaces_unsolicited::Integer')</span><br><span> </span><br><span> if op.get_context().bind.dialect.name == 'postgresql':</span><br><span> ENUM(name=AST_BOOL_NAME).drop(op.get_bind(), checkfirst=False)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11185">change 11185</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11185"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib4d70cf3ce5080023a50be496272a777b55d6c8e </div>
<div style="display:none"> Gerrit-Change-Number: 11185 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: mattf <creslin@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>