Merge lp:~raoul-snyman/openlp/bug-896977 into lp:openlp

[Raoul Snyman]

Removed 'populate_default' arguments as they are not supported in older versions of migrate.

Fixed bug #896977 by removing 'populate_default' arguments as they are not supported in older versions of migrate.

[Tim Bentley (trb143)]

If you remove the populate_default then we need a mechanism to handle the defining of the fields as the values may not be as expected.

review: Needs Information

[Raoul Snyman (raoul-snyman)]

In the first upgrade, it is not needed, since the "populate_default" was on a new table, which would not have any rows in it.

In the second upgrade, I'm not too sure how accurate it would be to set all the created and modified datetimes of the songs to the moment of the upgrade. It would be incorrect on both counts. Any ideas for a possible alternative?

[Tim Bentley (trb143)]

No but I will think as I have another change planned which will need an update

review: Approve

=== 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'])
+