Many-many association eager loading support for PGSQL

lib/dialects/postgres/query-generator.js

@@ -258,16 +258,38 @@ module.exports = (function() {
 
           optAttributes = optAttributes.concat(attributes)
 
-          var joinQuery = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
-
-          query += Utils._.template(joinQuery)({
-            table:      this.quoteIdentifiers(include.daoFactory.tableName),
-            as:         this.quoteIdentifier(include.as),
-            tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
-            attrLeft:   this.quoteIdentifier('id'),
-            tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
-            attrRight:  this.quoteIdentifier(include.association.identifier)
-          })
+          if (include.association.associationType !== 'HasMany') {
+            var joinQuery = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
+
+            query += Utils._.template(joinQuery)({
+              table:      this.quoteIdentifiers(include.daoFactory.tableName),
+              as:         this.quoteIdentifier(include.as),
+              tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
+              attrLeft:   this.quoteIdentifier('id'),
+              tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
+              attrRight:  this.quoteIdentifier(include.association.identifier)
+            })
+          } else {
+            var joinQueryLeft = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>  LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
+
+            query += Utils._.template(joinQuery)({
+              table:      this.quoteIdentifiers(include.association.connectorDAO.tableName),
+              as:         this.quoteIdentifier(include.association.connectorDAO.tableName),
+              tableLeft:  this.quoteIdentifiers(tableName),
+              attrLeft:   this.quoteIdentifier('id'),
+              tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
+              attrRight:  this.quoteIdentifier(include.association.identifier)
+            })
+
+            query += Utils._.template(joinQuery)({
+              table:      this.quoteIdentifiers(include.daoFactory.tableName),
+              as:         this.quoteIdentifier(include.as),
+              tableLeft:  this.quoteIdentifiers(include.as),
+              attrLeft:   this.quoteIdentifier('id'),
+              tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
+              attrRight:  this.quoteIdentifier(include.association.foreignIdentifier)
+            })
+          }
         }.bind(this))
 
         options.attributes = optAttributes.join(', ')