objection 3.5.0 → 3.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/README.md +3 -3
  2. package/lib/model/AjvValidator.js +33 -10
  3. package/lib/model/modelClone.js +0 -2
  4. package/lib/queryBuilder/InternalOptions.js +2 -0
  5. package/lib/queryBuilder/QueryBuilder.js +56 -10
  6. package/lib/queryBuilder/RelationExpression.js +6 -4
  7. package/lib/queryBuilder/graph/GraphOptions.js +141 -22
  8. package/lib/queryBuilder/graph/GraphUpsert.js +57 -0
  9. package/lib/queryBuilder/graph/insert/GraphInsert.js +2 -0
  10. package/lib/queryBuilder/graph/patch/GraphPatchAction.js +3 -0
  11. package/lib/queryBuilder/operations/InstanceUpdateOperation.js +6 -1
  12. package/lib/queryBuilder/operations/UpdateOperation.js +11 -0
  13. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeMsSqlOperation.js +3 -1
  14. package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeSqliteOperation.js +4 -9
  15. package/lib/queryBuilder/parsers/jsonFieldExpressionParser.js +434 -364
  16. package/lib/queryBuilder/parsers/relationExpressionParser.js +513 -548
  17. package/lib/queryBuilder/parsers/relationExpressionParser.pegjs +1 -1
  18. package/lib/queryBuilder/transformations/WrapMysqlModifySubqueryTransformation.js +4 -7
  19. package/lib/relations/Relation.js +7 -0
  20. package/lib/relations/RelationFindOperation.js +27 -40
  21. package/lib/relations/belongsToOne/BelongsToOneDeleteOperation.js +4 -2
  22. package/lib/relations/belongsToOne/BelongsToOneRelation.js +9 -0
  23. package/lib/relations/manyToMany/ManyToManyModifyMixin.js +41 -13
  24. package/lib/relations/manyToMany/ManyToManyMySqlModifyMixin.js +31 -42
  25. package/lib/relations/manyToMany/ManyToManyRelation.js +15 -18
  26. package/lib/relations/manyToMany/ManyToManySqliteModifyMixin.js +0 -13
  27. package/lib/relations/manyToMany/find/ManyToManyFindOperation.js +2 -3
  28. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateMySqlOperation.js +1 -5
  29. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperation.js +1 -5
  30. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperationBase.js +9 -0
  31. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateSqliteOperation.js +1 -5
  32. package/lib/relations/manyToMany/update/ManyToManyUpdateOperationBase.js +28 -2
  33. package/lib/utils/identifierMapping.js +8 -17
  34. package/lib/utils/objectUtils.js +109 -2
  35. package/lib/utils/parseFieldExpression.js +10 -3
  36. package/package.json +5 -2
  37. package/typings/objection/index.d.ts +56 -36
  38. package/lib/relations/manyToMany/ManyToManyPostgresModifyMixin.js +0 -27
  39. package/lib/relations/manyToMany/unrelate/ManyToManyUnrelatePostgresOperation.js +0 -16
  40. package/lib/relations/manyToMany/update/ManyToManyUpdatePostgresOperation.js +0 -12
  41. package/lib/utils/clone.js +0 -2329
@@ -48,18 +48,13 @@ function isCompositeKey(columns) {
48
48
  }
49
49
 
50
50
  function buildCompositeArgs(columns, values) {
51
- if (!Array.isArray(values)) {
52
- // If the `values` is not an array of values but a function or a subquery
53
- // we have no way to implement this method.
54
- throw new Error(`sqlite doesn't support multi-column where in clauses`);
55
- }
56
-
57
- if (values.length === 0) {
51
+ if (!Array.isArray(values) || values.length === 0) {
58
52
  // knex turns an empty `whereIn` into `1 = 0` and an empty `whereNotIn`
59
- // into `1 = 1`.
53
+ // into `1 = 1`. Subqueries are compared as row values, which sqlite
54
+ // supports since version 3.15.
60
55
  return {
61
56
  method: 'whereIn',
62
- args: [columns, []],
57
+ args: [columns, values],
63
58
  };
64
59
  }
65
60