Allow specifying relation's name or localField in query

Author: techniq

src/index.js

@@ -294,45 +294,44 @@ class DSSqlAdapter {
 
           while (parts.length >= 2) {
             let relationName = parts.shift()
-            let relationResourceConfig = resourceConfig.getResource(relationName)
-            relationPath.push(relationName)
-
-            if (localResourceConfig.relationList) {
-              let [relation] = localResourceConfig.relationList.filter(r => r.relation === relationName)
-              if (relation) {
-                if (relation.type === 'belongsTo' || relation.type === 'hasOne') {
-                  // Apply table join for belongsTo/hasOne property (if not done already)
-                  if (!joinedTables.some(t => t === relationPath.join('.'))) {
-                    let table = getTable(localResourceConfig)
-                    let localId = `${table}.${relation.localKey}`
-
-                    let relationTable = getTable(relationResourceConfig)
-                    let foreignId = `${relationTable}.${relationResourceConfig.idAttribute}`
-
-                    query.join(relationTable, localId, foreignId)
-                    joinedTables.push(relationPath.join('.'))
-                  }
-                } else if (relation.type === 'hasMany') {
-                  // Perform `WHERE EXISTS` subquery for hasMany property
+            let [relation] = localResourceConfig.relationList.filter(r => r.relation === relationName || r.localField === relationName)
+
+            if (relation) {
+              let relationResourceConfig = resourceConfig.getResource(relation.relation)
+              relationPath.push(relation.relation)
+              
+              if (relation.type === 'belongsTo' || relation.type === 'hasOne') {
+                // Apply table join for belongsTo/hasOne property (if not done already)
+                if (!joinedTables.some(t => t === relationPath.join('.'))) {
                   let table = getTable(localResourceConfig)
-                  let localId = `${table}.${localResourceConfig.idAttribute}`
+                  let localId = `${table}.${relation.localKey}`
 
                   let relationTable = getTable(relationResourceConfig)
-                  let foreignId = `${relationTable}.${relation.foreignKey}`
-
-                  let existsParams = {
-                    [foreignId]: {'===': knex.raw(localId)},
-                    [parts[0]]: criteria
-                  };
-                  query.whereExists(this.filterQuery(relationResourceConfig, existsParams, options));
-                  criteria = null; // criteria handled by EXISTS subquery
+                  let foreignId = `${relationTable}.${relationResourceConfig.idAttribute}`
+
+                  query.join(relationTable, localId, foreignId)
+                  joinedTables.push(relationPath.join('.'))
                 }
-              } else {
-                // hopefully a qualified local column
+              } else if (relation.type === 'hasMany') {
+                // Perform `WHERE EXISTS` subquery for hasMany property
+                let table = getTable(localResourceConfig)
+                let localId = `${table}.${localResourceConfig.idAttribute}`
+
+                let relationTable = getTable(relationResourceConfig)
+                let foreignId = `${relationTable}.${relation.foreignKey}`
+
+                let existsParams = {
+                  [foreignId]: {'===': knex.raw(localId)},
+                  [parts[0]]: criteria
+                };
+                query.whereExists(this.filterQuery(relationResourceConfig, existsParams, options));
+                criteria = null; // criteria handled by EXISTS subquery
               }
 
               localResourceConfig = relationResourceConfig
-            } 
+            } else {
+              // hopefully a qualified local column
+            }
           }
 
           return `${getTable(localResourceConfig)}.${parts[0]}`

test/findAll.spec.js

@@ -46,7 +46,7 @@ describe('DSSqlAdapter#findAll', function () {
     assert.equal(posts[2].content, 'baz');
   });
 
-  it('should filter using a hasMany relation', function* () {
+  it("should filter using a hasMany relation's name", function* () {
     let user1 = yield adapter.create(User, {name: 'Sean'});
     let post1 = yield adapter.create(Post, {userId: user1.id, content: 'foo'});
     let post2 = yield adapter.create(Post, {userId: user1.id, content: 'bar'});
@@ -65,6 +65,26 @@ describe('DSSqlAdapter#findAll', function () {
     assert.equal(users[0].name, 'Sean');
     assert.equal(users[1].name, 'Jason');
   });
+  
+  it("should filter using a hasMany relation's localField", function* () {
+    let user1 = yield adapter.create(User, {name: 'Sean'});
+    let post1 = yield adapter.create(Post, {userId: user1.id, content: 'foo'});
+    let post2 = yield adapter.create(Post, {userId: user1.id, content: 'bar'});
+    let post3 = yield adapter.create(Post, {userId: user1.id, content: 'baz'});
+    
+    let user2 = yield adapter.create(User, {name: 'Jason'});
+    let post4 = yield adapter.create(Post, {userId: user2.id, content: 'foo'});
+    let post5 = yield adapter.create(Post, {userId: user2.id, content: 'bar'});
+    
+    let user3 = yield adapter.create(User, {name: 'Ed'});
+    let post6 = yield adapter.create(Post, {userId: user3.id, content: 'bar'});
+    let post7 = yield adapter.create(Post, {userId: user3.id, content: 'baz'});
+
+    let users = yield adapter.findAll(User, {where: {'posts.content': {'==': 'foo'} }});
+    assert.equal(users.length, 2);
+    assert.equal(users[0].name, 'Sean');
+    assert.equal(users[1].name, 'Jason');
+  });
 
   describe('near', function () {
     beforeEach(function * () {