Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit b3bffddd by Sascha Depold
Options

removed dialect from prepareTransactionTest

1 parent 633a6cfa
Inline Side-by-side
Showing with 24 additions and 22 deletions
test/dao-factory.test.js
...@@ -353,7 +353,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -353,7 +353,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('findOrInitialize', function() { describe('findOrInitialize', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING, foo: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -433,7 +433,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -433,7 +433,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
it("supports transactions", function(done) { it("supports transactions", function(done) {
var self = this var self = this
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING, data: Sequelize.STRING }) var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING, data: Sequelize.STRING })
User User
...@@ -515,7 +515,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -515,7 +515,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
it('supports transactions', function(done) { it('supports transactions', function(done) {
var self = this var self = this
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING }) var User = sequelize.define('user_with_transaction', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1065,7 +1065,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1065,7 +1065,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('bulkCreate', function() { describe('bulkCreate', function() {
it("supports transactions", function(done) { it("supports transactions", function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1291,7 +1291,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1291,7 +1291,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('update', function() { describe('update', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1435,7 +1435,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1435,7 +1435,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('destroy', function() { describe('destroy', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1552,7 +1552,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -1552,7 +1552,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('find', function() { describe('find', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -2391,7 +2391,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -2391,7 +2391,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('findAll', function() { describe('findAll', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -3241,7 +3241,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3241,7 +3241,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -3329,7 +3329,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3329,7 +3329,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -3418,7 +3418,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3418,7 +3418,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
describe('count', function() { describe('count', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -3496,7 +3496,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3496,7 +3496,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { age: Sequelize.INTEGER }) var User = sequelize.define('User', { age: Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -3564,7 +3564,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -3564,7 +3564,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { age: Sequelize.INTEGER }) var User = sequelize.define('User', { age: Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -4283,7 +4283,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () { ...@@ -4283,7 +4283,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Sequelize.STRING }) var User = sequelize.define('User', { username: Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
......
test/dao.test.js
...@@ -267,7 +267,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -267,7 +267,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { number: Support.Sequelize.INTEGER }) var User = sequelize.define('User', { number: Support.Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -399,7 +399,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -399,7 +399,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
}) })
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { number: Support.Sequelize.INTEGER }) var User = sequelize.define('User', { number: Support.Sequelize.INTEGER })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -527,7 +527,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -527,7 +527,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
describe('reload', function () { describe('reload', function () {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Support.Sequelize.STRING }) var User = sequelize.define('User', { username: Support.Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -695,7 +695,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -695,7 +695,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
describe('save', function() { describe('save', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Support.Sequelize.STRING }) var User = sequelize.define('User', { username: Support.Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1315,7 +1315,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -1315,7 +1315,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
describe('updateAttributes', function() { describe('updateAttributes', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Support.Sequelize.STRING }) var User = sequelize.define('User', { username: Support.Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
...@@ -1449,7 +1449,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -1449,7 +1449,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
describe('destroy', function() { describe('destroy', function() {
it('supports transactions', function(done) { it('supports transactions', function(done) {
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
var User = sequelize.define('User', { username: Support.Sequelize.STRING }) var User = sequelize.define('User', { username: Support.Sequelize.STRING })
User.sync({ force: true }).success(function() { User.sync({ force: true }).success(function() {
......
test/sequelize.test.js
...@@ -533,7 +533,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () { ...@@ -533,7 +533,7 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
beforeEach(function(done) { beforeEach(function(done) {
var self = this var self = this
Support.prepareTransactionTest(dialect, this.sequelize, function(sequelize) { Support.prepareTransactionTest(this.sequelize, function(sequelize) {
self.sequelizeWithTransaction = sequelize self.sequelizeWithTransaction = sequelize
done() done()
}) })
......
test/support.js
...@@ -25,7 +25,9 @@ var Support = { ...@@ -25,7 +25,9 @@ var Support = {
}) })
}, },
prepareTransactionTest: function(dialect, sequelize, callback) { prepareTransactionTest: function(sequelize, callback) {
var dialect = Support.getTestDialect()
if (dialect === 'sqlite') { if (dialect === 'sqlite') {
var options = Sequelize.Utils._.extend({}, sequelize.options, { storage: path.join(__dirname, 'tmp', 'db.sqlite') }) var options = Sequelize.Utils._.extend({}, sequelize.options, { storage: path.join(__dirname, 'tmp', 'db.sqlite') })
, _sequelize = new Sequelize(sequelize.config.datase, null, null, options) , _sequelize = new Sequelize(sequelize.config.datase, null, null, options)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!