Skip to content

public / sequelize

Go to a project

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

You need to sign in or sign up before continuing.
Commit d581e869 by Sascha Depold
Options

moved test database config into config.js

1 parent f42b40f7
Inline Side-by-side
Showing with 42 additions and 33 deletions
lib/sequelize/Helper/QueryChainer.js
...@@ -74,7 +74,7 @@ var instanceMethods = { ...@@ -74,7 +74,7 @@ var instanceMethods = {
var expandedQueries = this.expandMultiQueries(queries) var expandedQueries = this.expandMultiQueries(queries)
if(queries.length > 0) this.executeQuery(expandedQueries, 0, callback) 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 ...@@ -377,8 +377,6 @@ exports.SequelizeTable = function(Sequelize, sequelize, tableName, attributes, o
} }
sequelize.query(query, function(result, stats) { sequelize.query(query, function(result, stats) {
console.log(self.id)
console.log(stats)
self.id = self.id || stats.insert_id self.id = self.id || stats.insert_id
if(callback) callback(self) if(callback) callback(self)
}) })
......
test/Table/associations.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}) , config = require(__dirname + '/../config')
var Day = s.define('Day', { name: Sequelize.TEXT }) , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
var assert = require("assert") , Day = s.define('Day', { name: Sequelize.TEXT })
, assert = require("assert")
module.exports = { module.exports = {
'hasMany': function() { 'hasMany': function() {
...@@ -39,7 +40,7 @@ module.exports = { ...@@ -39,7 +40,7 @@ module.exports = {
}) })
}, },
'hasOne': function() { '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 Day = s.define('Day2', { name: Sequelize.TEXT })
var HasOneBlubb = s.define('HasOneBlubb', {}) var HasOneBlubb = s.define('HasOneBlubb', {})
Day.hasOne('HasOneBlubb', HasOneBlubb) Day.hasOne('HasOneBlubb', HasOneBlubb)
...@@ -47,7 +48,7 @@ module.exports = { ...@@ -47,7 +48,7 @@ module.exports = {
assert.isDefined(Day.prototype.getHasOneBlubb) assert.isDefined(Day.prototype.getHasOneBlubb)
}, },
'hasOne set association': function(beforeExit) { '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 Task = s2.define('Task', {title: Sequelize.STRING})
var Deadline = s2.define('Deadline', {date: Sequelize.DATE}) var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
...@@ -76,7 +77,7 @@ module.exports = { ...@@ -76,7 +77,7 @@ module.exports = {
assert.isDefined(new Day({name:''}).getBelongsToBlubb) assert.isDefined(new Day({name:''}).getBelongsToBlubb)
}, },
'belongsTo: set association': function(beforeExit) { '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 Task = s2.define('Task', {title: Sequelize.STRING})
var Deadline = s2.define('Deadline', {date: Sequelize.DATE}) var Deadline = s2.define('Deadline', {date: Sequelize.DATE})
var allowExit = false var allowExit = false
......
test/Table/basics.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}) , config = require(__dirname + '/../config')
var Day = s.define('Day', { name: Sequelize.TEXT }) , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
var assert = require("assert") , Day = s.define('Day', { name: Sequelize.TEXT })
, assert = require("assert")
module.exports = { module.exports = {
'constructor': function() { 'constructor': function() {
......
test/Table/databaseAccess.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}) , config = require(__dirname + '/../config')
var Day = s.define('Day', { name: Sequelize.TEXT }) , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
var assert = require("assert") , Day = s.define('Day', { name: Sequelize.TEXT })
, assert = require("assert")
module.exports = { module.exports = {
'save should set the id of a newly created object': function(beforeExit) { 'save should set the id of a newly created object': function(beforeExit) {
......
test/Table/fetchAssociations.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize, var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}), , config = require(__dirname + '/../config')
Foo = s.define('Foo', { name: Sequelize.TEXT }), , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
Bar = s.define('Bar', { nr: Sequelize.INTEGER }) , Foo = s.define('Foo', { name: Sequelize.TEXT })
, Bar = s.define('Bar', { nr: Sequelize.INTEGER })
var assert = require("assert") , assert = require("assert")
module.exports = { module.exports = {
'should have no fetchedAssociations first': function(beforeExit) { 'should have no fetchedAssociations first': function(beforeExit) {
var allowExit = false var allowExit = false
Foo.hasMany('bars', Bar, 'foos') 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) { new Foo({name:'asd'}).save(function(foo) {
assert.eql(foo.fetchedAssociations, {}) assert.eql(foo.fetchedAssociations, {})
allowExit = true allowExit = true
...@@ -24,7 +24,7 @@ module.exports = { ...@@ -24,7 +24,7 @@ module.exports = {
var allowExit = false var allowExit = false
Foo.hasMany('bars', Bar, 'foos') 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) { new Foo({name:'asd'}).save(function(foo) {
foo.fetchAssociations(function() { foo.fetchAssociations(function() {
assert.eql(foo.fetchedAssociations, {bars: []}) assert.eql(foo.fetchedAssociations, {bars: []})
......
test/Table/finder.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}) , config = require(__dirname + '/../config')
var Day = s.define('Day', { name: Sequelize.TEXT }) , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
var assert = require("assert") , Day = s.define('Day', { name: Sequelize.TEXT })
, assert = require("assert")
module.exports = { module.exports = {
'findAll should return all items as class objects': function(beforeExit) { 'findAll should return all items as class objects': function(beforeExit) {
var allFindAllTestItems = null var allFindAllTestItems = null
......
test/Table/prepareAssociations.js
var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize
var s = new Sequelize('sequelize_test', 'root', null, {disableLogging: true}) , config = require(__dirname + '/../config')
var Day = s.define('Day', { name: Sequelize.TEXT }) , s = new Sequelize(config.database, config.username, config.password, {disableLogging: true})
var assert = require("assert") , Day = s.define('Day', { name: Sequelize.TEXT })
, assert = require("assert")
module.exports = { module.exports = {
'prepareAssociations belongsTo': function() { '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 Me = s.define('Me', {})
var You = s.define('You', {}) var You = s.define('You', {})
var assoc = Me.hasOne('you', You) var assoc = Me.hasOne('you', You)
......
test/config.js 0 → 100644
module.exports = {
username: 'root',
password: 'root',
database: 'sequelize_test'
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!