@abedmurrar/objection 4.0.0-alpha.0 → 4.0.0-beta.1

package/lib/queryBuilder/operations/UpsertGraphOperation.js

@@ -1,66 +1,47 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('./QueryBuilderOperation');
 const { GraphUpsert } = require('../graph/GraphUpsert');
 const { RelationFindOperation } = require('../../relations/RelationFindOperation');
-
 class UpsertGraphOperation extends QueryBuilderOperation {
-  constructor(name, opt) {
-    super(
-      name,
-      Object.assign({}, opt, {
-        upsertOptions: {},
-      }),
-    );
-
-    this.upsertOptions = opt.upsertOptions || {};
-    this.upsert = null;
-  }
-
-  get models() {
-    return this.upsert.objects;
-  }
-
-  get isArray() {
-    return this.upsert.isArray;
-  }
-
-  onAdd(builder, args) {
-    const [objects] = args;
-
-    this.upsert = new GraphUpsert({
-      objects,
-      rootModelClass: builder.modelClass(),
-      upsertOptions: this.upsertOptions,
-    });
-
-    // Never execute this builder.
-    builder.resolve([]);
-
-    return true;
-  }
-
-  onAfter1(builder) {
-    if (hasOtherSqlModifyingQueryBuilderCalls(builder)) {
-      throw new Error(
-        'upsertGraph query should contain no other query builder calls like `findById`, `where` or `$relatedQuery` that would affect the SQL. They have no effect.',
-      );
+    constructor(name, opt) {
+        super(name, Object.assign({}, opt, {
+            upsertOptions: {},
+        }));
+        this.upsertOptions = opt.upsertOptions || {};
+        this.upsert = null;
+    }
+    get models() {
+        return this.upsert.objects;
+    }
+    get isArray() {
+        return this.upsert.isArray;
+    }
+    onAdd(builder, args) {
+        const [objects] = args;
+        this.upsert = new GraphUpsert({
+            objects,
+            rootModelClass: builder.modelClass(),
+            upsertOptions: this.upsertOptions,
+        });
+        // Never execute this builder.
+        builder.resolve([]);
+        return true;
+    }
+    onAfter1(builder) {
+        if (hasOtherSqlModifyingQueryBuilderCalls(builder)) {
+            throw new Error('upsertGraph query should contain no other query builder calls like `findById`, `where` or `$relatedQuery` that would affect the SQL. They have no effect.');
+        }
+        return this.upsert.run(builder);
+    }
+    clone() {
+        const clone = super.clone();
+        clone.upsert = this.upsert;
+        return clone;
     }
-
-    return this.upsert.run(builder);
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.upsert = this.upsert;
-    return clone;
-  }
 }
-
 function hasOtherSqlModifyingQueryBuilderCalls(builder) {
-  return builder.has(/where/) || builder.has(RelationFindOperation);
+    return builder.has(/where/) || builder.has(RelationFindOperation);
 }
-
 module.exports = {
-  UpsertGraphOperation,
+    UpsertGraphOperation,
 };

package/lib/queryBuilder/operations/WhereCompositeOperation.js

@@ -1,57 +1,48 @@
 'use strict';
-
 const { ObjectionToKnexConvertingOperation } = require('./ObjectionToKnexConvertingOperation');
 const { asSingle } = require('../../utils/objectUtils');
-
 class WhereCompositeOperation extends ObjectionToKnexConvertingOperation {
-  onBuildKnex(knexBuilder, builder) {
-    const args = this.getKnexArgs(builder);
-
-    if (args.length === 2) {
-      // Convert whereComposite('foo', 1) into whereComposite('foo', '=', 1)
-      args.splice(1, 0, '=');
-    } else if (args.length !== 3) {
-      throw new Error(`invalid number of arguments ${args.length}`);
+    onBuildKnex(knexBuilder, builder) {
+        const args = this.getKnexArgs(builder);
+        if (args.length === 2) {
+            // Convert whereComposite('foo', 1) into whereComposite('foo', '=', 1)
+            args.splice(1, 0, '=');
+        }
+        else if (args.length !== 3) {
+            throw new Error(`invalid number of arguments ${args.length}`);
+        }
+        return knexBuilder.where(...buildWhereArgs(...args));
     }
-
-    return knexBuilder.where(...buildWhereArgs(...args));
-  }
 }
-
 function buildWhereArgs(cols, op, values) {
-  if (isNormalWhere(cols, values)) {
-    return buildNormalWhereArgs(cols, op, values);
-  } else if (isCompositeWhere(cols, values)) {
-    return buildCompositeWhereArgs(cols, op, values);
-  } else {
-    throw new Error(`both cols and values must have same dimensions`);
-  }
+    if (isNormalWhere(cols, values)) {
+        return buildNormalWhereArgs(cols, op, values);
+    }
+    else if (isCompositeWhere(cols, values)) {
+        return buildCompositeWhereArgs(cols, op, values);
+    }
+    else {
+        throw new Error(`both cols and values must have same dimensions`);
+    }
 }
-
 function isNormalWhere(cols, values) {
-  return (
-    (!Array.isArray(cols) || cols.length === 1) && (!Array.isArray(values) || values.length === 1)
-  );
+    return ((!Array.isArray(cols) || cols.length === 1) && (!Array.isArray(values) || values.length === 1));
 }
-
 function buildNormalWhereArgs(cols, op, values) {
-  return [asSingle(cols), op, asSingle(values)];
+    return [asSingle(cols), op, asSingle(values)];
 }
-
 function isCompositeWhere(cols, values) {
-  return Array.isArray(cols) && Array.isArray(values) && cols.length === values.length;
+    return Array.isArray(cols) && Array.isArray(values) && cols.length === values.length;
 }
-
 function buildCompositeWhereArgs(cols, op, values) {
-  return [
-    (builder) => {
-      for (let i = 0, l = cols.length; i < l; ++i) {
-        builder.where(cols[i], op, values[i]);
-      }
-    },
-  ];
+    return [
+        (builder) => {
+            for (let i = 0, l = cols.length; i < l; ++i) {
+                builder.where(cols[i], op, values[i]);
+            }
+        },
+    ];
 }
-
 module.exports = {
-  WhereCompositeOperation,
+    WhereCompositeOperation,
 };

package/lib/queryBuilder/operations/WhereInOperation.js

@@ -1,48 +1,46 @@
 'use strict';
-
 const { ObjectionToKnexConvertingOperation } = require('./ObjectionToKnexConvertingOperation');
 const { isKnexRaw } = require('../../utils/knexUtils');
-
-// `whereIn`, `whereNotIn`, `onIn` etc. knex compiles the values before the column,
-// so the bindings of a raw column (like `ref('data:a').castInt()` on MySQL or
-// `fn.lower(ref('a'))`) end up after the values and the query uses the wrong
-// bindings. In that case the condition is built as raw sql with the bindings in
-// the right order.
+// `onIn`, `onNotIn` etc. of join callbacks. knex compiles the values before the
+// column, so the bindings of a raw column (like `ref('data:a').castInt()` on
+// MySQL or `fn.lower(ref('a'))`) end up after the values and the query uses the
+// wrong bindings. In that case the condition is built as raw sql with the
+// bindings in the right order. knex 3.2 fixed this for `whereIn` but not for
+// `onIn`.
 class WhereInOperation extends ObjectionToKnexConvertingOperation {
-  onBuildKnex(knexBuilder, builder) {
-    const args = this.getKnexArgs(builder);
-    const [column, values] = args;
-
-    if (args.length !== 2 || !hasBindings(column) || isEmptyArray(values)) {
-      return knexBuilder[this.name].apply(knexBuilder, args);
+    onBuildKnex(knexBuilder, builder) {
+        const args = this.getKnexArgs(builder);
+        const [column, values] = args;
+        if (args.length !== 2 || !hasBindings(column) || isEmptyArray(values)) {
+            return knexBuilder[this.name].apply(knexBuilder, args);
+        }
+        const knex = builder.knex();
+        const not = this.opt.not ? 'not ' : '';
+        let sql;
+        let bindings;
+        if (Array.isArray(values)) {
+            sql = `? ${not}in (${values.map(() => '?').join(', ')})`;
+            bindings = [column, ...values];
+        }
+        else if (isKnexRaw(values)) {
+            // knex doesn't wrap raw bindings in parentheses.
+            sql = `? ${not}in (?)`;
+            bindings = [column, values];
+        }
+        else {
+            // A subquery, which knex wraps in parentheses.
+            sql = `? ${not}in ?`;
+            bindings = [column, values];
+        }
+        return knexBuilder[this.opt.rawMethod](knex.raw(sql, bindings));
     }
-
-    const knex = builder.knex();
-    const not = this.opt.not ? 'not ' : '';
-    let sql;
-    let bindings;
-
-    if (Array.isArray(values)) {
-      sql = `? ${not}in (${values.map(() => '?').join(', ')})`;
-      bindings = [column, ...values];
-    } else {
-      // A subquery.
-      sql = `? ${not}in ?`;
-      bindings = [column, values];
-    }
-
-    return knexBuilder[this.opt.rawMethod](knex.raw(sql, bindings));
-  }
 }
-
 function hasBindings(column) {
-  return isKnexRaw(column) && Array.isArray(column.bindings) && column.bindings.length > 0;
+    return isKnexRaw(column) && Array.isArray(column.bindings) && column.bindings.length > 0;
 }
-
 function isEmptyArray(values) {
-  return Array.isArray(values) && values.length === 0;
+    return Array.isArray(values) && values.length === 0;
 }
-
 module.exports = {
-  WhereInOperation,
+    WhereInOperation,
 };

package/lib/queryBuilder/operations/eager/EagerOperation.js

@@ -1,61 +1,46 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('../QueryBuilderOperation');
 const { RelationExpression } = require('../../RelationExpression');
-
 class EagerOperation extends QueryBuilderOperation {
-  constructor(name, opt) {
-    super(name, opt);
-
-    this.expression = RelationExpression.create();
-    this.modifiersAtPath = [];
-    this.graphOptions = this.opt.defaultGraphOptions;
-  }
-
-  buildFinalExpression() {
-    const expression = this.expression.clone();
-
-    this.modifiersAtPath.forEach((modifier, i) => {
-      const modifierName = getModifierName(i);
-
-      expression.expressionsAtPath(modifier.path).forEach((expr) => {
-        expr.node.$modify.push(modifierName);
-      });
-    });
-
-    return expression;
-  }
-
-  buildFinalModifiers(builder) {
-    // `modifiers()` returns a clone so we can modify it.
-    const modifiers = builder.modifiers();
-
-    this.modifiersAtPath.forEach((modifier, i) => {
-      const modifierName = getModifierName(i);
-
-      modifiers[modifierName] = modifier.modifier;
-    });
-
-    return modifiers;
-  }
-
-  cloneFrom(eagerOp) {
-    this.expression = eagerOp.expression.clone();
-    this.modifiersAtPath = eagerOp.modifiersAtPath.slice();
-    this.graphOptions = Object.assign({}, eagerOp.graphOptions);
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.cloneFrom(this);
-    return clone;
-  }
+    constructor(name, opt) {
+        super(name, opt);
+        this.expression = RelationExpression.create();
+        this.modifiersAtPath = [];
+        this.graphOptions = this.opt.defaultGraphOptions;
+    }
+    buildFinalExpression() {
+        const expression = this.expression.clone();
+        this.modifiersAtPath.forEach((modifier, i) => {
+            const modifierName = getModifierName(i);
+            expression.expressionsAtPath(modifier.path).forEach((expr) => {
+                expr.node.$modify.push(modifierName);
+            });
+        });
+        return expression;
+    }
+    buildFinalModifiers(builder) {
+        // `modifiers()` returns a clone so we can modify it.
+        const modifiers = builder.modifiers();
+        this.modifiersAtPath.forEach((modifier, i) => {
+            const modifierName = getModifierName(i);
+            modifiers[modifierName] = modifier.modifier;
+        });
+        return modifiers;
+    }
+    cloneFrom(eagerOp) {
+        this.expression = eagerOp.expression.clone();
+        this.modifiersAtPath = eagerOp.modifiersAtPath.slice();
+        this.graphOptions = Object.assign({}, eagerOp.graphOptions);
+    }
+    clone() {
+        const clone = super.clone();
+        clone.cloneFrom(this);
+        return clone;
+    }
 }
-
 function getModifierName(index) {
-  return `_f${index}_`;
+    return `_f${index}_`;
 }
-
 module.exports = {
-  EagerOperation,
+    EagerOperation,
 };

package/lib/queryBuilder/operations/eager/JoinEagerOperation.js

@@ -1,51 +1,41 @@
 'use strict';
-
 const { EagerOperation } = require('./EagerOperation');
 const { RelationJoiner } = require('../../join/RelationJoiner');
-
 class JoinEagerOperation extends EagerOperation {
-  constructor(name, opt) {
-    super(name, opt);
-    this.joiner = null;
-  }
-
-  onAdd(builder) {
-    builder.findOptions({ callAfterFindDeeply: true });
-
-    this.joiner = new RelationJoiner({
-      modelClass: builder.modelClass(),
-    });
-
-    return true;
-  }
-
-  onBefore3(builder) {
-    return this.joiner
-      .setExpression(this.buildFinalExpression())
-      .setModifiers(this.buildFinalModifiers(builder))
-      .setOptions(this.graphOptions)
-      .fetchColumnInfo(builder);
-  }
-
-  onBuild(builder) {
-    this.joiner
-      .setExpression(this.buildFinalExpression())
-      .setModifiers(this.buildFinalModifiers(builder))
-      .setOptions(this.graphOptions)
-      .build(builder);
-  }
-
-  onRawResult(builder, rows) {
-    return this.joiner.parseResult(builder, rows);
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.joiner = this.joiner;
-    return clone;
-  }
+    constructor(name, opt) {
+        super(name, opt);
+        this.joiner = null;
+    }
+    onAdd(builder) {
+        builder.findOptions({ callAfterFindDeeply: true });
+        this.joiner = new RelationJoiner({
+            modelClass: builder.modelClass(),
+        });
+        return true;
+    }
+    onBefore3(builder) {
+        return this.joiner
+            .setExpression(this.buildFinalExpression())
+            .setModifiers(this.buildFinalModifiers(builder))
+            .setOptions(this.graphOptions)
+            .fetchColumnInfo(builder);
+    }
+    onBuild(builder) {
+        this.joiner
+            .setExpression(this.buildFinalExpression())
+            .setModifiers(this.buildFinalModifiers(builder))
+            .setOptions(this.graphOptions)
+            .build(builder);
+    }
+    onRawResult(builder, rows) {
+        return this.joiner.parseResult(builder, rows);
+    }
+    clone() {
+        const clone = super.clone();
+        clone.joiner = this.joiner;
+        return clone;
+    }
 }
-
 module.exports = {
-  JoinEagerOperation,
+    JoinEagerOperation,
 };

package/lib/queryBuilder/operations/eager/NaiveEagerOperation.js

@@ -1,13 +1,10 @@
 'use strict';
-
 const { WhereInEagerOperation } = require('./WhereInEagerOperation');
-
 class NaiveEagerOperation extends WhereInEagerOperation {
-  batchSize() {
-    return 1;
-  }
+    batchSize() {
+        return 1;
+    }
 }
-
 module.exports = {
-  NaiveEagerOperation,
+    NaiveEagerOperation,
 };