不要怂,就是干,撸起袖子干!

Commit 3b297e00 by Chia-liang Kao

Make tests pass for postgresql by quoting table column names with uppercases. A…

…lso skip stored procedure unless mysql.
1 parent e79089a0
Showing with 6 additions and 5 deletions
...@@ -35,7 +35,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -35,7 +35,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 \"" + this.User.tableName + "\" (username, \"createdAt\", \"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)
...@@ -70,7 +70,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -70,7 +70,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 \"" + 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()
...@@ -83,7 +83,8 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -83,7 +83,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(
...@@ -96,11 +97,11 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -96,11 +97,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 \"" + 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))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!