moved test database config into config.js

lib/sequelize/Helper/QueryChainer.js

@@ -74,7 +74,7 @@ var instanceMethods = {
     var expandedQueries = this.expandMultiQueries(queries)
     
     if(queries.length > 0) this.executeQuery(expandedQueries, 0, callback)
-    else if (callback) callback()
+    else callback && callback()
   }
 }
 

lib/sequelize/SequelizeTable.js

@@ -377,8 +377,6 @@ exports.SequelizeTable = function(Sequelize, sequelize, tableName, attributes, o
       }
 
       sequelize.query(query, function(result, stats) {
-        console.log(self.id)
-        console.log(stats)
         self.id = self.id || stats.insert_id
         if(callback) callback(self)
       })

test/Table/associations.js

 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
-var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
-var Day = s.define('Day', { name: Sequelize.TEXT })
-var assert = require("assert")
+  , config    = require(__dirname + '/../config')
+  , s         = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Day       = s.define('Day', { name: Sequelize.TEXT })
+  , assert    = require("assert")
 
 module.exports = {
   'hasMany': function() {
@@ -39,7 +40,7 @@ module.exports = {
     })
   },
   'hasOne': function() {
-    var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
+    var s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
     var Day = s.define('Day2', { name: Sequelize.TEXT })
     var HasOneBlubb = s.define('HasOneBlubb', {})
     Day.hasOne('HasOneBlubb', HasOneBlubb)
@@ -47,7 +48,7 @@ module.exports = {
     assert.isDefined(Day.prototype.getHasOneBlubb)
   },
   'hasOne set association': function(beforeExit) {
-    var s2 = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
+    var s2 = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
     var Task = s2.define('Task', {title: Sequelize.STRING})
     var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
 
@@ -76,7 +77,7 @@ module.exports = {
     assert.isDefined(new Day({name:''}).getBelongsToBlubb)
   },
   'belongsTo: set association': function(beforeExit) {
-    var s2 = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
+    var s2 = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
     var Task = s2.define('Task', {title: Sequelize.STRING})
     var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
     var allowExit = false

test/Table/basics.js

 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
-var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
-var Day = s.define('Day', { name: Sequelize.TEXT })
-var assert = require("assert")
+  , config    = require(__dirname + '/../config')
+  , s         = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Day       = s.define('Day', { name: Sequelize.TEXT })
+  , assert    = require("assert")
 
 module.exports = {
   'constructor': function() {

test/Table/databaseAccess.js

 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
-var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
-var Day = s.define('Day', { name: Sequelize.TEXT })
-var assert = require("assert")
+  , config    = require(__dirname + '/../config')
+  , s         = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Day       = s.define('Day', { name: Sequelize.TEXT })
+  , assert    = require("assert")
 
 module.exports = {
  'save should set the id of a newly created object': function(beforeExit) {

test/Table/fetchAssociations.js

-var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize,
-    s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}),
-    Foo = s.define('Foo', { name: Sequelize.TEXT }),
-    Bar = s.define('Bar', { nr: Sequelize.INTEGER })
-
-var assert = require("assert")
+var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
+  , config = require(__dirname + '/../config')
+  , s      = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Foo    = s.define('Foo', { name: Sequelize.TEXT })
+  , Bar    = s.define('Bar', { nr: Sequelize.INTEGER })
+  , assert = require("assert")
 
 module.exports = {
   'should have no fetchedAssociations first': function(beforeExit) {
     var allowExit = false
-
+    
     Foo.hasMany('bars', Bar, 'foos')
-    Sequelize.chainQueries([{drop: s}, {sync: s}], function() {
+    Sequelize.chainQueries({drop: s}, {sync: s}, function() {
       new Foo({name:'asd'}).save(function(foo) {
         assert.eql(foo.fetchedAssociations, {})
         allowExit = true
@@ -24,7 +24,7 @@ module.exports = {
     var allowExit = false
 
     Foo.hasMany('bars', Bar, 'foos')
-    Sequelize.chainQueries([{drop: s}, {sync: s}], function() {
+    Sequelize.chainQueries({drop: s}, {sync: s}, function() {
       new Foo({name:'asd'}).save(function(foo) {
         foo.fetchAssociations(function() {
           assert.eql(foo.fetchedAssociations, {bars: []})

test/Table/finder.js

 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
-var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
-var Day = s.define('Day', { name: Sequelize.TEXT })
-var assert = require("assert")
-
+  , config    = require(__dirname + '/../config')
+  , s         = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Day       = s.define('Day', { name: Sequelize.TEXT })
+  , assert    = require("assert")
+  
 module.exports = {
   'findAll should return all items as class objects': function(beforeExit) {
     var allFindAllTestItems = null

test/Table/prepareAssociations.js

 var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
-var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
-var Day = s.define('Day', { name: Sequelize.TEXT })
-var assert = require("assert")
-
+  , config    = require(__dirname + '/../config')
+  , s         = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
+  , Day       = s.define('Day', { name: Sequelize.TEXT })
+  , assert    = require("assert")
+  
 module.exports = {
  'prepareAssociations belongsTo': function() {
-    var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true})
+    var s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
     var Me = s.define('Me', {})
     var You = s.define('You', {})
     var assoc = Me.hasOne('you', You)

test/config.js

+module.exports = {
+  username: 'root',
+  password: 'root',
+  database: 'sequelize_test'
+}
\ No newline at end of file