openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Hopefully the last fix to this!
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-863845/+merge/84396
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-863845 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/olpimport.py'
--- openlp/plugins/songs/lib/olpimport.py	2011-12-03 22:30:22 +0000
+++ openlp/plugins/songs/lib/olpimport.py	2011-12-04 13:31:24 +0000
@@ -145,6 +145,7 @@
             else:
                 song_props['media_files'] = relation(OldMediaFile,
                     backref='songs',
+                    foreign_keys=[source_media_files_table.c.song_id],
                     primaryjoin=source_songs_table.c.id == \
                         source_media_files_table.c.song_id)
         try: