diff options
| author | Jens Georg <mail@jensge.org> | 2012-06-13 23:26:56 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2012-06-13 23:38:19 +0200 |
| commit | 3af0eaded2efac3edcabc89ddf80ccb5db4010a1 (patch) | |
| tree | 114736d47635ab6ea9901c6a0e9fc176f9842be7 | |
| parent | 335e58abbd5ecc91cb33479ddc98976bafd03128 (diff) | |
| download | rygel-3af0eaded2efac3edcabc89ddf80ccb5db4010a1.tar.gz | |
media-export: Fix upgrade from rygel 0.6
| -rw-r--r-- | src/plugins/media-export/rygel-media-export-media-cache-upgrader.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/media-export/rygel-media-export-media-cache-upgrader.vala b/src/plugins/media-export/rygel-media-export-media-cache-upgrader.vala index 192d1595..c2c109dc 100644 --- a/src/plugins/media-export/rygel-media-export-media-cache-upgrader.vala +++ b/src/plugins/media-export/rygel-media-export-media-cache-upgrader.vala @@ -200,10 +200,10 @@ internal class Rygel.MediaExport.MediaCacheUpgrader { try { database.begin (); database.exec ("DROP TABLE object_type"); + database.exec ("DROP TRIGGER IF EXISTS trgr_delete_uris"); database.exec ("ALTER TABLE Object ADD COLUMN uri TEXT"); database.exec ("UPDATE Object SET uri = (SELECT uri " + "FROM uri WHERE Uri.object_fk == Object.upnp_id LIMIT 1)"); - database.exec ("DROP TRIGGER IF EXISTS trgr_delete_uris"); database.exec ("DROP INDEX IF EXISTS idx_uri_fk"); database.exec ("DROP TABLE Uri"); database.exec ("UPDATE schema_info SET version = '6'"); @@ -284,13 +284,13 @@ internal class Rygel.MediaExport.MediaCacheUpgrader { this.database.exec ("DROP TRIGGER trgr_delete_closure"); this.database.exec ("DROP INDEX idx_parent"); this.database.exec ("DROP INDEX idx_meta_data_fk"); - this.database.exec ("DROP INDEX idx_closure"); + this.database.exec ("DROP INDEX IF EXISTS idx_closure"); this.database.exec ("DROP TABLE Closure"); // keep meta-data although we're deleting loads of objects this.database.exec ("DROP TRIGGER trgr_delete_metadata"); - this.database.exec ("INSERT INTO Object (parent, upnp_id, " + + this.database.exec ("INSERT OR REPLACE INTO Object (parent, upnp_id, " + "type_fk, title, timestamp) VALUES " + "('0', '" + RootContainer.FILESYSTEM_FOLDER_ID + |