Added table prepend option to getWhereConditions in query generator

lib/dialects/abstract/query-generator.js

@@ -706,7 +706,7 @@ module.exports = (function() {
       
       
       // Add HAVING to sub or main query
       // Add HAVING to sub or main query
       if (options.hasOwnProperty('having')) {
       if (options.hasOwnProperty('having')) {
-        options.having = this.getWhereConditions(options.having, tableName, factory, options)
+        options.having = this.getWhereConditions(options.having, tableName, factory, options, false)
         if (subQuery) {
         if (subQuery) {
           subQueryItems.push(" HAVING " + options.having)
           subQueryItems.push(" HAVING " + options.having)
         } else {
         } else {
@@ -813,12 +813,17 @@ module.exports = (function() {
     /*
     /*
       Takes something and transforms it into values of a where condition.
       Takes something and transforms it into values of a where condition.
     */
     */
-    getWhereConditions: function(smth, tableName, factory, options) {
+    getWhereConditions: function(smth, tableName, factory, options, prepend) {
       var result = null
       var result = null
         , where = {}
         , where = {}
 
 
+      if (typeof prepend === 'undefined')
+        prepend = true
+
       if (Utils.isHash(smth)) {
       if (Utils.isHash(smth)) {
-        smth   = Utils.prependTableNameToHash(tableName, smth)
+        if (!prepend)
+          smth   = Utils.prependTableNameToHash(tableName, smth)
+
         result = this.hashToWhereConditions(smth, factory, options)
         result = this.hashToWhereConditions(smth, factory, options)
       } else if (typeof smth === 'number') {
       } else if (typeof smth === 'number') {
         var primaryKeys = !!factory ? Object.keys(factory.primaryKeys) : []
         var primaryKeys = !!factory ? Object.keys(factory.primaryKeys) : []