diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-05-22 11:10:19 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-05-22 11:10:19 +0200 |
commit | 7525386dccf23434eb0751d8ca5f6d1a17e47f49 (patch) | |
tree | 64dffa3d20a2bcc1274805f17bafdda9ff829baf | |
parent | 2c566fe8da9b2463c3376bafb24bc7428ab341a3 (diff) |
Fix missing db prefix in migration0.9.0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r-- | application/migrations/014_deduplicate_file_storage.php | 12 | ||||
-rw-r--r-- | application/migrations/015_actually_deduplicate_file_storage.php | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/application/migrations/014_deduplicate_file_storage.php b/application/migrations/014_deduplicate_file_storage.php index a1ea4fab4..133fbbab7 100644 --- a/application/migrations/014_deduplicate_file_storage.php +++ b/application/migrations/014_deduplicate_file_storage.php @@ -40,18 +40,18 @@ class Migration_deduplicate_file_storage extends CI_Migration { // XXX: This query also exists in migration 15 $this->db->query(' - DELETE file_storage - FROM file_storage - LEFT OUTER JOIN files ON files.file_storage_id = file_storage.id - WHERE file_storage.id NOT IN ( + DELETE `'.$prefix.'file_storage` + FROM `'.$prefix.'file_storage` + LEFT OUTER JOIN `'.$prefix.'files` ON `'.$prefix.'files`.file_storage_id = `'.$prefix.'file_storage`.id + WHERE `'.$prefix.'file_storage`.id NOT IN ( SELECT min(x.id) FROM ( SELECT fs.id, fs.hash - FROM file_storage fs + FROM `'.$prefix.'file_storage` fs ) x GROUP BY x.hash ) - AND files.id IS NULL + AND `'.$prefix.'files`.id IS NULL '); $chunk = 500; diff --git a/application/migrations/015_actually_deduplicate_file_storage.php b/application/migrations/015_actually_deduplicate_file_storage.php index 8f2a51c74..2fea26dab 100644 --- a/application/migrations/015_actually_deduplicate_file_storage.php +++ b/application/migrations/015_actually_deduplicate_file_storage.php @@ -13,18 +13,18 @@ class Migration_actually_deduplicate_file_storage extends CI_Migration { } else { // XXX: This query also exists in migration 14 $this->db->query(' - DELETE file_storage - FROM file_storage - LEFT OUTER JOIN files ON files.file_storage_id = file_storage.id - WHERE file_storage.id NOT IN ( + DELETE `'.$prefix.'file_storage` + FROM `'.$prefix.'file_storage` + LEFT OUTER JOIN `'.$prefix.'files` ON `'.$prefix.'files`.file_storage_id = `'.$prefix.'file_storage`.id + WHERE `'.$prefix.'file_storage`.id NOT IN ( SELECT min(x.id) FROM ( SELECT fs.id, fs.hash - FROM file_storage fs + FROM `'.$prefix.'file_storage` fs ) x GROUP BY x.hash ) - AND files.id IS NULL + AND `'.$prefix.'files`.id IS NULL '); $chunk = 500; |