You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/09/12 12:29:28 UTC
[14/28] git commit: [#7527] Bugfix for migrations to prevent
duplicates
[#7527] Bugfix for migrations to prevent duplicates
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/99de4f45
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/99de4f45
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/99de4f45
Branch: refs/heads/je/42cc_4905
Commit: 99de4f45c5cd348a7d422073adb2f7476d507801
Parents: f825a56
Author: Alexander Luberg <al...@slashdotmedia.com>
Authored: Wed Aug 27 05:28:00 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 28 20:27:02 2014 +0000
----------------------------------------------------------------------
.../030-email-address-_id-to-email--before-upgrade.js | 4 ++--
scripts/migrations/030-email-address-_id-to-email--cleanup.js | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/99de4f45/scripts/migrations/030-email-address-_id-to-email--before-upgrade.js
----------------------------------------------------------------------
diff --git a/scripts/migrations/030-email-address-_id-to-email--before-upgrade.js b/scripts/migrations/030-email-address-_id-to-email--before-upgrade.js
index 6681864..3cc2618 100644
--- a/scripts/migrations/030-email-address-_id-to-email--before-upgrade.js
+++ b/scripts/migrations/030-email-address-_id-to-email--before-upgrade.js
@@ -2,5 +2,5 @@ db.email_address.find().snapshot().forEach(function (e) {
e.email = e._id;
e._id = new ObjectId();
db.email_address_new.insert(e);
- db.email_address.update({'_id': e._id}, {'migrated': true});
-});
\ No newline at end of file
+ db.email_address.update({'_id': e.email}, {$set: {migrated: true}});
+});
http://git-wip-us.apache.org/repos/asf/allura/blob/99de4f45/scripts/migrations/030-email-address-_id-to-email--cleanup.js
----------------------------------------------------------------------
diff --git a/scripts/migrations/030-email-address-_id-to-email--cleanup.js b/scripts/migrations/030-email-address-_id-to-email--cleanup.js
index 26b0064..34cf7a0 100644
--- a/scripts/migrations/030-email-address-_id-to-email--cleanup.js
+++ b/scripts/migrations/030-email-address-_id-to-email--cleanup.js
@@ -1,8 +1,8 @@
-db.email_address_old.find({'migrated': {'$ne': false}}).snapshot().forEach(function (e) {
+db.email_address_old.find({'migrated': {'$ne': true}}).snapshot().forEach(function (e) {
e.email = e._id;
e._id = new ObjectId();
db.email_address.insert(e);
- db.email_address_old.update({'_id': e._id}, {'migrated': true});
+ db.email_address_old.update({'_id': e.email}, {$set: {migrated: true}});
});
// Drop the collection manually if everything is okay
-// db.email_address_old.drop();
\ No newline at end of file
+// db.email_address_old.drop();