Fixes issue with automigrate when no records are present (really a problem with createEach)

mikermcneil · mikermcneil · commit 2351300744d6 · 2014-07-09T16:08:14.000-05:00
diff --git a/lib/adapter.js b/lib/adapter.js
@@ -26,7 +26,7 @@ var STRINGFILE = {
 // string queries to be elegantly displayed (see wl2
 // or tweet @mikermcneil for status of this feature or
 // to help out)
-var LOG_QUERIES = false;
+var LOG_QUERIES = true;
 
 module.exports = (function() {
 
@@ -114,8 +114,13 @@ module.exports = (function() {
         var tableName = mysql.escapeId(collectionName);
 
         var query = 'DESCRIBE ' + tableName;
-        var pkQuery = 'SHOW INDEX FROM ' + tableName + ';';
+        var pkQuery = 'SHOW INDEX FROM ' + tableName;
 
+        // Run query
+        if (LOG_QUERIES) {
+          console.log('\nExecuting MySQL query: ',query);
+          console.log('and: ',pkQuery);
+        }
         connection.query(query, function __DESCRIBE__(err, schema) {
           if (err) {
             if (err.code === 'ER_NO_SUCH_TABLE') {
@@ -203,6 +208,9 @@ module.exports = (function() {
 
 
         // Run query
+        if (LOG_QUERIES) {
+          console.log('\nExecuting MySQL query: ',query);
+        }
         connection.query(query, function __DEFINE__(err, result) {
           if (err) return cb(err);
 
@@ -248,6 +256,10 @@ module.exports = (function() {
           // Build query
           var query = 'DROP TABLE ' + tableName;
 
+          if (LOG_QUERIES) {
+            console.log('\nExecuting MySQL query: ',query);
+          }
+
           // Run query
           connection.query(query, function __DROP__(err, result) {
             if (err) {
@@ -284,6 +296,11 @@ module.exports = (function() {
 
         var query = sql.addColumn(tableName, attrName, attrDef);
 
+        // Run query
+        if (LOG_QUERIES) {
+          console.log('\nExecuting MySQL query: ',query);
+        }
+
         // Run query
         connection.query(query, function(err, result) {
           if (err) return cb(err);
@@ -312,6 +329,10 @@ module.exports = (function() {
 
         var query = sql.removeColumn(tableName, attrName);
 
+        if (LOG_QUERIES) {
+          console.log('\nExecuting MySQL query: ',query);
+        }
+
         // Run query
         connection.query(query, function(err, result) {
           if (err) return cb(err);
@@ -350,6 +371,9 @@ module.exports = (function() {
         var query = sql.insertQuery(tableName, data);
 
         // Run query
+        if (LOG_QUERIES) {
+          console.log('\nExecuting MySQL query: ',query);
+        }
         connection.query(query, function(err, result) {
           if (err) return cb( handleQueryError(err) );
 
@@ -410,7 +434,9 @@ module.exports = (function() {
 
           // Run query
           var query = sql.insertQuery(tableName, data) + '; ';
-
+          if (LOG_QUERIES) {
+            console.log('\nExecuting MySQL query: ',query);
+          }
           connection.query(query, function(err, results) {
             if (err) return cb( handleQueryError(err) );
             records.push(results.insertId);
@@ -426,10 +452,19 @@ module.exports = (function() {
             pk = key;
           });
 
+          // If there are no records (`!records.length`)
+          // then skip the query altogether- we don't need to look anything up
+          if (!records.length){
+            return cb(null, []);
+          }
+
           // Build a Query to get newly inserted records
           var query = 'SELECT * FROM ' + mysql.escapeId(tableName) + ' WHERE ' + mysql.escapeId(pk) + ' IN (' + records + ');';
 
           // Run Query returing results
+          if (LOG_QUERIES) {
+            console.log('\ncreateEach() :: Executing MySQL query: ',query);
+          }
           connection.query(query, function(err, results) {
             if(err) return cb(err);
 
