Fixed tests.

lib/dialects/postgres/query-generator.js

@@ -138,7 +138,7 @@ module.exports = (function() {
           return false
           return false
         }
         }
 
 
-        return [1].split('_').splice(1)
+        return match[1].split('_').splice(1)
       }
       }
     },
     },
 
 

lib/dialects/sqlite/query-generator.js

@@ -200,7 +200,6 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
       return Utils._.template(query)(replacements)
     },
     },
 
 
-<<<<<<< HEAD
     selectQuery: function(tableName, options, factory) {
     selectQuery: function(tableName, options, factory) {
       var table = null,
       var table = null,
           joinQuery = ""
           joinQuery = ""

test/dao-factory.test.js

@@ -620,6 +620,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         })
         })
       })
       })
     })
     })
+
     it("casts empty array correct for postgres update", function(done) {
     it("casts empty array correct for postgres update", function(done) {
       if (dialect !== "postgres") {
       if (dialect !== "postgres") {
         expect('').to.equal('')
         expect('').to.equal('')
@@ -653,8 +654,8 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
 
 
       User.sync({ force: true }).on('sql', function(sql) {
       User.sync({ force: true }).on('sql', function(sql) {
-        expect(sql).to.match(/UNIQUE \(username, email\)/)
-        expect(sql).to.match(/UNIQUE \(aCol, bCol\)/)
+        expect(sql).to.match(/UNIQUE\s*(uniq_UserWithUniqueUsernames_username_email)?\s*\([`"]?username[`"]?, [`"]?email[`"]?\)/)
+        expect(sql).to.match(/UNIQUE\s*(uniq_UserWithUniqueUsernames_aCol_bCol)?\s*\([`"]?aCol[`"]?, [`"]?bCol[`"]?\)/)
         done()
         done()
       })
       })
     })
     })