[svn-commits] rmudgett: trunk r420212 - in /trunk: ./ contrib/ast-db-manage/ contrib/ast-db...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug  6 12:04:08 2014
New Revision: 420212

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420212
Log:
alembic: Adjust sippeers, queue_members, and voicemail_messages tables.

* Increased the sippeers useragent max string size to 255.

* Changed the queue_members uniqueid to an auto incremented integer
instead of a string.

* Increased the voicemail_messages BLOB size to LONGBLOB on mysql.

* Fixed the add_tables_for_pjsip config change version downgrade actions
to drop a table it created.

* Adjusted the sample alembic.ini files cdr.ini.sample, config.ini.sample,
and voicemail.ini.sample to give a mysql and postgres sqlalchemy.url
lines.

ASTERISK-23847 #close
Reported by: Stephen More

ASTERISK-23825 #close
Reported by: Stephen More

ASTERISK-23909 #close
Reported by: Stephen More

Review: https://reviewboard.asterisk.org/r/3870/
........

Merged revisions 420211 from http://svn.asterisk.org/svn/asterisk/branches/12

Added:
    trunk/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py
      - copied unchanged from r420211, branches/12/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py
    trunk/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py
      - copied unchanged from r420211, branches/12/contrib/ast-db-manage/config/versions/5139253c0423_make_q_member_uniqueid_autoinc.py
    trunk/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py
      - copied unchanged from r420211, branches/12/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py
Modified:
    trunk/   (props changed)
    trunk/contrib/ast-db-manage/cdr.ini.sample
    trunk/contrib/ast-db-manage/config.ini.sample
    trunk/contrib/ast-db-manage/config/versions/43956d550a44_add_tables_for_pjsip.py
    trunk/contrib/ast-db-manage/voicemail.ini.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/contrib/ast-db-manage/cdr.ini.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/cdr.ini.sample?view=diff&rev=420212&r1=420211&r2=420212
==============================================================================
--- trunk/contrib/ast-db-manage/cdr.ini.sample (original)
+++ trunk/contrib/ast-db-manage/cdr.ini.sample Wed Aug  6 12:04:08 2014
@@ -15,7 +15,10 @@
 # the 'revision' command, regardless of autogenerate
 # revision_environment = false
 
-sqlalchemy.url = mysql://user:pass@localhost/voicemail
+#sqlalchemy.url = driver://user:pass@localhost/dbname
+
+#sqlalchemy.url = postgresql://user:pass@localhost/cdr
+sqlalchemy.url = mysql://user:pass@localhost/cdr
 
 
 # Logging configuration

Modified: trunk/contrib/ast-db-manage/config.ini.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/config.ini.sample?view=diff&rev=420212&r1=420211&r2=420212
==============================================================================
--- trunk/contrib/ast-db-manage/config.ini.sample (original)
+++ trunk/contrib/ast-db-manage/config.ini.sample Wed Aug  6 12:04:08 2014
@@ -1,3 +1,5 @@
+# A generic, single database configuration.
+
 [alembic]
 # path to migration scripts
 script_location = config
@@ -5,11 +7,18 @@
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s
 
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
 # set to 'true' to run the environment during
 # the 'revision' command, regardless of autogenerate
 # revision_environment = false
 
-sqlalchemy.url = mysql://root:password@localhost/asterisk
+#sqlalchemy.url = driver://user:pass@localhost/dbname
+
+#sqlalchemy.url = postgresql://user:pass@localhost/asterisk
+sqlalchemy.url = mysql://user:pass@localhost/asterisk
 
 
 # Logging configuration

Modified: trunk/contrib/ast-db-manage/config/versions/43956d550a44_add_tables_for_pjsip.py
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/config/versions/43956d550a44_add_tables_for_pjsip.py?view=diff&rev=420212&r1=420211&r2=420212
==============================================================================
--- trunk/contrib/ast-db-manage/config/versions/43956d550a44_add_tables_for_pjsip.py (original)
+++ trunk/contrib/ast-db-manage/config/versions/43956d550a44_add_tables_for_pjsip.py Wed Aug  6 12:04:08 2014
@@ -184,5 +184,6 @@
     op.drop_table('ps_endpoints')
     op.drop_table('ps_auths')
     op.drop_table('ps_aors')
+    op.drop_table('ps_contacts')
     op.drop_table('ps_domain_aliases')
     op.drop_table('ps_endpoint_id_ips')

Modified: trunk/contrib/ast-db-manage/voicemail.ini.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/voicemail.ini.sample?view=diff&rev=420212&r1=420211&r2=420212
==============================================================================
--- trunk/contrib/ast-db-manage/voicemail.ini.sample (original)
+++ trunk/contrib/ast-db-manage/voicemail.ini.sample Wed Aug  6 12:04:08 2014
@@ -1,3 +1,5 @@
+# A generic, single database configuration.
+
 [alembic]
 # path to migration scripts
 script_location = voicemail
@@ -5,10 +7,17 @@
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s
 
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
 # set to 'true' to run the environment during
 # the 'revision' command, regardless of autogenerate
 # revision_environment = false
 
+#sqlalchemy.url = driver://user:pass@localhost/dbname
+
+#sqlalchemy.url = postgresql://user:pass@localhost/voicemail
 sqlalchemy.url = mysql://user:pass@localhost/voicemail