use withGraphFetched instead of eager internally

koskimas · koskimas · commit c2569c1297e1 · 2019-08-21T12:49:53.000+03:00
diff --git a/lib/model/Model.js b/lib/model/Model.js
@@ -514,6 +514,10 @@ class Model {
     return cachedGet(this, '$$virtualAttributes', getVirtualAttributes);
   }
 
+  static getDefaultGraphOptions() {
+    return this.defaultGraphOptions || this.defaultEagerOptions;
+  }
+
   static query(trx) {
     const query = this.QueryBuilder.forClass(this).transacting(trx);
     this.onCreateQuery(query);
diff --git a/lib/queryBuilder/QueryBuilder.js b/lib/queryBuilder/QueryBuilder.js
@@ -214,7 +214,7 @@ class QueryBuilder extends QueryBuilderBase {
     const parsedExp = parseRelationExpression(this.modelClass(), exp);
 
     eagerOp.expression = eagerOp.expression.merge(parsedExp);
-    eagerOp.eagerOptions = { ...eagerOp.eagerOptions, ...options };
+    eagerOp.graphOptions = { ...eagerOp.graphOptions, ...options };
 
     checkEager(this);
     return this;
@@ -431,7 +431,7 @@ class QueryBuilder extends QueryBuilderBase {
 
   _eagerOptions(opt) {
     const eagerOp = ensureEagerOperation(this);
-    eagerOp.eagerOptions = Object.assign({}, eagerOp.eagerOptions, opt);
+    eagerOp.graphOptions = Object.assign({}, eagerOp.graphOptions, opt);
     return this;
   }
 
@@ -1235,7 +1235,7 @@ function getTableName(modelClassOrTableName) {
 
 function ensureEagerOperation(builder, algorithm = null) {
   const modelClass = builder.modelClass();
-  const defaultEagerOptions = modelClass.defaultGraphOptions || modelClass.defaultEagerOptions;
+  const defaultGraphOptions = modelClass.getDefaultGraphOptions();
   const eagerOp = builder.findOperation(EagerOperation);
 
   if (algorithm) {
@@ -1245,7 +1245,7 @@ function ensureEagerOperation(builder, algorithm = null) {
       return eagerOp;
     } else {
       const newEagerOp = new EagerOperationClass('eager', {
-        defaultEagerOptions
+        defaultGraphOptions
       });
 
       if (eagerOp) {
@@ -1267,7 +1267,7 @@ function ensureEagerOperation(builder, algorithm = null) {
       );
 
       const newEagerOp = new EagerOperationClass('eager', {
-        defaultEagerOptions
+        defaultGraphOptions
       });
 
       builder.addOperation(newEagerOp);
diff --git a/lib/queryBuilder/RelationExpression.js b/lib/queryBuilder/RelationExpression.js
@@ -74,8 +74,14 @@ class RelationExpression {
   // Merges this relation expression with another. `expr` can be a string,
   // a pojo, or a RelationExpression instance.
   merge(expr) {
-    const node = RelationExpression.create(expr).node;
-    return new RelationExpression(mergeNodes(this.node, node));
+    expr = RelationExpression.create(expr);
+
+    if (this.isEmpty) {
+      // Nothing to merge.
+      return expr;
+    }
+
+    return new RelationExpression(mergeNodes(this.node, expr.node));
   }
 
   // Returns true if `expr` is contained by this expression. For example
diff --git a/lib/queryBuilder/graph/GraphOperation.js b/lib/queryBuilder/graph/GraphOperation.js
@@ -29,8 +29,7 @@ class GraphOperation {
       .modify(propagateMethodCallsFromQuery(builder))
       .modify(buildFetchQuerySelects(graph, graphOptions, eagerExpr))
       .findByIds(rootIds)
-      .eagerAlgorithm(modelClass.WhereInEagerAlgorighm)
-      .eager(eagerExpr)
+      .withGraphFetched(eagerExpr)
       .internalOptions(fetchQueryInternalOptions())
       .then(models => ModelGraph.create(modelClass, models));
   }
diff --git a/lib/queryBuilder/operations/InsertGraphAndFetchOperation.js b/lib/queryBuilder/operations/InsertGraphAndFetchOperation.js
@@ -34,7 +34,7 @@ class InsertGraphAndFetchOperation extends DelegateOperation {
       .query()
       .childQueryOf(builder)
       .findByIds(ids)
-      .eager(eager)
+      .withGraphFetched(eager)
       .then(models => {
         return this.isArray ? models : models[0] || null;
       });
diff --git a/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js b/lib/queryBuilder/operations/UpsertGraphAndFetchOperation.js
@@ -34,7 +34,7 @@ class UpsertGraphAndFetchOperation extends DelegateOperation {
       .query()
       .childQueryOf(builder)
       .findByIds(ids)
-      .eager(eager)
+      .withGraphFetched(eager)
       .then(models => {
         return this.isArray ? models : models[0] || null;
       });
diff --git a/lib/queryBuilder/operations/eager/EagerOperation.js b/lib/queryBuilder/operations/eager/EagerOperation.js
@@ -9,7 +9,7 @@ class EagerOperation extends QueryBuilderOperation {
 
     this.expression = RelationExpression.create();
     this.modifiersAtPath = [];
-    this.eagerOptions = this.opt.defaultEagerOptions;
+    this.graphOptions = this.opt.defaultGraphOptions;
   }
 
   buildFinalExpression() {
@@ -42,7 +42,7 @@ class EagerOperation extends QueryBuilderOperation {
   cloneFrom(eagerOp) {
     this.expression = eagerOp.expression.clone();
     this.modifiersAtPath = eagerOp.modifiersAtPath.slice();
-    this.eagerOptions = Object.assign({}, eagerOp.eagerOptions);
+    this.graphOptions = Object.assign({}, eagerOp.graphOptions);
   }
 
   clone() {
diff --git a/lib/queryBuilder/operations/eager/JoinEagerOperation.js b/lib/queryBuilder/operations/eager/JoinEagerOperation.js
@@ -23,15 +23,15 @@ class JoinEagerOperation extends EagerOperation {
     return this.joiner
       .setExpression(this.buildFinalExpression())
       .setModifiers(this.buildFinalModifiers(builder))
-      .setOptions(this.eagerOptions)
+      .setOptions(this.graphOptions)
       .fetchColumnInfo(builder);
   }
 
   onBuild(builder) {
     this.joiner
       .setExpression(this.buildFinalExpression())
       .setModifiers(this.buildFinalModifiers(builder))
-      .setOptions(this.eagerOptions)
+      .setOptions(this.graphOptions)
       .build(builder);
   }
 
diff --git a/lib/queryBuilder/operations/eager/WhereInEagerOperation.js b/lib/queryBuilder/operations/eager/WhereInEagerOperation.js
@@ -19,8 +19,8 @@ class WhereInEagerOperation extends EagerOperation {
   }
 
   batchSize(knex) {
-    if (this.eagerOptions.maxBatchSize) {
-      return this.eagerOptions.maxBatchSize;
+    if (this.graphOptions.maxBatchSize) {
+      return this.graphOptions.maxBatchSize;
     } else if (isMsSql(knex)) {
       // On MSSQL the parameter limit is actually 2100, but since I couldn't figure out
       // if the limit is for all parameters in a query or for individual clauses, we set
@@ -139,8 +139,7 @@ class WhereInEagerOperation extends EagerOperation {
     return relation.relatedModelClass
       .query()
       .childQueryOf(builder)
-      .eagerOptions(this.eagerOptions)
-      .eager(childExpression)
+      .withGraphFetched(childExpression, this.graphOptions)
       .modifiers(this.buildFinalModifiers(builder));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class EagerOperation extends QueryBuilderOperation {`
`9`	`9`
`10`	`10`	`this.expression = RelationExpression.create();`
`11`	`11`	`this.modifiersAtPath = [];`
`12`		`- this.eagerOptions = this.opt.defaultEagerOptions;`
	`12`	`+ this.graphOptions = this.opt.defaultGraphOptions;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`buildFinalExpression() {`
`@@ -42,7 +42,7 @@ class EagerOperation extends QueryBuilderOperation {`
`42`	`42`	`cloneFrom(eagerOp) {`
`43`	`43`	`this.expression = eagerOp.expression.clone();`
`44`	`44`	`this.modifiersAtPath = eagerOp.modifiersAtPath.slice();`
`45`		`- this.eagerOptions = Object.assign({}, eagerOp.eagerOptions);`
	`45`	`+ this.graphOptions = Object.assign({}, eagerOp.graphOptions);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`clone() {`