fix: deprecated relatedTableAlias from objection.js, upgrade objectio…

…njs (#44)
Vincit · Feb 26, 2019 · 5116082 · 5116082
1 parent 275bc04
commit 5116082
Show file tree

Hide file tree

Showing 4 changed files with 741 additions and 705 deletions.
diff --git a/lib/FindQueryBuilder.js b/lib/FindQueryBuilder.js
@@ -389,8 +389,11 @@ class FindQueryBuilder {
       });
     });
 
-    _.each(_.uniq(relationsToJoin, 'name'), function(relation) {
-      relation.join(builder, { joinOperation: 'leftJoin' });
+    _.each(_.uniq(relationsToJoin, 'name'), relation => {
+      relation.join(builder, {
+        joinOperation: 'leftJoin',
+        relatedTableAlias: this._modelClass.tableName + '_rel_' + relation.name
+      });
     });
 
     if (!_.isEmpty(relationsToJoin)) {

diff --git a/lib/PropertyRef.js b/lib/PropertyRef.js
@@ -109,7 +109,14 @@ class PropertyRef {
       const builder = this.modelClass.query();
       // one-to-one relations are joined and the joined table is given an alias.
       // We must refer to the column through that alias.
-      return this.relation.relatedTableAlias(builder) + '.' + this.columnName;
+
+      return (
+        this.relation.relatedModelClass.getTableName() +
+        '_rel_' +
+        this.relation.name +
+        '.' +
+        this.columnName
+      );
     } else {
       return this.modelClass.tableName + '.' + this.columnName;
     }