Non-'id' primary key include support - Postgres

lib/dialects/postgres/query-generator.js

@@ -262,20 +262,24 @@ module.exports = (function() {
           var joinQuery = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
           var joinQuery = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
 
 
           if (!include.association.connectorDAO) {
           if (!include.association.connectorDAO) {
+            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
             query += Utils._.template(joinQuery)({
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               as:         this.quoteIdentifier(include.as),
               as:         this.quoteIdentifier(include.as),
               tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
               tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])),
               tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
               tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
               attrRight:  this.quoteIdentifier(include.association.identifier)
               attrRight:  this.quoteIdentifier(include.association.identifier)
             })
             })
           } else {
           } else {
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys);
+            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys);
+
             query += Utils._.template(joinQuery)({
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.association.connectorDAO.tableName),
               table:      this.quoteIdentifiers(include.association.connectorDAO.tableName),
               as:         this.quoteIdentifier(include.association.connectorDAO.tableName),
               as:         this.quoteIdentifier(include.association.connectorDAO.tableName),
               tableLeft:  this.quoteIdentifiers(tableName),
               tableLeft:  this.quoteIdentifiers(tableName),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               attrRight:  this.quoteIdentifier(include.association.identifier)
               attrRight:  this.quoteIdentifier(include.association.identifier)
             })
             })
@@ -284,7 +288,7 @@ module.exports = (function() {
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               as:         this.quoteIdentifier(include.as),
               as:         this.quoteIdentifier(include.as),
               tableLeft:  this.quoteIdentifiers(include.as),
               tableLeft:  this.quoteIdentifiers(include.as),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               attrRight:  this.quoteIdentifier(include.association.foreignIdentifier)
               attrRight:  this.quoteIdentifier(include.association.foreignIdentifier)
             })
             })