openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-896977 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #896977 in OpenLP: "TypeError: __init__() got an unexpected keyword argument 'populate_default'"
  https://bugs.launchpad.net/openlp/+bug/896977

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-896977/+merge/83531

Fixed bug #896977 by removing 'populate_default' arguments as they are not supported in older versions of migrate.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-896977/+merge/83531
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-896977 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/upgrade.py'
--- openlp/plugins/songs/lib/upgrade.py	2011-10-03 20:12:57 +0000
+++ openlp/plugins/songs/lib/upgrade.py	2011-11-27 21:29:24 +0000
@@ -68,9 +68,9 @@
     """
     Table(u'media_files_songs', metadata, autoload=True).drop(checkfirst=True)
     Column(u'song_id', types.Integer(), default=None)\
-        .create(table=tables[u'media_files'], populate_default=True)
+        .create(table=tables[u'media_files'])
     Column(u'weight', types.Integer(), default=0)\
-        .create(table=tables[u'media_files'], populate_default=True)
+        .create(table=tables[u'media_files'])
     if metadata.bind.url.get_dialect().name != 'sqlite':
         # SQLite doesn't support ALTER TABLE ADD CONSTRAINT
         ForeignKeyConstraint([u'song_id'], [u'songs.id'],
@@ -83,6 +83,7 @@
     This upgrade adds a create_date and last_modified date to the songs table
     """
     Column(u'create_date', types.DateTime(), default=func.now())\
-        .create(table=tables[u'songs'], populate_default=True)
+        .create(table=tables[u'songs'])
     Column(u'last_modified', types.DateTime(), default=func.now())\
-        .create(table=tables[u'songs'], populate_default=True)
+        .create(table=tables[u'songs'])
+