allow queries to use either the normalized value placeholder or questions marks generated by sql builder

Author: particlebanana

machines/compile-statement.js

@@ -48,7 +48,8 @@ module.exports = {
       outputDescription: 'The `nativeQuery` property is the compiled native query for the database.  The `meta` property is reserved for custom driver-specific extensions.',
       example: '==='
       // example: {
-      //   nativeQuery: '*',
+      //   nativeQuery: 'SELECT * FROM foo',
+      //   valuesToEscape: ['foo']
       //   meta: '==='
       // }
     },
@@ -105,9 +106,16 @@ module.exports = {
       return exits.error(err);
     }
 
+
+    // Attach a flag to the meta object to denote that the query was generated
+    // with Knex and that it's valuesToEscape don't need to be processed any further.
+    var meta = inputs.meta || {};
+    meta.isUsingQuestionMarks = true;
+
     return exits.success({
-      nativeQuery: compiledNativeQuery,
-      meta: inputs.meta
+      nativeQuery: compiledNativeQuery.sql,
+      valuesToEscape: compiledNativeQuery.bindings || [],
+      meta: meta
     });
   }
 

machines/send-native-query.js

@@ -104,34 +104,49 @@ module.exports = {
     // Validate provided native query.
     var sql = inputs.nativeQuery;
     var bindings = inputs.valuesToEscape || [];
+    var queryInfo;
 
 
     debug('Running SQL Query:');
     debug('SQL: ' + sql);
     debug('Bindings: ' + bindings);
     debug('Connection Id: ' + inputs.connection.id);
 
-    // Process SQL template, escaping bindings.
-    // This converts `$1`, `$2`, etc. into the escaped binding.
-    sql = sql.replace(/\$[1-9][0-9]*/g, function (substr){
-
-      // e.g. `'$3'` => `'3'` => `3` => `2`
-      var idx = +( substr.slice(1) ) - 1;
+    // If the meta flag is defined and it has a flag titled `isUsingQuestionMarks`
+    // then the query was generated by Knex in compileStatement and the query
+    // string is using `?` in place of values rather than the Waterline standardized
+    // $1, $2, etc.
+    if (!inputs.meta || !inputs.meta.isUsingQuestionMarks) {
+      // Process SQL template, escaping bindings.
+      // This converts `$1`, `$2`, etc. into the escaped binding.
+      sql = sql.replace(/\$[1-9][0-9]*/g, function (substr){
+
+        // e.g. `'$3'` => `'3'` => `3` => `2`
+        var idx = +( substr.slice(1) ) - 1;
+
+        // If no such binding exists, then just leave the original
+        // template string (e.g. "$3") alone.
+        if (idx >= bindings.length) {
+          return substr;
+        }
 
-      // If no such binding exists, then just leave the original
-      // template string (e.g. "$3") alone.
-      if (idx >= bindings.length) {
-        return substr;
-      }
+        // But otherwise, replace it with the escaped binding.
+        return inputs.connection.escape(bindings[idx]);
+      });
 
-      // But otherwise, replace it with the escaped binding.
-      return inputs.connection.escape(bindings[idx]);
-    });
+      // In this case the query has the values inline.
+      queryInfo = sql;
+    } else {
+      queryInfo = {
+        sql: sql,
+        values: bindings
+      };
+    }
 
     debug('Compiled (final) SQL: ' + sql);
 
     // Send native query to the database using node-mysql.
-    inputs.connection.query(sql, function query() {
+    inputs.connection.query(queryInfo, function query() {
       // The exact format of the arguments for this callback are not part of
       // the officially documented behavior of node-mysql (at least not as
       // of March 2016 when this comment is being written).