Tidy up where for relations

Author: Raymond Feng

lib/sql.js

@@ -230,7 +230,23 @@ SQLConnector.prototype.tableEscaped = function(model) {
  * @returns {String} The escaped column name
  */
 SQLConnector.prototype.columnEscaped = function(model, property) {
-  return this.tableEscaped(model) + '.' + this.escapeName(this.column(model, property));
+  return this.escapeName(this.column(model, property));
+};
+
+/**
+ * Get the escaped qualified column name (table.column for join)
+ * @param {String} model The model name
+ * @param {String} property The property name
+ * @returns {String} The escaped column name
+ */
+SQLConnector.prototype.qualifiedColumnEscaped = function(model, property) {
+  var table = this.tableEscaped(model);
+  var index = table.indexOf('.');
+  if (index !== -1) {
+    // Remove the schema name
+    table = table.substring(index);
+  }
+  return table + '.' + this.escapeName(this.column(model, property));
 };
 
 /*!
@@ -1017,18 +1033,7 @@ SQLConnector.prototype.buildSelect = function(model, filter, options) {
     }
   }
 
-  var haveRelationFilters = false;
-  if (filter.where) {
-    var relations = this.getModelDefinition(model).model.relations;
-    if (relations) {
-      for (var key in filter.where) {
-        if (key in relations) {
-          haveRelationFilters = true;
-          break;
-        }
-      }
-    }
-  }
+  var haveRelationFilters = this.hasRelationClause(model, filter.where);
   var distinct = haveRelationFilters ? 'DISTINCT ' : '';
 
   var selectStmt = new ParameterizedSQL('SELECT ' + distinct +
@@ -1084,8 +1089,8 @@ SQLConnector.prototype.buildJoins = function(model, where) {
     innerIdField[keyTo] = true;
     innerFilter.fields = assign({}, innerFilter.fields, innerIdField);
 
-    var condition = this.columnEscaped(modelFrom, keyFrom) + '=' +
-      this.columnEscaped(modelTo, keyTo);
+    var condition = this.qualifiedColumnEscaped(modelFrom, keyFrom) + '=' +
+      this.qualifiedColumnEscaped(modelTo, keyTo);
 
     var innerSelect = this.buildSelect(modelTo, innerFilter, {
       skipParameterize: true
@@ -1113,7 +1118,7 @@ SQLConnector.prototype.buildJoins = function(model, where) {
       // n:m relation
       var modelThrough = rel.modelThrough.definition.name;
       var keyThrough = rel.keyThrough;
-      var modelToKey = rel.modelTo.definition._ids[0].name;
+      var modelToKey = rel.modelTo.definition.idName();
       var innerFilter = {fields: {}};
       innerFilter.fields[keyThrough] = true;
 
@@ -1229,25 +1234,36 @@ SQLConnector.prototype.find = function(model, id, options, cb) {
 Connector.defineAliases(SQLConnector.prototype, 'find', ['findById']);
 
 /**
- * Build a SQL SELECT statement to count rows
- * @param {String} model Model name
- * @param {Object} where Where object
- * @param {Object} options Options object
- * @returns {ParameterizedSQL} Statement object {sql: ..., params: [...]}
+ * Check if the where statement contains relations
+ * @param model
+ * @param where
+ * @returns {boolean}
  */
-SQLConnector.prototype.buildCount = function(model, where, options) {
-  var haveRelationFilters = false;
+SQLConnector.prototype.hasRelationClause = function(model, where) {
+  var found = false;
   if (where) {
     var relations = this.getModelDefinition(model).model.relations;
     if (relations) {
       for (var key in where) {
         if (key in relations) {
-          haveRelationFilters = true;
+          found = true;
           break;
         }
       }
     }
   }
+  return found;
+};
+
+/**
+ * Build a SQL SELECT statement to count rows
+ * @param {String} model Model name
+ * @param {Object} where Where object
+ * @param {Object} options Options object
+ * @returns {ParameterizedSQL} Statement object {sql: ..., params: [...]}
+ */
+SQLConnector.prototype.buildCount = function(model, where, options) {
+  var haveRelationFilters = this.hasRelationClause(model, where);
 
   var count = 'count(*)';
   if (haveRelationFilters) {