issue #23982: identify patches

diff --git a/enyo-client/database/source/populate_data.js b/enyo-client/database/source/populate_data.js
index 1cd4cfa..f7f23af 100644 (file)
--- a/enyo-client/database/source/populate_data.js
+++ b/enyo-client/database/source/populate_data.js
@@ -1,3 +1,3 @@
-exports.commands = [
-  {"nameSpace":"XM","type":"Customer","id":"TTOYS","lock":{"effective":"2014-06-24T00:20:04.951Z","key":9,"username":"admin"},"patches":[{"op":"add","path":"/creditCards/0","value":{"isActive":true,"name":"John Brown","address1":"123 Test St","address2":"","city":"Norfolk","country":"United States","state":"VA","zip":"23517","creditCardType":"V","number":"4111111111111111","monthExpired":"12","yearExpired":"2020"}}],"binaryField":null,"requery":false,"encoding":"rjson","username":"admin","encryptionKey":"this is any content"}
+exports.patches = [
+  {"nameSpace":"XM","type":"Customer","id":"TTOYS","patches":[{"op":"add","path":"/creditCards/0","value":{"isActive":true,"name":"John Brown","address1":"123 Test St","address2":"","city":"Norfolk","country":"United States","state":"VA","zip":"23517","creditCardType":"V","number":"4111111111111111","monthExpired":"12","yearExpired":"2020"}}],"binaryField":null,"requery":false,"encoding":"rjson"}
 ];

diff --git a/scripts/lib/build_database.js b/scripts/lib/build_database.js
index de656f5..206b97d 100644 (file)
--- a/scripts/lib/build_database.js
+++ b/scripts/lib/build_database.js
@@ -222,13 +222,13 @@ var  async = require('async'),
         credsClone.database = spec.database;
         buildDatabaseUtil.sendToDatabase(allSql, credsClone, spec, function (err, res) {
           if (spec.populateData) {
-            var commands = require(path.join(__dirname, "../../enyo-client/database/source/populate_data")).commands;
             var populateSql = "DO $$ XT.disableLocks = true; $$ language plv8;";
             var encryptionKey = fs.readFileSync(path.join(__dirname, "../../node-datasource", creds.encryptionKeyFile), "utf8");
-            _.each(commands, function (command) {
-              command.encryptionKey = encryptionKey;
-              command.username = creds.username;
-              populateSql += "select xt.patch(\'" + JSON.stringify(command) + "\');";
+            var patches = require(path.join(__dirname, "../../enyo-client/database/source/populate_data")).patches;
+            _.each(patches, function (patch) {
+              patch.encryptionKey = encryptionKey;
+              patch.username = creds.username;
+              populateSql += "select xt.patch(\'" + JSON.stringify(patch) + "\');";
             });
             populateSql += "DO $$ XT.disableLocks = undefined; $$ language plv8;";
             dataSource.query(populateSql, credsClone, databaseCallback);