From 751d7a5a49e67d0e13331c7a89c7eaa4724d1c87 Mon Sep 17 00:00:00 2001
From: George Joseph <george.joseph@fairview5.com>
Date: Thu, 7 Apr 2016 10:49:43 -0600
Subject: [PATCH] alembic: Remove batch operations (and sqlite support)
Because SQLite doesn't support full ALTER capabilities, alembic scripts
require batch operations. However, that capability wasn't available until
0.7.0 which some distributions haven't reached yet. Therefore, the batch
operations introduced in commit 86d6e44cc (review 2319) have been reverted
and SQLite is unsupported again, for now anyway.
Tested the full upgrade and downgrade on MySQL/Mariadb and Postgresql.
ASTERISK-25890 #close
Reported-by: Harley Peters
Change-Id: I82eba5456736320256f6775f5b0b40133f4d1c80
---
contrib/ast-db-manage/config/env.py | 3 +-
.../10aedae86a32_add_outgoing_enum_va.py | 10 +---
.../136885b81223_add_regcontext_to_pj.py | 3 +-
.../154177371065_add_default_from_user.py | 3 +-
...8e8bbf6b_increase_useragent_column_size.py | 6 +--
.../189a235b3fd7_add_keep_alive_interval.py | 3 +-
.../1c688d9a003c_pjsip_voicemail_extension.py | 11 ++--
.../1d50859ed02e_create_accountcode.py | 3 +-
.../21e526ad3040_add_pjsip_debug_option.py | 3 +-
.../23530d604b96_add_rpid_immediate.py | 3 +-
..._add_bind_rtp_to_media_address_to_pjsip.py | 3 +-
.../26f10cadc157_add_pjsip_timeout_options.py | 5 +-
.../28b8e71e541f_add_g726_non_standard.py | 3 +-
...8ce1e718f05_add_fatal_response_interval.py | 3 +-
...078ec071b7_increaes_contact_column_size.py | 6 +--
...1b3_add_pjsip_endpoint_options_for_12_1.py | 38 ++++++-------
.../31cd4f4891ec_add_auto_dtmf_mode.py | 10 +---
...4143e_add_user_eq_phone_option_to_pjsip.py | 3 +-
.../3855ee4e5f85_add_missing_pjsip_options.py | 6 +--
...bc2c9_add_allow_reload_to_ps_transports.py | 3 +-
.../423f34ad36e2_fix_pjsip_qualify_ti.py | 12 ++---
...c44_add_pjsip_endpoint_identifier_order.py | 3 +-
.../461d7d691209_add_pjsip_qualify_timeout.py | 6 +--
.../498357a710ae_add_rtp_keepalive.py | 3 +-
.../4c573e7135bd_fix_tos_field_types.py | 54 ++++++++-----------
...253c0423_make_q_member_uniqueid_autoinc.py | 25 +++------
.../51f8cb66540e_add_further_dtls_options.py | 5 +-
..._add_contact_expiration_check_interval_.py | 3 +-
.../5950038a6ead_fix_pjsip_verifiy_typo.py | 6 +--
...dd_media_encryption_optimistic_to_pjsip.py | 3 +-
...5e89_add_pjsip_max_initial_qualify_time.py | 3 +-
...a908_add_missing_columns_to_sys_and_reg.py | 8 ++-
.../e96a0b8071c_increase_pjsip_column_size.py | 30 +++++------
33 files changed, 105 insertions(+), 184 deletions(-)
diff --git a/contrib/ast-db-manage/config/env.py b/contrib/ast-db-manage/config/env.py
index 4118da0668..6740d5906d 100755
--- a/contrib/ast-db-manage/config/env.py
+++ b/contrib/ast-db-manage/config/env.py
@@ -58,8 +58,7 @@ def run_migrations_online():
connection = engine.connect()
context.configure(
connection=connection,
- target_metadata=target_metadata,
- render_as_batch=True
+ target_metadata=target_metadata
)
try:
diff --git a/contrib/ast-db-manage/config/versions/10aedae86a32_add_outgoing_enum_va.py b/contrib/ast-db-manage/config/versions/10aedae86a32_add_outgoing_enum_va.py
index cc9f0e0cc1..b4ea71cbd0 100755
--- a/contrib/ast-db-manage/config/versions/10aedae86a32_add_outgoing_enum_va.py
+++ b/contrib/ast-db-manage/config/versions/10aedae86a32_add_outgoing_enum_va.py
@@ -45,10 +45,7 @@ def upgrade():
context = op.get_context()
# Upgrading to this revision WILL clear your directmedia values.
- if context.bind.dialect.name == 'sqlite':
- with op.batch_alter_table('sippeers') as batch_op:
- batch_op.alter_column('directmedia', type_=new_type)
- elif context.bind.dialect.name != 'postgresql':
+ if context.bind.dialect.name != 'postgresql':
op.alter_column('sippeers', 'directmedia',
type_=new_type,
existing_type=old_type)
@@ -69,10 +66,7 @@ def downgrade():
op.execute(tcr.update().where(tcr.c.directmedia==u'outgoing')
.values(directmedia=None))
- if context.bind.dialect.name == 'sqlite':
- with op.batch_alter_table('sippeers') as batch_op:
- batch_op.alter_column('directmedia', type_=old_type)
- elif context.bind.dialect.name != 'postgresql':
+ if context.bind.dialect.name != 'postgresql':
op.alter_column('sippeers', 'directmedia',
type_=old_type,
existing_type=new_type)
diff --git a/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py b/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
index 22fd6c7b74..724a5e5769 100644
--- a/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
+++ b/contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
@@ -17,5 +17,4 @@ def upgrade():
op.add_column('ps_globals', sa.Column('regcontext', sa.String(80)))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('regcontext')
+ op.drop_column('ps_globals', 'regcontext')
diff --git a/contrib/ast-db-manage/config/versions/154177371065_add_default_from_user.py b/contrib/ast-db-manage/config/versions/154177371065_add_default_from_user.py
index 6c5f808bba..7e6cf994f6 100644
--- a/contrib/ast-db-manage/config/versions/154177371065_add_default_from_user.py
+++ b/contrib/ast-db-manage/config/versions/154177371065_add_default_from_user.py
@@ -19,5 +19,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('default_from_user')
+ op.drop_column('ps_globals', 'default_from_user')
diff --git a/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py b/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py
index c16cff9f4a..215726fa05 100755
--- a/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py
+++ b/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py
@@ -33,11 +33,9 @@ import sqlalchemy as sa
def upgrade():
- with op.batch_alter_table('sippeers') as batch_op:
- batch_op.alter_column('useragent', type_=sa.String(255))
+ op.alter_column('sippeers', 'useragent', type_=sa.String(255))
def downgrade():
- with op.batch_alter_table('sippeers') as batch_op:
- batch_op.alter_column('useragent', type_=sa.String(20))
+ op.alter_column('sippeers', 'useragent', type_=sa.String(20))
diff --git a/contrib/ast-db-manage/config/versions/189a235b3fd7_add_keep_alive_interval.py b/contrib/ast-db-manage/config/versions/189a235b3fd7_add_keep_alive_interval.py
index dee384d4c3..ba972b64ed 100644
--- a/contrib/ast-db-manage/config/versions/189a235b3fd7_add_keep_alive_interval.py
+++ b/contrib/ast-db-manage/config/versions/189a235b3fd7_add_keep_alive_interval.py
@@ -19,5 +19,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('keep_alive_interval')
+ op.drop_column('ps_globals', 'keep_alive_interval')
diff --git a/contrib/ast-db-manage/config/versions/1c688d9a003c_pjsip_voicemail_extension.py b/contrib/ast-db-manage/config/versions/1c688d9a003c_pjsip_voicemail_extension.py
index 781dca703b..e6f917d870 100644
--- a/contrib/ast-db-manage/config/versions/1c688d9a003c_pjsip_voicemail_extension.py
+++ b/contrib/ast-db-manage/config/versions/1c688d9a003c_pjsip_voicemail_extension.py
@@ -22,10 +22,7 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('default_voicemail_extension')
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.drop_column('voicemail_extension')
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('voicemail_extension')
- batch_op.drop_column('mwi_subscribe_replaces_unsolicited')
+ op.drop_column('ps_globals', 'default_voicemail_extension')
+ op.drop_column('ps_aors', 'voicemail_extension')
+ op.drop_column('ps_endpoints', 'voicemail_extension')
+ op.drop_column('ps_endpoints', 'mwi_subscribe_replaces_unsolicited')
diff --git a/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py b/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py
index 4d520fcee6..eb20001378 100644
--- a/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py
+++ b/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py
@@ -17,5 +17,4 @@ def upgrade():
op.add_column('ps_endpoints', sa.Column('accountcode', sa.String(20)))
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('accountcode')
+ op.drop_column('ps_endpoints', 'accountcode')
diff --git a/contrib/ast-db-manage/config/versions/21e526ad3040_add_pjsip_debug_option.py b/contrib/ast-db-manage/config/versions/21e526ad3040_add_pjsip_debug_option.py
index 8b77eb7ac6..2adca628b5 100755
--- a/contrib/ast-db-manage/config/versions/21e526ad3040_add_pjsip_debug_option.py
+++ b/contrib/ast-db-manage/config/versions/21e526ad3040_add_pjsip_debug_option.py
@@ -18,5 +18,4 @@ def upgrade():
op.add_column('ps_globals', sa.Column('debug', sa.String(40)))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('debug')
+ op.drop_column('ps_globals', 'debug')
diff --git a/contrib/ast-db-manage/config/versions/23530d604b96_add_rpid_immediate.py b/contrib/ast-db-manage/config/versions/23530d604b96_add_rpid_immediate.py
index 8ca63f1487..dc0c01c24c 100755
--- a/contrib/ast-db-manage/config/versions/23530d604b96_add_rpid_immediate.py
+++ b/contrib/ast-db-manage/config/versions/23530d604b96_add_rpid_immediate.py
@@ -45,5 +45,4 @@ def upgrade():
op.add_column('ps_endpoints', sa.Column('rpid_immediate', yesno_values))
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('rpid_immediate')
+ op.drop_column('ps_endpoints', 'rpid_immediate')
diff --git a/contrib/ast-db-manage/config/versions/26d7f3bf0fa5_add_bind_rtp_to_media_address_to_pjsip.py b/contrib/ast-db-manage/config/versions/26d7f3bf0fa5_add_bind_rtp_to_media_address_to_pjsip.py
index 1199d0c838..e7c11da192 100644
--- a/contrib/ast-db-manage/config/versions/26d7f3bf0fa5_add_bind_rtp_to_media_address_to_pjsip.py
+++ b/contrib/ast-db-manage/config/versions/26d7f3bf0fa5_add_bind_rtp_to_media_address_to_pjsip.py
@@ -28,5 +28,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('bind_rtp_to_media_address')
+ op.drop_column('ps_endpoints', 'bind_rtp_to_media_address')
diff --git a/contrib/ast-db-manage/config/versions/26f10cadc157_add_pjsip_timeout_options.py b/contrib/ast-db-manage/config/versions/26f10cadc157_add_pjsip_timeout_options.py
index 2a792d3f1e..8972d80302 100644
--- a/contrib/ast-db-manage/config/versions/26f10cadc157_add_pjsip_timeout_options.py
+++ b/contrib/ast-db-manage/config/versions/26f10cadc157_add_pjsip_timeout_options.py
@@ -20,6 +20,5 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('rtp_timeout')
- batch_op.drop_column('rtp_timeout_hold')
+ op.drop_column('ps_endpoints', 'rtp_timeout')
+ op.drop_column('ps_endpoints', 'rtp_timeout_hold')
diff --git a/contrib/ast-db-manage/config/versions/28b8e71e541f_add_g726_non_standard.py b/contrib/ast-db-manage/config/versions/28b8e71e541f_add_g726_non_standard.py
index 09056d6c40..ad36bd9b7c 100644
--- a/contrib/ast-db-manage/config/versions/28b8e71e541f_add_g726_non_standard.py
+++ b/contrib/ast-db-manage/config/versions/28b8e71e541f_add_g726_non_standard.py
@@ -27,5 +27,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('g726_non_standard')
+ op.drop_column('ps_endpoints', 'g726_non_standard')
diff --git a/contrib/ast-db-manage/config/versions/28ce1e718f05_add_fatal_response_interval.py b/contrib/ast-db-manage/config/versions/28ce1e718f05_add_fatal_response_interval.py
index 8e05a62a4c..8c499aee8c 100644
--- a/contrib/ast-db-manage/config/versions/28ce1e718f05_add_fatal_response_interval.py
+++ b/contrib/ast-db-manage/config/versions/28ce1e718f05_add_fatal_response_interval.py
@@ -19,5 +19,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_registrations') as batch_op:
- batch_op.drop_column('fatal_retry_interval')
+ op.drop_column('ps_registrations', 'fatal_retry_interval')
diff --git a/contrib/ast-db-manage/config/versions/2d078ec071b7_increaes_contact_column_size.py b/contrib/ast-db-manage/config/versions/2d078ec071b7_increaes_contact_column_size.py
index 9f98750f61..2ade86f9f3 100644
--- a/contrib/ast-db-manage/config/versions/2d078ec071b7_increaes_contact_column_size.py
+++ b/contrib/ast-db-manage/config/versions/2d078ec071b7_increaes_contact_column_size.py
@@ -15,10 +15,8 @@ import sqlalchemy as sa
def upgrade():
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.alter_column('contact', type_=sa.String(255))
+ op.alter_column('ps_aors', 'contact', type_=sa.String(255))
def downgrade():
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.alter_column('contact', type_=sa.String(40))
+ op.alter_column('ps_aors', 'contact', type_=sa.String(40))
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 102265ea84..d39ddb41a5 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
@@ -120,17 +120,15 @@ def upgrade():
op.create_index('ps_registrations_id', 'ps_registrations', ['id'])
########################## add columns ###########################
- with op.batch_alter_table('ps_endpoints') as batch_op:
# new columns for endpoints
- batch_op.add_column(sa.Column('media_address', sa.String(40)))
- batch_op.add_column(sa.Column('redirect_method',
- pjsip_redirect_method_values))
- batch_op.add_column(sa.Column('set_var', sa.Text()))
+ op.add_column('ps_endpoints', sa.Column('media_address', sa.String(40)))
+ op.add_column('ps_endpoints', sa.Column('redirect_method',
+ pjsip_redirect_method_values))
+ op.add_column('ps_endpoints', sa.Column('set_var', sa.Text()))
# rename mwi_fromuser to mwi_from_user
- batch_op.alter_column('mwi_fromuser',
- new_column_name='mwi_from_user',
- existing_type=sa.String(40))
+ op.alter_column('ps_endpoints', 'mwi_fromuser',
+ new_column_name='mwi_from_user', existing_type=sa.String(40))
# new columns for contacts
op.add_column('ps_contacts', sa.Column('outbound_proxy', sa.String(40)))
@@ -144,23 +142,19 @@ def upgrade():
def downgrade():
########################## drop columns ##########################
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.drop_column('support_path')
- batch_op.drop_column('outbound_proxy')
- batch_op.drop_column('maximum_expiration')
+ op.drop_column('ps_aors', 'support_path')
+ op.drop_column('ps_aors', 'outbound_proxy')
+ op.drop_column('ps_aors', 'maximum_expiration')
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.drop_column('path')
- batch_op.drop_column('outbound_proxy')
+ op.drop_column('ps_contacts', 'path')
+ op.drop_column('ps_contacts', 'outbound_proxy')
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.alter_column('mwi_from_user',
- new_column_name='mwi_fromuser',
- existing_type=sa.String(40))
+ op.alter_column('ps_endpoints', 'mwi_from_user',
+ new_column_name='mwi_fromuser', existing_type=sa.String(40))
- batch_op.drop_column('set_var')
- batch_op.drop_column('redirect_method')
- batch_op.drop_column('media_address')
+ op.drop_column('ps_endpoints', 'set_var')
+ op.drop_column('ps_endpoints', 'redirect_method')
+ op.drop_column('ps_endpoints', 'media_address')
########################## drop tables ###########################
diff --git a/contrib/ast-db-manage/config/versions/31cd4f4891ec_add_auto_dtmf_mode.py b/contrib/ast-db-manage/config/versions/31cd4f4891ec_add_auto_dtmf_mode.py
index b1a9f8be8e..778de8f37a 100644
--- a/contrib/ast-db-manage/config/versions/31cd4f4891ec_add_auto_dtmf_mode.py
+++ b/contrib/ast-db-manage/config/versions/31cd4f4891ec_add_auto_dtmf_mode.py
@@ -24,10 +24,7 @@ def upgrade():
context = op.get_context()
# Upgrading to this revision WILL clear your directmedia values.
- if context.bind.dialect.name == 'sqlite':
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.alter_column('dtmf_mode', type_=new_type)
- elif context.bind.dialect.name != 'postgresql':
+ if context.bind.dialect.name != 'postgresql':
op.alter_column('ps_endpoints', 'dtmf_mode',
type_=new_type,
existing_type=old_type)
@@ -45,10 +42,7 @@ def upgrade():
def downgrade():
context = op.get_context()
- if context.bind.dialect.name == 'sqlite':
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.alter_column('dtmf_mode', type_=old_type)
- elif context.bind.dialect.name != 'postgresql':
+ if context.bind.dialect.name != 'postgresql':
op.alter_column('ps_endpoints', 'dtmf_mode',
type_=old_type,
existing_type=new_type)
diff --git a/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py b/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py
index 5de7aa862b..145d6bea65 100644
--- a/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py
+++ b/contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py
@@ -27,5 +27,4 @@ def upgrade():
op.add_column('ps_endpoints', sa.Column('user_eq_phone', yesno_values))
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('user_eq_phone')
+ op.drop_column('ps_endpoints', 'user_eq_phone')
diff --git a/contrib/ast-db-manage/config/versions/3855ee4e5f85_add_missing_pjsip_options.py b/contrib/ast-db-manage/config/versions/3855ee4e5f85_add_missing_pjsip_options.py
index 08457a9d8c..afc1beb377 100644
--- a/contrib/ast-db-manage/config/versions/3855ee4e5f85_add_missing_pjsip_options.py
+++ b/contrib/ast-db-manage/config/versions/3855ee4e5f85_add_missing_pjsip_options.py
@@ -20,7 +20,5 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.drop_column('user_agent')
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('message_context')
+ op.drop_column('ps_contacts', 'user_agent')
+ op.drop_column('ps_endpoints', 'message_context')
diff --git a/contrib/ast-db-manage/config/versions/3bcc0b5bc2c9_add_allow_reload_to_ps_transports.py b/contrib/ast-db-manage/config/versions/3bcc0b5bc2c9_add_allow_reload_to_ps_transports.py
index 7f2c579785..0becc1e263 100644
--- a/contrib/ast-db-manage/config/versions/3bcc0b5bc2c9_add_allow_reload_to_ps_transports.py
+++ b/contrib/ast-db-manage/config/versions/3bcc0b5bc2c9_add_allow_reload_to_ps_transports.py
@@ -22,5 +22,4 @@ def upgrade():
op.add_column('ps_transports', sa.Column('allow_reload', yesno_values))
def downgrade():
- with op.batch_alter_table('ps_transports') as batch_op:
- batch_op.drop_column('allow_reload')
+ op.drop_column('ps_transports', 'allow_reload')
diff --git a/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py b/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
index 563b98d08a..b8b19b4c95 100644
--- a/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
+++ b/contrib/ast-db-manage/config/versions/423f34ad36e2_fix_pjsip_qualify_ti.py
@@ -15,13 +15,9 @@ import sqlalchemy as sa
def upgrade():
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.alter_column('qualify_timeout', type_=sa.Float)
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.alter_column('qualify_timeout', type_=sa.Float)
+ op.alter_column('ps_aors', 'qualify_timeout', type_=sa.Float)
+ op.alter_column('ps_contacts', 'qualify_timeout', type_=sa.Float)
def downgrade():
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.alter_column('qualify_timeout', type_=sa.Integer)
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.alter_column('qualify_timeout', type_=sa.Integer)
+ op.alter_column('ps_aors', 'qualify_timeout', type_=sa.Integer)
+ op.alter_column('ps_contacts', 'qualify_timeout', type_=sa.Integer)
diff --git a/contrib/ast-db-manage/config/versions/45e3f47c6c44_add_pjsip_endpoint_identifier_order.py b/contrib/ast-db-manage/config/versions/45e3f47c6c44_add_pjsip_endpoint_identifier_order.py
index b09acf7a3f..b7d9924932 100644
--- a/contrib/ast-db-manage/config/versions/45e3f47c6c44_add_pjsip_endpoint_identifier_order.py
+++ b/contrib/ast-db-manage/config/versions/45e3f47c6c44_add_pjsip_endpoint_identifier_order.py
@@ -18,5 +18,4 @@ def upgrade():
op.add_column('ps_globals', sa.Column('endpoint_identifier_order', sa.String(40)))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('endpoint_identifier_order')
+ op.drop_column('ps_globals', 'endpoint_identifier_order')
diff --git a/contrib/ast-db-manage/config/versions/461d7d691209_add_pjsip_qualify_timeout.py b/contrib/ast-db-manage/config/versions/461d7d691209_add_pjsip_qualify_timeout.py
index ec8a90449f..0512ef9368 100644
--- a/contrib/ast-db-manage/config/versions/461d7d691209_add_pjsip_qualify_timeout.py
+++ b/contrib/ast-db-manage/config/versions/461d7d691209_add_pjsip_qualify_timeout.py
@@ -18,7 +18,5 @@ def upgrade():
op.add_column('ps_contacts', sa.Column('qualify_timeout', sa.Integer))
def downgrade():
- with op.batch_alter_table('ps_aors') as batch_op:
- batch_op.drop_column('qualify_timeout')
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.drop_column('qualify_timeout')
+ op.drop_column('ps_aors', 'qualify_timeout')
+ op.drop_column('ps_contacts', 'qualify_timeout')
diff --git a/contrib/ast-db-manage/config/versions/498357a710ae_add_rtp_keepalive.py b/contrib/ast-db-manage/config/versions/498357a710ae_add_rtp_keepalive.py
index 3ad26509b2..5a4f470aad 100644
--- a/contrib/ast-db-manage/config/versions/498357a710ae_add_rtp_keepalive.py
+++ b/contrib/ast-db-manage/config/versions/498357a710ae_add_rtp_keepalive.py
@@ -19,5 +19,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('rtp_keepalive')
+ op.drop_column('ps_endpoints', 'rtp_keepalive')
diff --git a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
index d9bbf8977d..27b498f30a 100755
--- a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
+++ b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
@@ -19,43 +19,35 @@ YESNO_NAME = 'yesno_values'
YESNO_VALUES = ['yes', 'no']
def upgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.alter_column('tos_audio',
- type_=sa.String(10))
- batch_op.alter_column('tos_video',
- type_=sa.String(10))
- batch_op.drop_column('cos_audio')
- batch_op.drop_column('cos_video')
- batch_op.add_column(sa.Column('cos_audio', sa.Integer))
- batch_op.add_column(sa.Column('cos_video', sa.Integer))
-
- with op.batch_alter_table('ps_transports') as batch_op:
- batch_op.alter_column('tos',
- type_=sa.String(10))
+ op.alter_column('ps_endpoints', 'tos_audio', type_=sa.String(10))
+ op.alter_column('ps_endpoints', 'tos_video', type_=sa.String(10))
+ op.drop_column('ps_endpoints', 'cos_audio')
+ op.drop_column('ps_endpoints', 'cos_video')
+ op.add_column('ps_endpoints', sa.Column('cos_audio', sa.Integer))
+ op.add_column('ps_endpoints', sa.Column('cos_video', sa.Integer))
- # Can't cast YENO_VALUES to Integers, so dropping and adding is required
- batch_op.drop_column('cos')
+ op.alter_column('ps_transports', 'tos', type_=sa.String(10))
- batch_op.add_column(sa.Column('cos', sa.Integer))
+ # Can't cast YENO_VALUES to Integers, so dropping and adding is required
+ op.drop_column('ps_transports', 'cos')
+ op.add_column('ps_transports', sa.Column('cos', sa.Integer))
def downgrade():
yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
# Can't cast string to YESNO_VALUES, so dropping and adding is required
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('tos_audio')
- batch_op.drop_column('tos_video')
- batch_op.add_column(sa.Column('tos_audio', yesno_values))
- batch_op.add_column(sa.Column('tos_video', yesno_values))
- batch_op.drop_column('cos_audio')
- batch_op.drop_column('cos_video')
- batch_op.add_column(sa.Column('cos_audio', yesno_values))
- batch_op.add_column(sa.Column('cos_video', yesno_values))
-
- with op.batch_alter_table('ps_transports') as batch_op:
- batch_op.drop_column('tos')
- batch_op.add_column(sa.Column('tos', yesno_values))
+ op.drop_column('ps_endpoints', 'tos_audio')
+ op.drop_column('ps_endpoints', 'tos_video')
+ op.add_column('ps_endpoints', sa.Column('tos_audio', yesno_values))
+ op.add_column('ps_endpoints', sa.Column('tos_video', yesno_values))
+ op.drop_column('ps_endpoints', 'cos_audio')
+ op.drop_column('ps_endpoints', 'cos_video')
+ op.add_column('ps_endpoints', sa.Column('cos_audio', yesno_values))
+ op.add_column('ps_endpoints', sa.Column('cos_video', yesno_values))
+
+ op.drop_column('ps_transports', 'tos')
+ op.add_column('ps_transports', sa.Column('tos', yesno_values))
# Can't cast integers to YESNO_VALUES, so dropping and adding is required
- batch_op.drop_column('cos')
- batch_op.add_column(sa.Column('cos', yesno_values))
+ op.drop_column('ps_transports', 'cos')
+ op.add_column('ps_transports', sa.Column('cos', yesno_values))
diff --git a/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py b/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py
index 632f4c4eb1..01d4985fe5 100755
--- a/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py
+++ b/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py
@@ -36,28 +36,19 @@ def upgrade():
context = op.get_context()
# Was unable to find a way to use op.alter_column() to add the unique
# index property.
- if context.bind.dialect.name == 'sqlite':
- with op.batch_alter_table('queue_members') as batch_op:
- batch_op.create_primary_key('queue_members_pj', columns='uniqueid')
- else:
- op.drop_column('queue_members', 'uniqueid')
- op.add_column(
- 'queue_members',
- sa.Column(
- name='uniqueid', type_=sa.Integer, nullable=False,
- unique=True))
+ op.drop_column('queue_members', 'uniqueid')
+ op.add_column('queue_members', sa.Column(name='uniqueid', type_=sa.Integer,
+ nullable=False, unique=True))
# The postgres backend does not like the autoincrement needed for
# mysql here. It is just the backend that is giving a warning and
# not the database itself.
- op.alter_column(
- table_name='queue_members', column_name='uniqueid',
- existing_type=sa.Integer, existing_nullable=False,
- autoincrement=True)
+ op.alter_column(table_name='queue_members', column_name='uniqueid',
+ existing_type=sa.Integer, existing_nullable=False,
+ autoincrement=True)
def downgrade():
# Was unable to find a way to use op.alter_column() to remove the
# unique index property.
- with op.batch_alter_table('queue_members') as batch_op:
- batch_op.drop_column('uniqueid')
- batch_op.add_column(sa.Column(name='uniqueid', type_=sa.String(80), nullable=False))
+ op.drop_column('queue_members', 'uniqueid')
+ op.add_column('queue_members', sa.Column(name='uniqueid', type_=sa.String(80), nullable=False))
diff --git a/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py b/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py
index 8d0f68f03d..c2dacda2c6 100644
--- a/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py
+++ b/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py
@@ -28,6 +28,5 @@ def upgrade():
op.add_column('ps_endpoints', sa.Column('media_use_received_transport', yesno_values))
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('force_avp')
- batch_op.drop_column('media_use_received_transport')
+ op.drop_column('ps_endpoints', 'force_avp')
+ op.drop_column('ps_endpoints', 'media_use_received_transport')
diff --git a/contrib/ast-db-manage/config/versions/5813202e92be_add_contact_expiration_check_interval_.py b/contrib/ast-db-manage/config/versions/5813202e92be_add_contact_expiration_check_interval_.py
index 2c61f2b9dc..efa0196ac5 100644
--- a/contrib/ast-db-manage/config/versions/5813202e92be_add_contact_expiration_check_interval_.py
+++ b/contrib/ast-db-manage/config/versions/5813202e92be_add_contact_expiration_check_interval_.py
@@ -17,5 +17,4 @@ def upgrade():
op.add_column('ps_globals', sa.Column('contact_expiration_check_interval', sa.Integer))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('contact_expiration_check_interval')
+ op.drop_column('ps_globals', 'contact_expiration_check_interval')
diff --git a/contrib/ast-db-manage/config/versions/5950038a6ead_fix_pjsip_verifiy_typo.py b/contrib/ast-db-manage/config/versions/5950038a6ead_fix_pjsip_verifiy_typo.py
index ace5444231..28ebc8b177 100644
--- a/contrib/ast-db-manage/config/versions/5950038a6ead_fix_pjsip_verifiy_typo.py
+++ b/contrib/ast-db-manage/config/versions/5950038a6ead_fix_pjsip_verifiy_typo.py
@@ -19,13 +19,11 @@ YESNO_VALUES = ['yes', 'no']
def upgrade():
yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
- with op.batch_alter_table('ps_transports') as batch_op:
- batch_op.alter_column('verifiy_server', type_=yesno_values,
+ op.alter_column('ps_transports', 'verifiy_server', type_=yesno_values,
new_column_name='verify_server')
def downgrade():
yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
- with op.batch_alter_table('ps_transports') as batch_op:
- batch_op.alter_column('verify_server', type_=yesno_values,
+ op.alter_column('ps_transports', 'verify_server', type_=yesno_values,
new_column_name='verifiy_server')
diff --git a/contrib/ast-db-manage/config/versions/945b1098bdd_add_media_encryption_optimistic_to_pjsip.py b/contrib/ast-db-manage/config/versions/945b1098bdd_add_media_encryption_optimistic_to_pjsip.py
index fff2504034..7a463f0575 100644
--- a/contrib/ast-db-manage/config/versions/945b1098bdd_add_media_encryption_optimistic_to_pjsip.py
+++ b/contrib/ast-db-manage/config/versions/945b1098bdd_add_media_encryption_optimistic_to_pjsip.py
@@ -28,5 +28,4 @@ def upgrade():
def downgrade():
- with op.batch_alter_table('ps_endpoints') as batch_op:
- batch_op.drop_column('media_encryption_optimistic')
+ op.drop_column('ps_endpoints', 'media_encryption_optimistic')
diff --git a/contrib/ast-db-manage/config/versions/a541e0b5e89_add_pjsip_max_initial_qualify_time.py b/contrib/ast-db-manage/config/versions/a541e0b5e89_add_pjsip_max_initial_qualify_time.py
index dc06d84ef1..0ffd7848da 100644
--- a/contrib/ast-db-manage/config/versions/a541e0b5e89_add_pjsip_max_initial_qualify_time.py
+++ b/contrib/ast-db-manage/config/versions/a541e0b5e89_add_pjsip_max_initial_qualify_time.py
@@ -17,5 +17,4 @@ def upgrade():
op.add_column('ps_globals', sa.Column('max_initial_qualify_time', sa.Integer))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.drop_column('max_initial_qualify_time')
+ op.drop_column('ps_globals', 'max_initial_qualify_time')
diff --git a/contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py b/contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py
index b4502eb3d1..8aa16f1552 100644
--- a/contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py
+++ b/contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py
@@ -29,8 +29,6 @@ def upgrade():
op.add_column('ps_registrations', sa.Column('endpoint', sa.String(40)))
def downgrade():
- with op.batch_alter_table('ps_systems') as batch_op:
- batch_op.drop_column('disable_tcp_switch')
- with op.batch_alter_table('ps_registrations') as batch_op:
- batch_op.drop_column('line')
- batch_op.drop_column('endpoint')
+ op.drop_column('ps_systems', 'disable_tcp_switch')
+ op.drop_column('ps_registrations', 'line')
+ op.drop_column('ps_registrations', 'endpoint')
diff --git a/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py b/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py
index f25c2987e6..9c00c012ef 100644
--- a/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py
+++ b/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py
@@ -15,28 +15,22 @@ import sqlalchemy as sa
def upgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.alter_column('user_agent', type_=sa.String(255))
+ op.alter_column('ps_globals', 'user_agent', type_=sa.String(255))
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.alter_column('id', type_=sa.String(255))
- batch_op.alter_column('uri', type_=sa.String(255))
- batch_op.alter_column('user_agent', type_=sa.String(255))
+ op.alter_column('ps_contacts', 'id', type_=sa.String(255))
+ op.alter_column('ps_contacts', 'uri', type_=sa.String(255))
+ op.alter_column('ps_contacts', 'user_agent', type_=sa.String(255))
- with op.batch_alter_table('ps_registrations') as batch_op:
- batch_op.alter_column('client_uri', type_=sa.String(255))
- batch_op.alter_column('server_uri', type_=sa.String(255))
+ op.alter_column('ps_registrations', 'client_uri', type_=sa.String(255))
+ op.alter_column('ps_registrations', 'server_uri', type_=sa.String(255))
def downgrade():
- with op.batch_alter_table('ps_globals') as batch_op:
- batch_op.alter_column('user_agent', type_=sa.String(40))
+ op.alter_column('ps_globals', 'user_agent', type_=sa.String(40))
- with op.batch_alter_table('ps_contacts') as batch_op:
- batch_op.alter_column('id', type_=sa.String(40))
- batch_op.alter_column('uri', type_=sa.String(40))
- batch_op.alter_column('user_agent', type_=sa.String(40))
+ op.alter_column('ps_contacts', 'id', type_=sa.String(40))
+ op.alter_column('ps_contacts', 'uri', type_=sa.String(40))
+ op.alter_column('ps_contacts', 'user_agent', type_=sa.String(40))
- with op.batch_alter_table('ps_registrations') as batch_op:
- batch_op.alter_column('client_uri', type_=sa.String(40))
- batch_op.alter_column('server_uri', type_=sa.String(40))
+ op.alter_column('ps_registrations', 'client_uri', type_=sa.String(40))
+ op.alter_column('ps_registrations', 'server_uri', type_=sa.String(40))
--
GitLab