knex 2.5.0 → 3.0.0

package/lib/formatter/formatterUtils.js

@@ -1,42 +1,42 @@
-const { isObject } = require('../util/is');
-
-// Compiles a callback using the query builder.
-function compileCallback(callback, method, client, bindingsHolder) {
-  // Build the callback
-  const builder = client.queryBuilder();
-  callback.call(builder, builder);
-
-  // Compile the callback, using the current formatter (to track all bindings).
-  const compiler = client.queryCompiler(builder, bindingsHolder.bindings);
-
-  // Return the compiled & parameterized sql.
-  return compiler.toSQL(method || builder._method || 'select');
-}
-
-function wrapAsIdentifier(value, builder, client) {
-  const queryContext = builder.queryContext();
-  return client.wrapIdentifier((value || '').trim(), queryContext);
-}
-
-function formatDefault(value, type, client) {
-  if (value === void 0) {
-    return '';
-  } else if (value === null) {
-    return 'null';
-  } else if (value && value.isRawInstance) {
-    return value.toQuery();
-  } else if (type === 'bool') {
-    if (value === 'false') value = 0;
-    return `'${value ? 1 : 0}'`;
-  } else if ((type === 'json' || type === 'jsonb') && isObject(value)) {
-    return `'${JSON.stringify(value)}'`;
-  } else {
-    return client._escapeBinding(value.toString());
-  }
-}
-
-module.exports = {
-  compileCallback,
-  wrapAsIdentifier,
-  formatDefault,
-};
+const { isObject } = require('../util/is');
+
+// Compiles a callback using the query builder.
+function compileCallback(callback, method, client, bindingsHolder) {
+  // Build the callback
+  const builder = client.queryBuilder();
+  callback.call(builder, builder);
+
+  // Compile the callback, using the current formatter (to track all bindings).
+  const compiler = client.queryCompiler(builder, bindingsHolder.bindings);
+
+  // Return the compiled & parameterized sql.
+  return compiler.toSQL(method || builder._method || 'select');
+}
+
+function wrapAsIdentifier(value, builder, client) {
+  const queryContext = builder.queryContext();
+  return client.wrapIdentifier((value || '').trim(), queryContext);
+}
+
+function formatDefault(value, type, client) {
+  if (value === void 0) {
+    return '';
+  } else if (value === null) {
+    return 'null';
+  } else if (value && value.isRawInstance) {
+    return value.toQuery();
+  } else if (type === 'bool') {
+    if (value === 'false') value = 0;
+    return `'${value ? 1 : 0}'`;
+  } else if ((type === 'json' || type === 'jsonb') && isObject(value)) {
+    return `'${JSON.stringify(value)}'`;
+  } else {
+    return client._escapeBinding(value.toString());
+  }
+}
+
+module.exports = {
+  compileCallback,
+  wrapAsIdentifier,
+  formatDefault,
+};

package/lib/formatter/rawFormatter.js

@@ -1,84 +1,84 @@
-const { columnize } = require('./wrappingFormatter');
-
-function replaceRawArrBindings(raw, client) {
-  const bindingsHolder = {
-    bindings: [],
-  };
-  const builder = raw;
-
-  const expectedBindings = raw.bindings.length;
-  const values = raw.bindings;
-  let index = 0;
-
-  const sql = raw.sql.replace(/\\?\?\??/g, function (match) {
-    if (match === '\\?') {
-      return match;
-    }
-
-    const value = values[index++];
-
-    if (match === '??') {
-      return columnize(value, builder, client, bindingsHolder);
-    }
-    return client.parameter(value, builder, bindingsHolder);
-  });
-
-  if (expectedBindings !== index) {
-    throw new Error(`Expected ${expectedBindings} bindings, saw ${index}`);
-  }
-
-  return {
-    method: 'raw',
-    sql,
-    bindings: bindingsHolder.bindings,
-  };
-}
-
-function replaceKeyBindings(raw, client) {
-  const bindingsHolder = {
-    bindings: [],
-  };
-  const builder = raw;
-
-  const values = raw.bindings;
-  const regex = /\\?(:(\w+):(?=::)|:(\w+):(?!:)|:(\w+))/g;
-
-  const sql = raw.sql.replace(regex, function (match, p1, p2, p3, p4) {
-    if (match !== p1) {
-      return p1;
-    }
-
-    const part = p2 || p3 || p4;
-    const key = match.trim();
-    const isIdentifier = key[key.length - 1] === ':';
-    const value = values[part];
-
-    if (value === undefined) {
-      if (Object.prototype.hasOwnProperty.call(values, part)) {
-        bindingsHolder.bindings.push(value);
-      }
-
-      return match;
-    }
-
-    if (isIdentifier) {
-      return match.replace(
-        p1,
-        columnize(value, builder, client, bindingsHolder)
-      );
-    }
-
-    return match.replace(p1, client.parameter(value, builder, bindingsHolder));
-  });
-
-  return {
-    method: 'raw',
-    sql,
-    bindings: bindingsHolder.bindings,
-  };
-}
-
-module.exports = {
-  replaceKeyBindings,
-  replaceRawArrBindings,
-};
+const { columnize } = require('./wrappingFormatter');
+
+function replaceRawArrBindings(raw, client) {
+  const bindingsHolder = {
+    bindings: [],
+  };
+  const builder = raw;
+
+  const expectedBindings = raw.bindings.length;
+  const values = raw.bindings;
+  let index = 0;
+
+  const sql = raw.sql.replace(/\\?\?\??/g, function (match) {
+    if (match === '\\?') {
+      return match;
+    }
+
+    const value = values[index++];
+
+    if (match === '??') {
+      return columnize(value, builder, client, bindingsHolder);
+    }
+    return client.parameter(value, builder, bindingsHolder);
+  });
+
+  if (expectedBindings !== index) {
+    throw new Error(`Expected ${expectedBindings} bindings, saw ${index}`);
+  }
+
+  return {
+    method: 'raw',
+    sql,
+    bindings: bindingsHolder.bindings,
+  };
+}
+
+function replaceKeyBindings(raw, client) {
+  const bindingsHolder = {
+    bindings: [],
+  };
+  const builder = raw;
+
+  const values = raw.bindings;
+  const regex = /\\?(:(\w+):(?=::)|:(\w+):(?!:)|:(\w+))/g;
+
+  const sql = raw.sql.replace(regex, function (match, p1, p2, p3, p4) {
+    if (match !== p1) {
+      return p1;
+    }
+
+    const part = p2 || p3 || p4;
+    const key = match.trim();
+    const isIdentifier = key[key.length - 1] === ':';
+    const value = values[part];
+
+    if (value === undefined) {
+      if (Object.prototype.hasOwnProperty.call(values, part)) {
+        bindingsHolder.bindings.push(value);
+      }
+
+      return match;
+    }
+
+    if (isIdentifier) {
+      return match.replace(
+        p1,
+        columnize(value, builder, client, bindingsHolder)
+      );
+    }
+
+    return match.replace(p1, client.parameter(value, builder, bindingsHolder));
+  });
+
+  return {
+    method: 'raw',
+    sql,
+    bindings: bindingsHolder.bindings,
+  };
+}
+
+module.exports = {
+  replaceKeyBindings,
+  replaceRawArrBindings,
+};