Merge pull request #432 from clkao/patch-3

get dialect from env when not specified

spec/migrator.spec.js

@@ -28,7 +28,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         .error(function(err) { console.log(err) })
         .error(function(err) { console.log(err) })
     }.bind(this)
     }.bind(this)
 
 
-    Helpers.initTests({ onComplete: done, context: this })
+    Helpers.initTests({ dialect: dialect, onComplete: done, context: this })
   })
   })
 
 
   it("as", function() {
   it("as", function() {

spec/sequelize.spec.js

@@ -5,11 +5,18 @@ if(typeof require === 'function') {
 
 
 }
 }
 
 
+var qq = function(str) {
+    if (dialect == 'postgres')
+        return '"' + str + '"';
+    return str;
+};
+
 buster.spec.expose()
 buster.spec.expose()
 
 
 describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
 describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
   before(function(done) {
   before(function(done) {
     Helpers.initTests({
     Helpers.initTests({
+      dialect: dialect,
       beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this),
       beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this),
       onComplete: done
       onComplete: done
     })
     })
@@ -34,7 +41,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
         username: Helpers.Sequelize.STRING
         username: Helpers.Sequelize.STRING
       })
       })
 
 
-      this.insertQuery = "INSERT INTO " + this.User.tableName + " (username, createdAt, updatedAt) VALUES ('john', '2012-01-01 10:10:10', '2012-01-01 10:10:10')"
+      this.insertQuery = "INSERT INTO " + qq(this.User.tableName) + " (username, " + qq("createdAt") + ", " + qq("updatedAt") + ") VALUES ('john', '2012-01-01 10:10:10', '2012-01-01 10:10:10')"
 
 
       this.User.sync().success(done).error(function(err) {
       this.User.sync().success(done).error(function(err) {
         console(err)
         console(err)
@@ -69,7 +76,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
     it('executes select queries correctly', function(done) {
     it('executes select queries correctly', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize
         this.sequelize
-          .query("select * from " + this.User.tableName)
+          .query("select * from " + qq(this.User.tableName) + "")
           .success(function(users) {
           .success(function(users) {
             expect(users.map(function(u){ return u.username })).toEqual(['john'])
             expect(users.map(function(u){ return u.username })).toEqual(['john'])
             done()
             done()
@@ -82,7 +89,8 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
       }.bind(this))
       }.bind(this))
     })
     })
 
 
-    it('executes stored procedures', function(done) {
+    if (dialect == 'mysql')
+     it('executes stored procedures', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize.query('DROP PROCEDURE IF EXISTS foo').success(function() {
         this.sequelize.query('DROP PROCEDURE IF EXISTS foo').success(function() {
           this.sequelize.query(
           this.sequelize.query(
@@ -95,11 +103,11 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
           }.bind(this))
           }.bind(this))
         }.bind(this))
         }.bind(this))
       }.bind(this))
       }.bind(this))
-    })
+     })
 
 
     it('uses the passed DAOFactory', function(done) {
     it('uses the passed DAOFactory', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
       this.sequelize.query(this.insertQuery).success(function() {
-        this.sequelize.query("SELECT * FROM " + this.User.tableName + ";", this.User).success(function(users) {
+        this.sequelize.query("SELECT * FROM " + qq(this.User.tableName) + ";", this.User).success(function(users) {
           expect(users[0].__factory).toEqual(this.User)
           expect(users[0].__factory).toEqual(this.User)
           done()
           done()
         }.bind(this))
         }.bind(this))