Skip to content

public / sequelize

Go to a project

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

Commit 66ccf6b9 by Daniel Durante
Options

Cleaned up BusterJS even more, hopefully this will fix most of the problems.

1 parent ea264aba
Expand all
Inline Side-by-side
Showing with 233 additions and 227 deletions
lib/dialects/mysql/query-generator.js
......@@ -377,7 +377,7 @@ module.exports = (function() {
}, options || {})
return Utils._.compact([
"CREATE", options.indicesType, "INDEX IF NOT EXISTS", options.indexName,
"CREATE", options.indicesType, "INDEX", options.indexName,
(options.indexType ? ('USING ' + options.indexType) : undefined),
"ON", tableName, '(' + transformedAttributes.join(', ') + ')',
(options.parser ? "WITH PARSER " + options.parser : undefined)
......
spec/associations/belongs-to.spec.js
......@@ -8,9 +8,9 @@ var buster = require("buster")
buster.spec.expose()
buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
before(function(done) {
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
......
spec/associations/has-many.spec.js
......@@ -9,9 +9,9 @@ var buster = require("buster")
buster.spec.expose()
buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
describe(Helpers.getTestDialectTeaser("HasMany"), function() {
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
before(function(done) {
var self = this
self.sequelize = sequelize
......@@ -20,67 +20,72 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
describe('general usage', function() {
before(function(done) {
this.User = this.sequelize.define('User', { username: Helpers.Sequelize.STRING })
this.Task = this.sequelize.define('Task', { title: Helpers.Sequelize.STRING })
this.sequelize.sync({ force: true }).success(done)
var self = this
self.User = self.sequelize.define('User', { username: Helpers.Sequelize.STRING })
self.Task = self.sequelize.define('Task', { title: Helpers.Sequelize.STRING })
self.User.sync({ force: true }).success(function() {
self.Task.sync({ force: true }).success(done)
})
})
describe('mono-directional', function() {
it("adds the foreign key", function(done) {
this.User.hasMany(this.Task)
expect(this.Task.attributes.UserId).toEqual("INTEGER")
done()
it("adds the foreign key", function() {
var self = this
self.User.hasMany(self.Task)
expect(self.Task.attributes.UserId).toEqual("INTEGER")
})
it('adds the foreign key with underscore', function(done) {
var User = this.sequelize.define('User', { username: Helpers.Sequelize.STRING })
, Task = this.sequelize.define('Task', { title: Helpers.Sequelize.STRING }, { underscored: true })
it('adds the foreign key with underscore', function() {
var self = this
, User = self.sequelize.define('User', { username: Helpers.Sequelize.STRING })
, Task = self.sequelize.define('Task', { title: Helpers.Sequelize.STRING }, { underscored: true })
Task.hasMany(User)
expect(User.attributes.task_id).toBeDefined()
done()
})
it('uses the passed foreign key', function(done) {
this.User.hasMany(this.Task, { foreignKey: 'person_id' })
expect(this.Task.attributes.person_id).toEqual("INTEGER")
done()
it('uses the passed foreign key', function() {
var self = this
self.User.hasMany(self.Task, { foreignKey: 'person_id' })
expect(self.Task.attributes.person_id).toEqual("INTEGER")
})
it('defines getters and setters', function(done) {
this.User.hasMany(this.Task)
it('defines getters and setters', function() {
var self = this
self.User.hasMany(self.Task)
var u = this.User.build({username: 'asd'})
var u = self.User.build({username: 'asd'})
expect(u.setTasks).toBeDefined()
expect(u.getTasks).toBeDefined()
done()
})
it("defines getters and setters according to the 'as' option", function(done) {
this.User.hasMany(this.Task, {as: 'Tasks'})
var u = this.User.build({username: 'asd'})
it("defines getters and setters according to the 'as' option", function() {
var self = this
self.User.hasMany(self.Task, {as: 'Tasks'})
var u = self.User.build({username: 'asd'})
expect(u.setTasks).toBeDefined()
expect(u.getTasks).toBeDefined()
done()
})
it("sets and gets associated objects", function(done) {
var self = this
this.User.hasMany(this.Task, { as: 'Tasks' })
this.sequelize.sync({ force: true }).success(function() {
self.User.create({username: 'name'}).success(function(user) {
self.Task.create({title: 'task1'}).success(function(task1) {
self.Task.create({title: 'task2'}).success(function(task2) {
user.setTasks([task1, task2]).success(function() {
user.getTasks().success(function(tasks) {
expect(tasks.length).toEqual(2)
user.getTasks({attributes: ['title']}).success(function(tasks) {
expect(tasks[0].selectedValues.title).toEqual('task1')
expect(tasks[0].selectedValues.id).not.toBeDefined()
done()
self.User.hasMany(self.Task, { as: 'Tasks' })
self.User.sync({ force: true }).success(function() {
self.Task.sync({ force: true }).success(function() {
self.User.create({username: 'name'}).success(function(user) {
self.Task.create({title: 'task1'}).success(function(task1) {
self.Task.create({title: 'task2'}).success(function(task2) {
user.setTasks([task1, task2]).success(function() {
user.getTasks().success(function(tasks) {
expect(tasks.length).toEqual(2)
user.getTasks({attributes: ['title']}).success(function(tasks) {
expect(tasks[0].selectedValues.title).toEqual('task1')
expect(tasks[0].selectedValues.id).not.toBeDefined()
done()
})
})
})
})
......@@ -92,15 +97,16 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
})
it("should allow selfAssociation to be single linked (only one DAO is created)", function(done) {
var oldLength = this.sequelize.daoFactoryManager.daos.length
, Comment = this.sequelize.define('Comment', { content: Helpers.Sequelize.STRING })
var self = this
, oldLength = self.sequelize.daoFactoryManager.daos.length
, Comment = self.sequelize.define('Comment', { content: Helpers.Sequelize.STRING })
Comment.belongsTo(Comment, {as: "Parent"});
Comment.hasMany(Comment, {as: 'Children', foreignKey: "ParentId", useJunctionTable: false})
expect(this.sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 1)
expect(self.sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 1)
Comment.sync({force: true}).success(function() {
self.sequelize.sync({ force: true }).success(function() {
Comment.create({ content: 'parentComment' }).success(function(parent) {
Comment.create({ content: 'child1' }).success(function(child1) {
child1.setParent(parent).success(function() {
......@@ -120,19 +126,19 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
})
})
it("should still use many to many for selfAssociation by default (two DAOs are created)", function(done) {
var oldLength = this.sequelize.daoFactoryManager.daos.length
, Comment = this.sequelize.define('Comment', { content: Sequelize.STRING })
it("should still use many to many for selfAssociation by default (two DAOs are created)", function() {
var self = this
, oldLength = self.sequelize.daoFactoryManager.daos.length
, Comment = self.sequelize.define('Comment', { content: Sequelize.STRING })
Comment.belongsTo(Comment, {as: "Parent"})
Comment.hasMany(Comment, {as: 'Children'})
expect(this.sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 2)
done();
expect(self.sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 2)
})
describe('bi-directional', function() {
it('adds the foreign key', function(done) {
it('adds the foreign key', function() {
var self = this
this.Task.hasMany(this.User)
......@@ -149,7 +155,6 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
expect(dao.attributes.UserId).toBeDefined()
expect(dao.attributes.TaskId).toBeDefined()
})
done()
})
it("adds the foreign key with underscores", function(done) {
......@@ -340,7 +345,8 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
})
it("gets and sets the connector daos", function(done) {
var Person = this.sequelize.define('Person', { name: Helpers.Sequelize.STRING })
var self = this
, Person = self.sequelize.define('Person', { name: Helpers.Sequelize.STRING })
Person.hasMany(Person, {as: 'Children'})
Person.hasMany(Person, {as: 'Friends'})
......@@ -531,20 +537,22 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
before(function(done) {
var self = this
this.User = this.sequelize.define('User', { username: Sequelize.STRING })
this.Task = this.sequelize.define('Task', { title: Sequelize.STRING, active: Sequelize.BOOLEAN })
self.User = self.sequelize.define('User', { username: Sequelize.STRING })
self.Task = self.sequelize.define('Task', { title: Sequelize.STRING, active: Sequelize.BOOLEAN })
this.User.hasMany(self.Task)
self.User.hasMany(self.Task)
this.sequelize.sync({ force: true }).done(function() {
var chainer = new Sequelize.Utils.QueryChainer([
self.User.create({ username: 'John'}),
self.Task.create({ title: 'Get rich', active: true}),
self.Task.create({ title: 'Die trying', active: false})
])
self.User.sync({ force: true }).done(function() {
self.Task.sync({ force: true }).success(function() {
var chainer = new Sequelize.Utils.QueryChainer([
self.User.create({ username: 'John'}),
self.Task.create({ title: 'Get rich', active: true}),
self.Task.create({ title: 'Die trying', active: false})
])
chainer.run().success(function (results, john, task1, task2) {
john.setTasks([task1, task2]).success(done)
chainer.run().success(function (results, john, task1, task2) {
john.setTasks([task1, task2]).success(done)
})
})
})
})
......
spec/associations/mixin.spec.js
......@@ -6,9 +6,9 @@ var buster = require("buster")
buster.spec.expose()
buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
describe(Helpers.getTestDialectTeaser("Mixin"), function() {
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
before(function(done) {
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
......
spec/configuration.spec.js
var buster = require("buster")
, semver = require("semver")
, Helpers = require('./buster-helpers')
, config = require(__dirname + "/config/config")
, dialect = Helpers.getTestDialect()
var buster = require("buster")
, semver = require("semver")
, Helpers = require('./buster-helpers')
, config = require(__dirname + "/config/config")
, dialect = Helpers.getTestDialect()
, Sequelize = require(__dirname + '/../index')
, noDomains = semver.lt(process.version, '0.8.0')
buster.spec.expose()
buster.testRunner.timeout = 1000
var Sequelize = require(__dirname + '/../index')
, noDomains = semver.lt(process.version, '0.8.0')
describe(Helpers.getTestDialectTeaser("Configuration"), function() {
describe('Connections problems should fail with a nice message', function() {
it('when we don\'t have the correct server details', function(done) {
......@@ -19,21 +18,23 @@ describe(Helpers.getTestDialectTeaser("Configuration"), function() {
return done()
}
var sequelize = new Sequelize(config[dialect].database, config[dialect].username, config[dialect].password, {storage: '/path/to/no/where/land', logging: false, host: '0.0.0.1', port: config[dialect].port, dialect: dialect})
, domain = require('domain')
, d = domain.create()
d.on('error', function(err){
expect(err).toMatch(/Failed to find (.*?) Please double check your settings\./)
d.remove(sequelize.query)
done()
})
d.run(function(){
d.add(sequelize.query)
sequelize.query('select 1 as hello')
.success(function(){})
})
(function() {
var sequelizeSpecific2 = new Sequelize(config[dialect].database, config[dialect].username, config[dialect].password, {storage: '/path/to/no/where/land', logging: false, host: '0.0.0.1', port: config[dialect].port, dialect: dialect})
, domain = require('domain')
, d = domain.create()
d.on('error', function(err){
expect(err).toMatch(/Failed to find (.*?) Please double check your settings\./)
d.remove(sequelizeSpecific2.query)
done()
})
d.run(function(){
d.add(sequelizeSpecific2.query)
sequelizeSpecific2.query('select 1 as hello')
.success(function(){})
})
})()
})
it('when we don\'t have the correct login information', function(done) {
......@@ -49,19 +50,19 @@ describe(Helpers.getTestDialectTeaser("Configuration"), function() {
return done()
}
var sequelize = new Sequelize(config[dialect].database, config[dialect].username, 'fakepass123', {logging: false, host: config[dialect].host, port: 1, dialect: dialect})
var sequelizeSpecific1 = new Sequelize(config[dialect].database, config[dialect].username, 'fakepass123', {logging: false, host: config[dialect].host, port: 1, dialect: dialect})
, domain = require('domain')
, d = domain.create()
d.on('error', function(err){
expect(err).toMatch(/^Failed to authenticate/)
d.remove(sequelize)
d.remove(sequelizeSpecific1.query)
done()
})
d.run(function(){
d.add(sequelize)
sequelize.query('select 1 as hello')
d.add(sequelizeSpecific1.query)
sequelizeSpecific1.query('select 1 as hello')
.success(function(){})
})
})
......@@ -75,7 +76,7 @@ describe(Helpers.getTestDialectTeaser("Configuration"), function() {
})
describe('Instantiation with a URL string', function() {
it('should accept username, password, host, port, and database', function(done) {
it('should accept username, password, host, port, and database', function() {
var sequelize = new Sequelize('mysql://user:pass@example.com:9821/dbname')
var config = sequelize.config
var options = sequelize.options
......@@ -87,49 +88,44 @@ describe(Helpers.getTestDialectTeaser("Configuration"), function() {
expect(config.username).toEqual('user')
expect(config.password).toEqual('pass')
expect(config.port).toEqual(9821)
done()
})
it('should work with no authentication options', function(done) {
it('should work with no authentication options', function() {
var sequelize = new Sequelize('mysql://example.com:9821/dbname')
var config = sequelize.config
expect(config.username).toEqual(undefined)
expect(config.password).toEqual(null)
done()
})
it('should use the default port when no other is specified', function(done) {
it('should use the default port when no other is specified', function() {
var sequelize = new Sequelize('mysql://example.com/dbname')
var config = sequelize.config
// The default port should be set
expect(config.port).toEqual(3306)
done()
})
})
describe('Intantiation with arguments', function() {
it('should accept two parameters (database, username)', function(done) {
it('should accept two parameters (database, username)', function() {
var sequelize = new Sequelize('dbname', 'root')
var config = sequelize.config
expect(config.database).toEqual('dbname')
expect(config.username).toEqual('root')
done()
})
it('should accept three parameters (database, username, password)', function(done) {
it('should accept three parameters (database, username, password)', function() {
var sequelize = new Sequelize('dbname', 'root', 'pass')
var config = sequelize.config
expect(config.database).toEqual('dbname')
expect(config.username).toEqual('root')
expect(config.password).toEqual('pass')
done()
})
it('should accept four parameters (database, username, password, options)', function(done) {
it('should accept four parameters (database, username, password, options)', function() {
var sequelize = new Sequelize('dbname', 'root', 'pass', { port: 999 })
var config = sequelize.config
......@@ -137,7 +133,6 @@ describe(Helpers.getTestDialectTeaser("Configuration"), function() {
expect(config.username).toEqual('root')
expect(config.password).toEqual('pass')
expect(config.port).toEqual(999)
done()
})
})
})
spec/dao-factory.spec.js
/* jshint camelcase: false */
var buster = require("buster")
, Sequelize = require("../index")
, Helpers = require('./buster-helpers')
, _ = require('lodash')
, moment = require('moment')
, dialect = Helpers.getTestDialect()
, DataTypes = require(__dirname + "/../lib/data-types")
, Sequelize = require("../index")
, Helpers = require('./buster-helpers')
, _ = require('lodash')
, moment = require('moment')
, dialect = Helpers.getTestDialect()
, DataTypes = require(__dirname + "/../lib/data-types")
buster.spec.expose()
buster.testRunner.timeout = 1000
......@@ -341,7 +341,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
Helpers.checkMatchForDialects(dialect, err.message, {
sqlite: /.*SQLITE_CONSTRAINT.*/,
mysql: "Column 'smth' cannot be null",
// We need to allow two different errors for MySQL, see:
// http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_trans_tables
mysql: /(Column 'smth' cannot be null|Field 'smth' doesn't have a default value)/,
postgres: /.*column "smth" violates not-null.*/
})
......@@ -1313,26 +1315,17 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
describe('eager loading', function() {
before(function(done) {
var self = this
this.Task = this.sequelize.define('Task', { title: Sequelize.STRING })
this.Worker = this.sequelize.define('Worker', { name: Sequelize.STRING })
this.Domain = this.sequelize.define('Domain', { ip: Sequelize.STRING })
this.Environment = this.sequelize.define('Environment', { name: Sequelize.STRING })
this.Environment
.belongsTo(this.Domain, { as: 'PrivateDomain', foreignKey: 'privateDomainId' })
.belongsTo(this.Domain, { as: 'PublicDomain', foreignKey: 'publicDomainId' })
self.Task = self.sequelize.define('Task', { title: Sequelize.STRING })
self.Worker = self.sequelize.define('Worker', { name: Sequelize.STRING })
this.init = function(callback) {
self.Task.sync({ force: true }).success(function() {
self.Worker.sync({ force: true }).success(function() {
self.Domain.sync({ force: true }).success(function() {
self.Environment.sync({ force: true }).success(function() {
self.Worker.create({ name: 'worker' }).success(function(worker) {
self.Task.create({ title: 'homework' }).success(function(task) {
self.worker = worker
self.task = task
callback()
})
})
self.Worker.create({ name: 'worker' }).success(function(worker) {
self.Task.create({ title: 'homework' }).success(function(task) {
self.worker = worker
self.task = task
callback()
})
})
})
......@@ -1342,72 +1335,84 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
})
describe('belongsTo', function() {
before(function(done) {
var self = this
this.Task.belongsTo(this.Worker)
this.init(function() {
self.task.setWorker(self.worker).success(done)
describe('generic', function() {
before(function(done) {
var self = this
this.Task.belongsTo(this.Worker)
this.init(function() {
self.task.setWorker(self.worker).success(done)
})
})
})
it('throws an error about unexpected input if include contains a non-object', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ 1 ] })
}).toThrow('Error', 'Include unexpected. Element has to be either an instance of DAOFactory or an object.')
done()
})
it('throws an error about missing attributes if include contains an object with daoFactory', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ { daoFactory: self.Worker } ] })
}).toThrow('Error', 'Include malformed. Expected attributes: daoFactory, as!')
done()
})
it('throws an error about unexpected input if include contains a non-object', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ 1 ] })
}).toThrow('Error', 'Include unexpected. Element has to be either an instance of DAOFactory or an object.')
done()
})
it('throws an error if included DaoFactory is not associated', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ self.Task ] })
}).toThrow('Error', 'Task is not associated to Worker!')
done()
})
it('throws an error about missing attributes if include contains an object with daoFactory', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ { daoFactory: self.Worker } ] })
}).toThrow('Error', 'Include malformed. Expected attributes: daoFactory, as!')
done()
})
it('returns the associated worker via task.worker', function(done) {
this.Task.find({
where: { title: 'homework' },
include: [ this.Worker ]
}).complete(function(err, task) {
expect(err).toBeNull()
expect(task).toBeDefined()
expect(task.worker).toBeDefined()
expect(task.worker.name).toEqual('worker')
it('throws an error if included DaoFactory is not associated', function(done) {
var self = this
expect(function() {
self.Worker.find({ include: [ self.Task ] })
}).toThrow('Error', 'Task is not associated to Worker!')
done()
})
it('returns the associated worker via task.worker', function(done) {
this.Task.find({
where: { title: 'homework' },
include: [ this.Worker ]
}).complete(function(err, task) {
expect(err).toBeNull()
expect(task).toBeDefined()
expect(task.worker).toBeDefined()
expect(task.worker.name).toEqual('worker')
done()
})
})
})
it('returns the private and public ip', function(done) {
var self = this
this.Domain.create({ ip: '192.168.0.1' }).success(function(privateIp) {
self.Domain.create({ ip: '91.65.189.19' }).success(function(publicIp) {
self.Environment.create({ name: 'environment' }).success(function(env) {
env.setPrivateDomain(privateIp).success(function() {
env.setPublicDomain(publicIp).success(function() {
self.Environment.find({
where: { name: 'environment' },
include: [
{ daoFactory: self.Domain, as: 'PrivateDomain' },
{ daoFactory: self.Domain, as: 'PublicDomain' }
]
}).complete(function(err, environment) {
expect(err).toBeNull()
expect(environment).toBeDefined()
expect(environment.privateDomain).toBeDefined()
expect(environment.privateDomain.ip).toEqual('192.168.0.1')
expect(environment.publicDomain).toBeDefined()
expect(environment.publicDomain.ip).toEqual('91.65.189.19')
done()
self.Domain = self.sequelize.define('Domain', { ip: Sequelize.STRING })
self.Environment = self.sequelize.define('Environment', { name: Sequelize.STRING })
self.Environment
.belongsTo(self.Domain, { as: 'PrivateDomain', foreignKey: 'privateDomainId' })
.belongsTo(self.Domain, { as: 'PublicDomain', foreignKey: 'publicDomainId' })
self.Domain.sync({ force: true }).success(function() {
self.Environment.sync({ force: true }).success(function() {
self.Domain.create({ ip: '192.168.0.1' }).success(function(privateIp) {
self.Domain.create({ ip: '91.65.189.19' }).success(function(publicIp) {
self.Environment.create({ name: 'environment' }).success(function(env) {
env.setPrivateDomain(privateIp).success(function() {
env.setPublicDomain(publicIp).success(function() {
self.Environment.find({
where: { name: 'environment' },
include: [
{ daoFactory: self.Domain, as: 'PrivateDomain' },
{ daoFactory: self.Domain, as: 'PublicDomain' }
]
}).complete(function(err, environment) {
expect(err).toBeNull()
expect(environment).toBeDefined()
expect(environment.privateDomain).toBeDefined()
expect(environment.privateDomain.ip).toEqual('192.168.0.1')
expect(environment.publicDomain).toBeDefined()
expect(environment.publicDomain.ip).toEqual('91.65.189.19')
done()
})
})
})
})
})
......@@ -2456,7 +2461,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
})
it("emits the error event as the referenced table name is invalid", function(done) {
this.timeout = 1500
this.timeout = 2500
var self = this
this.Author.sync({ force: true }).success(function() {
self.Post.sync({ force: true }).success(function() {
......
spec/dao.spec.js
......@@ -965,7 +965,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
identifier: {type: Helpers.Sequelize.STRING, primaryKey: true}
})
User.sync().success(function(){
User.sync({ force: true }).success(function(){
User.create({
name: 'snafu',
identifier: 'identifier'
......@@ -993,7 +993,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
identifier: {type: Helpers.Sequelize.STRING, primaryKey: true}
})
User.sync().success(function(){
User.sync({ force: true }).success(function(){
User.create({
name: 'snafu',
identifier: 'identifier'
......
spec/language.spec.js
var buster = require("buster")
var buster = require("buster")
, Sequelize = require("../index")
, Helpers = require('./buster-helpers')
, dialect = Helpers.getTestDialect()
......
spec/mysql/associations.spec.js
/* jshint camelcase: false */
var buster = require("buster")
, config = require('../config/config')
, Helpers = require('../buster-helpers')
, dialect = Helpers.getTestDialect()
......@@ -10,9 +9,8 @@ buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
if (dialect.match(/^mysql/)) {
describe('[MYSQL] Associations', function() {
describe('[MYSQL Specific] Associations', function() {
before(function(done) {
var self = this
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
})
......@@ -26,9 +24,11 @@ if (dialect.match(/^mysql/)) {
Table1.hasMany(Table2)
Table2.hasMany(Table1)
this.sequelize.sync({ force: true }).success(function() {
expect(self.sequelize.daoFactoryManager.getDAO('wp_table1swp_table2s')).toBeDefined()
done()
Table1.sync({ force: true }).success(function() {
Table2.sync({ force: true }).success(function() {
expect(self.sequelize.daoFactoryManager.getDAO('wp_table1swp_table2s')).toBeDefined()
done()
})
})
})
})
......@@ -40,17 +40,14 @@ if (dialect.match(/^mysql/)) {
Table1.hasMany(Table2, {joinTableName: 'table1_to_table2'})
Table2.hasMany(Table1, {joinTableName: 'table1_to_table2'})
this.sequelize.sync({ force: true }).success(done)
Table1.sync({ force: true }).success(function() {
Table2.sync({ force: true }).success(done)
})
})
it("should not use a combined name", function(done) {
it("should not use only a specified name", function() {
expect(this.sequelize.daoFactoryManager.getDAO('ms_table1sms_table2s')).not.toBeDefined()
done()
})
it("should use the specified name", function(done) {
expect(this.sequelize.daoFactoryManager.getDAO('table1_to_table2')).toBeDefined()
done()
})
})
})
......@@ -79,9 +76,11 @@ if (dialect.match(/^mysql/)) {
tasks[tasks.length] = {name: 'Task' + Math.random()}
}
this.sequelize.sync({ force: true }).success(function() {
self.User.bulkCreate(users).success(function() {
self.Task.bulkCreate(tasks).success(done)
this.User.sync({ force: true }).success(function() {
self.Task.sync({ force: true }).success(function() {
self.User.bulkCreate(users).success(function() {
self.Task.bulkCreate(tasks).success(done)
})
})
})
})
......
spec/mysql/connector-manager.spec.js
......@@ -8,7 +8,7 @@ buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
if (dialect.match(/^mysql/)) {
describe('[MYSQL] Connector Manager', function() {
describe('[MYSQL Specific] Connector Manager', function() {
before(function(done) {
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
......
spec/mysql/dao-factory.spec.js
......@@ -10,7 +10,7 @@ buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
if (dialect.match(/^mysql/)) {
describe('[MYSQL] DAOFactory', function() {
describe('[MYSQL Specific] DAOFactory', function() {
before(function(done) {
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
......
spec/mysql/query-generator.spec.js
......@@ -11,7 +11,7 @@ buster.testRunner.timeout = 1000
var sequelize = Helpers.createSequelizeInstance({dialect: dialect})
if (dialect.match(/^mysql/)) {
describe('[MYSQL] QueryGenerator', function() {
describe('[MYSQL Specific] QueryGenerator', function() {
before(function(done) {
this.sequelize = sequelize
Helpers.clearDatabase(this.sequelize, done)
......
spec/promise.spec.js
var buster = require("buster")
, Helpers = require('./buster-helpers')
, DataTypes = require(__dirname + "/../lib/data-types")
, dialect = Helpers.getTestDialect()
, _ = require('lodash')
var buster = require("buster")
, Helpers = require('./buster-helpers')
, DataTypes = require(__dirname + "/../lib/data-types")
, dialect = Helpers.getTestDialect()
, _ = require('lodash')
buster.spec.expose()
buster.testRunner.timeout = 1000
......@@ -73,7 +73,7 @@ describe(Helpers.getTestDialectTeaser("Promise"), function () {
return self.User.find(1)
}).then(function(user5) {
expect(user5.aNumber).toBe(3)
done();
done()
}, done)
})
})
......
spec/query-chainer.spec.js
if(typeof require === 'function') {
const buster = require("buster")
, QueryChainer = require("../lib/query-chainer")
, CustomEventEmitter = require("../lib/emitters/custom-event-emitter")
, Helpers = require('./buster-helpers')
, dialect = Helpers.getTestDialect()
}
var buster = require("buster")
, QueryChainer = require("../lib/query-chainer")
, CustomEventEmitter = require("../lib/emitters/custom-event-emitter")
, Helpers = require('./buster-helpers')
buster.spec.expose()
buster.testRunner.timeout = 1000
......
spec/query-interface.spec.js
var buster = require("buster")
, Helpers = require('./buster-helpers')
, dialect = Helpers.getTestDialect()
, Helpers = require('./buster-helpers')
, dialect = Helpers.getTestDialect()
buster.spec.expose()
buster.testRunner.timeout = 1000
......
spec/sequelize.spec.js
......@@ -241,12 +241,14 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
var Project = this.sequelize.define('project' + config.rand(), { title: Helpers.Sequelize.STRING })
var Task = this.sequelize.define('task' + config.rand(), { title: Helpers.Sequelize.STRING })
sequelize.sync().success(function() {
Project.create({title: 'bla'}).success(function() {
Task.create({title: 'bla'}).success(function(task){
expect(task).toBeDefined()
expect(task.title).toEqual('bla')
done()
Project.sync({ force: true }).success(function() {
Task.sync({ force: true }).success(function() {
Project.create({title: 'bla'}).success(function() {
Task.create({title: 'bla'}).success(function(task){
expect(task).toBeDefined()
expect(task.title).toEqual('bla')
done()
})
})
})
})
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!