From 517a580dc79707d14a468ecce23129d2127ee846 Mon Sep 17 00:00:00 2001 From: shane adams Date: Sun, 9 Dec 2012 14:07:04 -0800 Subject: [PATCH 001/360] BIGINT support --- lib/data-types.js | 1 + spec/dao-factory.spec.js | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/lib/data-types.js b/lib/data-types.js index 78a69ea15efb..987c45d619e3 100644 --- a/lib/data-types.js +++ b/lib/data-types.js @@ -2,6 +2,7 @@ module.exports = { STRING: 'VARCHAR(255)', TEXT: 'TEXT', INTEGER: 'INTEGER', + BIGINT: 'BIGINT', DATE: 'DATETIME', BOOLEAN: 'TINYINT(1)', FLOAT: 'FLOAT', diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 3e42c7634072..edae560cf83e 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -205,6 +205,19 @@ describe("[" + Helpers.getTestDialectTeaser() + "] DAOFactory", function() { }) }) + it('sets a 64 bit int in bigint', function(done) { + var User = this.sequelize.define('UserWithBigIntFields', { + big: Sequelize.BIGINT + }) + + User.sync({ force: true }).success(function() { + User.create({ big: '9223372036854775807' }).on('success', function(user) { + expect(user.big).toEqual( '9223372036854775807' ) + done() + }) + }) + }) + it('sets auto increment fields', function(done) { var User = this.sequelize.define('UserWithAutoIncrementField', { userid: { type: Sequelize.INTEGER, autoIncrement: true, primaryKey: true, allowNull: false } From 5f5b8e0f3a120fdd905ac9c12a1eec152b811638 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Wed, 12 Dec 2012 22:38:51 +0100 Subject: [PATCH 002/360] bigint --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index c29d8389fc74..77f844a7ec28 100644 --- a/changelog.md +++ b/changelog.md @@ -17,6 +17,7 @@ - [FEATURE] added possibility to define the attributes of received associations (thanks to joshm) - [FEATURE] added findOrCreate, which returns a the already existing instance or creates one (thanks to eveiga) - [FEATURE] minConnections option for MySQL pooling (thanks to dominiklessel) +- [FEATURe] added BIGINT data type which is treated like a string (thanks to adamsch1) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From 4b57038362096954b73655d7e528b82340fd825f Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Wed, 12 Dec 2012 22:39:28 +0100 Subject: [PATCH 003/360] moved migration specs to buster --- .watchr.js | 14 + package.json | 3 +- spec-jasmine/migrator.spec.js | 313 ------------------ .../migrations/20111117063700-createPerson.js | 15 + .../20111130161100-emptyMigration.js | 4 + .../20111205064000-renamePersonToUser.js | 9 + ...20111205162700-addSignatureColumnToUser.js | 13 + ...111206061400-removeShopIdColumnFromUser.js | 9 + ...-changeSignatureColumnOfUserToMendatory.js | 11 + ...163300-renameSignatureColumnOfUserToSig.js | 9 + spec/assets/project.js | 5 + spec/associations/belongs-to.spec.js | 2 +- spec/associations/has-many.spec.js | 2 +- spec/associations/has-one.spec.js | 2 +- spec/associations/mixin.spec.js | 2 +- spec/buster-helpers.js | 17 +- spec/dao-factory.spec.js | 2 +- spec/dao.spec.js | 2 +- spec/dao.validations.spec.js | 2 +- {spec-jasmine => spec}/migration.spec.js | 21 +- spec/migrator.spec.js | 278 ++++++++++++++++ spec/query-chainer.spec.js | 2 +- spec/sequelize.spec.js | 2 +- 23 files changed, 404 insertions(+), 335 deletions(-) create mode 100644 .watchr.js delete mode 100644 spec-jasmine/migrator.spec.js create mode 100644 spec/assets/migrations/20111117063700-createPerson.js create mode 100644 spec/assets/migrations/20111130161100-emptyMigration.js create mode 100644 spec/assets/migrations/20111205064000-renamePersonToUser.js create mode 100644 spec/assets/migrations/20111205162700-addSignatureColumnToUser.js create mode 100644 spec/assets/migrations/20111206061400-removeShopIdColumnFromUser.js create mode 100644 spec/assets/migrations/20111206063000-changeSignatureColumnOfUserToMendatory.js create mode 100644 spec/assets/migrations/20111206163300-renameSignatureColumnOfUserToSig.js create mode 100644 spec/assets/project.js rename {spec-jasmine => spec}/migration.spec.js (72%) create mode 100644 spec/migrator.spec.js diff --git a/.watchr.js b/.watchr.js new file mode 100644 index 000000000000..191a5c85c88c --- /dev/null +++ b/.watchr.js @@ -0,0 +1,14 @@ +var watchr = require('watchr') + , spawn = require('child_process').spawn + +watchr.watch({ + path: __dirname, + listener: function(eventName, filePath) { + if (['new', 'change'].indexOf(eventName) > -1) { + var buster = spawn('./node_modules/.bin/buster-test', ['--reporter', 'specification'], { env: process.ENV }) + + buster.stderr.on('data', function(data) { console.log(data.toString()) }) + buster.stdout.on('data', function(data) { console.log(data.toString()) }) + } + } +}) diff --git a/package.json b/package.json index 5f74b16e2b02..b966138b21f1 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "sqlite3": "~2.1.5", "pg": "~0.8.7", "buster": "~0.6.0", - "dox-foundation": "~0.3.0" + "dox-foundation": "~0.3.0", + "watchr": "~2.1.6" }, "keywords": [ "mysql", diff --git a/spec-jasmine/migrator.spec.js b/spec-jasmine/migrator.spec.js deleted file mode 100644 index 62a2a16aa9c3..000000000000 --- a/spec-jasmine/migrator.spec.js +++ /dev/null @@ -1,313 +0,0 @@ -var config = require("./config/config") - , Sequelize = require("../index") - , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false }) - , Helpers = new (require("./config/helpers"))(sequelize) - , Migrator = require("../lib/migrator") - , _ = Sequelize.Utils._ - -describe('Migrator', function() { - var migrator = null - , SequelizeMeta = null - - var setup = function(_options) { - Helpers.async(function(done) { - var options = Sequelize.Utils._.extend({ - path: __dirname + '/assets/migrations', - logging: false - }, _options || {}) - - migrator = new Migrator(sequelize, options) - migrator - .findOrCreateSequelizeMetaDAO({ force: true }) - .success(function(_SequelizeMeta) { - SequelizeMeta = _SequelizeMeta - done() - }) - .error(function(err) { console.log(err) }) - }) - } - - var reset = function() { - migrator = null - Helpers.dropAllTables() - } - - beforeEach(reset) - afterEach(reset) - - describe('getUndoneMigrations', function() { - it("returns no files if timestamps are after the files timestamp", function() { - setup({ from: 20120101010101 }) - - Helpers.async(function(done) { - migrator.getUndoneMigrations(function(err, migrations) { - expect(err).toBeNull() - expect(migrations.length).toEqual(0) - done() - }) - }) - }) - - it("returns only files between from and to", function() { - setup({ from: 19700101000000, to: 20111117063700 }) - - Helpers.async(function(done) { - migrator.getUndoneMigrations(function(err, migrations) { - expect(err).toBeNull() - expect(migrations.length).toEqual(1) - expect(_.last(migrations).filename).toEqual('20111117063700-createPerson.js') - done() - }) - }) - }) - - it("returns also the file which is exactly options.from or options.to", function() { - setup({ from: 20111117063700, to: 20111130161100 }) - - Helpers.async(function(done) { - migrator.getUndoneMigrations(function(err, migrations) { - expect(err).toBeNull() - expect(migrations.length).toEqual(2) - expect(migrations[0].filename).toEqual('20111117063700-createPerson.js') - expect(migrations[1].filename).toEqual('20111130161100-emptyMigration.js') - done() - }) - }) - }) - - it("returns all files to options.to if no options.from is defined", function() { - setup({ to: 20111130161100 }) - - Helpers.async(function(done) { - migrator.getUndoneMigrations(function(err, migrations) { - expect(err).toBeNull() - expect(migrations.length).toEqual(2) - done() - }) - }) - }) - - it("returns all files from last migration id stored in database", function() { - setup() - - Helpers.async(function(done) { - SequelizeMeta.create({ from: null, to: 20111117063700 }).success(function() { - migrator.getUndoneMigrations(function(err, migrations) { - expect(err).toBeNull() - expect(migrations.length).toEqual(6) - expect(migrations[0].filename).toEqual('20111130161100-emptyMigration.js') - done() - }) - }) - }) - }) - }) - - describe('migrations', function() { - beforeEach(function() { - setup({ from: 20111117063700, to: 20111117063700 }) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - }) - - describe('executions', function() { - it("executes migration #20111117063700 and correctly creates the table", function() { - Helpers.async(function(done) { - sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) - expect(tableNames.length).toEqual(1) - expect(tableNames[0]).toEqual('Person') - done() - }) - }) - }) - - it("executes migration #20111117063700 and correctly adds isBetaMember", function() { - Helpers.async(function(done) { - sequelize.getQueryInterface().describeTable('Person').success(function(data) { - var beta = data.filter(function(d) { return d.Field == 'isBetaMember'}) - expect(beta).toBeDefined() - done() - }) - }) - }) - - it("executes migration #20111117063700 correctly up (createTable) and downwards (dropTable)", function() { - Helpers.async(function(done) { - sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) - expect(tableNames.length).toEqual(1) - done() - }) - }) - - Helpers.async(function(done) { - migrator.migrate({ method: 'down' }).success(function() { - sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) - expect(tableNames.length).toEqual(0) - done() - }).error(function(err){ console.log(err); done() }) - }).error(function(err){ console.log(err); done() }) - }) - }) - - it("executes the empty migration #20111130161100", function() { - Helpers.async(function(done) { - setup({ from: 20111130161100, to: 20111130161100}) - done() - }) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - // this migration isn't actually testing anything but - // should not timeout - }) - }) - }) - - describe('renameTable', function() { - it("executes migration #20111205064000 and renames a table", function() { - Helpers.async(function(done) { - sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) - expect(tableNames.length).toEqual(1) - expect(tableNames[0]).toEqual('Person') - done() - }) - }) - - setup({from: 20111205064000, to: 20111205064000}) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - - Helpers.async(function(done) { - sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) - expect(tableNames.length).toEqual(1) - expect(tableNames[0]).toEqual('User') - done() - }) - }) - }) - }) - - describe('addColumn', function() { - it('adds a column to the user table', function() { - setup({from: 20111205064000, to: 20111205162700}) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - - Helpers.async(function(done) { - sequelize.getQueryInterface().describeTable('User').success(function(data) { - var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] - , isAdmin = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0] - , shopId = data.filter(function(hash){ return hash.Field == 'shopId' })[0] - - expect(signature.Field).toEqual('signature') - expect(signature.Null).toEqual('NO') - - expect(isAdmin.Field).toEqual('isAdmin') - expect(isAdmin.Null).toEqual('NO') - expect(isAdmin.Default).toEqual('0') - - expect(shopId.Field).toEqual('shopId') - expect(shopId.Null).toEqual('YES') - - done() - }).error(function(err) { - console.log(err) - }) - }) - }) - }) - - describe('removeColumn', function() { - it('removes the shopId column from user', function() { - setup({from: 20111205064000, to: 20111206061400}) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - - Helpers.async(function(done) { - sequelize.getQueryInterface().describeTable('User').success(function(data) { - var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] - , isAdmin = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0] - , shopId = data.filter(function(hash){ return hash.Field == 'shopId' })[0] - - expect(signature.Field).toEqual('signature') - expect(signature.Null).toEqual('NO') - - expect(isAdmin.Field).toEqual('isAdmin') - expect(isAdmin.Null).toEqual('NO') - expect(isAdmin.Default).toEqual('0') - - expect(shopId).toBeFalsy() - - done() - }).error(function(err) { - console.log(err) - }) - }) - - }) - }) - - describe('changeColumn', function() { - it('changes the signature column from user to default "signature" + notNull', function() { - setup({from: 20111205064000, to: 20111206063000}) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - - Helpers.async(function(done) { - sequelize.getQueryInterface().describeTable('User').success(function(data) { - var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] - - expect(signature.Field).toEqual('signature') - expect(signature.Type).toEqual('varchar(255)') - expect(signature.Null).toEqual('NO') - expect(signature.Default).toEqual('Signature') - - done() - }).error(function(err) { - console.log(err) - }) - }) - }) - }) - }) - - describe('renameColumn', function() { - it("renames the signature column from user to sig", function() { - setup({from: 20111117063700, to: 20111206163300}) - - Helpers.async(function(done) { - migrator.migrate().success(done).error(function(err) { console.log(err) }) - }) - - Helpers.async(function(done) { - sequelize.getQueryInterface().describeTable('User').success(function(data) { - var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] - , sig = data.filter(function(hash){ return hash.Field == 'sig' })[0] - - expect(signature).toBeFalsy() - expect(sig).toBeTruthy() - - done() - }).error(function(err) { - console.log(err) - }) - }) - }) - }) -}) - diff --git a/spec/assets/migrations/20111117063700-createPerson.js b/spec/assets/migrations/20111117063700-createPerson.js new file mode 100644 index 000000000000..241f0026e2a0 --- /dev/null +++ b/spec/assets/migrations/20111117063700-createPerson.js @@ -0,0 +1,15 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.createTable('Person', { + name: DataTypes.STRING, + isBetaMember: { + type: DataTypes.BOOLEAN, + defaultValue: false, + allowNull: false + } + }) + }, + down: function(migration) { + migration.dropTable('Person') + } +} diff --git a/spec/assets/migrations/20111130161100-emptyMigration.js b/spec/assets/migrations/20111130161100-emptyMigration.js new file mode 100644 index 000000000000..ade8b7735ea9 --- /dev/null +++ b/spec/assets/migrations/20111130161100-emptyMigration.js @@ -0,0 +1,4 @@ +module.exports = { + up: function() {}, + down: function() {} +} diff --git a/spec/assets/migrations/20111205064000-renamePersonToUser.js b/spec/assets/migrations/20111205064000-renamePersonToUser.js new file mode 100644 index 000000000000..af2b8aa0546b --- /dev/null +++ b/spec/assets/migrations/20111205064000-renamePersonToUser.js @@ -0,0 +1,9 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.renameTable('Person', 'User') + }, + + down: function(migration, DataTypes) { + migration.renameTable('User', 'Person') + } +} diff --git a/spec/assets/migrations/20111205162700-addSignatureColumnToUser.js b/spec/assets/migrations/20111205162700-addSignatureColumnToUser.js new file mode 100644 index 000000000000..94c9fa6181e3 --- /dev/null +++ b/spec/assets/migrations/20111205162700-addSignatureColumnToUser.js @@ -0,0 +1,13 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.addColumn('User', 'signature', DataTypes.TEXT) + migration.addColumn('User', 'shopId', { type: DataTypes.INTEGER, allowNull: true }) + migration.addColumn('User', 'isAdmin', { type: DataTypes.BOOLEAN, defaultValue: false, allowNull: false }) + }, + + down: function(migration, DataTypes) { + migration.removeColumn('User', 'signature') + migration.removeColumn('User', 'shopId') + migration.removeColumn('User', 'isAdmin') + } +} diff --git a/spec/assets/migrations/20111206061400-removeShopIdColumnFromUser.js b/spec/assets/migrations/20111206061400-removeShopIdColumnFromUser.js new file mode 100644 index 000000000000..40eb92556b46 --- /dev/null +++ b/spec/assets/migrations/20111206061400-removeShopIdColumnFromUser.js @@ -0,0 +1,9 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.removeColumn('User', 'shopId') + }, + + down: function(migration, DataTypes) { + migration.addColumn('User', 'shopId', { type: DataTypes.INTEGER, allowNull: true }) + } +} diff --git a/spec/assets/migrations/20111206063000-changeSignatureColumnOfUserToMendatory.js b/spec/assets/migrations/20111206063000-changeSignatureColumnOfUserToMendatory.js new file mode 100644 index 000000000000..2b3726a9c1c9 --- /dev/null +++ b/spec/assets/migrations/20111206063000-changeSignatureColumnOfUserToMendatory.js @@ -0,0 +1,11 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.changeColumn('User', 'signature', { + type: DataTypes.STRING, + allowNull: false, + defaultValue: 'Signature' + }) + }, + + down: function(migration, DataTypes) {} +} diff --git a/spec/assets/migrations/20111206163300-renameSignatureColumnOfUserToSig.js b/spec/assets/migrations/20111206163300-renameSignatureColumnOfUserToSig.js new file mode 100644 index 000000000000..22184aa9d8c4 --- /dev/null +++ b/spec/assets/migrations/20111206163300-renameSignatureColumnOfUserToSig.js @@ -0,0 +1,9 @@ +module.exports = { + up: function(migration, DataTypes) { + migration.renameColumn('User', 'signature', 'sig') + }, + + down: function(migration, DataTypes) { + migration.renameColumn('User', 'sig', 'signature') + } +} diff --git a/spec/assets/project.js b/spec/assets/project.js new file mode 100644 index 000000000000..f2eeced8a1f8 --- /dev/null +++ b/spec/assets/project.js @@ -0,0 +1,5 @@ +module.exports = function(sequelize, DataTypes) { + return sequelize.define('Project' + parseInt(Math.random() * 9999999999999999), { + name: DataTypes.STRING + }) +} \ No newline at end of file diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js index 2891cb033027..8653283f42dc 100644 --- a/spec/associations/belongs-to.spec.js +++ b/spec/associations/belongs-to.spec.js @@ -8,7 +8,7 @@ if (typeof require === 'function') { buster.spec.expose() buster.testRunner.timeout = 500 -describe("[" + Helpers.getTestDialectTeaser() + "] BelongsTo", function() { +describe(Helpers.getTestDialectTeaser("BelongsTo"), function() { before(function(done) { Helpers.initTests({ beforeComplete: function(sequelize) { diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js index a70c4fa84a8d..f298f0c9ce1f 100644 --- a/spec/associations/has-many.spec.js +++ b/spec/associations/has-many.spec.js @@ -8,7 +8,7 @@ if (typeof require === 'function') { buster.spec.expose() buster.testRunner.timeout = 500 -describe("[" + Helpers.getTestDialectTeaser() + "] HasMany", function() { +describe(Helpers.getTestDialectTeaser("HasMany"), function() { before(function(done) { var self = this diff --git a/spec/associations/has-one.spec.js b/spec/associations/has-one.spec.js index 4ffa165466b0..0791c637881b 100644 --- a/spec/associations/has-one.spec.js +++ b/spec/associations/has-one.spec.js @@ -8,7 +8,7 @@ if (typeof require === 'function') { buster.spec.expose() buster.testRunner.timeout = 1500 -describe("[" + Helpers.getTestDialectTeaser() + "] HasOne", function() { +describe(Helpers.getTestDialectTeaser("HasOne"), function() { before(function(done) { var self = this diff --git a/spec/associations/mixin.spec.js b/spec/associations/mixin.spec.js index d8367d7c2313..b20b1171c910 100644 --- a/spec/associations/mixin.spec.js +++ b/spec/associations/mixin.spec.js @@ -7,7 +7,7 @@ if (typeof require === 'function') { buster.spec.expose() -describe("[" + Helpers.getTestDialectTeaser() + "] Mixin", function() { +describe(Helpers.getTestDialectTeaser("Mixin"), function() { before(function(done) { Helpers.initTests({ dialect: dialect, diff --git a/spec/buster-helpers.js b/spec/buster-helpers.js index 1d1a76f10b6a..545bfec4ee6f 100644 --- a/spec/buster-helpers.js +++ b/spec/buster-helpers.js @@ -10,8 +10,17 @@ var BusterHelpers = module.exports = { var sequelize = this.createSequelizeInstance(options) this.clearDatabase(sequelize, function() { - options.beforeComplete && options.beforeComplete(sequelize, DataTypes) - options.onComplete && options.onComplete(sequelize, DataTypes) + if (options.context) { + options.context.sequelize = sequelize + } + + if (options.beforeComplete) { + options.beforeComplete(sequelize, DataTypes) + } + + if (options.onComplete) { + options.onComplete(sequelize, DataTypes) + } }) }, @@ -70,14 +79,14 @@ var BusterHelpers = module.exports = { return envDialect }, - getTestDialectTeaser: function() { + getTestDialectTeaser: function(moduleName) { var dialect = this.getTestDialect() if (process.env.DIALECT === 'postgres-native') { dialect = 'postgres-native' } - return dialect.toUpperCase() + return "[" + dialect.toUpperCase() + "] " + moduleName }, checkMatchForDialects: function(dialect, value, expectations) { diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 3e42c7634072..2d1725bddc1e 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -7,7 +7,7 @@ if(typeof require === 'function') { buster.spec.expose() -describe("[" + Helpers.getTestDialectTeaser() + "] DAOFactory", function() { +describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { before(function(done) { Helpers.initTests({ dialect: dialect, diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 2703da8108f7..265b7eaf1699 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -6,7 +6,7 @@ if(typeof require === 'function') { buster.spec.expose() -describe("[" + Helpers.getTestDialectTeaser() + "] DAO", function() { +describe(Helpers.getTestDialectTeaser("DAO"), function() { before(function(done) { var self = this diff --git a/spec/dao.validations.spec.js b/spec/dao.validations.spec.js index 460b742555b9..4d17c2d34bf7 100644 --- a/spec/dao.validations.spec.js +++ b/spec/dao.validations.spec.js @@ -7,7 +7,7 @@ if(typeof require === 'function') { buster.spec.expose() -describe("[" + Helpers.getTestDialectTeaser() + "] DAO", function() { +describe(Helpers.getTestDialectTeaser("DAO"), function() { describe('validations', function() { before(function(done) { Helpers.initTests({ diff --git a/spec-jasmine/migration.spec.js b/spec/migration.spec.js similarity index 72% rename from spec-jasmine/migration.spec.js rename to spec/migration.spec.js index dfe659070b0e..8c018fff5a3f 100644 --- a/spec-jasmine/migration.spec.js +++ b/spec/migration.spec.js @@ -1,12 +1,17 @@ -var config = require("./config/config") - , Sequelize = require("../index") - , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false }) - , Helpers = new (require("./config/helpers"))(sequelize) - , Migrator = require("../lib/migrator") - , Migration = require("../lib/migration") - , _ = Sequelize.Utils._ +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() + , Migrator = require("../lib/migrator") + , Migration = require("../lib/migration") +} -describe('Migration', function() { +buster.spec.expose() +buster.testRunner.timeout = 1000 + +describe(Helpers.getTestDialectTeaser("Migration"), function() { describe('migrationHasInterfaceCalls', function() { // the syntax in the following tests are correct // don't touch them! the functions will get stringified below diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js new file mode 100644 index 000000000000..b0f27cc3d019 --- /dev/null +++ b/spec/migrator.spec.js @@ -0,0 +1,278 @@ +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() + , Migrator = require("../lib/migrator") +} + +buster.spec.expose() +buster.testRunner.timeout = 1000 + +describe('=>'+Helpers.getTestDialectTeaser("Migrator"), function() { + before(function(done) { + this.init = function(options, callback) { + options = Helpers.Sequelize.Utils._.extend({ + path: __dirname + '/assets/migrations', + logging: false + }, options || {}) + + var migrator = new Migrator(this.sequelize, options) + + migrator + .findOrCreateSequelizeMetaDAO({ force: true }) + .success(function(SequelizeMeta) { + callback && callback(migrator, SequelizeMeta) + }) + .error(function(err) { console.log(err) }) + }.bind(this) + + Helpers.initTests({ onComplete: done, context: this }) + }) + + it("as", function() { + expect(1).toEqual(1) + }) + + describe('getUndoneMigrations', function() { + it("returns no files if timestamps are after the files timestamp", function(done) { + this.init({ from: 20120101010101 }, function(migrator) { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(0) + done() + }.bind(this)) + }.bind(this)) + }) + + it("returns only files between from and to", function(done) { + this.init({ from: 19700101000000, to: 20111117063700 }, function(migrator) { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(1) + expect(migrations[migrations.length - 1].filename).toEqual('20111117063700-createPerson.js') + done() + }.bind(this)) + }.bind(this)) + }) + + it("returns exactly the migration which is defined in from and to", function(done) { + this.init({ from: 20111117063700, to: 20111117063700 }, function(migrator) { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(1) + expect(migrations[migrations.length - 1].filename).toEqual('20111117063700-createPerson.js') + done() + }.bind(this)) + }.bind(this)) + }) + + it("returns also the file which is exactly options.from or options.to", function(done) { + this.init({ from: 20111117063700, to: 20111130161100 }, function(migrator) { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(2) + expect(migrations[0].filename).toEqual('20111117063700-createPerson.js') + expect(migrations[1].filename).toEqual('20111130161100-emptyMigration.js') + done() + }.bind(this)) + }.bind(this)) + }) + + it("returns all files to options.to if no options.from is defined", function(done) { + this.init({ to: 20111130161100 }, function(migrator) { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(2) + done() + }.bind(this)) + }.bind(this)) + }) + + it("returns all files from last migration id stored in database", function(done) { + this.init(undefined, function(migrator, SequelizeMeta) { + SequelizeMeta.create({ from: null, to: 20111117063700 }).success(function() { + migrator.getUndoneMigrations(function(err, migrations) { + expect(err).toBeNull() + expect(migrations.length).toEqual(6) + expect(migrations[0].filename).toEqual('20111130161100-emptyMigration.js') + done() + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + }) + + describe('migrations', function() { + before(function(done) { + this.init({ from: 20111117063700, to: 20111117063700 }, function(migrator) { + this.migrator = migrator + this.migrator.migrate().success(done) + }.bind(this)) + }) + + describe('executions', function() { + it("executes migration #20111117063700 and correctly creates the table", function(done) { + this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) + expect(tableNames).toEqual([ 'Person' ]) + done() + }) + }) + + it("executes migration #20111117063700 and correctly adds isBetaMember", function(done) { + this.sequelize.getQueryInterface().describeTable('Person').success(function(data) { + var fields = data.map(function(d) { return d.Field }).sort() + expect(fields).toEqual([ 'isBetaMember', 'name' ]) + done() + }) + }) + + it("executes migration #20111117063700 correctly up (createTable) and downwards (dropTable)", function(done) { + this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) + expect(tableNames).toEqual([ 'Person' ]) + + this.migrator.migrate({ method: 'down' }).success(function() { + this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) + expect(tableNames).toEqual([]) + done() + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + + it("executes the empty migration #20111130161100", function(done) { + this.init({ from: 20111130161100, to: 20111130161100 }, function(migrator) { + // this migration isn't actually testing anything but + // should not timeout + + expect(1).toEqual(1) + + migrator + .migrate() + .success(done) + .error(function(err) { console.log(err) }) + }) + }) + }) + + describe('renameTable', function() { + before(function(done) { + this.init({ from: 20111117063700, to: 20111117063700 }, function(migrator) { + this.migrator = migrator + this.migrator.migrate().success(done) + }.bind(this)) + }) + + it("executes migration #20111205064000 and renames a table", function(done) { + this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) + expect(tableNames).toEqual([ 'Person' ]) + + this.init({ from: 20111205064000, to: 20111205064000 }, function(migrator) { + migrator.migrate().success(function() { + this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) + expect(tableNames).toEqual([ 'User' ]) + done() + }) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + }) + + describe('addColumn', function() { + it('//adds a column to the user table', function(done) { + this.init({ from: 20111117063700, to: 20111205162700 }, function(migrator) { + migrator.migrate().success(function() { + this.sequelize.getQueryInterface().describeTable('User').success(function(data) { + console.log(data) + var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] + , isAdmin = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0] + , shopId = data.filter(function(hash){ return hash.Field == 'shopId' })[0] + + expect(signature.Field).toEqual('signature') + expect(signature.Null).toEqual('NO') + + expect(isAdmin.Field).toEqual('isAdmin') + expect(isAdmin.Null).toEqual('NO') + expect(isAdmin.Default).toEqual('0') + + expect(shopId.Field).toEqual('shopId') + expect(shopId.Null).toEqual('YES') + + done() + }) + }.bind(this)) + }.bind(this)) + }) + }) + + describe('removeColumn', function() { + it('removes the shopId column from user', function(done) { + this.init({ to: 20111206061400 }, function(migrator) { + migrator.migrate().success(function(){ + this.sequelize.getQueryInterface().describeTable('User').success(function(data) { + var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] + , isAdmin = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0] + , shopId = data.filter(function(hash){ return hash.Field == 'shopId' })[0] + + expect(signature.Field).toEqual('signature') + expect(signature.Null).toEqual('NO') + + expect(isAdmin.Field).toEqual('isAdmin') + expect(isAdmin.Null).toEqual('NO') + expect(isAdmin.Default).toEqual('0') + + expect(shopId).toBeFalsy() + + done() + }) + }.bind(this)) + }.bind(this)) + }) + }) + + describe('changeColumn', function() { + it('changes the signature column from user to default "signature" + notNull', function(done) { + this.init({ to: 20111206063000 }, function(migrator) { + migrator.migrate().success(function() { + this.sequelize.getQueryInterface().describeTable('User').success(function(data) { + var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] + + expect(signature.Field).toEqual('signature') + expect(signature.Type).toEqual('varchar(255)') + expect(signature.Null).toEqual('NO') + expect(signature.Default).toEqual('Signature') + + done() + }) + }.bind(this)) + }.bind(this)) + }) + }) + }) + + describe('renameColumn', function() { + it("renames the signature column from user to sig", function(done) { + this.init({ to: 20111206163300 }, function(migrator) { + migrator.migrate().success(function(){ + this.sequelize.getQueryInterface().describeTable('User').success(function(data) { + var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0] + , sig = data.filter(function(hash){ return hash.Field == 'sig' })[0] + + expect(signature).toBeFalsy() + expect(sig).toBeTruthy() + + done() + }) + }.bind(this)) + }.bind(this)) + }) + }) +}) + diff --git a/spec/query-chainer.spec.js b/spec/query-chainer.spec.js index 07e76ca70e72..c842debd6e23 100644 --- a/spec/query-chainer.spec.js +++ b/spec/query-chainer.spec.js @@ -9,7 +9,7 @@ if(typeof require === 'function') { buster.spec.expose() buster.testRunner.timeout = 1000 -describe("[" + Helpers.getTestDialectTeaser() + "] QueryChainer", function() { +describe(Helpers.getTestDialectTeaser("QueryChainer"), function() { before(function() { this.queryChainer = new QueryChainer() }) diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index 11a524dd3202..bf664efbfa54 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -7,7 +7,7 @@ if(typeof require === 'function') { buster.spec.expose() -describe("[" + Helpers.getTestDialectTeaser() + "] Sequelize", function() { +describe(Helpers.getTestDialectTeaser("Sequelize"), function() { before(function(done) { Helpers.initTests({ beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this), From 5e12ba98117786aad8df72597aa4cbfbe229629d Mon Sep 17 00:00:00 2001 From: slamkajs Date: Fri, 14 Dec 2012 16:43:47 -0500 Subject: [PATCH 004/360] Added tableName override for models. --- lib/dao-factory.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index c7309cc636f0..3bf2ef7e7442 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -19,7 +19,11 @@ module.exports = (function() { }, options || {}) this.name = name - this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name) + if(!this.options.tableName) { + this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name) + } else { + this.tableName = this.options.tableName + } this.rawAttributes = attributes this.daoFactoryManager = null // defined in init function this.associations = {} From 238670d8fad3d6ad42fdbed959d25839d3d4a4ea Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Sat, 15 Dec 2012 13:51:03 +0100 Subject: [PATCH 005/360] use latest version of watchr to not screw up the cpu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b966138b21f1..e41a431aacd3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "pg": "~0.8.7", "buster": "~0.6.0", "dox-foundation": "~0.3.0", - "watchr": "~2.1.6" + "watchr": "~2.2.0" }, "keywords": [ "mysql", From 6b25017759e1377be2b1059aefb33b19e3a3d88a Mon Sep 17 00:00:00 2001 From: shane adams Date: Mon, 17 Dec 2012 16:45:38 -0800 Subject: [PATCH 006/360] Help you out for typos --- lib/dao-factory.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index c7309cc636f0..1a0629fb7053 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -49,6 +49,8 @@ module.exports = (function() { this.primaryKeys = {}; Utils._.each(this.attributes, function(dataTypeString, attributeName) { + // If you don't specify a valid data type lets help you debug it + if( dataTypeString === undefined ) throw new Error("Unrecognized data type for field " + attributeName ); if((attributeName != 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) { self.primaryKeys[attributeName] = dataTypeString } From a6eadf1b60128229f87b968783075e3c9cd3ae84 Mon Sep 17 00:00:00 2001 From: shane adams Date: Mon, 17 Dec 2012 17:03:38 -0800 Subject: [PATCH 007/360] test for bad datatype --- spec/dao-factory.spec.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index edae560cf83e..3f511c14125d 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -205,6 +205,20 @@ describe("[" + Helpers.getTestDialectTeaser() + "] DAOFactory", function() { }) }) + it('raises an error if you mess up the datatype', function(done) { + + try { + var User = this.sequelize.define('UserBadDataType', { + activity_date: Sequelize.DATe + }); + done() + } + catch( e ) { + expect(e.message).toEqual('Unrecognized data type for field activity_date') + done() + } + }) + it('sets a 64 bit int in bigint', function(done) { var User = this.sequelize.define('UserWithBigIntFields', { big: Sequelize.BIGINT From 5bdcb343d862b7eca05b7f3bc884833ea574419b Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 25 Dec 2012 20:39:36 +0100 Subject: [PATCH 008/360] fnord --- changelog.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 77f844a7ec28..d369046c16c4 100644 --- a/changelog.md +++ b/changelog.md @@ -17,7 +17,8 @@ - [FEATURE] added possibility to define the attributes of received associations (thanks to joshm) - [FEATURE] added findOrCreate, which returns a the already existing instance or creates one (thanks to eveiga) - [FEATURE] minConnections option for MySQL pooling (thanks to dominiklessel) -- [FEATURe] added BIGINT data type which is treated like a string (thanks to adamsch1) +- [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1) +- [FEATURE] https://github.com/sdepold/sequelize/pull/345 # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From 4f9c9e4722d0a372b8a1a7988ddbf0d57ef749c9 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 25 Dec 2012 21:00:46 +0100 Subject: [PATCH 009/360] updated pg --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e41a431aacd3..450ef66fe2fa 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "devDependencies": { "jasmine-node": "1.0.17", "sqlite3": "~2.1.5", - "pg": "~0.8.7", + "pg": "~0.10.2", "buster": "~0.6.0", "dox-foundation": "~0.3.0", "watchr": "~2.2.0" From 9289a2f7b959ca8b710ec28b074a8966cbf50664 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 25 Dec 2012 21:02:17 +0100 Subject: [PATCH 010/360] enabled builds for 0.9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27c775b3864f..37e5f3dd16c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,5 @@ language: node_js node_js: # - 0.6 - 0.8 - # - 0.9 + - 0.9 From 5fa778ea765e05c2eedcd8139487020a453359ad Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Fri, 28 Dec 2012 20:03:07 +0100 Subject: [PATCH 011/360] added a test for tableName + enabled all tests again --- changelog.md | 1 + spec-jasmine/sequelize.spec.js | 11 +++++++++++ spec/migrator.spec.js | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index d369046c16c4..870ff4bf7c9e 100644 --- a/changelog.md +++ b/changelog.md @@ -19,6 +19,7 @@ - [FEATURE] minConnections option for MySQL pooling (thanks to dominiklessel) - [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1) - [FEATURE] https://github.com/sdepold/sequelize/pull/345 +- [FEATURE] allow definition of a models table name (thanks to slamkajs) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js index 841d8a9209d1..99b2685fcd00 100644 --- a/spec-jasmine/sequelize.spec.js +++ b/spec-jasmine/sequelize.spec.js @@ -69,6 +69,17 @@ describe('Sequelize', function() { expect(typeof DAO.options.classMethods.localClassMethod).toEqual('function') expect(typeof DAO.options.instanceMethods.globalInstanceMethod).toEqual('function') }) + + it("uses the passed tableName", function(done) { + var Photo = sequelize.define('Foto', { name: Sequelize.STRING }, { tableName: 'photos' }) + + Photo.sync({ force: true }).success(function() { + sequelize.getQueryInterface().showAllTables().success(function(tableNames) { + expect(tableNames).toInclude('photos') + done + }) + }) + }) }) describe('sync', function() { diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js index b0f27cc3d019..887fa66b47ee 100644 --- a/spec/migrator.spec.js +++ b/spec/migrator.spec.js @@ -10,7 +10,7 @@ if(typeof require === 'function') { buster.spec.expose() buster.testRunner.timeout = 1000 -describe('=>'+Helpers.getTestDialectTeaser("Migrator"), function() { +describe(Helpers.getTestDialectTeaser("Migrator"), function() { before(function(done) { this.init = function(options, callback) { options = Helpers.Sequelize.Utils._.extend({ From 93063a21b4ca8a00be6f9aa3e3b916fc742ed060 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Mon, 31 Dec 2012 07:31:58 -0700 Subject: [PATCH 012/360] allow for trapping postgres connection errors connect() returns an event emitter which can be used to handle errors gracefully rather than throwing an error in callback which would terminate the entire node process --- lib/dialects/postgres/connector-manager.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dialects/postgres/connector-manager.js b/lib/dialects/postgres/connector-manager.js index 171ffa7aad24..3ab218a3b2ea 100644 --- a/lib/dialects/postgres/connector-manager.js +++ b/lib/dialects/postgres/connector-manager.js @@ -46,6 +46,7 @@ module.exports = (function() { ConnectorManager.prototype.connect = function() { var self = this + var emitter = new (require('events').EventEmitter)() // in case database is slow to connect, prevent orphaning the client if (this.isConnecting) return @@ -58,7 +59,7 @@ module.exports = (function() { self.isConnecting = false if (!!err) { - throw err + emitter.emit('error', err) } else if (client) { client.query("SET TIME ZONE 'UTC'") .on('end', function() { @@ -78,6 +79,8 @@ module.exports = (function() { this.client = new this.pg.Client(uri) this.client.connect(connectCallback) } + + return emitter } ConnectorManager.prototype.disconnect = function() { From effcf18977c76cd61e52c24167ac1bc64c3b4da7 Mon Sep 17 00:00:00 2001 From: Shaun Rader Date: Sun, 6 Jan 2013 00:50:56 -0800 Subject: [PATCH 013/360] Fix issue with incorrect migration in SequelizeMeta being deleted when reverting last successful migration --- lib/migrator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/migrator.js b/lib/migrator.js index a454f3c9fe7e..a35ea38b057f 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -218,7 +218,7 @@ module.exports = (function() { self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) { SequelizeMeta - .find({ from: from.migrationId, to: to.migrationId }) + .find({ where: { from: from.migrationId, to: to.migrationId } }) .success(function(meta) { meta.destroy().success(callback) }) From 185444d2e75c0b85d9e7497e31588307fab016a0 Mon Sep 17 00:00:00 2001 From: Shaun Rader Date: Sun, 6 Jan 2013 00:56:10 -0800 Subject: [PATCH 014/360] Fix issue with incorrect migrations in SequelizeMeta being deleted when reverting multiple migrations --- lib/migrator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/migrator.js b/lib/migrator.js index a35ea38b057f..17ac14b253d5 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -49,8 +49,8 @@ module.exports = (function() { , from = migrations[0] if(options.method == 'down') { - migrations.reverse() from = migrations[0] + migrations.reverse() } migrations.forEach(function(migration) { From 7287f33266c1cf20ef03e26173044bf8f50535ec Mon Sep 17 00:00:00 2001 From: Daniel Durante Date: Mon, 7 Jan 2013 12:09:35 -0500 Subject: [PATCH 015/360] Added the ability to update records without a primary key but used a where option when selecting with updateAttribute --- lib/dao-factory.js | 14 ++++++++++++-- lib/dao.js | 8 ++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 27a2c84c9265..8751836d9926 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -15,7 +15,8 @@ module.exports = (function() { freezeTableName: false, underscored: false, syncOnAssociation: true, - paranoid: false + paranoid: false, + whereCollection: null }, options || {}) this.name = name @@ -54,7 +55,7 @@ module.exports = (function() { this.primaryKeys = {}; Utils._.each(this.attributes, function(dataTypeString, attributeName) { // If you don't specify a valid data type lets help you debug it - if( dataTypeString === undefined ) throw new Error("Unrecognized data type for field " + attributeName ); + if( dataTypeString === undefined ) throw new Error("Unrecognized data type for field " + attributeName ); if((attributeName != 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) { self.primaryKeys[attributeName] = dataTypeString } @@ -153,6 +154,9 @@ module.exports = (function() { }.bind(this)) } + // whereCollection is used for non-primary key updates + this.options.whereCollection = optcpy.where || undefined; + return this.QueryInterface.select(this, this.tableName, options, { type: 'SELECT', hasJoin: hasJoin }) } @@ -161,6 +165,9 @@ module.exports = (function() { var optcpy = Utils._.clone(options) optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"] + // whereCollection is used for non-primary key updates + this.options.whereCollection = optcpy.where || undefined; + return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' }) } @@ -215,6 +222,9 @@ module.exports = (function() { options.limit = 1 + // whereCollection is used for non-primary key updates + this.options.whereCollection = optcpy.where || undefined; + return this.QueryInterface.select(this, this.tableName, options, { plain: true, type: 'SELECT', hasJoin: hasJoin }) } diff --git a/lib/dao.js b/lib/dao.js index 882ad7a5ed83..81a6d76ae7d6 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -121,8 +121,12 @@ module.exports = (function() { if(this.isNewRecord) { return this.QueryInterface.insert(this, this.__factory.tableName, values) } else { - var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id - , tableName = this.__factory.tableName + var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id; + + if (identifier === null && this.__options.whereCollection !== null) + identifier = this.__options.whereCollection; + + var tableName = this.__factory.tableName , query = this.QueryInterface.update(this, tableName, values, identifier) return query From a08d1ca46068888c2960c1097ad57cf26467c911 Mon Sep 17 00:00:00 2001 From: Daniel Durante Date: Mon, 7 Jan 2013 15:24:01 -0500 Subject: [PATCH 016/360] Fixed several issues and added in a spec for saving records with no primary keys. --- lib/dao-factory.js | 16 ++++++++-------- spec/dao.spec.js | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 8751836d9926..d7ccfcea3751 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -151,11 +151,11 @@ module.exports = (function() { if (!options.include[daoName]) { options.include[daoName] = this.getAssociationByAlias(daoName).target } - }.bind(this)) - } + }.bind(this)); - // whereCollection is used for non-primary key updates - this.options.whereCollection = optcpy.where || undefined; + // whereCollection is used for non-primary key updates + this.options.whereCollection = options.where || undefined; + } return this.QueryInterface.select(this, this.tableName, options, { type: 'SELECT', hasJoin: hasJoin }) } @@ -217,14 +217,14 @@ module.exports = (function() { if (!options.include[daoName]) { options.include[daoName] = this.getAssociationByAlias(daoName).target } - }.bind(this)) + }.bind(this)); + + // whereCollection is used for non-primary key updates + this.options.whereCollection = options.where || undefined; } options.limit = 1 - // whereCollection is used for non-primary key updates - this.options.whereCollection = optcpy.where || undefined; - return this.QueryInterface.select(this, this.tableName, options, { plain: true, type: 'SELECT', hasJoin: hasJoin }) } diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 265b7eaf1699..293f06894ade 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -19,9 +19,17 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, aNumber: { type: DataTypes.INTEGER } }) + + self.HistoryLog = sequelize.define('HistoryLog', { + someText: { type: DataTypes.STRING }, + aNumber: { type: DataTypes.INTEGER }, + aRandomId: { type: DataTypes.INTEGER } + }) }, onComplete: function() { - self.User.sync({ force: true }).success(done) + self.User.sync({ force: true }).success(function(){ + self.HistoryLog.sync({ force: true }).success(done) + }) } }) }) @@ -67,6 +75,15 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { done() }) }) + + it('saves a record with no primary key', function(done){ + this.HistoryLog.create({ someText: 'Some random text', aNumber: 3, aRandomId: 5 }).success(function(log) { + log.updateAttributes({ aNumber: 5 }).success(function(newLog){ + expect(newLog.aNumber).toEqual(5) + done() + }) + }) + }) }) describe('toJSON', function toJSON() { From 01abe949b9743674a52428bf8920a1dd6031203c Mon Sep 17 00:00:00 2001 From: Daniel Durante Date: Mon, 7 Jan 2013 15:48:43 -0500 Subject: [PATCH 017/360] Default values for whereCollection is now null everywhere. --- lib/dao-factory.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index d7ccfcea3751..2d7c5afddbbd 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -154,7 +154,7 @@ module.exports = (function() { }.bind(this)); // whereCollection is used for non-primary key updates - this.options.whereCollection = options.where || undefined; + this.options.whereCollection = options.where || null; } return this.QueryInterface.select(this, this.tableName, options, { type: 'SELECT', hasJoin: hasJoin }) @@ -166,7 +166,7 @@ module.exports = (function() { optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"] // whereCollection is used for non-primary key updates - this.options.whereCollection = optcpy.where || undefined; + this.options.whereCollection = optcpy.where || null; return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' }) } @@ -220,7 +220,7 @@ module.exports = (function() { }.bind(this)); // whereCollection is used for non-primary key updates - this.options.whereCollection = options.where || undefined; + this.options.whereCollection = options.where || null; } options.limit = 1 From fef5e71ffc9bf3455387a249e675593c142f12db Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 8 Jan 2013 21:15:57 +0100 Subject: [PATCH 018/360] roadmap --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 648b52263160..e28deedf52f6 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,29 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa - Associations - Importing definitions from single files +## Roadmap + +### 1.6.0 (ToDo) +- Fix last issues with eager loading of associated data + +### 1.7.0 +- Transactions +- Support for update of tables without primary key +- MariaDB support +- Support for update and delete calls for whole tables without previous loading of instances + +### 1.7.x +- Complete support for non-id primary keys + +### 1.8.0 +- API sugar (like Model.select().where().group().include().all()) +- Schema dumping +- enum support +- attributes / values of a dao instance should be scoped + +### 2.0.0 +- save datetimes in UTC + ## Documentation, Examples and Updates ## You can find the documentation and announcements of updates on the [project's website](http://www.sequelizejs.com). From 180804cf5f6facc2e3d9e5db05ede343e59f578d Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Wed, 9 Jan 2013 07:05:48 +0100 Subject: [PATCH 019/360] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e28deedf52f6..c7201426684a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa ## Roadmap +A very basic roadmap. Chances aren't too bad, that not mentioned things are implemented as well. Don't panic :) + ### 1.6.0 (ToDo) - Fix last issues with eager loading of associated data @@ -29,6 +31,7 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa - Support for update of tables without primary key - MariaDB support - Support for update and delete calls for whole tables without previous loading of instances +- Eager loading of nested associations #388 ### 1.7.x - Complete support for non-id primary keys From b78ad765d51b658546e8f25331e4f09780f12b51 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Wed, 9 Jan 2013 07:06:33 +0100 Subject: [PATCH 020/360] correctly link to #388 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7201426684a..600b139f6feb 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl - Support for update of tables without primary key - MariaDB support - Support for update and delete calls for whole tables without previous loading of instances -- Eager loading of nested associations #388 +- Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099) ### 1.7.x - Complete support for non-id primary keys From c3b6e62935ef15ae4b4a28c72d462e7d09cbda6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Wed, 9 Jan 2013 11:26:07 +0000 Subject: [PATCH 021/360] Migrations: only load files ending in .js from the migrations dir. --- .gitignore | 1 + lib/migrator.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 13d90eb69e13..bdf53afc5ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ test*.js .DS_STORE node_modules npm-debug.log +*~ diff --git a/lib/migrator.js b/lib/migrator.js index a454f3c9fe7e..fadbc5e79b5e 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -93,7 +93,9 @@ module.exports = (function() { callback && callback(null, result) } - var migrationFiles = fs.readdirSync(this.options.path) + var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) { + return /\.js$/.test(file) + }) var migrations = migrationFiles.map(function(file) { return new Migration(self, self.options.path + '/' + file) From d660850793d70297885979280bf550b3fcf5b644 Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Wed, 9 Jan 2013 12:56:06 +0100 Subject: [PATCH 022/360] Add tests for Utils.format (currently failing) --- spec-jasmine/utils.spec.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec-jasmine/utils.spec.js b/spec-jasmine/utils.spec.js index e0abe0445770..49bbbbed935a 100644 --- a/spec-jasmine/utils.spec.js +++ b/spec-jasmine/utils.spec.js @@ -112,4 +112,16 @@ describe('Utils', function() { expect(Utils.isHash(values)).toBeTruthy(); }); }); + + describe('format', function() { + it('should format where clause correctly when the value is truthy', function() { + var where = ['foo = ?', 1]; + expect(Utils.format(where)).toEqual('foo = 1'); + }); + + it('should format where clause correctly when the value is falsy', function() { + var where = ['foo = ?', 0]; + expect(Utils.format(where)).toEqual('foo = 0'); + }); + }); }) From b1235d3b10d8600b9ca446d8bbe6d63643de5ff2 Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Wed, 9 Jan 2013 12:58:16 +0100 Subject: [PATCH 023/360] Fix bug in Utils.format that ignore falsy values. Previously this would affect where clauses, e.g: User.findAll({ where: ['foo = ?', 0]) Would translate into: SELECT * FROM `Users`.`foo` = ? Instead of: SELECT * FROM `Users`.`foo` = 0 --- lib/utils.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index 96c32519b194..b1e0f06db75f 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -47,10 +47,7 @@ var Utils = module.exports = { return connection.escape(s).replace(/\\"/g, '"') }, format: function(arr) { - var query = arr[0] - , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null})) - - return connection.format.apply(connection, [query, replacements]) + return connection.format.apply(connection, [arr.shift(), arr]) }, isHash: function(obj) { return Utils._.isObject(obj) && !Utils._.isArray(obj); From c05f7acc27693fafbba69b5078cc82ee80a064b0 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Thu, 10 Jan 2013 07:40:36 +0100 Subject: [PATCH 024/360] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 600b139f6feb..02d40f9b88c0 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl ### 1.6.0 (ToDo) - Fix last issues with eager loading of associated data +- Find out why Person.belongsTo(House) would add person_id to house. It should add house_id to person ### 1.7.0 - Transactions From dac576702ee626921731d84d3d643e5db65cb4a6 Mon Sep 17 00:00:00 2001 From: Shaun Rader Date: Thu, 10 Jan 2013 08:54:47 -0800 Subject: [PATCH 025/360] fixed issue with from and to migration ids not including single quotes around them in where clause --- lib/migrator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/migrator.js b/lib/migrator.js index 17ac14b253d5..22dcd9312ef8 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -218,7 +218,7 @@ module.exports = (function() { self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) { SequelizeMeta - .find({ where: { from: from.migrationId, to: to.migrationId } }) + .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } }) .success(function(meta) { meta.destroy().success(callback) }) From 926157578609302add0e725462f9085156693987 Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Thu, 10 Jan 2013 21:11:20 +0100 Subject: [PATCH 026/360] Use ES5 `Object.keys` instead of Underscore.js `keys` --- lib/associations/has-many-double-linked.js | 4 ++-- lib/dao-factory.js | 4 ++-- lib/dao.js | 4 ++-- lib/dialects/abstract/query.js | 2 +- lib/dialects/mysql/query-generator.js | 6 +++--- lib/dialects/postgres/query-generator.js | 6 +++--- lib/dialects/sqlite/query-generator.js | 2 +- lib/utils.js | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/associations/has-many-double-linked.js b/lib/associations/has-many-double-linked.js index 33a0641528fd..e692449845fa 100644 --- a/lib/associations/has-many-double-linked.js +++ b/lib/associations/has-many-double-linked.js @@ -15,7 +15,7 @@ module.exports = (function() { //fully qualify where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id - var primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes) + var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes) , foreignKey = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0] where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"} @@ -85,7 +85,7 @@ module.exports = (function() { obsoleteAssociations.forEach(function(associatedObject) { var where = {} - , primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes) + , primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes) , foreignKey = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0] , notFoundEmitters = [] diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 27a2c84c9265..d5b3720fd9e3 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -60,7 +60,7 @@ module.exports = (function() { } }) - this.primaryKeyCount = Utils._.keys(this.primaryKeys).length; + this.primaryKeyCount = Object.keys(this.primaryKeys).length; this.options.hasPrimaryKeys = this.hasPrimaryKeys = this.primaryKeyCount > 0; addDefaultAttributes.call(this) @@ -182,7 +182,7 @@ module.exports = (function() { } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) { var where = {} , self = this - , keys = Utils._.keys(primaryKeys) + , keys = Object.keys(primaryKeys) Utils._.each(arguments, function(arg, i) { var key = keys[i] diff --git a/lib/dao.js b/lib/dao.js index 882ad7a5ed83..e605beb39270 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -74,7 +74,7 @@ module.exports = (function() { Object.defineProperty(DAO.prototype, "identifiers", { get: function() { - var primaryKeys = Utils._.keys(this.__factory.primaryKeys) + var primaryKeys = Object.keys(this.__factory.primaryKeys) , result = {} , self = this @@ -203,7 +203,7 @@ module.exports = (function() { DAO.prototype.setAttributes = function(updates) { var self = this - var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys) + var readOnlyAttributes = Object.keys(this.__factory.primaryKeys) readOnlyAttributes.push('id') readOnlyAttributes.push('createdAt') diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index 88c57375aa1c..f03cbf568df4 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -168,7 +168,7 @@ module.exports = (function() { var queryResultHasJoin = function(results) { if (!!results[0]) { - var keys = Utils._.keys(results[0]) + var keys = Object.keys(results[0]) for (var i = 0; i < keys.length; i++) { if (!!findTableNameInAttribute.call(this, keys[i])) { diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index ff37f59a6f2c..1ed777125d5b 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -141,7 +141,7 @@ module.exports = (function() { , association = dao.getAssociation(daoFactory) if (association.connectorDAO) { - var foreignIdentifier = Utils._.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { + var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier) })[0] @@ -165,7 +165,7 @@ module.exports = (function() { , aliasName = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName optAttributes = optAttributes.concat( - Utils._.keys(dao.attributes).map(function(attr) { + Object.keys(dao.attributes).map(function(attr) { return '' + [_tableName, Utils.addTicks(attr)].join('.') + ' AS ' + @@ -213,7 +213,7 @@ module.exports = (function() { var replacements = { table: Utils.addTicks(tableName), - attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","), + attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","), values: Utils._.values(attrValueHash).map(function(value){ return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value) }).join(",") diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 625ac923a0d6..7d7e2538bb19 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -216,7 +216,7 @@ module.exports = (function() { , association = dao.getAssociation(daoFactory) if (association.connectorDAO) { - var foreignIdentifier = Utils._.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { + var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier) })[0] @@ -240,7 +240,7 @@ module.exports = (function() { , aliasName = !!aliasAssoc ? addQuotes(daoName) : _tableName optAttributes = optAttributes.concat( - Utils._.keys(dao.attributes).map(function(attr) { + Object.keys(dao.attributes).map(function(attr) { return '' + [_tableName, addQuotes(attr)].join('.') + ' AS "' + @@ -302,7 +302,7 @@ module.exports = (function() { var replacements = { table: addQuotes(tableName), - attributes: Utils._.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","), + attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","), values: Utils._.values(attrValueHash).map(function(value){ return pgEscape(value) }).join(",") diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index e84f3187fbfd..08bc1717667f 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -71,7 +71,7 @@ module.exports = (function() { var replacements = { table: Utils.addTicks(tableName), - attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","), + attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","), values: Utils._.values(attrValueHash).map(function(value){ return escape((value instanceof Date) ? Utils.toSqlDate(value) : value) }).join(",") diff --git a/lib/utils.js b/lib/utils.js index b1e0f06db75f..8b8f19a362a8 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -63,7 +63,7 @@ var Utils = module.exports = { ].join(" ") }, argsArePrimaryKeys: function(args, primaryKeys) { - var result = (args.length == Utils._.keys(primaryKeys).length) + var result = (args.length == Object.keys(primaryKeys).length) if (result) { Utils._.each(args, function(arg) { if(result) { From 5759c5b381d17d6dd4f16796a0ca0596ff1f6fee Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Thu, 10 Jan 2013 21:12:55 +0100 Subject: [PATCH 027/360] Use ES5 `Array.isArray` instead of Underscore.js `isArray` --- lib/dao.js | 2 +- lib/utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index e605beb39270..3f574c15a6aa 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -160,7 +160,7 @@ module.exports = (function() { else { // extra args fn_args = details.hasOwnProperty("args") ? details.args : details - if (!Utils._.isArray(fn_args)) + if (!Array.isArray(fn_args)) fn_args = [fn_args] // error msg fn_msg = details.hasOwnProperty("msg") ? details.msg : false diff --git a/lib/utils.js b/lib/utils.js index 8b8f19a362a8..24b7ecb62457 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -50,7 +50,7 @@ var Utils = module.exports = { return connection.format.apply(connection, [arr.shift(), arr]) }, isHash: function(obj) { - return Utils._.isObject(obj) && !Utils._.isArray(obj); + return Utils._.isObject(obj) && !Array.isArray(obj); }, toSqlDate: function(date) { return [ From f4f620e0c11a973be9295db887f5f0aa7cee9f64 Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Thu, 10 Jan 2013 21:38:22 +0100 Subject: [PATCH 028/360] Use ES5 `obj.some` and `obj.every` instead of Underscore.js `any` and `all` --- lib/associations/has-many.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js index 865366eb9b62..f9118aa3656c 100644 --- a/lib/associations/has-many.js +++ b/lib/associations/has-many.js @@ -90,9 +90,9 @@ module.exports = (function() { .error(function(err){ customEventEmitter.emit('error', err)}) .success(function(associatedObjects) { customEventEmitter.emit('success', - Utils._.all(objects, function(o) { - return Utils._.any(associatedObjects, function(associatedObject) { - return Utils._.all(associatedObject.identifiers, function(key, identifier) { + objects.every(function(o) { + return associatedObjects.some(function(associatedObject) { + return associatedObject.identifiers.every(function(key, identifier) { return o[identifier] == associatedObject[identifier]; }); }) @@ -110,8 +110,8 @@ module.exports = (function() { .error(function(err){ customEventEmitter.emit('error', err)}) .success(function(associatedObjects) { customEventEmitter.emit('success', - Utils._.any(associatedObjects, function(associatedObject) { - return Utils._.all(associatedObject.identifiers, function(key, identifier) { + associatedObjects.some(function(associatedObject) { + return associatedObject.identifiers.every(function(key, identifier) { return o[identifier] == associatedObject[identifier]; }); }) From e016b2ffef572b40457fca11731ab6aefdf55d0a Mon Sep 17 00:00:00 2001 From: Thomas Watson Steen Date: Thu, 10 Jan 2013 21:51:32 +0100 Subject: [PATCH 029/360] Revert "Use ES5 `obj.some` and `obj.every` instead of Underscore.js `any` and `all`" This reverts commit f4f620e0c11a973be9295db887f5f0aa7cee9f64. --- lib/associations/has-many.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js index f9118aa3656c..865366eb9b62 100644 --- a/lib/associations/has-many.js +++ b/lib/associations/has-many.js @@ -90,9 +90,9 @@ module.exports = (function() { .error(function(err){ customEventEmitter.emit('error', err)}) .success(function(associatedObjects) { customEventEmitter.emit('success', - objects.every(function(o) { - return associatedObjects.some(function(associatedObject) { - return associatedObject.identifiers.every(function(key, identifier) { + Utils._.all(objects, function(o) { + return Utils._.any(associatedObjects, function(associatedObject) { + return Utils._.all(associatedObject.identifiers, function(key, identifier) { return o[identifier] == associatedObject[identifier]; }); }) @@ -110,8 +110,8 @@ module.exports = (function() { .error(function(err){ customEventEmitter.emit('error', err)}) .success(function(associatedObjects) { customEventEmitter.emit('success', - associatedObjects.some(function(associatedObject) { - return associatedObject.identifiers.every(function(key, identifier) { + Utils._.any(associatedObjects, function(associatedObject) { + return Utils._.all(associatedObject.identifiers, function(key, identifier) { return o[identifier] == associatedObject[identifier]; }); }) From 3e53904253e4871c86077e93681d0b3484a67715 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:35:27 +0100 Subject: [PATCH 030/360] increment and decrement added --- lib/dao.js | 17 ++++ lib/dialects/mysql/query-generator.js | 22 +++++ lib/query-interface.js | 5 ++ spec/dao.spec.js | 120 ++++++++++++++++++++++++++ 4 files changed, 164 insertions(+) diff --git a/lib/dao.js b/lib/dao.js index 882ad7a5ed83..9f5dc2cc42bb 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -231,6 +231,23 @@ module.exports = (function() { } } + DAO.prototype.increment = function(fields, count) { + var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, + values = {} + + if (count === undefined) count = 1; + + Utils._.each(fields, function (field) { + values[field] = count + }) + + return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier) + } + + DAO.prototype.decrement = function (fields, count) { + return this.increment(fields, 0 - count); + } + DAO.prototype.equals = function(other) { var result = true , self = this diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index ff37f59a6f2c..7a3a73e690ea 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -258,6 +258,28 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function (tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> " + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value + + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + " + " +Utils.escape(_value)) + } + + var replacements = { + table: Utils.addTicks(tableName), + values: values.join(","), + where: QueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { if(typeof attribute == 'string') diff --git a/lib/query-interface.js b/lib/query-interface.js index deaca01ad6b4..49b8c915a0ba 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -199,6 +199,11 @@ module.exports = (function() { return queryAndEmit.call(this, [sql, factory, queryOptions], 'select') } + QueryInterface.prototype.increment = function(dao, tableName, values, identifier) { + var sql = this.QueryGenerator.incrementQuery(tableName, values, identifier); + return queryAndEmit.call(this, [sql, dao], 'increment'); + } + QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) { var self = this diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 265b7eaf1699..22cee10b5d64 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -2,6 +2,7 @@ if(typeof require === 'function') { const buster = require("buster") , Helpers = require('./buster-helpers') , dialect = Helpers.getTestDialect() + , _ = require('underscore') } buster.spec.expose() @@ -26,6 +27,124 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) + describe('increment', function () { + before(function (done) { + this.User.create({ id: 1, aNumber: 0 }).done(done) + }); + + it('', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment(['aNumber'], 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber + 2); + done(); + }); + }); + }); + }); + + it('should still work right with other concurrent updates', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + // Select the user again (simulating a concurrent query) + self.User.find(1).done(function (err, user2) { + user2.updateAttributes({ + aNumber: user2.aNumber + 1 + }).done(function (err, user3) { + user1.increment(['aNumber'], 2).done(function (err, user4) { + + self.User.find(1).done(function (err, user5) { + expect(user5.aNumber).toBe(user1.aNumber + 3); + done(); + }); + }); + }); + }); + }); + }); + + it('should still work right with other concurrent increments', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + var _done = _.after(3, function () { + self.User.find(1).done(function (err, user2) { + expect(user2.aNumber).toEqual(6); + done(); + }) + }); + + user1.increment(['aNumber'], 2).done(_done); + user1.increment(['aNumber'], 2).done(_done); + user1.increment(['aNumber'], 2).done(_done); + }); + }); + }); + + describe('decrement', function () { + before(function (done) { + this.User.create({ id: 1, aNumber: 0 }).done(done) + }); + + it('', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement(['aNumber'], 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber - 2); + done(); + }); + }); + }); + }); + + it('should still work right with other concurrent updates', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + // Select the user again (simulating a concurrent query) + self.User.find(1).done(function (err, user2) { + user2.updateAttributes({ + aNumber: user2.aNumber + 1 + }).done(function (err, user3) { + user1.decrement(['aNumber'], 2).done(function (err, user4) { + + self.User.find(1).done(function (err, user5) { + expect(user5.aNumber).toBe(user1.aNumber -1); + done(); + }); + }); + }); + }); + }); + }); + + it('should still work right with other concurrent increments', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + var _done = _.after(3, function () { + self.User.find(1).done(function (err, user2) { + expect(user2.aNumber).toEqual(-6); + done(); + }) + }); + + user1.decrement(['aNumber'], 2).done(_done); + user1.decrement(['aNumber'], 2).done(_done); + user1.decrement(['aNumber'], 2).done(_done); + }); + }); + }); +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -132,4 +251,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) + */ }) From e8d74734e1acf200acb0eeaa93ef6d1304f02ae2 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:37:41 +0100 Subject: [PATCH 031/360] update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 870ff4bf7c9e..6510634d8eb5 100644 --- a/changelog.md +++ b/changelog.md @@ -20,6 +20,7 @@ - [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1) - [FEATURE] https://github.com/sdepold/sequelize/pull/345 - [FEATURE] allow definition of a models table name (thanks to slamkajs) +- [FEATURE] add increment and decrement methods on dao (thanks to janmeier/innofluence) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From 59d2887704f3de245c69d2070886bf61b55a58c6 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:46:47 +0100 Subject: [PATCH 032/360] enable single field instead of array --- lib/dao.js | 1 + spec/dao.spec.js | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index 9f5dc2cc42bb..907673f03c09 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -235,6 +235,7 @@ module.exports = (function() { var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, values = {} + if (!Utils._.isArray(fields)) fields = [fields]; if (count === undefined) count = 1; Utils._.each(fields, function (field) { diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 22cee10b5d64..21a384e25d1c 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -32,7 +32,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { this.User.create({ id: 1, aNumber: 0 }).done(done) }); - it('', function (done) { + it('with array', function (done) { var self = this; // Select something @@ -47,6 +47,21 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); + it('with single field', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment('aNumber', 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber + 2); + done(); + }); + }); + }); + }); + it('should still work right with other concurrent updates', function (done) { var self = this; // Select something @@ -91,7 +106,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { this.User.create({ id: 1, aNumber: 0 }).done(done) }); - it('', function (done) { + it('with array', function (done) { var self = this; // Select something @@ -106,6 +121,21 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); + it('with single field', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement('aNumber', 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber - 2); + done(); + }); + }); + }); + }); + it('should still work right with other concurrent updates', function (done) { var self = this; // Select something From c403edd49ad9dafbefd005ee28b3caa011f35aaa Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:47:32 +0100 Subject: [PATCH 033/360] comment back tests --- spec/dao.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 21a384e25d1c..26c5f8acf1e9 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -174,7 +174,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); }); -/* + describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -281,5 +281,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) - */ }) From b1b08a60ae7f39b282652386c7c44dc470b94c2a Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:23:38 +0100 Subject: [PATCH 034/360] postgres and sqlite increment --- lib/dialects/postgres/query-generator.js | 21 +++++++++++++++++++++ lib/dialects/query-generator.js | 14 ++++++++++++++ lib/dialects/sqlite/query-generator.js | 20 ++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 625ac923a0d6..ec65d0728fd8 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -357,6 +357,27 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function(tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *" + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + values.push(addQuotes(key) + "=" + addQuotes(key) + pgEscape(value)) + } + + var replacements = { + table: addQuotes(tableName), + values: values.join(","), + where: QueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + + addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { if(typeof attribute == 'string') diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js index 45c1e3e53f13..2669a02ca894 100644 --- a/lib/dialects/query-generator.js +++ b/lib/dialects/query-generator.js @@ -143,6 +143,20 @@ module.exports = (function() { throwMethodUndefined('deleteQuery') }, + /* + Returns an update query. + Parameters: + - tableName -> Name of the table + - values -> A hash with attribute-value-pairs + - where -> A hash with conditions (e.g. {name: 'foo'}) + OR an ID as integer + OR a string with conditions (e.g. 'name="foo"'). + If you use a string, you have to escape it on your own. + */ + incrementQuery: function(tableName, values, where) { + throwMethodUndefined('incrementQuery') + }, + /* Returns an add index query. Parameters: diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index e84f3187fbfd..2589eaeee99c 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -113,6 +113,26 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function(tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>" + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) + } + + var replacements = { + table: Utils.addTicks(tableName), + values: values.join(","), + where: MySqlQueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + attributesToSQL: function(attributes) { var result = {} From 48c60fa35b99cc414e872fdc587400b5ba612d07 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:35:14 +0100 Subject: [PATCH 035/360] sqlite and postgres works and fix test for postgres --- lib/dialects/postgres/query-generator.js | 2 +- lib/dialects/sqlite/query-generator.js | 2 +- spec/dao.spec.js | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index ec65d0728fd8..ac3ef1be1320 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -365,7 +365,7 @@ module.exports = (function() { for (var key in attrValueHash) { var value = attrValueHash[key] - values.push(addQuotes(key) + "=" + addQuotes(key) + pgEscape(value)) + values.push(addQuotes(key) + "=" + addQuotes(key) + " + " + pgEscape(value)) } var replacements = { diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index 2589eaeee99c..3121daf89927 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -121,7 +121,7 @@ module.exports = (function() { for (var key in attrValueHash) { var value = attrValueHash[key] - values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + "+ " + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) } var replacements = { diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 26c5f8acf1e9..2ff2e648a3b3 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -40,7 +40,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber + 2); + expect(user3.aNumber).toBe(2); done(); }); }); @@ -55,7 +55,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment('aNumber', 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber + 2); + expect(user3.aNumber).toBe(2); done(); }); }); @@ -74,7 +74,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(function (err, user4) { self.User.find(1).done(function (err, user5) { - expect(user5.aNumber).toBe(user1.aNumber + 3); + expect(user5.aNumber).toBe(3); done(); }); }); @@ -101,6 +101,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); +/* describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -175,6 +176,9 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); +*/ + +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -281,4 +285,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) + */ }) From ff8cfb292492d605e1cf1809787c57776d616f5f Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:36:33 +0100 Subject: [PATCH 036/360] tests are back --- spec/dao.spec.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 2ff2e648a3b3..672c15de3bf5 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -101,7 +101,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); -/* + describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -176,9 +176,6 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); -*/ - -/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -285,5 +282,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) - */ }) From c85cce23bdbcf41a4f84ff409e9f356174f348b9 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:44:39 +0100 Subject: [PATCH 037/360] adapt decrement tests to postgres as well --- spec/dao.spec.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 672c15de3bf5..f12d787e7169 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -101,7 +101,6 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); - describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -115,7 +114,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber - 2); + expect(user3.aNumber).toBe(-2); done(); }); }); @@ -130,7 +129,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement('aNumber', 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber - 2); + expect(user3.aNumber).toBe(-2); done(); }); }); @@ -149,7 +148,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(function (err, user4) { self.User.find(1).done(function (err, user5) { - expect(user5.aNumber).toBe(user1.aNumber -1); + expect(user5.aNumber).toBe(-1); done(); }); }); From bbd7606dade2252d95592b047dfcdd2988ecf3cf Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:56:21 +0100 Subject: [PATCH 038/360] fix unrelated jasmine/sequelize tes --- spec-jasmine/sequelize.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js index 99b2685fcd00..4124742fb098 100644 --- a/spec-jasmine/sequelize.spec.js +++ b/spec-jasmine/sequelize.spec.js @@ -75,8 +75,8 @@ describe('Sequelize', function() { Photo.sync({ force: true }).success(function() { sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - expect(tableNames).toInclude('photos') - done + expect(tableNames).toContain('photos') + done() }) }) }) From 6e75948040f156e4cf38c5741ddaeb2ead9b9e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Mon, 14 Jan 2013 11:36:39 +0000 Subject: [PATCH 039/360] Fix typo in bin/sequelize --- bin/sequelize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sequelize b/bin/sequelize index e937b6abf3d4..06b38b954a2d 100755 --- a/bin/sequelize +++ b/bin/sequelize @@ -68,7 +68,7 @@ program .version(packageJson.version) .option('-i, --init', 'Initializes the project. Creates a config/config.json') .option('-m, --migrate', 'Runs undone migrations') - .option('-u, --undo', 'Redo the last migration.') + .option('-u, --undo', 'Undo the last migration.') .option('-f, --force', 'Forces the action to be done.') .option('-c, --create-migration [migration-name]', 'Create a new migration skeleton file.') .parse(process.argv) From 5936d8d5e630f6079a57f3a3f128714443adf594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Mon, 14 Jan 2013 12:03:21 +0000 Subject: [PATCH 040/360] Close issue #400. --- lib/query-interface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/query-interface.js b/lib/query-interface.js index deaca01ad6b4..de37d09e9d78 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -133,7 +133,7 @@ module.exports = (function() { return new Utils.CustomEventEmitter(function(emitter) { self.describeTable(tableName).success(function(data) { - data = data.filter(function(h) { return h.Field == attrNameBefore })[0] + data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {} var options = {} From 93265d15bd36f209a295d9e3359804c7b5241156 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 14 Jan 2013 17:37:06 +0100 Subject: [PATCH 041/360] Travis bump --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37e5f3dd16c1..6b4b29ab3d1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,3 @@ node_js: # - 0.6 - 0.8 - 0.9 - From c7bee1731f7e3481721323462d5e40b7f2d968f6 Mon Sep 17 00:00:00 2001 From: Jisoo Park Date: Tue, 4 Dec 2012 01:01:26 +0900 Subject: [PATCH 042/360] fix #334 ('include' places a "null" element to the result if no data is related) --- lib/dialects/abstract/query.js | 6 ++- lib/utils.js | 9 ++++ spec/dao-factory.spec.js | 82 ++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index 88c57375aa1c..e4f634b07d69 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -284,13 +284,15 @@ module.exports = (function() { associationData.forEach(function(data) { var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false }) + , identifier = associatedDaoFactory.hasPrimaryKeys ? Utils.firstKeyOfHash(associatedDaoFactory.primaryKeys) : 'id' if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) { accessor = Utils.singularize(accessor) - dao[accessor] = daoInstance + dao[accessor] = daoInstance[identifier] ? daoInstance : null } else { dao[accessor] = dao[accessor] || [] - dao[accessor].push(daoInstance) + if (daoInstance[identifier]) + dao[accessor].push(daoInstance) } }) } diff --git a/lib/utils.js b/lib/utils.js index b1e0f06db75f..d5c651ccb427 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -149,6 +149,14 @@ var Utils = module.exports = { } }, + firstKeyOfHash: function(obj) { + for (var key in obj) { + if (obj.hasOwnProperty(key)) + return key + } + return null + }, + inherit: function(subClass, superClass) { if (superClass.constructor == Function) { // Normal Inheritance @@ -164,6 +172,7 @@ var Utils = module.exports = { return subClass; } + } Utils.CustomEventEmitter = require("./emitters/custom-event-emitter") diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 8ef6a0e0a73d..088ce3fc2108 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -500,6 +500,25 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) //- sequelize.sync }) + it('fetches no associated object if none is set (1st direction)', function(done) { + this.User.hasOne(this.Task) + this.Task.belongsTo(this.User) + + this.sequelize.sync({ force: true }).success(function() { + this.User.create({ name: 'barfooz' }).success(function(user) { + this.Task.create({ title: 'task' }).success(function(task) { + this.User.find({ + where: { 'UserWithNames.id': 1 }, + include: [ 'Task' ] + }).success(function(user) { + expect(user.task).toEqual(null) + done() + }) + }.bind(this)) //- Task.create + }.bind(this)) //- User.create + }.bind(this)) //- sequelize.sync + }) + it('fetches associated objects via "as" param (1st direction)', function(done) { this.User.hasOne(this.Task, { as: 'Homework' }) this.Task.belongsTo(this.User) @@ -546,6 +565,27 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) //- sequelize.sync }) + it('fetches no associated object if none is set (2nd direction)', function(done) { + this.User.hasOne(this.Task) + this.Task.belongsTo(this.User) + + this.sequelize.sync({ force: true }).success(function() { + this.User.create({ name: 'barfooz' }).success(function(user) { + this.User.create({ name: 'another user' }).success(function(another_user) { + this.Task.create({ title: 'task' }).success(function(task) { + this.Task.find({ + where: { 'Tasks.id': 1 }, + include: [ 'UserWithName' ] + }).success(function(task) { + expect(task.userWithName).toEqual(null) + done() + }) + }.bind(this)) //- Task.create + }.bind(this)) //- User.create + }.bind(this)) //- User.create + }.bind(this)) //- sequelize.sync + }) + it('fetches associated object via "as" param (2nd direction)', function(done) { this.User.hasOne(this.Task) this.Task.belongsTo(this.User, { as: 'Owner' }) @@ -627,6 +667,25 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) //- sequelize.sync }) + it('fetches no associated objects for 1:N associations if none are set (1st direction)', function(done) { + this.User.hasMany(this.Task) + this.Task.belongsTo(this.User) + + this.sequelize.sync({ force: true }).success(function() { + this.User.create({ name: 'barfooz' }).success(function(user) { + this.Task.create({ title: 'task1' }).success(function(task1) { + this.User.find({ + where: { 'UserWithNames.id': 1 }, + include: [ 'Task' ] + }).success(function(user) { + expect(user.tasks.length).toEqual(0) + done() + }) + }.bind(this)) //- Task.create + }.bind(this)) //- User.create + }.bind(this)) //- sequelize.sync + }) + it('fetches associated objects for 1:N associations (2nd direction)', function(done) { this.User.hasMany(this.Task) this.Task.belongsTo(this.User) @@ -705,6 +764,29 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) //- sequelize.sync }) + it('fetches no associated objects for N:M associations if none are set (1st direction)', function(done) { + this.User.hasMany(this.Task) + this.Task.hasMany(this.User) + + this.sequelize.sync({ force: true }).success(function() { + this.User.create({ name: 'barfooz' }).success(function(user1) { + + this.Task.create({ title: 'task1' }).success(function(task1) { + this.Task.create({ title: 'task2' }).success(function(task2) { + this.User.find({ + where: { 'UserWithNames.id': user1.id }, + include: [ 'Task' ] + }).success(function(user) { + expect(user.tasks.length).toEqual(0) + done() + }) + }.bind(this)) //- Task.create + }.bind(this)) //- Task.create + + }.bind(this)) //- User.create + }.bind(this)) //- sequelize.sync + }) + it('fetches associated objects via "as" param for N:M associations (1st direction)', function(done) { this.User.hasMany(this.Task, { as: 'Homeworks' }) this.Task.hasMany(this.User, { as: 'Owners' }) From 83e08fce090a7678d419870bbc73fe8df163b0b4 Mon Sep 17 00:00:00 2001 From: Jisoo Park Date: Tue, 4 Dec 2012 01:21:10 +0900 Subject: [PATCH 043/360] reuse existing DAO.identifiers --- lib/dialects/abstract/query.js | 6 +++--- lib/utils.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index e4f634b07d69..bc877e79c158 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -284,14 +284,14 @@ module.exports = (function() { associationData.forEach(function(data) { var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false }) - , identifier = associatedDaoFactory.hasPrimaryKeys ? Utils.firstKeyOfHash(associatedDaoFactory.primaryKeys) : 'id' + , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers) if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) { accessor = Utils.singularize(accessor) - dao[accessor] = daoInstance[identifier] ? daoInstance : null + dao[accessor] = isEmpty ? null : daoInstance } else { dao[accessor] = dao[accessor] || [] - if (daoInstance[identifier]) + if (! isEmpty) dao[accessor].push(daoInstance) } }) diff --git a/lib/utils.js b/lib/utils.js index d5c651ccb427..c289cf31565c 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -149,10 +149,10 @@ var Utils = module.exports = { } }, - firstKeyOfHash: function(obj) { + firstValueOfHash: function(obj) { for (var key in obj) { if (obj.hasOwnProperty(key)) - return key + return obj[key] } return null }, From 6343ebb91e942c7f8fb0d969dd78df72b35793b0 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 20:24:54 +0100 Subject: [PATCH 044/360] fixed not existing toInclude helper in jasmine spec --- spec-jasmine/sequelize.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js index 99b2685fcd00..ceeb68df2680 100644 --- a/spec-jasmine/sequelize.spec.js +++ b/spec-jasmine/sequelize.spec.js @@ -75,7 +75,7 @@ describe('Sequelize', function() { Photo.sync({ force: true }).success(function() { sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - expect(tableNames).toInclude('photos') + expect(tableNames.indexOf('photos') !== -1).toBeTruthy() done }) }) From 322e1bb079b98f37717dcfee1cd2ed06a3986a54 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 20:36:30 +0100 Subject: [PATCH 045/360] don't run tests for 0.9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37e5f3dd16c1..27c775b3864f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,5 @@ language: node_js node_js: # - 0.6 - 0.8 - - 0.9 + # - 0.9 From 75c906a96a2aa10b9225125f71a17fe119bf0bd2 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 20:56:04 +0100 Subject: [PATCH 046/360] updateAttributes for tables without primary keys --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 870ff4bf7c9e..e5579001a4d4 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ - [BUG] fixed wrong version in sequelize binary - [BUG] local options have higher priority than global options (thanks to guersam) - [BUG] fixed where clause when passing an empty array (thanks to kbackowski) +- [BUG] fixed updateAttributes for models/tables without primary key (thanks to durango) - [FEATURE] added association prefetching for find and findAll - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot) - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result From b467638cc40f343dded89b28304c1a9a6dc139fb Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 21:37:09 +0100 Subject: [PATCH 047/360] some words about coding style --- README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/README.md b/README.md index 02d40f9b88c0..74c9367df20b 100644 --- a/README.md +++ b/README.md @@ -145,6 +145,53 @@ Ah and one last thing: If you think you deserve it, feel free to add yourself to `package.json`. Also I always look for projects which are using sequelize. If you have one of them, drop me a line! +### 6. Some words about coding style ### + +As people are regularly complaining about missing semi-colons and strangely formatted +things, I just want to explain the way I code JavaScript (including Sequelize +... obviously). I won't reject any pull-request because of having a different code +style than me but it would be good to have a consistent way of coding in the whole +project. Here are my rules of thumb: + +- No semi-colons. Where possible I try to avoid semi-colons. Please don't discuss this topic with me. Thanks. +- Curly braces for single line if blocks. I always add curly braces to if blocks. Same for loops and other places. +- Spacing. Indentation = 2 spaces. Also I add a lot of spaces where possible. See below. +- Anonymous functions over names functions. Usually I declare a function and assign it to a variable: `var foo = function() {}` + +#### Spaces #### + +Use spaces when defining functions. + +```js +function(arg1, arg2, arg3) { + return 1 +} +``` + +Use spaces for if statements. + +```js +if (condition) { + // do something +} else { + // something else +} +``` + +#### JSHint options #### + +```js +{ + "camelcase": true, + "curly": true, + "forin": true, + "indent": 2, + "unused": true, + "asi": true, + "evil": false, + "laxcomma": true +} +``` # Build status From 6c768506d2912bb5fc1a8b2a4555d1f9984e5ca6 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 21:39:35 +0100 Subject: [PATCH 048/360] bullets --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 74c9367df20b..285a08921a41 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ project. Here are my rules of thumb: - Spacing. Indentation = 2 spaces. Also I add a lot of spaces where possible. See below. - Anonymous functions over names functions. Usually I declare a function and assign it to a variable: `var foo = function() {}` -#### Spaces #### +#### 6.1. Spaces #### Use spaces when defining functions. @@ -178,7 +178,7 @@ if (condition) { } ``` -#### JSHint options #### +#### 6.2. JSHint options #### ```js { From dc1a5c9ab5834dac713a2d7ea96d3957ee7b69e6 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 21:44:11 +0100 Subject: [PATCH 049/360] leading comma --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 285a08921a41..86ed9eb472d8 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,7 @@ project. Here are my rules of thumb: - Curly braces for single line if blocks. I always add curly braces to if blocks. Same for loops and other places. - Spacing. Indentation = 2 spaces. Also I add a lot of spaces where possible. See below. - Anonymous functions over names functions. Usually I declare a function and assign it to a variable: `var foo = function() {}` +- Variable declarations. If multiple variables are defined, I use a leading comma for separation. #### 6.1. Spaces #### @@ -178,7 +179,15 @@ if (condition) { } ``` -#### 6.2. JSHint options #### +#### 6.2. Variable declarations #### + +```js +var num = 1 + , user = new User() + , date = new Date() +``` + +#### 6.3. JSHint options #### ```js { From ca150435f9ea84125c90515e6217de49ea2586ab Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 15 Jan 2013 21:49:17 +0100 Subject: [PATCH 050/360] more hints --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 86ed9eb472d8..43d1b5571480 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,8 @@ project. Here are my rules of thumb: - Spacing. Indentation = 2 spaces. Also I add a lot of spaces where possible. See below. - Anonymous functions over names functions. Usually I declare a function and assign it to a variable: `var foo = function() {}` - Variable declarations. If multiple variables are defined, I use a leading comma for separation. +- Camelcased variable names. No underscores. +- Make sure that key is in objects when iterating over it. See below. #### 6.1. Spaces #### @@ -187,7 +189,17 @@ var num = 1 , date = new Date() ``` -#### 6.3. JSHint options #### +#### 6.3. For-In-loops #### + +```js +for (var key in obj) { + if (obj.hasOwnProperty(key)) { + console.log(obj[key]) + } +} +``` + +#### 6.4. JSHint options #### ```js { From 3591d0784e98b07cad54d7881d798e7913b1a7c7 Mon Sep 17 00:00:00 2001 From: Daniel Durante Date: Tue, 15 Jan 2013 16:20:08 -0500 Subject: [PATCH 051/360] Cleaned up a lot of the files for the coding style specified at https://github.com/sdepold/sequelize#6-some-words-about-coding-style --- lib/associations/belongs-to.js | 2 +- lib/associations/has-many-double-linked.js | 6 +- lib/associations/has-many.js | 12 ++-- lib/associations/has-one.js | 6 +- lib/dao-factory.js | 33 +++++----- lib/dao.js | 20 +++--- lib/dialects/abstract/query.js | 6 +- lib/dialects/mysql/connector-manager.js | 28 ++++++--- lib/dialects/mysql/query-generator.js | 46 +++++++------- lib/dialects/mysql/query.js | 2 +- lib/dialects/postgres/connector-manager.js | 10 ++- lib/dialects/postgres/query-generator.js | 71 +++++++++++++++------- lib/dialects/postgres/query.js | 2 +- lib/dialects/sqlite/connector-manager.js | 5 -- lib/dialects/sqlite/query-generator.js | 4 +- lib/dialects/sqlite/query.js | 4 +- lib/migration.js | 9 +-- lib/migrator.js | 42 +++++++------ lib/query-chainer.js | 19 +++--- lib/query-interface.js | 19 +++--- lib/sequelize.js | 12 ++-- lib/utils.js | 14 ++--- 22 files changed, 214 insertions(+), 158 deletions(-) diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js index 2e6582fccb20..106b6bc0e5e5 100644 --- a/lib/associations/belongs-to.js +++ b/lib/associations/belongs-to.js @@ -9,7 +9,7 @@ module.exports = (function() { this.options = options this.isSelfAssociation = (this.source.tableName == this.target.tableName) - if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) { + if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) { this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored) } diff --git a/lib/associations/has-many-double-linked.js b/lib/associations/has-many-double-linked.js index 33a0641528fd..03b3b76b3875 100644 --- a/lib/associations/has-many-double-linked.js +++ b/lib/associations/has-many-double-linked.js @@ -79,7 +79,7 @@ module.exports = (function() { var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) }) - if(obsoleteAssociations.length === 0) { + if (obsoleteAssociations.length === 0) { return emitter.emit('success', null) } @@ -95,13 +95,13 @@ module.exports = (function() { self.__factory.connectorDAO .find({ where: where }) .success(function(connector) { - if(connector === null) { + if (connector === null) { notFoundEmitters.push(null) } else { chainer.add(connector.destroy()) } - if((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) { + if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) { // found all obsolete connectors and will delete them now chainer .run() diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js index 865366eb9b62..814fae17e717 100644 --- a/lib/associations/has-many.js +++ b/lib/associations/has-many.js @@ -41,7 +41,7 @@ module.exports = (function() { // or is the association on the model itself? if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) { // remove the obsolete association identifier from the source - if(this.isSelfAssociation) { + if (this.isSelfAssociation) { this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored) } else { this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier @@ -55,11 +55,11 @@ module.exports = (function() { this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options) - if(!this.isSelfAssociation) { + if (!this.isSelfAssociation) { this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO } - if(this.options.syncOnAssociation) { + if (this.options.syncOnAssociation) { this.connectorDAO.sync() } } else { @@ -127,7 +127,7 @@ module.exports = (function() { var self = this obj[this.accessors.set] = function(newAssociatedObjects) { - if(newAssociatedObjects === null) { + if (newAssociatedObjects === null) { newAssociatedObjects = [] } @@ -155,7 +155,7 @@ module.exports = (function() { instance[self.accessors.get]() .error(function(err){ customEventEmitter.emit('error', err)}) .success(function(currentAssociatedObjects) { - if(!newAssociatedObject.equalsOneOf(currentAssociatedObjects)) + if (!newAssociatedObject.equalsOneOf(currentAssociatedObjects)) currentAssociatedObjects.push(newAssociatedObject) instance[self.accessors.set](currentAssociatedObjects) @@ -173,7 +173,7 @@ module.exports = (function() { var newAssociations = [] currentAssociatedObjects.forEach(function(association) { - if(!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers)) + if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers)) newAssociations.push(association) }) diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js index 956bf002d1e6..69a93898b4f1 100644 --- a/lib/associations/has-one.js +++ b/lib/associations/has-one.js @@ -9,7 +9,7 @@ module.exports = (function() { this.options = options this.isSelfAssociation = (this.source.tableName == this.target.tableName) - if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) { + if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) { this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored) } @@ -68,12 +68,12 @@ module.exports = (function() { var instance = this; return new Utils.CustomEventEmitter(function(emitter) { instance[self.accessors.get]().success(function(oldObj) { - if(oldObj) { + if (oldObj) { oldObj[self.identifier] = null oldObj.save() } - if(associatedObject) { + if (associatedObject) { associatedObject[self.identifier] = instance.id associatedObject .save() diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 2d7c5afddbbd..44780ae5fc0c 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -20,7 +20,7 @@ module.exports = (function() { }, options || {}) this.name = name - if(!this.options.tableName) { + if (!this.options.tableName) { this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name) } else { this.tableName = this.options.tableName @@ -55,8 +55,11 @@ module.exports = (function() { this.primaryKeys = {}; Utils._.each(this.attributes, function(dataTypeString, attributeName) { // If you don't specify a valid data type lets help you debug it - if( dataTypeString === undefined ) throw new Error("Unrecognized data type for field " + attributeName ); - if((attributeName != 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) { + if (dataTypeString === undefined) { + throw new Error("Unrecognized data type for field " + attributeName ); + } + + if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) { self.primaryKeys[attributeName] = dataTypeString } }) @@ -86,10 +89,10 @@ module.exports = (function() { this.DAO.prototype.defaultValues = {}; this.DAO.prototype.validators = {}; Utils._.each(this.rawAttributes, function (definition, name) { - if(((definition === DataTypes.BOOLEAN) || (definition.type === DataTypes.BOOLEAN))) { + if (((definition === DataTypes.BOOLEAN) || (definition.type === DataTypes.BOOLEAN))) { self.DAO.prototype.booleanValues.push(name); } - if(definition.hasOwnProperty('defaultValue')) { + if (definition.hasOwnProperty('defaultValue')) { self.DAO.prototype.defaultValues[name] = function() { return Utils.toDefaultValue(definition.defaultValue); } @@ -119,11 +122,11 @@ module.exports = (function() { .on('sql', function(sql) { emitter.emit('sql', sql) }) } - if(options.force) + if (options.force) { self.drop().success(doQuery).error(function(err) { emitter.emit('error', err) }) - else + } else { doQuery() - + } }).run() } @@ -175,7 +178,7 @@ module.exports = (function() { var hasJoin = false; // no options defined? // return an emitter which emits null - if([null, undefined].indexOf(options) !== -1) { + if ([null, undefined].indexOf(options) !== -1) { return new Utils.CustomEventEmitter(function(emitter) { setTimeout(function() { emitter.emit('success', null) }, 10) }).run() @@ -184,7 +187,7 @@ module.exports = (function() { var primaryKeys = this.primaryKeys; // options is not a hash but an id - if(typeof options === 'number') { + if (typeof options === 'number') { options = { where: options } } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) { var where = {} @@ -200,7 +203,7 @@ module.exports = (function() { } else if ((typeof options === 'string') && (parseInt(options, 10).toString() === options)) { var parsedId = parseInt(options, 10); - if(!Utils._.isFinite(parsedId)) { + if (!Utils._.isFinite(parsedId)) { throw new Error('Invalid argument to find(). Must be an id or an options object.') } @@ -329,13 +332,15 @@ module.exports = (function() { } } - if(this.hasPrimaryKeys) defaultAttributes = {} + if (this.hasPrimaryKeys) { + defaultAttributes = {} + } - if(this.options.timestamps) { + if (this.options.timestamps) { defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false} defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false} - if(this.options.paranoid) + if (this.options.paranoid) defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE} } diff --git a/lib/dao.js b/lib/dao.js index 81a6d76ae7d6..681aaff1a25e 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -14,7 +14,7 @@ module.exports = (function() { if (this.hasDefaultValues) { Utils._.each(this.defaultValues, function (value, name) { - if(typeof self[name] === 'undefined') { + if (typeof self[name] === 'undefined') { self.addAttribute(name, value()); } }) @@ -78,8 +78,9 @@ module.exports = (function() { , result = {} , self = this - if(!this.__factory.hasPrimaryKeys) + if (!this.__factory.hasPrimaryKeys) { primaryKeys = ['id'] + } primaryKeys.forEach(function(identifier) { result[identifier] = self[identifier] @@ -114,17 +115,18 @@ module.exports = (function() { }) } - if(this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) { + if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) { this[updatedAtAttr] = values[updatedAtAttr] = new Date() } - if(this.isNewRecord) { + if (this.isNewRecord) { return this.QueryInterface.insert(this, this.__factory.tableName, values) } else { var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id; - if (identifier === null && this.__options.whereCollection !== null) + if (identifier === null && this.__options.whereCollection !== null) { identifier = this.__options.whereCollection; + } var tableName = this.__factory.tableName , query = this.QueryInterface.update(this, tableName, values, identifier) @@ -225,7 +227,7 @@ module.exports = (function() { } DAO.prototype.destroy = function() { - if(this.__options.timestamps && this.__options.paranoid) { + if (this.__options.timestamps && this.__options.paranoid) { var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt' this[attr] = new Date() return this.save() @@ -281,11 +283,11 @@ module.exports = (function() { // a newly created dao has no id var defaults = this.hasPrimaryKeys ? {} : { id: null } - if(this.__options.timestamps) { + if (this.__options.timestamps) { defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date() defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date() - if(this.__options.paranoid) { + if (this.__options.paranoid) { defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null } } @@ -294,7 +296,7 @@ module.exports = (function() { for (var attr in defaults) { var value = defaults[attr] - if(!this.hasOwnProperty(attr)) { + if (!this.hasOwnProperty(attr)) { this.addAttribute(attr, Utils.toDefaultValue(value)) } } diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index 88c57375aa1c..d03cc6d3e3cb 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -29,12 +29,12 @@ module.exports = (function() { * @return {void} */ AbstractQuery.prototype.checkLoggingOption = function() { - if(this.options.logging === true) { + if (this.options.logging === true) { console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log') this.options.logging = console.log } - if(this.options.logging == console.log) { + if (this.options.logging === console.log) { // using just console.log will break in node < 0.6 this.options.logging = function(s) { console.log(s) } } @@ -253,7 +253,7 @@ module.exports = (function() { } // return the first real model instance if options.plain is set (e.g. Model.find) - if(this.options.plain) { + if (this.options.plain) { result = (result.length === 0) ? null : result[0] } diff --git a/lib/dialects/mysql/connector-manager.js b/lib/dialects/mysql/connector-manager.js index d8f3eab94f73..9a1d3fe6b47b 100644 --- a/lib/dialects/mysql/connector-manager.js +++ b/lib/dialects/mysql/connector-manager.js @@ -25,7 +25,7 @@ module.exports = (function() { var self = this if (this.useReplicaton) { - var reads = 0, + var reads = 0, writes = 0; // Init configs with options from config if not present @@ -133,7 +133,9 @@ module.exports = (function() { var isConnecting = false; ConnectorManager.prototype.query = function(sql, callee, options) { - if (!this.isConnected && !this.pool) this.connect(); + if (!this.isConnected && !this.pool) { + this.connect() + } if (this.useQueue) { var queueItem = { @@ -160,7 +162,10 @@ module.exports = (function() { } }); - if (!this.pool) query.run(sql); + if (!this.pool) { + query.run(sql); + } + else { this.pool.acquire(function(err, client) { if (err) return query.emit('error', err); @@ -197,9 +202,14 @@ module.exports = (function() { var disconnect = function(client) { var self = this; - if (!this.useQueue) this.client = null; + if (!this.useQueue) { + this.client = null; + } + client.end(function() { - if (!self.useQueue) return client.destroy(); + if (!self.useQueue) { + return client.destroy(); + } var intervalObj = null var cleanup = function () { @@ -238,7 +248,7 @@ module.exports = (function() { var enqueue = function(queueItem, options) { options = options || {} - if(this.activeQueue.length < this.maxConcurrentQueries) { + if (this.activeQueue.length < this.maxConcurrentQueries) { this.activeQueue.push(queueItem) if (this.pool) { var self = this @@ -254,9 +264,7 @@ module.exports = (function() { execQueueItem.call(self, queueItem) return }, undefined, options.type) - } - else - { + } else { execQueueItem.call(this, queueItem) } } else { @@ -275,7 +283,7 @@ module.exports = (function() { var transferQueuedItems = function(count) { for(var i = 0; i < count; i++) { var queueItem = this.queue.shift(); - if(queueItem) { + if (queueItem) { enqueue.call(this, queueItem) } } diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index ff37f59a6f2c..413eece21381 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -35,7 +35,7 @@ module.exports = (function() { } , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ") - if(pkString.length > 0) { + if (pkString.length > 0) { values.attributes += ", PRIMARY KEY (" + pkString + ")" } @@ -178,23 +178,23 @@ module.exports = (function() { options.attributes = optAttributes.join(', ') } - if(options.where) { + if (options.where) { options.where = this.getWhereConditions(options.where, tableName) query += " WHERE <%= where %>" } - if(options.group) { + if (options.group) { options.group = Utils.addTicks(options.group) query += " GROUP BY <%= group %>" } - if(options.order) { + if (options.order) { query += " ORDER BY <%= order %>" } - if(options.limit && !(options.include && (options.limit === 1))) { - if(options.offset) { + if (options.limit && !(options.include && (options.limit === 1))) { + if (options.offset) { query += " LIMIT <%= offset %>, <%= limit %>" } else { query += " LIMIT <%= limit %>" @@ -260,28 +260,31 @@ module.exports = (function() { addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { - if(typeof attribute == 'string') + if(typeof attribute === 'string') { return attribute - else { + } else { var result = "" - if(!attribute.attribute) + if (!attribute.attribute) { throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute)) + } result += attribute.attribute - if(attribute.length) + if (attribute.length) { result += '(' + attribute.length + ')' + } - if(attribute.order) + if (attribute.order) { result += ' ' + attribute.order + } return result } }) var onlyAttributeNames = attributes.map(function(attribute) { - return (typeof attribute == 'string') ? attribute : attribute.attribute + return (typeof attribute === 'string') ? attribute : attribute.attribute }) options = Utils._.extend({ @@ -310,8 +313,9 @@ module.exports = (function() { var sql = "DROP INDEX <%= indexName %> ON <%= tableName %>" , indexName = indexNameOrAttributes - if(typeof indexName != 'string') + if (typeof indexName !== 'string') { indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_')) + } return Utils._.template(sql)({ tableName: tableName, indexName: indexName }) }, @@ -319,7 +323,7 @@ module.exports = (function() { getWhereConditions: function(smth, tableName) { var result = null - if(Utils.isHash(smth)) { + if (Utils.isHash(smth)) { smth = Utils.prependTableNameToHash(tableName, smth) result = this.hashToWhereConditions(smth) } else if (typeof smth === 'number') { @@ -346,7 +350,7 @@ module.exports = (function() { if (Array.isArray(value)) { // is value an array? - if(value.length == 0) { value = [null] } + if (value.length == 0) { value = [null] } _value = "(" + value.map(function(subValue) { return Utils.escape(subValue); }).join(',') + ")" @@ -373,28 +377,28 @@ module.exports = (function() { for (var name in attributes) { var dataType = attributes[name] - if(Utils.isHash(dataType)) { + if (Utils.isHash(dataType)) { var template = "<%= type %>" , replacements = { type: dataType.type } - if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) { + if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) { template += " NOT NULL" } - if(dataType.autoIncrement) { + if (dataType.autoIncrement) { template += " auto_increment" } - if((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) { + if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) { template += " DEFAULT <%= defaultValue %>" replacements.defaultValue = Utils.escape(dataType.defaultValue) } - if(dataType.unique) { + if (dataType.unique) { template += " UNIQUE" } - if(dataType.primaryKey) { + if (dataType.primaryKey) { template += " PRIMARY KEY" } diff --git a/lib/dialects/mysql/query.js b/lib/dialects/mysql/query.js index 91d883c32e70..8feec01c98e9 100644 --- a/lib/dialects/mysql/query.js +++ b/lib/dialects/mysql/query.js @@ -19,7 +19,7 @@ module.exports = (function() { Query.prototype.run = function(sql) { this.sql = sql - if(this.options.logging !== false) { + if (this.options.logging !== false) { this.options.logging('Executing: ' + this.sql) } diff --git a/lib/dialects/postgres/connector-manager.js b/lib/dialects/postgres/connector-manager.js index 171ffa7aad24..d90ae5e2ec44 100644 --- a/lib/dialects/postgres/connector-manager.js +++ b/lib/dialects/postgres/connector-manager.js @@ -26,7 +26,10 @@ module.exports = (function() { ConnectorManager.prototype.query = function(sql, callee, options) { var self = this - if (this.client == null) this.connect() + if (this.client == null) { + this.connect() + } + var query = new Query(this.client, this.sequelize, callee, options || {}) self.pendingQueries += 1 return query.run(sql) @@ -48,7 +51,10 @@ module.exports = (function() { var self = this // in case database is slow to connect, prevent orphaning the client - if (this.isConnecting) return + if (this.isConnecting) { + return + } + this.isConnecting = true this.isConnected = false diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 625ac923a0d6..d584a050f109 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -192,8 +192,8 @@ module.exports = (function() { options = options || {} options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName) - options.attributes = options.attributes && options.attributes.map(function(attr){ - if(Array.isArray(attr) && attr.length == 2) { + options.attributes = options.attributes && options.attributes.map(function(attr) { + if (Array.isArray(attr) && attr.length === 2) { return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ') } else if (attr.indexOf('`') >= 0) { return attr.replace(/`/g, '"') @@ -359,28 +359,31 @@ module.exports = (function() { addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { - if(typeof attribute == 'string') + if (typeof attribute === 'string') { return addQuotes(attribute) - else { + } else { var result = "" - if(!attribute.attribute) + if (!attribute.attribute) { throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute)) + } result += addQuotes(attribute.attribute) - if(attribute.length) + if (attribute.length) { result += '(' + attribute.length + ')' + } - if(attribute.order) + if (attribute.order) { result += ' ' + attribute.order + } return result } }) var onlyAttributeNames = attributes.map(function(attribute) { - return (typeof attribute == 'string') ? attribute : attribute.attribute + return (typeof attribute === "string") ? attribute : attribute.attribute }) var indexTable = tableName.split('.') @@ -406,8 +409,9 @@ module.exports = (function() { var sql = "DROP INDEX IF EXISTS <%= indexName %>" , indexName = indexNameOrAttributes - if(typeof indexName != 'string') + if (typeof indexName !== "string") { indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_')) + } return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) }) }, @@ -415,14 +419,18 @@ module.exports = (function() { getWhereConditions: function(smth) { var result = null - if(Utils.isHash(smth)) + if (Utils.isHash(smth)) { result = QueryGenerator.hashToWhereConditions(smth) - else if(typeof smth == 'number') + } + else if (typeof smth === "number") { result = '\"id\"' + "=" + pgEscape(smth) - else if(typeof smth == "string") + } + else if (typeof smth === "string") { result = smth - else if(Array.isArray(smth)) + } + else if (Array.isArray(smth)) { result = Utils.format(smth) + } return result }, @@ -437,15 +445,15 @@ module.exports = (function() { var _key = key.split('.').map(function(col){return addQuotes(col)}).join(".") , _value = null - if(Array.isArray(value)) { - if(value.length == 0) { value = [null] } + if (Array.isArray(value)) { + if (value.length == 0) { value = [null] } _value = "(" + value.map(function(subValue) { return pgEscape(subValue); }).join(',') + ")" result.push([_key, _value].join(" IN ")) } - else if ((value) && (typeof value == 'object')) { + else if ((value) && (typeof value === "object")) { //using as sentinel for join column => value _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".") result.push([_key, _value].join("=")) @@ -468,17 +476,34 @@ module.exports = (function() { var template = "<%= type %>" , replacements = { type: dataType.type } - if(dataType.type == 'TINYINT(1)') dataType.type = 'BOOLEAN' - if(dataType.type == 'DATETIME') dataType.type = 'TIMESTAMP' + if (dataType.type === "TINYINT(1)") { + dataType.type = 'BOOLEAN' + } + + if (dataType.type === "DATETIME") { + dataType.type = 'TIMESTAMP' + } + + if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) { + template += " NOT NULL" + } + + if (dataType.autoIncrement) { + template +=" SERIAL" + } - if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) template += " NOT NULL" - if(dataType.autoIncrement) template +=" SERIAL" - if(dataType.defaultValue != undefined) { + if (dataType.defaultValue !== undefined) { template += " DEFAULT <%= defaultValue %>" replacements.defaultValue = pgEscape(dataType.defaultValue) } - if(dataType.unique) template += " UNIQUE" - if(dataType.primaryKey) template += " PRIMARY KEY" + + if (dataType.unique) { + template += " UNIQUE" + } + + if (dataType.primaryKey) { + template += " PRIMARY KEY" + } result[name] = Utils._.template(template)(replacements) } else { diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js index 279a78c32f46..eb030c0f5d8f 100644 --- a/lib/dialects/postgres/query.js +++ b/lib/dialects/postgres/query.js @@ -19,7 +19,7 @@ module.exports = (function() { Query.prototype.run = function(sql) { this.sql = sql - if(this.options.logging !== false) { + if (this.options.logging !== false) { this.options.logging('Executing: ' + this.sql) } diff --git a/lib/dialects/sqlite/connector-manager.js b/lib/dialects/sqlite/connector-manager.js index 92ce4e67d33d..85436f8372bf 100644 --- a/lib/dialects/sqlite/connector-manager.js +++ b/lib/dialects/sqlite/connector-manager.js @@ -15,8 +15,3 @@ module.exports = (function() { return ConnectorManager })() - - - - - diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index e84f3187fbfd..3a45eb451b85 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -119,7 +119,7 @@ module.exports = (function() { for (var name in attributes) { var dataType = attributes[name] - if(Utils.isHash(dataType)) { + if (Utils.isHash(dataType)) { var template = "<%= type %>" , replacements = { type: dataType.type } @@ -127,7 +127,7 @@ module.exports = (function() { template += " NOT NULL" } - if(dataType.defaultValue != undefined) { + if (dataType.defaultValue !== undefined) { template += " DEFAULT <%= defaultValue %>" replacements.defaultValue = Utils.escape(dataType.defaultValue) } diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js index 5d608998dad7..bb1aaa9fbe72 100644 --- a/lib/dialects/sqlite/query.js +++ b/lib/dialects/sqlite/query.js @@ -25,7 +25,7 @@ module.exports = (function() { this.sql = sql - if(this.options.logging !== false) { + if (this.options.logging !== false) { this.options.logging('Executing: ' + this.sql) } @@ -83,7 +83,7 @@ module.exports = (function() { this.send('handleInsertQuery', results, metaData) } - if (this.sql.indexOf('sqlite_master') != -1) { + if (this.sql.indexOf('sqlite_master') !== -1) { result = results.map(function(resultSet) { return resultSet.name }) } else if (this.send('isSelectQuery')) { // we need to convert the timestamps into actual date objects diff --git a/lib/migration.js b/lib/migration.js index 31902690e6c9..3c52770e79f8 100644 --- a/lib/migration.js +++ b/lib/migration.js @@ -26,7 +26,7 @@ module.exports = (function() { Migration.parseFilename = function(s) { var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/) - if(matches === null) { + if (matches === null) { throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.') } @@ -72,7 +72,7 @@ module.exports = (function() { extendMigrationWithQueryInterfaceMethods.call(self, onSuccess) func.call(null, self, DataTypes) - if(!Migration.migrationHasInterfaceCalls(func)) + if (!Migration.migrationHasInterfaceCalls(func)) onSuccess() }).run() } @@ -115,10 +115,11 @@ module.exports = (function() { // the event will have the same name like the method self.queryInterface.on(_method, function(err) { self.undoneMethods-- - if(err) + if (err) { throw new Error(err) - else + } else { (self.undoneMethods == 0) && callback && callback() + } }) return self.queryInterface[_method].apply(self.queryInterface, args) diff --git a/lib/migrator.js b/lib/migrator.js index a454f3c9fe7e..63f3f5ef86da 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -16,12 +16,12 @@ module.exports = (function() { logging: console.log }, options || {}) - if(this.options.logging === true) { + if (this.options.logging === true) { console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log') this.options.logging = console.log } - if(this.options.logging == console.log) { + if (this.options.logging == console.log) { // using just console.log will break in node < 0.6 this.options.logging = function(s) { console.log(s) } } @@ -42,13 +42,13 @@ module.exports = (function() { return new Utils.CustomEventEmitter(function(emitter) { self.getUndoneMigrations(function(err, migrations) { - if(err) { + if (err) { emitter.emit('error', err) } else { var chainer = new Utils.QueryChainer , from = migrations[0] - if(options.method == 'down') { + if (options.method === 'down') { migrations.reverse() from = migrations[0] } @@ -56,18 +56,21 @@ module.exports = (function() { migrations.forEach(function(migration) { chainer.add(migration, 'execute', [options], { before: function(migration) { - if(self.options.logging !== false) + if (self.options.logging !== false) { self.options.logging('Executing migration: ' + migration.filename) + } }, after: function(migration) { - if(self.options.logging !== false) + if (self.options.logging !== false) { self.options.logging('Executed migration: ' + migration.filename) + } }, success: function(migration, callback) { - if(options.method == 'down') + if (options.method === 'down') { deleteUndoneMigration.call(self, from, migration, callback) - else + } else { saveSuccessfulMigration.call(self, from, migration, callback) + } } }) }) @@ -103,27 +106,30 @@ module.exports = (function() { return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0]) }) - if(this.options.from) { + if (this.options.from) { filterFrom(migrations, this.options.from, function(err, migrations) { - if(self.options.to) + if (self.options.to) { filterTo(migrations, self.options.to, callback) - else + } else { callback && callback(null, migrations) + } }) } else { getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) { - if(lastMigrationId) { + if (lastMigrationId) { filterFrom(migrations, lastMigrationId, function(err, migrations) { - if(self.options.to) + if (self.options.to) { filterTo(migrations, self.options.to, callback) - else + } else { callback && callback(null, migrations) + } }, { withoutEqual: true }) } else { - if(self.options.to) + if (self.options.to) { filterTo(migrations, self.options.to, callback) - else + } else { callback && callback(null, migrations) + } } }).error(function(err) { callback && callback(err, null) @@ -138,7 +144,7 @@ module.exports = (function() { var storedDAO = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta') , SequelizeMeta = storedDAO - if(!storedDAO) { + if (!storedDAO) { SequelizeMeta = self.sequelize.define('SequelizeMeta', { from: DataTypes.STRING, to: DataTypes.STRING @@ -148,7 +154,7 @@ module.exports = (function() { } // force sync when model has newly created or if syncOptions are passed - if(!storedDAO || syncOptions) { + if (!storedDAO || syncOptions) { SequelizeMeta .sync(syncOptions || {}) .success(function() { emitter.emit('success', SequelizeMeta) }) diff --git a/lib/query-chainer.js b/lib/query-chainer.js index 58f288ba275a..6dabbfca69ad 100644 --- a/lib/query-chainer.js +++ b/lib/query-chainer.js @@ -16,7 +16,7 @@ module.exports = (function() { emitters = emitters || [] emitters.forEach(function(emitter) { - if(Array.isArray(emitter)) { + if (Array.isArray(emitter)) { self.add.apply(self, emitter) } else { self.add(emitter) @@ -25,7 +25,7 @@ module.exports = (function() { } QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) { - if(!!method) { + if (!!method) { this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options }) } else { observeEmitter.call(this, emitterOrKlass) @@ -55,7 +55,7 @@ module.exports = (function() { var exec = function() { var serial = self.serials.pop() - if(serial) { + if (serial) { serial.options = serial.options || {} serial.options.before && serial.options.before(serial.klass) @@ -72,7 +72,7 @@ module.exports = (function() { exec() } - if(options.skipOnError && (self.fails.length > 0)) { + if (options.skipOnError && (self.fails.length > 0)) { onError('Skipped due to earlier error!') } else { var emitter = serial.klass[serial.method].apply(serial.klass, serial.params) @@ -80,7 +80,7 @@ module.exports = (function() { emitter.success(function(result) { self.serialResults[serialCopy.indexOf(serial)] = result - if(serial.options.success) { + if (serial.options.success) { serial.options.success(serial.klass, onSuccess) } else { onSuccess() @@ -115,7 +115,7 @@ module.exports = (function() { finish.call(self, 'emitterResults') }) .on('sql', function(sql) { - if(self.eventEmitter) { + if (self.eventEmitter) { self.eventEmitter.emit('sql', sql) } }) @@ -124,13 +124,14 @@ module.exports = (function() { var finish = function(resultsName) { this.finished = true - if(this.emitters.length > 0) { + if (this.emitters.length > 0) { this.finished = (this.finishedEmits == this.emitters.length) - } else if(this.serials.length > 0) { + } + else if (this.serials.length > 0) { this.finished = (this.finishedEmits == this.serials.length) } - if(this.finished && this.wasRunning) { + if (this.finished && this.wasRunning) { var status = (this.fails.length == 0 ? 'success' : 'error') , result = (this.fails.length == 0 ? this[resultsName] : this.fails) diff --git a/lib/query-interface.js b/lib/query-interface.js index deaca01ad6b4..7768ac5f9572 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -13,10 +13,11 @@ module.exports = (function() { var attributeHashes = {} Utils._.each(attributes, function(dataTypeOrOptions, attributeName) { - if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) + if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) { attributeHashes[attributeName] = { type: dataTypeOrOptions } - else + } else { attributeHashes[attributeName] = dataTypeOrOptions + } }) attributes = this.QueryGenerator.attributesToSQL(attributeHashes) @@ -98,10 +99,11 @@ module.exports = (function() { QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) { var attributes = {} - if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) + if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) { attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false } - else + } else { attributes[attributeName] = dataTypeOrOptions + } var options = this.QueryGenerator.attributesToSQL(attributes) , sql = this.QueryGenerator.addColumnQuery(tableName, options) @@ -117,10 +119,11 @@ module.exports = (function() { QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) { var attributes = {} - if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) + if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) { attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false } - else + } else { attributes[attributeName] = dataTypeOrOptions + } var options = this.QueryGenerator.attributesToSQL(attributes) , sql = this.QueryGenerator.changeColumnQuery(tableName, options) @@ -202,7 +205,7 @@ module.exports = (function() { QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) { var self = this - if(attributeSelector == undefined) { + if (attributeSelector == undefined) { throw new Error('Please pass an attribute selector!') } @@ -244,7 +247,7 @@ module.exports = (function() { return new Utils.CustomEventEmitter(function(emitter) { var query = null - if(Array.isArray(sqlOrQueryParams)) { + if (Array.isArray(sqlOrQueryParams)) { if (sqlOrQueryParams.length === 1) { sqlOrQueryParams.push(null) } diff --git a/lib/sequelize.js b/lib/sequelize.js index 5fa1d4e7d0cb..d238659cc935 100644 --- a/lib/sequelize.js +++ b/lib/sequelize.js @@ -5,7 +5,7 @@ var Utils = require("./utils") , Migrator = require("./migrator") , QueryInterface = require("./query-interface") -if(parseFloat(process.version.replace('v', '')) < 0.6) { +if (parseFloat(process.version.replace('v', '')) < 0.6) { console.log("DEPRECATION WARNING: Support for Node.JS < v0.6 will be canceled in the next minor release.") } @@ -43,7 +43,7 @@ module.exports = (function() { pool: {} }, options || {}) - if(this.options.logging === true) { + if (this.options.logging === true) { console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log') this.options.logging = console.log } @@ -85,7 +85,7 @@ module.exports = (function() { } Sequelize.prototype.getMigrator = function(options, force) { - if(force) { + if (force) { this.migrator = new Migrator(this, options) } else { this.migrator = this.migrator || new Migrator(this, options) @@ -98,10 +98,10 @@ module.exports = (function() { options = options || {} var globalOptions = this.options - if(globalOptions.define) { + if (globalOptions.define) { options = Utils._.extend({}, globalOptions.define, options) Utils._(['classMethods', 'instanceMethods']).each(function(key) { - if(globalOptions.define[key]) { + if (globalOptions.define[key]) { options[key] = options[key] || {} Utils._.extend(options[key], globalOptions.define[key]) } @@ -153,7 +153,7 @@ module.exports = (function() { Sequelize.prototype.sync = function(options) { options = options || {} - if(this.options.sync) { + if (this.options.sync) { options = Utils._.extend({}, this.options.sync, options) } diff --git a/lib/utils.js b/lib/utils.js index 96c32519b194..a044d8e39485 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -14,7 +14,7 @@ var Utils = module.exports = { camelizeIf: function(string, condition) { var result = string - if(condition) { + if (condition) { result = _.camelize(string) } @@ -23,7 +23,7 @@ var Utils = module.exports = { underscoredIf: function(string, condition) { var result = string - if(condition) { + if (condition) { result = _.underscored(string) } @@ -69,12 +69,12 @@ var Utils = module.exports = { var result = (args.length == Utils._.keys(primaryKeys).length) if (result) { Utils._.each(args, function(arg) { - if(result) { - if(['number', 'string'].indexOf(typeof arg) !== -1) + if (result) { + if (['number', 'string'].indexOf(typeof arg) !== -1) { result = true - else + } else { result = (arg instanceof Date) - + } } }) } @@ -119,7 +119,7 @@ var Utils = module.exports = { removeNullValuesFromHash: function(hash, omitNull) { var result = hash - if(omitNull) { + if (omitNull) { var _hash = {} Utils._.each(hash, function(val, key) { From 5c64b87335b7773b6b9bd39906c9b6029eb2cea1 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 18 Jan 2013 13:46:40 +0100 Subject: [PATCH 052/360] add key value pairs to increment --- lib/dao.js | 19 +++++++++++++++---- spec/dao.spec.js | 42 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index 907673f03c09..53099bd12f67 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -235,17 +235,28 @@ module.exports = (function() { var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, values = {} - if (!Utils._.isArray(fields)) fields = [fields]; if (count === undefined) count = 1; - Utils._.each(fields, function (field) { - values[field] = count - }) + if (Utils._.isString(fields)) { + values[fields] = count; + } else if (Utils._.isArray(fields)) { + Utils._.each(fields, function (field) { + values[field] = count + }) + } else { // Assume fields is key-value pairs + values = fields; + } return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier) } DAO.prototype.decrement = function (fields, count) { + if (!Utils._.isString(fields) && !Utils._.isArray(fields)) { // Assume fields is key-value pairs + Utils._.each(fields, function (value, field) { + fields[field] = -value; + }); + } + return this.increment(fields, 0 - count); } diff --git a/spec/dao.spec.js b/spec/dao.spec.js index f12d787e7169..d71b7b837871 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -18,7 +18,8 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { self.User = sequelize.define('User', { username: { type: DataTypes.STRING }, touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - aNumber: { type: DataTypes.INTEGER } + aNumber: { type: DataTypes.INTEGER }, + bNumber: { type: DataTypes.INTEGER } }) }, onComplete: function() { @@ -29,7 +30,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { describe('increment', function () { before(function (done) { - this.User.create({ id: 1, aNumber: 0 }).done(done) + this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done) }); it('with array', function (done) { @@ -99,11 +100,27 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(_done); }); }); + + it('with key value pair', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment({ 'aNumber': 1, 'bNumber': 2}).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(1); + expect(user3.bNumber).toBe(2); + done(); + }); + }); + }); + }); }); describe('decrement', function () { before(function (done) { - this.User.create({ id: 1, aNumber: 0 }).done(done) + this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done) }); it('with array', function (done) { @@ -173,8 +190,24 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(_done); }); }); - }); + it('with key value pair', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement({ 'aNumber': 1, 'bNumber': 2}).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(-1); + expect(user3.bNumber).toBe(-2); + done(); + }); + }); + }); + }); + }); +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -281,4 +314,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) + */ }) From 7e9d13a4712cd299b5bc764f13b88b1f06fc0f38 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 18 Jan 2013 13:55:39 +0100 Subject: [PATCH 053/360] dao tests are back again again --- spec/dao.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index d71b7b837871..89ec3521880d 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -207,7 +207,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); }); -/* + describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -314,5 +314,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) }) - */ }) From fa7913960e37c059871541bff4100f3b5dcb5ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Fri, 18 Jan 2013 16:36:29 +0000 Subject: [PATCH 054/360] Fix issue #418 - timestamps always returned. --- lib/dao-factory.js | 6 +++--- lib/dao.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index e208bc824395..fa079147e80f 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -252,12 +252,12 @@ module.exports = (function() { } DAOFactory.prototype.build = function(values, options) { - options = options || {} + options = options || {isNewRecord: true} var self = this - , instance = new this.DAO(values, this.options) + , instance = new this.DAO(values, this.options, options.isNewRecord) - instance.isNewRecord = options.hasOwnProperty('isNewRecord') ? options.isNewRecord : true + instance.isNewRecord = options.isNewRecord return instance } diff --git a/lib/dao.js b/lib/dao.js index b7092e02cf17..6faaa6979dc1 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -4,13 +4,13 @@ var Utils = require("./utils") , DataTypes = require("./data-types") module.exports = (function() { - var DAO = function(values, options) { + var DAO = function(values, options, isNewRecord) { var self = this; this.__options = options; this.hasPrimaryKeys = options.hasPrimaryKeys; this.selectedValues = values; - initAttributes.call(this, values) + initAttributes.call(this, values, isNewRecord) if (this.hasDefaultValues) { Utils._.each(this.defaultValues, function (value, name) { @@ -269,7 +269,7 @@ module.exports = (function() { // private - var initAttributes = function(values) { + var initAttributes = function(values, isNewRecord) { // add all passed values to the dao and store the attribute names in this.attributes for (var key in values) { if (values.hasOwnProperty(key)) { @@ -281,7 +281,7 @@ module.exports = (function() { // a newly created dao has no id var defaults = this.hasPrimaryKeys ? {} : { id: null } - if(this.__options.timestamps) { + if(this.__options.timestamps && isNewRecord) { defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date() defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date() From c1ed9a1bb08af13518e405d6926624aa5c061553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Mon, 21 Jan 2013 18:22:17 +0000 Subject: [PATCH 055/360] Fix missing foreign key attribute in BelongsTo. - the injectAttributes method should update the source DAO as that's where the foreign key is. --- lib/associations/belongs-to.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js index 2e6582fccb20..bd076e98d4b9 100644 --- a/lib/associations/belongs-to.js +++ b/lib/associations/belongs-to.js @@ -27,7 +27,7 @@ module.exports = (function() { Utils._.defaults(this.source.rawAttributes, newAttributes) // Sync attributes to DAO proto each time a new assoc is added - this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes); + this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes); return this } From 31a05e223bbfcc1230432bd59764c105fd1081bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Mon, 21 Jan 2013 18:29:32 +0000 Subject: [PATCH 056/360] Fix missing foreign key attribute with BelongsTo. --- lib/associations/belongs-to.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js index 2e6582fccb20..bd076e98d4b9 100644 --- a/lib/associations/belongs-to.js +++ b/lib/associations/belongs-to.js @@ -27,7 +27,7 @@ module.exports = (function() { Utils._.defaults(this.source.rawAttributes, newAttributes) // Sync attributes to DAO proto each time a new assoc is added - this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes); + this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes); return this } From bd5159e78f30473c94c4a6771d239cb073bc048a Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Sun, 27 Jan 2013 09:26:44 +0100 Subject: [PATCH 057/360] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 43d1b5571480..519c802579bb 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl - MariaDB support - Support for update and delete calls for whole tables without previous loading of instances - Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099) +- Model#delete ### 1.7.x - Complete support for non-id primary keys From 3843f4c45eb79ee4a4472538eefad875b04e7aa0 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 29 Jan 2013 08:53:28 +0100 Subject: [PATCH 058/360] belongsto should be fixed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 519c802579bb..e5b696751385 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl ### 1.6.0 (ToDo) - Fix last issues with eager loading of associated data -- Find out why Person.belongsTo(House) would add person_id to house. It should add house_id to person +- ~~Find out why Person.belongsTo(House) would add person_id to house. It should add house_id to person~~ ### 1.7.0 - Transactions From 98eb895f022a1cf28bb915eee6b7d99b183b3778 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 29 Jan 2013 08:56:08 +0100 Subject: [PATCH 059/360] changes in 1.6.0 --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index e5579001a4d4..17cec16bdb3e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,10 +1,13 @@ # v1.6.0 # - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3 - [REFACTORING] separated tests for dialects +- [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango) - [BUG] fixed wrong version in sequelize binary - [BUG] local options have higher priority than global options (thanks to guersam) - [BUG] fixed where clause when passing an empty array (thanks to kbackowski) - [BUG] fixed updateAttributes for models/tables without primary key (thanks to durango) +- [BUG] fixed the location of the foreign key when using belongsTo (thanks to ricardograca) +- [BUG] don't return timestamps if only specific attributes have been seleceted (thanks to ricardograca) - [FEATURE] added association prefetching for find and findAll - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot) - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result From 2725cb6aa60c127dadf9b188d53e5d80afb9d79a Mon Sep 17 00:00:00 2001 From: Daniel Durante Date: Wed, 30 Jan 2013 12:25:20 -0500 Subject: [PATCH 060/360] PostgreSQL can now accept special characters in usernames and passwords for it's connection. --- lib/dialects/postgres/query-generator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index a6722b116561..a8413d3582cd 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -532,8 +532,8 @@ module.exports = (function() { var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>'; return Utils._.template(template)({ - user: config.username, - password: config.password, + user: encodeURIComponent(config.username), + password: encodeURIComponent(config.password), database: config.database, host: config.host, port: config.port, From 884a93ed952f632a87d220c00c272aa6356b175e Mon Sep 17 00:00:00 2001 From: Kevin Martin Date: Tue, 5 Feb 2013 22:57:54 -0500 Subject: [PATCH 061/360] Added ENUM type --- lib/data-types.js | 3 ++- lib/dialects/mysql/query-generator.js | 6 ++++++ lib/dialects/postgres/query-generator.js | 22 ++++++++++++++++++++++ lib/dialects/sqlite/query-generator.js | 4 ++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/data-types.js b/lib/data-types.js index 987c45d619e3..1048a87f65e4 100644 --- a/lib/data-types.js +++ b/lib/data-types.js @@ -6,5 +6,6 @@ module.exports = { DATE: 'DATETIME', BOOLEAN: 'TINYINT(1)', FLOAT: 'FLOAT', - NOW: 'NOW' + NOW: 'NOW', + ENUM: 'ENUM' } diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index ab9d19e284c1..4dc435ca922b 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -381,6 +381,12 @@ module.exports = (function() { var template = "<%= type %>" , replacements = { type: dataType.type } + if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) { + replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) { + return Utils.escape(value) + }).join(", ") + ")" + } + if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) { template += " NOT NULL" } diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index a8413d3582cd..c5d64037d233 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -84,6 +84,10 @@ module.exports = (function() { for (var attr in attributes) { var dataType = pgDataTypeMapping(tableName, attr, attributes[attr]) attrStr.push(addQuotes(attr) + " " + dataType) + + if (attributes[attr].type.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].type "; " + query + } } var values = { @@ -130,6 +134,10 @@ module.exports = (function() { attrName: addQuotes(attrName), definition: pgDataTypeMapping(tableName, attrName, definition) })) + + if (definition.type.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.type "; " + query + } } return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') }) @@ -167,6 +175,10 @@ module.exports = (function() { }) sql.push(attrSql) + + if (definition.type.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.type "; " + query + } } return sql.join('') @@ -181,6 +193,10 @@ module.exports = (function() { before: addQuotes(attrBefore), after: addQuotes(attributeName), })) + + if (attributes[attributeName].type.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].type "; " + query + } } return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') }) @@ -476,6 +492,12 @@ module.exports = (function() { var template = "<%= type %>" , replacements = { type: dataType.type } + if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) { + replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) { + return Utils.escape(value) + }).join(", ") + ")" + } + if (dataType.type === "TINYINT(1)") { dataType.type = 'BOOLEAN' } diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index cfcb7a70fb10..3dd30a578098 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -123,6 +123,10 @@ module.exports = (function() { var template = "<%= type %>" , replacements = { type: dataType.type } + if (dataType.type === DataTypes.ENUM) { + replacements.type = "INTEGER" + } + if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) { template += " NOT NULL" } From 8cc6a9369a68410882239fae37f5a5c821a16df8 Mon Sep 17 00:00:00 2001 From: Kevin Martin Date: Tue, 5 Feb 2013 23:14:03 -0500 Subject: [PATCH 062/360] Fixed a typo in PG Query Generator ENUM update --- lib/dialects/postgres/query-generator.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index c5d64037d233..14bdfe52f962 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -86,7 +86,7 @@ module.exports = (function() { attrStr.push(addQuotes(attr) + " " + dataType) if (attributes[attr].type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].type "; " + query + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].type + "; " + query } } @@ -136,7 +136,7 @@ module.exports = (function() { })) if (definition.type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.type "; " + query + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.type + "; " + query } } @@ -177,7 +177,7 @@ module.exports = (function() { sql.push(attrSql) if (definition.type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.type "; " + query + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.type + "; " + query } } @@ -195,7 +195,7 @@ module.exports = (function() { })) if (attributes[attributeName].type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].type "; " + query + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].type + "; " + query } } From aa17f8d7b12b0fcc84811fac9ab1422fe4c2fbfe Mon Sep 17 00:00:00 2001 From: Kevin Martin Date: Tue, 5 Feb 2013 23:27:02 -0500 Subject: [PATCH 063/360] Added DataTypes require to PG and SQLite Query Generator --- lib/dialects/postgres/query-generator.js | 1 + lib/dialects/sqlite/query-generator.js | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 14bdfe52f962..5dba9915b9c2 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -1,5 +1,6 @@ var Utils = require("../../utils") , util = require("util") + , DataTypes = require("../../data-types") , tables = {} , primaryKeys = {}; diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index 3dd30a578098..e38f86584416 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -1,4 +1,5 @@ var Utils = require("../../utils") + , DataTypes = require("../../data-types") var MySqlQueryGenerator = Utils._.extend( Utils._.clone(require("../query-generator")), Utils._.clone(require("../mysql/query-generator")) From 8c17e416ab1f83cf7f761d1d2312d9c5477f215d Mon Sep 17 00:00:00 2001 From: Kevin Martin Date: Tue, 5 Feb 2013 23:41:35 -0500 Subject: [PATCH 064/360] Fixed a typo in PG Query Generator --- lib/dialects/postgres/query-generator.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 5dba9915b9c2..14ad616741a5 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -86,8 +86,8 @@ module.exports = (function() { var dataType = pgDataTypeMapping(tableName, attr, attributes[attr]) attrStr.push(addQuotes(attr) + " " + dataType) - if (attributes[attr].type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].type + "; " + query + if (attributes[attr].match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].match(/^ENUM\(.+\)/)[0] + "; " + query } } @@ -136,8 +136,8 @@ module.exports = (function() { definition: pgDataTypeMapping(tableName, attrName, definition) })) - if (definition.type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.type + "; " + query + if (definition.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.match(/^ENUM\(.+\)/)[0] + "; " + query } } @@ -177,8 +177,8 @@ module.exports = (function() { sql.push(attrSql) - if (definition.type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.type + "; " + query + if (definition.match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.match(/^ENUM\(.+\)/)[0] + "; " + query } } @@ -195,8 +195,8 @@ module.exports = (function() { after: addQuotes(attributeName), })) - if (attributes[attributeName].type.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].type + "; " + query + if (attributes[attributeName].match(/^ENUM\(/)) { + query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].match(/^ENUM\(.+\)/)[0] + "; " + query } } From dbab5ae8ed73723991e0206e39dea36f71087122 Mon Sep 17 00:00:00 2001 From: Kevin Martin Date: Wed, 6 Feb 2013 14:23:47 -0500 Subject: [PATCH 065/360] Added a few tests, DRY'd out some PG ENUM code --- lib/dialects/postgres/query-generator.js | 25 +++++++++++-------- spec-jasmine/mysql/query-generator.spec.js | 4 +++ spec-jasmine/postgres/query-generator.spec.js | 5 +++- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 14ad616741a5..0bac8cf15308 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -36,6 +36,10 @@ function pgEscape(val) { return "'"+val+"'"; } +function pgEnum(tableName, attr, dataType) { + return "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; " +} + function padInt(i) { return (i < 10) ? '0' + i.toString() : i.toString() } @@ -65,6 +69,10 @@ function pgDataTypeMapping(tableName, attr, dataType) { tables[tableName][attr] = 'serial' } + if (dataType.match(/^ENUM\(/)) { + dataType = dataType.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attr)) + } + return dataType } @@ -87,7 +95,7 @@ module.exports = (function() { attrStr.push(addQuotes(attr) + " " + dataType) if (attributes[attr].match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + attributes[attr].match(/^ENUM\(.+\)/)[0] + "; " + query + query = pgEnum(tableName, attr, attributes[attr])) + query; } } @@ -137,7 +145,7 @@ module.exports = (function() { })) if (definition.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attrName) + " AS " + definition.match(/^ENUM\(.+\)/)[0] + "; " + query + query = pgEnum(tableName, attrName, definition) + query } } @@ -170,16 +178,17 @@ module.exports = (function() { }) } + if (definition.match(/^ENUM\(/)) { + query = pgEnum(tableName, attributeName, definition) + query + definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName)) + } + attrSql += Utils._.template(query)({ tableName: addQuotes(tableName), query: addQuotes(attributeName) + ' TYPE ' + definition }) sql.push(attrSql) - - if (definition.match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + definition.match(/^ENUM\(.+\)/)[0] + "; " + query - } } return sql.join('') @@ -194,10 +203,6 @@ module.exports = (function() { before: addQuotes(attrBefore), after: addQuotes(attributeName), })) - - if (attributes[attributeName].match(/^ENUM\(/)) { - query = "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attributeName) + " AS " + attributes[attributeName].match(/^ENUM\(.+\)/)[0] + "; " + query - } } return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') }) diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js index 32164dfadbb8..ffe0e29141dd 100644 --- a/spec-jasmine/mysql/query-generator.spec.js +++ b/spec-jasmine/mysql/query-generator.spec.js @@ -22,6 +22,10 @@ describe('QueryGenerator', function() { { arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {charset: 'latin1'}], expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=latin1;" + }, + { + arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}, {charset: 'latin1'}], + expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` ENUM(\"A\", \"B\", \"C\"), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=latin1;" } ], diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js index 80b5217d059f..505e074870d5 100644 --- a/spec-jasmine/postgres/query-generator.spec.js +++ b/spec-jasmine/postgres/query-generator.spec.js @@ -23,7 +23,10 @@ describe('QueryGenerator', function() { arguments: ['mySchema.myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}], expectation: "CREATE TABLE IF NOT EXISTS \"mySchema\".\"myTable\" (\"title\" VARCHAR(255), \"name\" VARCHAR(255));" }, - + { + arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}], + expectation: "CREATE TYPE \"enum_myTable_title\" AS ENUM(\"A\", \"B\", \"C\"); CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" \"enum_myTable_title\", \"name\" VARCHAR(255));" + } ], dropTableQuery: [ From 851d3bde84c7c62045252f81ec0b16d42b9d3d7b Mon Sep 17 00:00:00 2001 From: carsondarling Date: Fri, 8 Feb 2013 17:43:35 -0500 Subject: [PATCH 066/360] Explicitly targets the docs folder for generating docs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 450ef66fe2fa..c3047816408d 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "test-buster-postgres": "DIALECT=postgres ./node_modules/.bin/buster-test", "test-buster-postgres-native": "DIALECT=postgres-native ./node_modules/.bin/buster-test", "test-buster-sqlite": "DIALECT=sqlite ./node_modules/.bin/buster-test", - "generate-docs": "node_modules/.bin/dox-foundation --source ./lib --title Sequelize" + "generate-docs": "node_modules/.bin/dox-foundation --source ./lib --target ./docs --title Sequelize" }, "bin": { "sequelize": "bin/sequelize" From 6ac5b842a0d130329d1228a25fa2b0de4a2db364 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Sat, 9 Feb 2013 11:15:49 +0100 Subject: [PATCH 067/360] #444 --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 17cec16bdb3e..58eac882ca7c 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3 - [REFACTORING] separated tests for dialects - [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango) +- [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling) - [BUG] fixed wrong version in sequelize binary - [BUG] local options have higher priority than global options (thanks to guersam) - [BUG] fixed where clause when passing an empty array (thanks to kbackowski) From e24091f20b9ad34061753b4b0bfdc8724597e411 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Wed, 13 Feb 2013 07:45:45 +0100 Subject: [PATCH 068/360] added google groups --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e5b696751385..2cc8b66d9674 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,18 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa - Associations - Importing definitions from single files +## Documentation, Examples and Updates ## + +You can find the documentation and announcements of updates on the [project's website](http://www.sequelizejs.com). +If you want to know about latest development and releases, follow me on [Twitter](http://twitter.com/sdepold). +Also make sure to take a look at the examples in the repository. The website will contain them soon, as well. + +- [Documentation](http://www.sequelizejs.com) +- [Twitter](http://twitter.com/sdepold) +- [IRC](irc://irc.freenode.net/sequelizejs) +- [Google Groups](https://groups.google.com/forum/#!forum/sequelize) +- [XING](https://www.xing.com/net/priec1b5cx/sequelize) (pretty much inactive, but you might want to name it on your profile) + ## Roadmap A very basic roadmap. Chances aren't too bad, that not mentioned things are implemented as well. Don't panic :) @@ -47,17 +59,6 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl ### 2.0.0 - save datetimes in UTC -## Documentation, Examples and Updates ## - -You can find the documentation and announcements of updates on the [project's website](http://www.sequelizejs.com). -If you want to know about latest development and releases, follow me on [Twitter](http://twitter.com/sdepold). -Also make sure to take a look at the examples in the repository. The website will contain them soon, as well. - -- [Documentation](http://www.sequelizejs.com) -- [Twitter](http://twitter.com/sdepold) -- [IRC](irc://irc.freenode.net/sequelizejs) -- [XING](https://www.xing.com/net/priec1b5cx/sequelize) - ## Collaboration 2.0 ## I'm glad to get pull request if any functionality is missing or something is buggy. But _please_ ... run the tests before you send me the pull request. From e79089a079254caf5b7c8664aa08ad34b9c2ddee Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Fri, 1 Feb 2013 03:54:57 +0800 Subject: [PATCH 069/360] Use env dialect for migrator and sequelize spec tests. --- spec/migrator.spec.js | 2 +- spec/sequelize.spec.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js index 887fa66b47ee..b97218d79abb 100644 --- a/spec/migrator.spec.js +++ b/spec/migrator.spec.js @@ -28,7 +28,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { .error(function(err) { console.log(err) }) }.bind(this) - Helpers.initTests({ onComplete: done, context: this }) + Helpers.initTests({ dialect: dialect, onComplete: done, context: this }) }) it("as", function() { diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index bf664efbfa54..5a5229e07d56 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -10,6 +10,7 @@ buster.spec.expose() describe(Helpers.getTestDialectTeaser("Sequelize"), function() { before(function(done) { Helpers.initTests({ + dialect: dialect, beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this), onComplete: done }) From 3b297e002349dd677a9b9f5df817c5cac766c88b Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Sat, 2 Feb 2013 13:46:28 +0800 Subject: [PATCH 070/360] Make tests pass for postgresql by quoting table column names with uppercases. Also skip stored procedure unless mysql. --- spec/sequelize.spec.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index 5a5229e07d56..9e30b4977301 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -35,7 +35,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { 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) { console(err) @@ -70,7 +70,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { it('executes select queries correctly', function(done) { this.sequelize.query(this.insertQuery).success(function() { this.sequelize - .query("select * from " + this.User.tableName) + .query("select * from \"" + this.User.tableName+ "\"") .success(function(users) { expect(users.map(function(u){ return u.username })).toEqual(['john']) done() @@ -83,7 +83,8 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { }.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('DROP PROCEDURE IF EXISTS foo').success(function() { this.sequelize.query( @@ -96,11 +97,11 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { }.bind(this)) }.bind(this)) }.bind(this)) - }) + }) it('uses the passed DAOFactory', function(done) { 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) done() }.bind(this)) From 82cabc6ce4763d0dd4e0e7e553ff8fa178f8dbdc Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Sat, 2 Feb 2013 17:05:11 +0800 Subject: [PATCH 071/360] only double quote table names for postgres --- spec/sequelize.spec.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index 9e30b4977301..76c75af982e9 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -5,6 +5,12 @@ if(typeof require === 'function') { } +var qq = function(str) { + if (dialect == 'postgres') + return '"' + str + '"'; + return str; +}; + buster.spec.expose() describe(Helpers.getTestDialectTeaser("Sequelize"), function() { @@ -35,7 +41,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { 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 " + qq(this.User.tableName) + " (username, " + qq("createdAt") + ", " + qq("updatedAt") + ") VALUES ('john', '2012-01-01 10:10:10', '2012-01-01 10:10:10')" this.User.sync().success(done).error(function(err) { console(err) @@ -70,7 +76,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { it('executes select queries correctly', function(done) { this.sequelize.query(this.insertQuery).success(function() { this.sequelize - .query("select * from \"" + this.User.tableName+ "\"") + .query("select * from " + qq(this.User.tableName) + "") .success(function(users) { expect(users.map(function(u){ return u.username })).toEqual(['john']) done() @@ -101,7 +107,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { it('uses the passed DAOFactory', function(done) { 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 " + qq(this.User.tableName) + ";", this.User).success(function(users) { expect(users[0].__factory).toEqual(this.User) done() }.bind(this)) From c25e8f46d6d7d3e7da6ca1e6950a4fd474ce1dd9 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Fri, 15 Feb 2013 22:52:35 +0800 Subject: [PATCH 072/360] mark all known dialect-specific failing tests as todo with itEventually --- spec/associations/belongs-to.spec.js | 1 + spec/dao-factory.spec.js | 2 +- spec/migrator.spec.js | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js index 8653283f42dc..932396b63fce 100644 --- a/spec/associations/belongs-to.spec.js +++ b/spec/associations/belongs-to.spec.js @@ -11,6 +11,7 @@ buster.testRunner.timeout = 500 describe(Helpers.getTestDialectTeaser("BelongsTo"), function() { before(function(done) { Helpers.initTests({ + dialect: dialect, beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this), diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 8ef6a0e0a73d..df50527bc022 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -352,7 +352,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - it('stores the current date in createdAt', function(done) { + ;(dialect.match(/^postgres/) ? itEventually : it)('stores the current date in createdAt', function(done) { this.User.create({ username: 'foo' }).success(function(user) { expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000)) done() diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js index b97218d79abb..6c4098501d78 100644 --- a/spec/migrator.spec.js +++ b/spec/migrator.spec.js @@ -121,7 +121,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { }) }) - it("executes migration #20111117063700 and correctly adds isBetaMember", function(done) { + ;(dialect === 'sqlite' ? itEventually : it)("executes migration #20111117063700 and correctly adds isBetaMember", function(done) { this.sequelize.getQueryInterface().describeTable('Person').success(function(data) { var fields = data.map(function(d) { return d.Field }).sort() expect(fields).toEqual([ 'isBetaMember', 'name' ]) @@ -167,7 +167,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { }.bind(this)) }) - it("executes migration #20111205064000 and renames a table", function(done) { + ;(dialect === 'sqlite' ? itEventually : it)("executes migration #20111205064000 and renames a table", function(done) { this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) { tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' }) expect(tableNames).toEqual([ 'Person' ]) @@ -213,7 +213,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { }) describe('removeColumn', function() { - it('removes the shopId column from user', function(done) { + (dialect === 'mysql' ? it : itEventually)('removes the shopId column from user', function(done) { this.init({ to: 20111206061400 }, function(migrator) { migrator.migrate().success(function(){ this.sequelize.getQueryInterface().describeTable('User').success(function(data) { @@ -238,7 +238,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { }) describe('changeColumn', function() { - it('changes the signature column from user to default "signature" + notNull', function(done) { + (dialect === 'mysql' ? it : itEventually)('changes the signature column from user to default "signature" + notNull', function(done) { this.init({ to: 20111206063000 }, function(migrator) { migrator.migrate().success(function() { this.sequelize.getQueryInterface().describeTable('User').success(function(data) { @@ -258,7 +258,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() { }) describe('renameColumn', function() { - it("renames the signature column from user to sig", function(done) { + (dialect === 'mysql' ? it : itEventually)("renames the signature column from user to sig", function(done) { this.init({ to: 20111206163300 }, function(migrator) { migrator.migrate().success(function(){ this.sequelize.getQueryInterface().describeTable('User').success(function(data) { From 574877a445c637e3200a26126b74b186020415ac Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sun, 17 Feb 2013 15:33:58 +0100 Subject: [PATCH 073/360] fixes #204 thanks to @bpartridge --- lib/associations/has-many-double-linked.js | 27 ++++++++++++++++++++-- lib/associations/has-many-single-linked.js | 23 ++++++++++++++++-- lib/associations/has-many.js | 21 ++++++++--------- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/lib/associations/has-many-double-linked.js b/lib/associations/has-many-double-linked.js index a76ae5979d28..9946e25860db 100644 --- a/lib/associations/has-many-double-linked.js +++ b/lib/associations/has-many-double-linked.js @@ -51,7 +51,11 @@ module.exports = (function() { var chainer = new Utils.QueryChainer , association = self.__factory.target.associations[self.__factory.associationAccessor] , foreignIdentifier = association.isSelfAssociation ? association.foreignIdentifier : association.identifier - , unassociatedObjects = newAssociations.filter(function(obj) { return !obj.equalsOneOf(oldAssociations) }) + , unassociatedObjects = newAssociations.filter(function (obj) { + return !Utils._.find(oldAssociations, function (old) { + return obj.id === old.id + }) + }) unassociatedObjects.forEach(function(unassociatedObject) { var attributes = {} @@ -69,6 +73,20 @@ module.exports = (function() { }) } + HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) { + var attributes = {} + , association = this.__factory.target.associations[this.__factory.associationAccessor] + , foreignIdentifier = association.isSelfAssociation ? association.foreignIdentifier : association.identifier; + + attributes[this.__factory.identifier] = this.instance.id + attributes[foreignIdentifier] = newAssociation.id + + this.__factory.connectorDAO.create(attributes) + .success(function() { emitterProxy.emit('success', newAssociation) }) + .error(function(err) { emitterProxy.emit('error', err) }) + .on('sql', function(sql) { emitterProxy.emit('sql', sql) }) + } + // private var destroyObsoleteAssociations = function(oldAssociations, newAssociations) { @@ -77,7 +95,12 @@ module.exports = (function() { return new Utils.CustomEventEmitter(function(emitter) { var chainer = new Utils.QueryChainer() var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier - var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) }) + var obsoleteAssociations = Utils._.filter(oldAssociations, function (old) { + // Return only those old associations that are not found in new + return !Utils._.find(newAssociations, function (obj) { + return obj.id === old.id + }) + }) if (obsoleteAssociations.length === 0) { return emitter.emit('success', null) diff --git a/lib/associations/has-many-single-linked.js b/lib/associations/has-many-single-linked.js index 4045df71e3cb..1380c8263c93 100644 --- a/lib/associations/has-many-single-linked.js +++ b/lib/associations/has-many-single-linked.js @@ -19,15 +19,25 @@ module.exports = (function() { var self = this , options = this.__factory.options , chainer = new Utils.QueryChainer() + , obsoleteAssociations = oldAssociations.filter(function (old) { + return !Utils._.find(newAssociations, function (obj) { + return obj.id === old.id + }) + }) + , unassociatedObjects = newAssociations.filter(function (obj) { + return !Utils._.find(oldAssociations, function (old) { + return obj.id === old.id + }) + }) // clear the old associations - oldAssociations.forEach(function(associatedObject) { + obsoleteAssociations.forEach(function(associatedObject) { associatedObject[self.__factory.identifier] = null chainer.add(associatedObject.save()) }) // set the new associations - newAssociations.forEach(function(associatedObject) { + unassociatedObjects.forEach(function(associatedObject) { associatedObject[self.__factory.identifier] = self.instance.id chainer.add(associatedObject.save()) }) @@ -38,5 +48,14 @@ module.exports = (function() { .error(function(err) { emitter.emit('error', err) }) } + HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) { + newAssociation[this.__factory.identifier] = this.instance.id + + newAssociation.save() + .success(function() { emitterProxy.emit('success', newAssociation) }) + .error(function(err) { emitterProxy.emit('error', err) }) + .on('sql', function(sql) { emitterProxy.emit('sql', sql) }) + } + return HasManySingleLinked })() diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js index 814fae17e717..b9f6738521db 100644 --- a/lib/associations/has-many.js +++ b/lib/associations/has-many.js @@ -151,19 +151,18 @@ module.exports = (function() { obj[this.accessors.add] = function(newAssociatedObject) { var instance = this - var customEventEmitter = new Utils.CustomEventEmitter(function() { - instance[self.accessors.get]() - .error(function(err){ customEventEmitter.emit('error', err)}) + return new Utils.CustomEventEmitter(function(emitter) { + instance[self.accessors.get]({ where: { id: newAssociatedObject.id }}) + .error(function(err){ emitter.emit('error', err)}) .success(function(currentAssociatedObjects) { - if (!newAssociatedObject.equalsOneOf(currentAssociatedObjects)) - currentAssociatedObjects.push(newAssociatedObject) - - instance[self.accessors.set](currentAssociatedObjects) - .success(function(instances) { customEventEmitter.emit('success', instances) }) - .error(function(err) { customEventEmitter.emit('error', err) }) + if (currentAssociatedObjects.length === 0) { + var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked + new Class(self, instance).injectAdder(emitter, newAssociatedObject) + } else { + emitter.emit('success', newAssociatedObject); + } }) - }) - return customEventEmitter.run() + }).run() } obj[this.accessors.remove] = function(oldAssociatedObject) { From a977e18ec162760448340299082d3490c4ffa5d2 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sun, 17 Feb 2013 15:44:32 +0100 Subject: [PATCH 074/360] use native array method --- lib/associations/has-many-double-linked.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/associations/has-many-double-linked.js b/lib/associations/has-many-double-linked.js index 9946e25860db..2cb7013df680 100644 --- a/lib/associations/has-many-double-linked.js +++ b/lib/associations/has-many-double-linked.js @@ -95,7 +95,7 @@ module.exports = (function() { return new Utils.CustomEventEmitter(function(emitter) { var chainer = new Utils.QueryChainer() var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier - var obsoleteAssociations = Utils._.filter(oldAssociations, function (old) { + var obsoleteAssociations = oldAssociations.filter(function (old) { // Return only those old associations that are not found in new return !Utils._.find(newAssociations, function (obj) { return obj.id === old.id From 2959786da18598b99810676bb153007cfacb485c Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:35:27 +0100 Subject: [PATCH 075/360] increment and decrement added --- lib/dao.js | 17 ++++ lib/dialects/mysql/query-generator.js | 22 +++++ lib/query-interface.js | 5 ++ spec/dao.spec.js | 120 ++++++++++++++++++++++++++ 4 files changed, 164 insertions(+) diff --git a/lib/dao.js b/lib/dao.js index c4e658c07096..05ca166b3868 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -237,6 +237,23 @@ module.exports = (function() { } } + DAO.prototype.increment = function(fields, count) { + var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, + values = {} + + if (count === undefined) count = 1; + + Utils._.each(fields, function (field) { + values[field] = count + }) + + return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier) + } + + DAO.prototype.decrement = function (fields, count) { + return this.increment(fields, 0 - count); + } + DAO.prototype.equals = function(other) { var result = true , self = this diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index ab9d19e284c1..2a0890cd664a 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -258,6 +258,28 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function (tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> " + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value + + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + " + " +Utils.escape(_value)) + } + + var replacements = { + table: Utils.addTicks(tableName), + values: values.join(","), + where: QueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { if(typeof attribute === 'string') { diff --git a/lib/query-interface.js b/lib/query-interface.js index 7a85664e5463..f032d1d47709 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -202,6 +202,11 @@ module.exports = (function() { return queryAndEmit.call(this, [sql, factory, queryOptions], 'select') } + QueryInterface.prototype.increment = function(dao, tableName, values, identifier) { + var sql = this.QueryGenerator.incrementQuery(tableName, values, identifier); + return queryAndEmit.call(this, [sql, dao], 'increment'); + } + QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) { var self = this diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 9ac974592b36..c9a256acc698 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -2,6 +2,7 @@ if(typeof require === 'function') { const buster = require("buster") , Helpers = require('./buster-helpers') , dialect = Helpers.getTestDialect() + , _ = require('underscore') } buster.spec.expose() @@ -34,6 +35,124 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }) }) + describe('increment', function () { + before(function (done) { + this.User.create({ id: 1, aNumber: 0 }).done(done) + }); + + it('', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment(['aNumber'], 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber + 2); + done(); + }); + }); + }); + }); + + it('should still work right with other concurrent updates', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + // Select the user again (simulating a concurrent query) + self.User.find(1).done(function (err, user2) { + user2.updateAttributes({ + aNumber: user2.aNumber + 1 + }).done(function (err, user3) { + user1.increment(['aNumber'], 2).done(function (err, user4) { + + self.User.find(1).done(function (err, user5) { + expect(user5.aNumber).toBe(user1.aNumber + 3); + done(); + }); + }); + }); + }); + }); + }); + + it('should still work right with other concurrent increments', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + var _done = _.after(3, function () { + self.User.find(1).done(function (err, user2) { + expect(user2.aNumber).toEqual(6); + done(); + }) + }); + + user1.increment(['aNumber'], 2).done(_done); + user1.increment(['aNumber'], 2).done(_done); + user1.increment(['aNumber'], 2).done(_done); + }); + }); + }); + + describe('decrement', function () { + before(function (done) { + this.User.create({ id: 1, aNumber: 0 }).done(done) + }); + + it('', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement(['aNumber'], 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber - 2); + done(); + }); + }); + }); + }); + + it('should still work right with other concurrent updates', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + // Select the user again (simulating a concurrent query) + self.User.find(1).done(function (err, user2) { + user2.updateAttributes({ + aNumber: user2.aNumber + 1 + }).done(function (err, user3) { + user1.decrement(['aNumber'], 2).done(function (err, user4) { + + self.User.find(1).done(function (err, user5) { + expect(user5.aNumber).toBe(user1.aNumber -1); + done(); + }); + }); + }); + }); + }); + }); + + it('should still work right with other concurrent increments', function (done) { + var self = this; + // Select something + this.User.find(1).done(function (err, user1) { + var _done = _.after(3, function () { + self.User.find(1).done(function (err, user2) { + expect(user2.aNumber).toEqual(-6); + done(); + }) + }); + + user1.decrement(['aNumber'], 2).done(_done); + user1.decrement(['aNumber'], 2).done(_done); + user1.decrement(['aNumber'], 2).done(_done); + }); + }); + }); +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -169,4 +288,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) + */ }) From f89d88d20667d691deac7c2bcad7a75dcc921cef Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:37:41 +0100 Subject: [PATCH 076/360] update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 58eac882ca7c..d9a7e50b9bf7 100644 --- a/changelog.md +++ b/changelog.md @@ -25,6 +25,7 @@ - [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1) - [FEATURE] https://github.com/sdepold/sequelize/pull/345 - [FEATURE] allow definition of a models table name (thanks to slamkajs) +- [FEATURE] add increment and decrement methods on dao (thanks to janmeier/innofluence) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From 856a215042cebb858309a63c9971a679db69b393 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:46:47 +0100 Subject: [PATCH 077/360] enable single field instead of array --- lib/dao.js | 1 + spec/dao.spec.js | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index 05ca166b3868..b13383885ff6 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -241,6 +241,7 @@ module.exports = (function() { var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, values = {} + if (!Utils._.isArray(fields)) fields = [fields]; if (count === undefined) count = 1; Utils._.each(fields, function (field) { diff --git a/spec/dao.spec.js b/spec/dao.spec.js index c9a256acc698..9d09927d62bb 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -40,7 +40,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { this.User.create({ id: 1, aNumber: 0 }).done(done) }); - it('', function (done) { + it('with array', function (done) { var self = this; // Select something @@ -55,6 +55,21 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); + it('with single field', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment('aNumber', 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber + 2); + done(); + }); + }); + }); + }); + it('should still work right with other concurrent updates', function (done) { var self = this; // Select something @@ -99,7 +114,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { this.User.create({ id: 1, aNumber: 0 }).done(done) }); - it('', function (done) { + it('with array', function (done) { var self = this; // Select something @@ -114,6 +129,21 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); + it('with single field', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement('aNumber', 2).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(user1.aNumber - 2); + done(); + }); + }); + }); + }); + it('should still work right with other concurrent updates', function (done) { var self = this; // Select something From 9d1b8f6fda7988481d3b74b5fad0807caae166e7 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 11 Jan 2013 16:47:32 +0100 Subject: [PATCH 078/360] comment back tests --- spec/dao.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 9d09927d62bb..24febf81e5cc 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -182,7 +182,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); }); -/* + describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -318,5 +318,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) - */ }) From 2481b8d10ba634396588e7dab75705fe6e0b75eb Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:23:38 +0100 Subject: [PATCH 079/360] postgres and sqlite increment --- lib/dialects/postgres/query-generator.js | 21 +++++++++++++++++++++ lib/dialects/query-generator.js | 14 ++++++++++++++ lib/dialects/sqlite/query-generator.js | 20 ++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index a8413d3582cd..a8c4598da1f6 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -357,6 +357,27 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function(tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *" + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + values.push(addQuotes(key) + "=" + addQuotes(key) + pgEscape(value)) + } + + var replacements = { + table: addQuotes(tableName), + values: values.join(","), + where: QueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + + addIndexQuery: function(tableName, attributes, options) { var transformedAttributes = attributes.map(function(attribute) { if (typeof attribute === 'string') { diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js index 45c1e3e53f13..2669a02ca894 100644 --- a/lib/dialects/query-generator.js +++ b/lib/dialects/query-generator.js @@ -143,6 +143,20 @@ module.exports = (function() { throwMethodUndefined('deleteQuery') }, + /* + Returns an update query. + Parameters: + - tableName -> Name of the table + - values -> A hash with attribute-value-pairs + - where -> A hash with conditions (e.g. {name: 'foo'}) + OR an ID as integer + OR a string with conditions (e.g. 'name="foo"'). + If you use a string, you have to escape it on your own. + */ + incrementQuery: function(tableName, values, where) { + throwMethodUndefined('incrementQuery') + }, + /* Returns an add index query. Parameters: diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index cfcb7a70fb10..5b18aaad5966 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -113,6 +113,26 @@ module.exports = (function() { return Utils._.template(query)(replacements) }, + incrementQuery: function(tableName, attrValueHash, where) { + attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull) + + var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>" + , values = [] + + for (var key in attrValueHash) { + var value = attrValueHash[key] + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) + } + + var replacements = { + table: Utils.addTicks(tableName), + values: values.join(","), + where: MySqlQueryGenerator.getWhereConditions(where) + } + + return Utils._.template(query)(replacements) + }, + attributesToSQL: function(attributes) { var result = {} From 1fa9d8450bbea03db706bc55017bfb9c3d904e49 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:35:14 +0100 Subject: [PATCH 080/360] sqlite and postgres works and fix test for postgres --- lib/dialects/postgres/query-generator.js | 2 +- lib/dialects/sqlite/query-generator.js | 2 +- spec/dao.spec.js | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index a8c4598da1f6..3f1813b77659 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -365,7 +365,7 @@ module.exports = (function() { for (var key in attrValueHash) { var value = attrValueHash[key] - values.push(addQuotes(key) + "=" + addQuotes(key) + pgEscape(value)) + values.push(addQuotes(key) + "=" + addQuotes(key) + " + " + pgEscape(value)) } var replacements = { diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js index 5b18aaad5966..8943bc509135 100644 --- a/lib/dialects/sqlite/query-generator.js +++ b/lib/dialects/sqlite/query-generator.js @@ -121,7 +121,7 @@ module.exports = (function() { for (var key in attrValueHash) { var value = attrValueHash[key] - values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) + values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + "+ " + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)) } var replacements = { diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 24febf81e5cc..0e204e75f1d7 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -48,7 +48,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber + 2); + expect(user3.aNumber).toBe(2); done(); }); }); @@ -63,7 +63,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment('aNumber', 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber + 2); + expect(user3.aNumber).toBe(2); done(); }); }); @@ -82,7 +82,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(function (err, user4) { self.User.find(1).done(function (err, user5) { - expect(user5.aNumber).toBe(user1.aNumber + 3); + expect(user5.aNumber).toBe(3); done(); }); }); @@ -109,6 +109,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); +/* describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -183,6 +184,9 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); +*/ + +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -318,4 +322,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) + */ }) From d2ae8610d969020073419bc626727fbc970b111b Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:36:33 +0100 Subject: [PATCH 081/360] tests are back --- spec/dao.spec.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 0e204e75f1d7..ed9eb93aa106 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -109,7 +109,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); -/* + describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -184,9 +184,6 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); -*/ - -/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -322,5 +319,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) - */ }) From 36662b1e36ca3b7602eed05b543f80b46bceb3b9 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:44:39 +0100 Subject: [PATCH 082/360] adapt decrement tests to postgres as well --- spec/dao.spec.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index ed9eb93aa106..03c321f8b742 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -109,7 +109,6 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); - describe('decrement', function () { before(function (done) { this.User.create({ id: 1, aNumber: 0 }).done(done) @@ -123,7 +122,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber - 2); + expect(user3.aNumber).toBe(-2); done(); }); }); @@ -138,7 +137,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement('aNumber', 2).done(function (err, user2) { self.User.find(1).done(function (err, user3) { - expect(user3.aNumber).toBe(user1.aNumber - 2); + expect(user3.aNumber).toBe(-2); done(); }); }); @@ -157,7 +156,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(function (err, user4) { self.User.find(1).done(function (err, user5) { - expect(user5.aNumber).toBe(user1.aNumber -1); + expect(user5.aNumber).toBe(-1); done(); }); }); From 9f3d170da1f50e4688ef60768326d378048ddbc8 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sat, 12 Jan 2013 19:56:21 +0100 Subject: [PATCH 083/360] fix unrelated jasmine/sequelize tes --- spec-jasmine/sequelize.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js index ceeb68df2680..4124742fb098 100644 --- a/spec-jasmine/sequelize.spec.js +++ b/spec-jasmine/sequelize.spec.js @@ -75,8 +75,8 @@ describe('Sequelize', function() { Photo.sync({ force: true }).success(function() { sequelize.getQueryInterface().showAllTables().success(function(tableNames) { - expect(tableNames.indexOf('photos') !== -1).toBeTruthy() - done + expect(tableNames).toContain('photos') + done() }) }) }) From 260fc6b42b02a1f2a8374effcb07cd89ec20fcc9 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 14 Jan 2013 17:37:06 +0100 Subject: [PATCH 084/360] Travis bump --- .jshintrc | 22 +++++++++++++++ .travis.yml | 3 +- spec-jasmine/sqlite/test.sqlite | Bin 0 -> 4096 bytes spec/buster-test-win.js | 48 ++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 .jshintrc create mode 100644 spec-jasmine/sqlite/test.sqlite create mode 100644 spec/buster-test-win.js diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000000000000..e723c4c1c1ff --- /dev/null +++ b/.jshintrc @@ -0,0 +1,22 @@ +{ + "globals": { + "jasmine": false, + "spyOn": false, + "it": false, + "console": false, + "describe": false, + "expect": false, + "beforeEach": false, + "waits": false, + "waitsFor": false, + "runs": false + }, + "camelcase": true, + "curly": true, + "forin": true, + "indent": 2, + "unused": true, + "asi": true, + "evil": false, + "laxcomma": true +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 27c775b3864f..f09cce677169 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,4 @@ language: node_js node_js: # - 0.6 - 0.8 - # - 0.9 - + # - 0.9 \ No newline at end of file diff --git a/spec-jasmine/sqlite/test.sqlite b/spec-jasmine/sqlite/test.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..673a4ac4e790a394cdd19fa599d002e76ec3dcf0 GIT binary patch literal 4096 zcmeH|K}*9h6vvaM>Opqy!OO$b#@w(QQ*jro1}$!N)=u1Mty`P}-P~I7?kDlfh*v*? zc=H2z_oY_QQo)0WU;=59|9egPeo6Wc4;sTr!0C8;5kycWI-!(o01%Rk2*DvC468=S z+#|LW>wEdwf7eni&QW@T9IF$mJrnJj)wRWxiyHoM0=Rki#=-)<=|;iHxoC-LI39&b zqi?y~@;G?bW`l#Ds6OQVQE(xAII`TWUCYf^YPG@=_-8@b4X=ZN51#FGY{$!+QXckw zzyaUkF0@>`X}KNP;~lWt-oEYN5>4)S=+~QyAQF8m@?jfS_3S1GXWs*--Dsfs>azc( zxzN&Pjbf2@;vmAwIiC7%C?;28)Dx+p_9>{8F)ssK!Z!=JZ+C`a(3@U7XFEhP@goH# z)+CZ(fJBlw@pCf?oeakahabyue*;TSo<6+g>?OYEfBY<}&r<{xfuA5SPv3r3$y_p* z%UrLDBA^KTBLXu2>uiIt2X@OYv7?G2pa^`MKv|!YxwBfGsVtk-(sHF_u7bI;UNP5e eYZ+3RCH{JbF+(bAi9gFQW=Lh4_-h%)4Cxj2&BX%% literal 0 HcmV?d00001 diff --git a/spec/buster-test-win.js b/spec/buster-test-win.js new file mode 100644 index 000000000000..b213a5908b31 --- /dev/null +++ b/spec/buster-test-win.js @@ -0,0 +1,48 @@ +var fs = require('fs'), + child_process = require('child_process'); + +var specs = []; + +var walk = function(path, callback) { + var files = fs.readdirSync(path); + var count = files.length; + files.forEach(function(file) { + fs.stat(path + '/' + file, function (err, stat) { + if (stat && stat.isDirectory()) { + walk(path + '/' + file, function() { + count--; + if (count === 0) { + callback(); + } + }); + } else { + if (file.indexOf(".spec.js") !== -1) { + specs.push(path+'/'+file); + } + count--; + if (count === 0) { + callback(); + } + } + }); + }); +}; + + +walk(__dirname, function () { + var i = 0; + + var exec = function () { + var spec = specs[i++]; + + if (spec) { + var child = child_process.exec('node ' + spec, null, function (err, stdout, sterr) { + exec(); + }); + child.stdout.pipe(process.stdout); + child.stderr.pipe(process.stderr); + } + } + + exec(); +}); \ No newline at end of file From 3be596cf1df665badae0246a2ae88b1940b59817 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 18 Jan 2013 13:46:40 +0100 Subject: [PATCH 085/360] add key value pairs to increment --- lib/dao.js | 19 +++++++++++++++---- spec/dao.spec.js | 42 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index b13383885ff6..98c41346a60f 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -241,17 +241,28 @@ module.exports = (function() { var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id, values = {} - if (!Utils._.isArray(fields)) fields = [fields]; if (count === undefined) count = 1; - Utils._.each(fields, function (field) { - values[field] = count - }) + if (Utils._.isString(fields)) { + values[fields] = count; + } else if (Utils._.isArray(fields)) { + Utils._.each(fields, function (field) { + values[field] = count + }) + } else { // Assume fields is key-value pairs + values = fields; + } return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier) } DAO.prototype.decrement = function (fields, count) { + if (!Utils._.isString(fields) && !Utils._.isArray(fields)) { // Assume fields is key-value pairs + Utils._.each(fields, function (value, field) { + fields[field] = -value; + }); + } + return this.increment(fields, 0 - count); } diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 03c321f8b742..0594bc5377dc 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -18,7 +18,8 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { self.User = sequelize.define('User', { username: { type: DataTypes.STRING }, touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW }, - aNumber: { type: DataTypes.INTEGER } + aNumber: { type: DataTypes.INTEGER }, + bNumber: { type: DataTypes.INTEGER } }) self.HistoryLog = sequelize.define('HistoryLog', { @@ -37,7 +38,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { describe('increment', function () { before(function (done) { - this.User.create({ id: 1, aNumber: 0 }).done(done) + this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done) }); it('with array', function (done) { @@ -107,11 +108,27 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.increment(['aNumber'], 2).done(_done); }); }); + + it('with key value pair', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.increment({ 'aNumber': 1, 'bNumber': 2}).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(1); + expect(user3.bNumber).toBe(2); + done(); + }); + }); + }); + }); }); describe('decrement', function () { before(function (done) { - this.User.create({ id: 1, aNumber: 0 }).done(done) + this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done) }); it('with array', function (done) { @@ -181,8 +198,24 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { user1.decrement(['aNumber'], 2).done(_done); }); }); - }); + it('with key value pair', function (done) { + var self = this; + + // Select something + this.User.find(1).done(function (err, user1) { + user1.decrement({ 'aNumber': 1, 'bNumber': 2}).done(function (err, user2) { + + self.User.find(1).done(function (err, user3) { + expect(user3.aNumber).toBe(-1); + expect(user3.bNumber).toBe(-2); + done(); + }); + }); + }); + }); + }); +/* describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -318,4 +351,5 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) + */ }) From 06bcfa14c95c57603edf0161c9cbb5b8c463ebee Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Fri, 18 Jan 2013 13:55:39 +0100 Subject: [PATCH 086/360] dao tests are back again again --- spec/dao.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 0594bc5377dc..64f3a9d86a7d 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -215,7 +215,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }); }); }); -/* + describe('default values', function() { describe('current date', function() { it('should store a date in touchedAt', function() { @@ -351,5 +351,4 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) - */ }) From cf507b334ec05be5eda8fe752bdedd1723711e0d Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sun, 17 Feb 2013 16:30:12 +0100 Subject: [PATCH 087/360] rm jshint file --- .jshintrc | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .jshintrc diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index e723c4c1c1ff..000000000000 --- a/.jshintrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "globals": { - "jasmine": false, - "spyOn": false, - "it": false, - "console": false, - "describe": false, - "expect": false, - "beforeEach": false, - "waits": false, - "waitsFor": false, - "runs": false - }, - "camelcase": true, - "curly": true, - "forin": true, - "indent": 2, - "unused": true, - "asi": true, - "evil": false, - "laxcomma": true -} \ No newline at end of file From 5d4227cef8371e651f06ebcbb1c3e77eb9756c20 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Sun, 17 Feb 2013 16:30:59 +0100 Subject: [PATCH 088/360] rm unrelated bustertestwin --- spec/buster-test-win.js | 48 ----------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 spec/buster-test-win.js diff --git a/spec/buster-test-win.js b/spec/buster-test-win.js deleted file mode 100644 index b213a5908b31..000000000000 --- a/spec/buster-test-win.js +++ /dev/null @@ -1,48 +0,0 @@ -var fs = require('fs'), - child_process = require('child_process'); - -var specs = []; - -var walk = function(path, callback) { - var files = fs.readdirSync(path); - var count = files.length; - files.forEach(function(file) { - fs.stat(path + '/' + file, function (err, stat) { - if (stat && stat.isDirectory()) { - walk(path + '/' + file, function() { - count--; - if (count === 0) { - callback(); - } - }); - } else { - if (file.indexOf(".spec.js") !== -1) { - specs.push(path+'/'+file); - } - count--; - if (count === 0) { - callback(); - } - } - }); - }); -}; - - -walk(__dirname, function () { - var i = 0; - - var exec = function () { - var spec = specs[i++]; - - if (spec) { - var child = child_process.exec('node ' + spec, null, function (err, stdout, sterr) { - exec(); - }); - child.stdout.pipe(process.stdout); - child.stderr.pipe(process.stderr); - } - } - - exec(); -}); \ No newline at end of file From bae5c9717b4fee64da79498e777c11b6fcdb9610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Sun, 17 Feb 2013 20:52:06 +0000 Subject: [PATCH 089/360] Fix issue #447 --- lib/dao-factory.js | 13 +++++++------ spec/dao.spec.js | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index d15b09750de8..21c757b893ea 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -140,12 +140,13 @@ module.exports = (function() { } DAOFactory.prototype.findAll = function(options) { - var hasJoin = false; + var hasJoin = false + var options = Utils._.clone(options) if ((typeof options === 'object') && (options.hasOwnProperty('include'))) { var includes = options.include - hasJoin = true; + hasJoin = true options.include = {} includes.forEach(function(daoName) { @@ -154,10 +155,10 @@ module.exports = (function() { if (!options.include[daoName]) { options.include[daoName] = this.getAssociationByAlias(daoName).target } - }.bind(this)); + }.bind(this)) - // whereCollection is used for non-primary key updates - this.options.whereCollection = options.where || null; + // whereCollection is used for non-primary key updates + this.options.whereCollection = options.where || null } return this.QueryInterface.select(this, this.tableName, options, { type: 'SELECT', hasJoin: hasJoin }) @@ -168,7 +169,7 @@ module.exports = (function() { var optcpy = Utils._.clone(options) optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"] - // whereCollection is used for non-primary key updates + // whereCollection is used for non-primary key updates this.options.whereCollection = optcpy.where || null; return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' }) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 9ac974592b36..540a70beaae4 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -168,5 +168,20 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }.bind(this)) }) + + it("can reuse query option objects", function(done) { + this.User.create({ username: 'fnord' }).success(function() { + var query = { where: { username: 'fnord' }} + + this.User.findAll(query).success(function(users) { + expect(users[0].username).toEqual('fnord') + + this.User.findAll(query).success(function(users) { + expect(users[0].username).toEqual('fnord') + done() + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) }) }) From c3fe9efbcdd1ae771fd2aea813af515b8ca60270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Sun, 17 Feb 2013 21:58:16 +0000 Subject: [PATCH 090/360] Enable reusing query option objects in find --- lib/dao-factory.js | 42 +++++++++++++++++++++++------------------- spec/dao.spec.js | 17 +++++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 21c757b893ea..e78ed8f1269c 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -176,7 +176,7 @@ module.exports = (function() { } DAOFactory.prototype.find = function(options) { - var hasJoin = false; + var hasJoin = false // no options defined? // return an emitter which emits null if ([null, undefined].indexOf(options) !== -1) { @@ -185,7 +185,7 @@ module.exports = (function() { }).run() } - var primaryKeys = this.primaryKeys; + var primaryKeys = this.primaryKeys // options is not a hash but an id if (typeof options === 'number') { @@ -201,30 +201,34 @@ module.exports = (function() { }) options = { where: where } - } else if ((typeof options === 'string') && (parseInt(options, 10).toString() === options)) { - var parsedId = parseInt(options, 10); + } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) { + var parsedId = parseInt(options, 10) if (!Utils._.isFinite(parsedId)) { throw new Error('Invalid argument to find(). Must be an id or an options object.') } options = { where: parsedId } - } else if ((typeof options === 'object') && (options.hasOwnProperty('include'))) { - var includes = options.include - hasJoin = true; - - options.include = {} - - includes.forEach(function(daoName) { - options.include[daoName] = this.daoFactoryManager.getDAO(daoName) - - if (!options.include[daoName]) { - options.include[daoName] = this.getAssociationByAlias(daoName).target - } - }.bind(this)); + } else if (typeof options === 'object') { + var options = Utils._.clone(options) + var includes + + if (options.hasOwnProperty('include')) { + hasJoin = true + includes = options.include + options.include = {} + + includes.forEach(function(daoName) { + options.include[daoName] = this.daoFactoryManager.getDAO(daoName) + + if (!options.include[daoName]) { + options.include[daoName] = this.getAssociationByAlias(daoName).target + } + }.bind(this)) + } - // whereCollection is used for non-primary key updates - this.options.whereCollection = options.where || null; + // whereCollection is used for non-primary key updates + this.options.whereCollection = options.where || null } options.limit = 1 diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 540a70beaae4..0876c998928e 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -184,4 +184,21 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { }.bind(this)) }) }) + + describe('find', function find() { + it("can reuse query option objects", function(done) { + this.User.create({ username: 'fnord' }).success(function() { + var query = { where: { username: 'fnord' }} + + this.User.find(query).success(function(user) { + expect(user.username).toEqual('fnord') + + this.User.find(query).success(function(user) { + expect(user.username).toEqual('fnord') + done() + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + }) }) From 3589147b1830f241912562139b0d7bc7a84f39ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gra=C3=A7a?= Date: Sun, 17 Feb 2013 22:03:10 +0000 Subject: [PATCH 091/360] Fix bad formatting of code --- lib/dao-factory.js | 4 ++-- spec/dao.spec.js | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index e78ed8f1269c..8b325d22f34a 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -212,12 +212,12 @@ module.exports = (function() { } else if (typeof options === 'object') { var options = Utils._.clone(options) var includes - + if (options.hasOwnProperty('include')) { hasJoin = true includes = options.include options.include = {} - + includes.forEach(function(daoName) { options.include[daoName] = this.daoFactoryManager.getDAO(daoName) diff --git a/spec/dao.spec.js b/spec/dao.spec.js index 0876c998928e..baf83837d013 100644 --- a/spec/dao.spec.js +++ b/spec/dao.spec.js @@ -177,14 +177,14 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { expect(users[0].username).toEqual('fnord') this.User.findAll(query).success(function(users) { - expect(users[0].username).toEqual('fnord') - done() - }.bind(this)) + expect(users[0].username).toEqual('fnord') + done() + }.bind(this)) }.bind(this)) }.bind(this)) }) }) - + describe('find', function find() { it("can reuse query option objects", function(done) { this.User.create({ username: 'fnord' }).success(function() { @@ -194,9 +194,9 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() { expect(user.username).toEqual('fnord') this.User.find(query).success(function(user) { - expect(user.username).toEqual('fnord') - done() - }.bind(this)) + expect(user.username).toEqual('fnord') + done() + }.bind(this)) }.bind(this)) }.bind(this)) }) From 3836db40e1def199b5f67cccfa95f47e7fee0d4f Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Mon, 18 Feb 2013 20:20:44 +0100 Subject: [PATCH 092/360] tests for enums --- lib/dialects/postgres/query-generator.js | 11 +++++++--- spec/dao-factory.spec.js | 4 +--- spec/sequelize.spec.js | 28 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 0bac8cf15308..09ec178dbb99 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -36,8 +36,13 @@ function pgEscape(val) { return "'"+val+"'"; } +function pgEscapeAndQuote(val) { + return addQuotes(removeQuotes(pgEscape(val), "'")) +} + function pgEnum(tableName, attr, dataType) { - return "CREATE TYPE " + Utils.escape("enum_" + tableName + "_" + attr) + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; " + var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr) + return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; " } function padInt(i) { @@ -70,7 +75,7 @@ function pgDataTypeMapping(tableName, attr, dataType) { } if (dataType.match(/^ENUM\(/)) { - dataType = dataType.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attr)) + dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr)) } return dataType @@ -95,7 +100,7 @@ module.exports = (function() { attrStr.push(addQuotes(attr) + " " + dataType) if (attributes[attr].match(/^ENUM\(/)) { - query = pgEnum(tableName, attr, attributes[attr])) + query; + query = pgEnum(tableName, attr, attributes[attr]) + query; } } diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index df50527bc022..b8206f5a204a 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -213,7 +213,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }); done() } - catch( e ) { + catch( e ) { expect(e.message).toEqual('Unrecognized data type for field activity_date') done() } @@ -795,8 +795,6 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) //- sequelize.sync }) }) - - }) //- describe: find describe('findAll', function findAll() { diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index 76c75af982e9..d6a6c0c52c56 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -114,4 +114,32 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { }.bind(this)) }) }) + + describe('define', function() { + describe('enum', function() { + before(function(done) { + this.Review = this.sequelize.define('review', { + status: { type: Helpers.Sequelize.ENUM, values: ['scheduled', 'active', 'finished']} + }) + + this.Review.sync({ force: true }).success(done) + }) + + it('correctly stores values', function(done) { + this.Review.create({ status: 'active' }).success(function(review) { + expect(review.status).toEqual('active') + done() + }) + }) + + it('correctly loads values', function(done) { + this.Review.create({ status: 'active' }).success(function() { + this.Review.findAll().success(function(reviews) { + expect(reviews[0].status).toEqual('active') + done() + }) + }.bind(this)) + }) + }) + }) }) From 058d0b1c792ece08a9836eada2bb2d6709979cc2 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Mon, 18 Feb 2013 20:34:30 +0100 Subject: [PATCH 093/360] added failing test for values out of enum range --- spec-jasmine/postgres/query-generator.spec.js | 2 +- spec/sequelize.spec.js | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js index 505e074870d5..52402682b7ae 100644 --- a/spec-jasmine/postgres/query-generator.spec.js +++ b/spec-jasmine/postgres/query-generator.spec.js @@ -25,7 +25,7 @@ describe('QueryGenerator', function() { }, { arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}], - expectation: "CREATE TYPE \"enum_myTable_title\" AS ENUM(\"A\", \"B\", \"C\"); CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" \"enum_myTable_title\", \"name\" VARCHAR(255));" + expectation: "DROP TYPE IF EXISTS \"enum_myTable_title\"; CREATE TYPE \"enum_myTable_title\" AS ENUM(\"A\", \"B\", \"C\"); CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" \"enum_myTable_title\", \"name\" VARCHAR(255));" } ], diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js index d6a6c0c52c56..c7a88686e6fb 100644 --- a/spec/sequelize.spec.js +++ b/spec/sequelize.spec.js @@ -6,10 +6,12 @@ if(typeof require === 'function') { } var qq = function(str) { - if (dialect == 'postgres') - return '"' + str + '"'; - return str; -}; + if (dialect == 'postgres') { + return '"' + str + '"' + } else { + return str + } +} buster.spec.expose() @@ -140,6 +142,13 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { }) }.bind(this)) }) + + itEventually("doesn't save an instance if value is not in the range of enums", function(done) { + this.Review.create({ status: 'fnord' }).error(function(err) { + expect(1).toEqual(1) + done() + }) + }) }) }) }) From 8582c0caeac7baa4f732e7a20406a80cc8cbe8dd Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Mon, 18 Feb 2013 20:35:13 +0100 Subject: [PATCH 094/360] enum support --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 58eac882ca7c..5f2cf214b485 100644 --- a/changelog.md +++ b/changelog.md @@ -25,6 +25,7 @@ - [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1) - [FEATURE] https://github.com/sdepold/sequelize/pull/345 - [FEATURE] allow definition of a models table name (thanks to slamkajs) +- [FEATURE] allow usage of enums. #440 (thanks to KevinMartin) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From b6350ea55285fc4512f5715e5c9fcf75ef7e50f8 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Mon, 3 Dec 2012 16:07:09 +0800 Subject: [PATCH 095/360] avoid unnecessary loading of path --- lib/migrator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/migrator.js b/lib/migrator.js index 289ca37d3083..fb5e89519f65 100644 --- a/lib/migrator.js +++ b/lib/migrator.js @@ -1,5 +1,4 @@ const fs = require("fs") - , path = require("path") , moment = require("moment") var Utils = require("./utils") From d1261e6aeb21fffab5c8d6450e67cb7eb8a1e895 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Mon, 3 Dec 2012 16:07:29 +0800 Subject: [PATCH 096/360] Do not assume process, so the module can be loaded into plv8 --- lib/sequelize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sequelize.js b/lib/sequelize.js index d238659cc935..6639c0b828c3 100644 --- a/lib/sequelize.js +++ b/lib/sequelize.js @@ -5,7 +5,7 @@ var Utils = require("./utils") , Migrator = require("./migrator") , QueryInterface = require("./query-interface") -if (parseFloat(process.version.replace('v', '')) < 0.6) { +if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')) < 0.6) { console.log("DEPRECATION WARNING: Support for Node.JS < v0.6 will be canceled in the next minor release.") } From 0ed7a104496a22926f018704d712f1b9ba217327 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Mon, 3 Dec 2012 16:17:43 +0800 Subject: [PATCH 097/360] Include SqlString from mysql and do not depend on the mysql package. --- lib/SqlString.js | 136 +++++++++++++++++++++++++++++++++++++++++++++++ lib/utils.js | 9 ++-- package.json | 1 - 3 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 lib/SqlString.js diff --git a/lib/SqlString.js b/lib/SqlString.js new file mode 100644 index 000000000000..5dfa3bebb1a5 --- /dev/null +++ b/lib/SqlString.js @@ -0,0 +1,136 @@ +var SqlString = exports; + +SqlString.escapeId = function (val, forbidQualified) { + if (forbidQualified) { + return '`' + val.replace(/`/g, '``') + '`'; + } + return '`' + val.replace(/`/g, '``').replace(/\./g, '`.`') + '`'; +}; + +SqlString.escape = function(val, stringifyObjects, timeZone) { + if (val === undefined || val === null) { + return 'NULL'; + } + + switch (typeof val) { + case 'boolean': return (val) ? 'true' : 'false'; + case 'number': return val+''; + } + + if (val instanceof Date) { + val = SqlString.dateToString(val, timeZone || "Z"); + } + + if (Buffer.isBuffer(val)) { + return SqlString.bufferToString(val); + } + + if (Array.isArray(val)) { + return SqlString.arrayToList(val, timeZone); + } + + if (typeof val === 'object') { + if (stringifyObjects) { + val = val.toString(); + } else { + return SqlString.objectToValues(val, timeZone); + } + } + + val = val.replace(/[\0\n\r\b\t\\\'\"\x1a]/g, function(s) { + switch(s) { + case "\0": return "\\0"; + case "\n": return "\\n"; + case "\r": return "\\r"; + case "\b": return "\\b"; + case "\t": return "\\t"; + case "\x1a": return "\\Z"; + default: return "\\"+s; + } + }); + return "'"+val+"'"; +}; + +SqlString.arrayToList = function(array, timeZone) { + return array.map(function(v) { + if (Array.isArray(v)) return '(' + SqlString.arrayToList(v) + ')'; + return SqlString.escape(v, true, timeZone); + }).join(', '); +}; + +SqlString.format = function(sql, values, timeZone) { + values = [].concat(values); + + return sql.replace(/\?/g, function(match) { + if (!values.length) { + return match; + } + + return SqlString.escape(values.shift(), false, timeZone); + }); +}; + +SqlString.dateToString = function(date, timeZone) { + var dt = new Date(date); + + if (timeZone != 'local') { + var tz = convertTimezone(timeZone); + + dt.setTime(dt.getTime() + (dt.getTimezoneOffset() * 60000)); + if (tz !== false) { + dt.setTime(dt.getTime() + (tz * 60000)); + } + } + + var year = dt.getFullYear(); + var month = zeroPad(dt.getMonth() + 1); + var day = zeroPad(dt.getDate()); + var hour = zeroPad(dt.getHours()); + var minute = zeroPad(dt.getMinutes()); + var second = zeroPad(dt.getSeconds()); + + return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second; +}; + +SqlString.bufferToString = function(buffer) { + var hex = ''; + try { + hex = buffer.toString('hex'); + } catch (err) { + // node v0.4.x does not support hex / throws unknown encoding error + for (var i = 0; i < buffer.length; i++) { + var byte = buffer[i]; + hex += zeroPad(byte.toString(16)); + } + } + + return "X'" + hex+ "'"; +}; + +SqlString.objectToValues = function(object, timeZone) { + var values = []; + for (var key in object) { + var value = object[key]; + if(typeof value === 'function') { + continue; + } + + values.push(this.escapeId(key) + ' = ' + SqlString.escape(value, true, timeZone)); + } + + return values.join(', '); +}; + +function zeroPad(number) { + return (number < 10) ? '0' + number : number; +} + +function convertTimezone(tz) { + if (tz == "Z") return 0; + + var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/); + if (m) { + return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60; + } + return false; +} diff --git a/lib/utils.js b/lib/utils.js index c712ce6c5a39..abb637b92e12 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,7 +1,6 @@ -var mysql = require("mysql") - , connection = mysql.createConnection({}) - , util = require("util") +var util = require("util") , DataTypes = require("./data-types") + , SqlString = require("./SqlString") var Utils = module.exports = { _: (function() { @@ -44,10 +43,10 @@ var Utils = module.exports = { return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "") }, escape: function(s) { - return connection.escape(s).replace(/\\"/g, '"') + return SqlString.escape(s, true, "local").replace(/\\"/g, '"') }, format: function(arr) { - return connection.format.apply(connection, [arr.shift(), arr]) + return SqlString.format(arr.shift(), arr) }, isHash: function(obj) { return Utils._.isObject(obj) && !Array.isArray(obj); diff --git a/package.json b/package.json index c3047816408d..1c32f65bb744 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ } ], "dependencies": { - "mysql": "~2.0.0-alpha3", "underscore": "~1.4.0", "underscore.string": "~2.3.0", "lingo": "~0.0.5", From 6701b586d2996326004beaf6f0af2acaff416a6a Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Fri, 1 Feb 2013 16:17:15 +0800 Subject: [PATCH 098/360] delay migrator loading --- lib/sequelize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sequelize.js b/lib/sequelize.js index 6639c0b828c3..b7b355925025 100644 --- a/lib/sequelize.js +++ b/lib/sequelize.js @@ -2,7 +2,6 @@ var Utils = require("./utils") , DAOFactory = require("./dao-factory") , DataTypes = require('./data-types') , DAOFactoryManager = require("./dao-factory-manager") - , Migrator = require("./migrator") , QueryInterface = require("./query-interface") if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')) < 0.6) { @@ -85,6 +84,7 @@ module.exports = (function() { } Sequelize.prototype.getMigrator = function(options, force) { + var Migrator = require("./migrator") if (force) { this.migrator = new Migrator(this, options) } else { From d60f2462bbf5a9ba3f9d72796d387461eedddf9a Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Sat, 2 Feb 2013 17:44:17 +0800 Subject: [PATCH 099/360] move mysql into devDependencies so travis can pick it up --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1c32f65bb744..03e53ddcef88 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "devDependencies": { "jasmine-node": "1.0.17", "sqlite3": "~2.1.5", + "mysql": "~2.0.0-alpha3", "pg": "~0.10.2", "buster": "~0.6.0", "dox-foundation": "~0.3.0", From de43af10f8e3618bda4510860428317e8ded034b Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Sat, 2 Feb 2013 18:28:26 +0800 Subject: [PATCH 100/360] bump validator to 0.4.x, as 0.3 requires node-specific net module --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03e53ddcef88..b501b7b64ad5 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "underscore": "~1.4.0", "underscore.string": "~2.3.0", "lingo": "~0.0.5", - "validator": "0.3.x", + "validator": "0.4.x", "moment": "~1.7.0", "commander": "~0.6.0", "generic-pool": "1.0.9" From 00284832fd8ed6c2efb32bc57602e8f927079362 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Mon, 4 Feb 2013 11:01:42 +0800 Subject: [PATCH 101/360] warning message when mysql dialect is loaded without mysql module installed --- lib/dialects/mysql/connector-manager.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dialects/mysql/connector-manager.js b/lib/dialects/mysql/connector-manager.js index 9a1d3fe6b47b..5879435eefff 100644 --- a/lib/dialects/mysql/connector-manager.js +++ b/lib/dialects/mysql/connector-manager.js @@ -1,9 +1,12 @@ -var mysql = require("mysql") +var mysql , Pooling = require('generic-pool') , Query = require("./query") , Utils = require("../../utils") , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) } +try { mysql = require("mysql") } catch (err) { + console.log("You need to install mysql package manually"); } + module.exports = (function() { var ConnectorManager = function(sequelize, config) { this.sequelize = sequelize From 4350fae41117ab39383059f446264ce1b75063a7 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Thu, 21 Feb 2013 21:13:26 +0100 Subject: [PATCH 102/360] #449 --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 5f2cf214b485..3473c5dcd8c1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,7 @@ # v1.6.0 # - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3 - [REFACTORING] separated tests for dialects +- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association #449 (thanks to innofluence/janmeier) - [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango) - [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling) - [BUG] fixed wrong version in sequelize binary From 0f30d408a04793cb659025e7c35bf83c2fa10dfb Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Thu, 21 Feb 2013 21:44:05 +0100 Subject: [PATCH 103/360] re-run --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 27c775b3864f..bd57f8196d39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,3 +23,4 @@ node_js: - 0.8 # - 0.9 + From a3201953d0f3e8beabb6765c1c357ef160bfc7fb Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Thu, 21 Feb 2013 21:45:44 +0100 Subject: [PATCH 104/360] test --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd57f8196d39..27c775b3864f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,3 @@ node_js: - 0.8 # - 0.9 - From 9fbe5615d9d6f64ea856d677b8237046762980b4 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Thu, 21 Feb 2013 21:47:33 +0100 Subject: [PATCH 105/360] test --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 27c775b3864f..bd57f8196d39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,3 +23,4 @@ node_js: - 0.8 # - 0.9 + From da7ebe6135cd159267835cff90fb3aef14f663cc Mon Sep 17 00:00:00 2001 From: Pasvaz Date: Fri, 22 Feb 2013 15:35:16 +0100 Subject: [PATCH 106/360] Allows updateAttributes to update only some fields IT's the same logic as for save(), you can update the whole record or pick the fields you want to update. --- lib/dao.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dao.js b/lib/dao.js index c4e658c07096..e5d9d524380f 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -201,9 +201,9 @@ module.exports = (function() { } - DAO.prototype.updateAttributes = function(updates) { + DAO.prototype.updateAttributes = function(updates, fields) { this.setAttributes(updates) - return this.save() + return this.save(fields) } DAO.prototype.setAttributes = function(updates) { From c886089cb31f47b0f7499fed55fb2a95a5476906 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Fri, 22 Feb 2013 20:57:06 +0100 Subject: [PATCH 107/360] run tests --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd57f8196d39..27c775b3864f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,3 @@ node_js: - 0.8 # - 0.9 - From fa08a58cc53f78b62ed85886ca84446daa817823 Mon Sep 17 00:00:00 2001 From: Mick Hansen Date: Sat, 23 Feb 2013 13:36:57 +0100 Subject: [PATCH 108/360] allows updateAttributes to target specific fields --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 3473c5dcd8c1..a8148bbfec62 100644 --- a/changelog.md +++ b/changelog.md @@ -27,6 +27,7 @@ - [FEATURE] https://github.com/sdepold/sequelize/pull/345 - [FEATURE] allow definition of a models table name (thanks to slamkajs) - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin) +- [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz) # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From 830b86b3262900c0866c82df2274d59b2cebcfd6 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Mon, 25 Feb 2013 13:00:02 +0100 Subject: [PATCH 109/360] updated the docs --- docs/associations/belongs-to.js.html | 181 ++--- .../has-many-double-linked.js.html | 193 ++---- .../has-many-single-linked.js.html | 177 ++--- docs/associations/has-many.js.html | 193 ++---- docs/associations/has-one.js.html | 185 ++---- docs/associations/mixin.js.html | 185 ++---- docs/dao-factory-manager.js.html | 154 ++--- docs/dao-factory.js.html | 460 +++++-------- docs/dao.js.html | 187 ++---- docs/data-types.js.html | 156 ++--- docs/dialects/abstract/query.js.html | 325 +++++---- docs/dialects/connector-manager.js.html | 154 ++--- docs/dialects/mysql/connector-manager.js.html | 361 +++++----- docs/dialects/mysql/query-generator.js.html | 298 ++++----- docs/dialects/mysql/query.js.html | 213 ++---- .../postgres/connector-manager.js.html | 192 ++---- .../dialects/postgres/query-generator.js.html | 373 ++++++----- docs/dialects/postgres/query.js.html | 260 +++----- docs/dialects/query-generator.js.html | 154 ++--- .../dialects/sqlite/connector-manager.js.html | 154 ++--- docs/dialects/sqlite/query-generator.js.html | 246 +++---- docs/dialects/sqlite/query.js.html | 219 ++---- docs/emitters/custom-event-emitter.js.html | 154 ++--- docs/index.html | 158 +---- docs/lib/associations/belongs-to.js.html | 116 ++++ .../has-many-double-linked.js.html | 188 ++++++ .../has-many-single-linked.js.html | 106 +++ docs/lib/associations/has-many.js.html | 236 +++++++ docs/lib/associations/has-one.js.html | 139 ++++ docs/lib/associations/mixin.js.html | 112 ++++ docs/lib/dao-factory-manager.js.html | 80 +++ docs/lib/dao-factory.js.html | 300 +++++++++ docs/lib/dao.js.html | 210 ++++++ docs/lib/data-types.js.html | 56 ++ docs/lib/dialects/abstract/query.js.html | 370 +++++++++++ docs/lib/dialects/connector-manager.js.html | 69 ++ .../dialects/mysql/connector-manager.js.html | 379 +++++++++++ .../dialects/mysql/query-generator.js.html | 483 ++++++++++++++ docs/lib/dialects/mysql/query.js.html | 84 +++ .../postgres/connector-manager.js.html | 146 ++++ .../dialects/postgres/query-generator.js.html | 624 ++++++++++++++++++ docs/lib/dialects/postgres/query.js.html | 136 ++++ docs/lib/dialects/query-generator.js.html | 92 +++ .../dialects/sqlite/connector-manager.js.html | 62 ++ .../dialects/sqlite/query-generator.js.html | 240 +++++++ docs/lib/dialects/sqlite/query.js.html | 160 +++++ .../lib/emitters/custom-event-emitter.js.html | 91 +++ docs/lib/migration.js.html | 177 +++++ docs/lib/migrator.js.html | 282 ++++++++ docs/lib/query-chainer.js.html | 188 ++++++ docs/lib/query-interface.js.html | 329 +++++++++ docs/lib/sequelize.js.html | 210 ++++++ docs/lib/utils.js.html | 225 +++++++ docs/migration.js.html | 165 ++--- docs/migrator.js.html | 204 ++---- docs/query-chainer.js.html | 173 ++--- docs/query-interface.js.html | 198 ++---- docs/sequelize.js.html | 203 +++--- docs/utils.js.html | 207 ++---- 59 files changed, 8303 insertions(+), 4069 deletions(-) create mode 100644 docs/lib/associations/belongs-to.js.html create mode 100644 docs/lib/associations/has-many-double-linked.js.html create mode 100644 docs/lib/associations/has-many-single-linked.js.html create mode 100644 docs/lib/associations/has-many.js.html create mode 100644 docs/lib/associations/has-one.js.html create mode 100644 docs/lib/associations/mixin.js.html create mode 100644 docs/lib/dao-factory-manager.js.html create mode 100644 docs/lib/dao-factory.js.html create mode 100644 docs/lib/dao.js.html create mode 100644 docs/lib/data-types.js.html create mode 100644 docs/lib/dialects/abstract/query.js.html create mode 100644 docs/lib/dialects/connector-manager.js.html create mode 100644 docs/lib/dialects/mysql/connector-manager.js.html create mode 100644 docs/lib/dialects/mysql/query-generator.js.html create mode 100644 docs/lib/dialects/mysql/query.js.html create mode 100644 docs/lib/dialects/postgres/connector-manager.js.html create mode 100644 docs/lib/dialects/postgres/query-generator.js.html create mode 100644 docs/lib/dialects/postgres/query.js.html create mode 100644 docs/lib/dialects/query-generator.js.html create mode 100644 docs/lib/dialects/sqlite/connector-manager.js.html create mode 100644 docs/lib/dialects/sqlite/query-generator.js.html create mode 100644 docs/lib/dialects/sqlite/query.js.html create mode 100644 docs/lib/emitters/custom-event-emitter.js.html create mode 100644 docs/lib/migration.js.html create mode 100644 docs/lib/migrator.js.html create mode 100644 docs/lib/query-chainer.js.html create mode 100644 docs/lib/query-interface.js.html create mode 100644 docs/lib/sequelize.js.html create mode 100644 docs/lib/utils.js.html diff --git a/docs/associations/belongs-to.js.html b/docs/associations/belongs-to.js.html index c30aa52eefec..32e93d68f1c7 100644 --- a/docs/associations/belongs-to.js.html +++ b/docs/associations/belongs-to.js.html @@ -1,4 +1,4 @@ -Sequelize

Sequelize

declaration

Utils

Utils
    var Utils     = require("./../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
    Sequelize
    declaration
    Utils
    Utils
      var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -33,7 +57,7 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
-    if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
     }
 
@@ -48,7 +72,11 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.extend(this.source.rawAttributes, newAttributes)
+    Utils._.defaults(this.source.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
     return this
   }
 
@@ -56,9 +84,18 @@
     var self     = this
       , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
-    obj[accessor] = function() {
-      var id = obj[self.identifier]
-      return self.target.find(id)
+    obj[accessor] = function(params) {
+      var id = this[self.identifier]
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: {id:id}}, params)
+        }
+      } else {
+        params = id
+      }
+
+      return self.target.find(params)
     }
 
     return this
@@ -69,120 +106,24 @@
       , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
     obj[accessor] = function(associatedObject) {
-      obj[self.identifier] = associatedObject ? associatedObject.id : null
+      this[self.identifier] = associatedObject ? associatedObject.id : null
 
       // passes the changed field to save, so only that field get updated.
-      return obj.save([ self.identifier ])
+      return this.save([ self.identifier ])
     }
 
     return this
   }
 
   return BelongsTo
-})()
      
\ No newline at end of file
+})()
      \ No newline at end of file diff --git a/docs/associations/has-many-double-linked.js.html b/docs/associations/has-many-double-linked.js.html index 7e0c03241b5e..6e072dbaa37b 100644 --- a/docs/associations/has-many-double-linked.js.html +++ b/docs/associations/has-many-double-linked.js.html @@ -1,4 +1,4 @@ -Sequelize

      Sequelize

      declaration

      Utils

      Utils
        var Utils = require('./../utils')
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
        Sequelize
        declaration
        Utils
        Utils
          var Utils = require('./../utils')
 
 module.exports = (function() {
   var HasManyDoubleLinked = function(definition, instance) {
@@ -39,7 +63,7 @@
       //fully qualify
       where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
 
-      var primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
         , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
 
       where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
@@ -50,7 +74,7 @@
           options.where[self.__factory.target.tableName+"."+index] = value;
         });
 
-        options.where = options.where ? Utils.merge(options.where, where) : where
+        Utils._.extend(options.where, where)
       } else {
         options.where = where;
       }
@@ -75,7 +99,11 @@
         var chainer             = new Utils.QueryChainer
           , association         = self.__factory.target.associations[self.__factory.associationAccessor]
           , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
-          , unassociatedObjects = newAssociations.filter(function(obj) { return !obj.equalsOneOf(oldAssociations) })
+          , unassociatedObjects = newAssociations.filter(function (obj) { 
+              return !Utils._.find(oldAssociations, function (old) {
+                return obj.id === old.id
+              }) 
+            })
 
         unassociatedObjects.forEach(function(unassociatedObject) {
           var attributes = {}
@@ -93,6 +121,20 @@
       })
   }
 
+  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    var attributes = {}
+      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
+
+    attributes[this.__factory.identifier] = this.instance.id
+    attributes[foreignIdentifier] = newAssociation.id
+
+    this.__factory.connectorDAO.create(attributes)
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
   // private
 
   var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
@@ -101,15 +143,20 @@
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
       var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
-      var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) })
+      var obsoleteAssociations = oldAssociations.filter(function (old) {
+        // Return only those old associations that are not found in new
+        return !Utils._.find(newAssociations, function (obj) {
+          return obj.id === old.id
+        })
+      })
 
-      if(obsoleteAssociations.length === 0) {
+      if (obsoleteAssociations.length === 0) {
         return emitter.emit('success', null)
       }
 
       obsoleteAssociations.forEach(function(associatedObject) {
         var where            = {}
-          , primaryKeys      = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
           , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
           , notFoundEmitters = []
 
@@ -119,13 +166,13 @@
         self.__factory.connectorDAO
           .find({ where: where })
           .success(function(connector) {
-            if(connector === null) {
+            if (connector === null) {
               notFoundEmitters.push(null)
             } else {
               chainer.add(connector.destroy())
             }
 
-            if((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
               // found all obsolete connectors and will delete them now
               chainer
                 .run()
@@ -141,110 +188,14 @@
   }
 
   return HasManyDoubleLinked
-})()
          
\ No newline at end of file
+})()
          \ No newline at end of file diff --git a/docs/associations/has-many-single-linked.js.html b/docs/associations/has-many-single-linked.js.html index c8cf86b9f97e..9d83917a30d6 100644 --- a/docs/associations/has-many-single-linked.js.html +++ b/docs/associations/has-many-single-linked.js.html @@ -1,4 +1,4 @@ -Sequelize

          Sequelize

          declaration

          Utils

          Utils
            var Utils = require('./../utils')
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
            Sequelize
            declaration
            Utils
            Utils
              var Utils = require('./../utils')
 
 module.exports = (function() {
   var HasManySingleLinked = function(definition, instance) {
@@ -35,7 +59,7 @@
 
     where[this.__factory.identifier] = this.instance.id
 
-    options.where = options.where ? Utils.merge(options.where, where) : where
+    options.where = options.where ? Utils._.extend(options.where, where) : where
     return this.__factory.target.findAll(options)
   }
 
@@ -43,15 +67,25 @@
     var self    = this
       , options = this.__factory.options
       , chainer = new Utils.QueryChainer()
+      , obsoleteAssociations = oldAssociations.filter(function (old) { 
+          return !Utils._.find(newAssociations, function (obj) {
+            return obj.id === old.id
+          }) 
+        })
+      , unassociatedObjects = newAssociations.filter(function (obj) { 
+          return !Utils._.find(oldAssociations, function (old) {
+            return obj.id === old.id
+          }) 
+        })
 
     // clear the old associations
-    oldAssociations.forEach(function(associatedObject) {
+    obsoleteAssociations.forEach(function(associatedObject) {
       associatedObject[self.__factory.identifier] = null
       chainer.add(associatedObject.save())
     })
 
     // set the new associations
-    newAssociations.forEach(function(associatedObject) {
+    unassociatedObjects.forEach(function(associatedObject) {
       associatedObject[self.__factory.identifier] = self.instance.id
       chainer.add(associatedObject.save())
     })
@@ -62,111 +96,24 @@
       .error(function(err) { emitter.emit('error', err) })
   }
 
-  return HasManySingleLinked
-})()
              
\ No newline at end of file
+  return HasManySingleLinked
+})()
              \ No newline at end of file diff --git a/docs/associations/has-many.js.html b/docs/associations/has-many.js.html index cfc43bd7b913..41f0e36531a8 100644 --- a/docs/associations/has-many.js.html +++ b/docs/associations/has-many.js.html @@ -1,4 +1,4 @@ -Sequelize

              Sequelize

              declaration

              Utils

              Utils
                var Utils     = require("./../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                Sequelize
                declaration
                Utils
                Utils
                  var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
 
 var HasManySingleLinked = require("./has-many-single-linked")
@@ -30,6 +54,7 @@
 
 module.exports = (function() {
   var HasMany = function(srcDAO, targetDAO, options) {
+    this.associationType = 'HasMany'
     this.source = srcDAO
     this.target = targetDAO
     this.options = options
@@ -64,7 +89,7 @@
     // or is the association on the model itself?
     if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
       // remove the obsolete association identifier from the source
-      if(this.isSelfAssociation) {
+      if (this.isSelfAssociation) {
         this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
       } else {
         this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
@@ -77,19 +102,24 @@
       combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
-      if(!this.isSelfAssociation) {
+
+      if (!this.isSelfAssociation) {
         this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
       }
 
-      if(this.options.syncOnAssociation) {
+      if (this.options.syncOnAssociation) {
         this.connectorDAO.sync()
       }
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-      Utils._.extend(this.target.rawAttributes, newAttributes)
+      Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
 
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
     return this
   }
 
@@ -145,7 +175,7 @@
     var self = this
 
     obj[this.accessors.set] = function(newAssociatedObjects) {
-      if(newAssociatedObjects === null) {
+      if (newAssociatedObjects === null) {
         newAssociatedObjects = []
       }
 
@@ -169,19 +199,18 @@
 
     obj[this.accessors.add] = function(newAssociatedObject) {
       var instance = this
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-          .error(function(err){ customEventEmitter.emit('error', err)})
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
+          .error(function(err){ emitter.emit('error', err)})
           .success(function(currentAssociatedObjects) {
-            if(!newAssociatedObject.equalsOneOf(currentAssociatedObjects))
-              currentAssociatedObjects.push(newAssociatedObject)
-
-            instance[self.accessors.set](currentAssociatedObjects)
-              .success(function(instances) { customEventEmitter.emit('success', instances) })
-              .error(function(err) { customEventEmitter.emit('error', err) })
+            if (currentAssociatedObjects.length === 0) {
+              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
+            } else {
+              emitter.emit('success', newAssociatedObject);
+            }
           })
-      })
-      return customEventEmitter.run()
+      }).run()
     }
 
     obj[this.accessors.remove] = function(oldAssociatedObject) {
@@ -191,7 +220,7 @@
           var newAssociations = []
 
           currentAssociatedObjects.forEach(function(association) {
-            if(!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
               newAssociations.push(association)
           })
 
@@ -207,110 +236,14 @@
   }
 
   return HasMany
-})()
                  
\ No newline at end of file
+})()
                  \ No newline at end of file diff --git a/docs/associations/has-one.js.html b/docs/associations/has-one.js.html index ae62c0c64278..811582c3e759 100644 --- a/docs/associations/has-one.js.html +++ b/docs/associations/has-one.js.html @@ -1,4 +1,4 @@ -Sequelize

                  Sequelize

                  declaration

                  Utils

                  Utils
                    var Utils     = require("./../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                    Sequelize
                    declaration
                    Utils
                    Utils
                      var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -33,7 +57,7 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
-    if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
     }
 
@@ -53,7 +77,10 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.extend(this.target.rawAttributes, newAttributes)
+    Utils._.defaults(this.target.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
 
     return this
   }
@@ -61,12 +88,21 @@
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
 
-    obj[this.accessors.get] = function() {
-      var id    = obj.id
+    obj[this.accessors.get] = function(params) {
+      var id    = this.id
         , where = {}
 
       where[self.identifier] = id
-      return self.target.find({where: where})
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: where}, params)
+        }
+      } else {
+        params = {where: where}
+      }
+
+      return self.target.find(params)
     }
 
     return this
@@ -77,15 +113,16 @@
       , options = self.options || {}
 
     obj[this.accessors.set] = function(associatedObject) {
+      var instance = this;
       return new Utils.CustomEventEmitter(function(emitter) {
-        obj[self.accessors.get]().success(function(oldObj) {
-          if(oldObj) {
+        instance[self.accessors.get]().success(function(oldObj) {
+          if (oldObj) {
             oldObj[self.identifier] = null
             oldObj.save()
           }
 
-          if(associatedObject) {
-            associatedObject[self.identifier] = obj.id
+          if (associatedObject) {
+            associatedObject[self.identifier] = instance.id
             associatedObject
               .save()
               .success(function() { emitter.emit('success', associatedObject) })
@@ -102,110 +139,14 @@
   }
 
   return HasOne
-})()
                      
\ No newline at end of file
+})()
                      \ No newline at end of file diff --git a/docs/associations/mixin.js.html b/docs/associations/mixin.js.html index ed4a931aba33..57dd2695c0b6 100644 --- a/docs/associations/mixin.js.html +++ b/docs/associations/mixin.js.html @@ -1,4 +1,4 @@ -Sequelize

                      Sequelize

                      declaration

                      Mixin

                      Mixin

                      Defines Mixin for all models.

                        var Mixin = module.exports = function(){}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                        Sequelize
                        declaration
                        Mixin
                        Mixin
                        Defines Mixin for all models.
                          var Mixin = module.exports = function(){}
 
 Mixin.hasOne = function(associatedDAO, options) {
   // the id is in the foreign table
   var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype);
+  association.injectSetter(this.DAO.prototype);
+
   return this
 }
 
 Mixin.belongsTo = function(associatedDAO, options) {
   // the id is in this table
-  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
   return this
 }
 
@@ -42,125 +74,52 @@
   // the id is in the foreign table or in a connecting table
   var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
   return this
 }
 
-Mixin.getAssociation = function(target, options) {
+Mixin.getAssociation = function(target) {
   var result = null
 
   for (var associationName in this.associations) {
-    var association = this.associations[associationName]
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
 
-    if (!result && (association.target === target)) {
-      result = association
+console.log(target.name, association.target.name)
+      if (!result && (association.target === target)) {
+        result = association
+      }
     }
   }
 
   return result
-}
                          example for instance methods:
                            Mixin.prototype.test = function() {
                              console.log('asd')
                            }
                            
\ No newline at end of file
+  return result
+}

                            example for instance methods:
                            Mixin.prototype.test = function() {
                            console.log('asd')
                            }

                              \ No newline at end of file diff --git a/docs/dao-factory-manager.js.html b/docs/dao-factory-manager.js.html index 1c8bb2cedf87..de1c575a24d8 100644 --- a/docs/dao-factory-manager.js.html +++ b/docs/dao-factory-manager.js.html @@ -1,4 +1,4 @@ -Sequelize

                              Sequelize

                              property

                              exports

                              module.exports
                                module.exports = (function() {
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                Sequelize
                                property
                                exports
                                module.exports
                                  module.exports = (function() {
   var DAOFactoryManager = function(sequelize) {
     this.daos = []
     this.sequelize = sequelize
@@ -56,110 +80,14 @@
   })
 
   return DAOFactoryManager
-})()
                                  
\ No newline at end of file
+})()
                                  \ No newline at end of file diff --git a/docs/dao-factory.js.html b/docs/dao-factory.js.html index d00c3550494f..4b0f4733a5d9 100644 --- a/docs/dao-factory.js.html +++ b/docs/dao-factory.js.html @@ -1,4 +1,4 @@ -Sequelize

                                  Sequelize

                                  declaration

                                  Utils

                                  Utils
                                    var Utils     = require("./utils")
-  , DAO       = require("./dao")
-  , DataTypes = require("./data-types")
-
-module.exports = (function() {
-  var DAOFactory = function(name, attributes, options) {
-    var self = this
-
-    this.options = Utils._.extend({
-      timestamps: true,
-      instanceMethods: {},
-      classMethods: {},
-      validate: {},
-      freezeTableName: false,
-      underscored: false,
-      syncOnAssociation: true,
-      paranoid: false
-    }, options || {})
-
-    this.name = name
-    this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name)
-    this.rawAttributes = attributes
-    this.daoFactoryManager = null // defined in init function
-    this.associations = {}
-
-    // extract validation
-    this.validate = this.options.validate || {}
-  }
-
-  Object.defineProperty(DAOFactory.prototype, 'attributes', {
-    get: function() {
-      return this.QueryGenerator.attributesToSQL(this.rawAttributes)
-    }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'QueryInterface', {
-    get: function() { return this.daoFactoryManager.sequelize.getQueryInterface() }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'QueryGenerator', {
-    get: function() { return this.QueryInterface.QueryGenerator }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'primaryKeyCount', {
-    get: function() { return Utils._.keys(this.primaryKeys).length }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'hasPrimaryKeys', {
-    get: function() { return this.primaryKeyCount > 0 }
-  })
-
-  DAOFactory.prototype.init = function(daoFactoryManager) {
-    this.daoFactoryManager = daoFactoryManager
-
-    addDefaultAttributes.call(this)
-    addOptionalClassMethods.call(this)
-    findAutoIncrementField.call(this)
-
-    return this
-  }
-
-  DAOFactory.prototype.sync = function(options) {
-    options = Utils.merge(options || {}, this.options)
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
 
-    var self = this
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var doQuery = function() {
-        self.QueryInterface
-          .createTable(self.tableName, self.attributes, options)
-          .success(function() { emitter.emit('success', self) })
-          .error(function(err) { emitter.emit('error', err) })
-          .on('sql', function(sql) { emitter.emit('sql', sql) })
-      }
+#folder-structure > ul > li a {
+  display: block;
+}
 
-      if(options.force)
-        self.drop().success(doQuery).error(function(err) { emitter.emit('error', err) })
-      else
-        doQuery()
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                    Sequelize
                                    ptions.include =
                                      includes.map(function(include) {
+        console.log(include instanceof DAOFactory)
+      })
 
-    }).run()
-  }
+      includes.forEach(function(daoName) {
+        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
 
-  DAOFactory.prototype.drop = function() {
-    return this.QueryInterface.dropTable(this.tableName)
-  }
+        if (!options.include[daoName]) {
+          options.include[daoName] = this.getAssociationByAlias(daoName).target
+        }
+      }.bind(this))
 
-  // alias for findAll
-  DAOFactory.prototype.all = function(options) {
-    return this.findAll(options)
-  }
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
 
-  DAOFactory.prototype.findAll = function(options) {
-    return this.QueryInterface.select(this, this.tableName, options)
+    return this.QueryInterface.select(this, this.tableName, options, {
+      type:    'SELECT',
+      hasJoin: hasJoin
+    })
   }
 
   //right now, the caller (has-many-double-linked) is in charge of the where clause
@@ -122,44 +73,96 @@
     var optcpy = Utils._.clone(options)
     optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
 
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy)
-  }
+    // whereCollection is used for non-primary key updates
+    this.options.whereCollection = optcpy.where || null;
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+  }
                                      method
                                      find
                                      DAOFactory.prototype.find()
                                      Search for an instance.
                                      • @param:  {Object} options Options to describe the scope of the search.
                                      • @: 
                                      • @return:  {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                      DAOFactory.prototype.find = function(options) {
+    var hasJoin = false
 
-  DAOFactory.prototype.find = function(options) {
     // no options defined?
     // return an emitter which emits null
-    if([null, undefined].indexOf(options) > -1) {
+    if ([null, undefined].indexOf(options) !== -1) {
       return new Utils.CustomEventEmitter(function(emitter) {
         setTimeout(function() { emitter.emit('success', null) }, 10)
       }).run()
     }
 
+    var primaryKeys = this.primaryKeys
+
     // options is not a hash but an id
-    if(typeof options === 'number') {
+    if (typeof options === 'number') {
       options = { where: options }
-    } else if (Utils.argsArePrimaryKeys(arguments, this.primaryKeys)) {
-        var where = {}
-          , self  = this
-
-        Utils._.each(arguments, function(arg, i) {
-          var key = Utils._.keys(self.primaryKeys)[i]
-          where[key] = arg
-        })
-
-        options = { where: where }
-    } else if((typeof options === 'object') && (options.hasOwnProperty('include'))) {
-      var includes = options.include
+    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
+      var where = {}
+        , self  = this
+        , keys = Object.keys(primaryKeys)
+
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
+
+      options = { where: where }
+    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
+      var parsedId = parseInt(options, 10)
+
+      if (!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
 
-      options.include = {}
+      options = { where: parsedId }
+    } else if (typeof options === 'object') {
+      var includes = null
+
+      options = Utils._.clone(options)
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          if (include instanceof DAOFactory) {
+            include = { daoFactory: include, as: include.tableName }
+          }
+
+          if (typeof include === 'object') {
+            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
+              var usesAlias = include.as !== include.tableName
+
+              // check if the current daoFactory is actually associated with the passed daoFactory
+              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
+                return include
+              } else {
+                var msg = include.daoFactory.name
+
+                if (usesAlias) {
+                  msg += " (" + include.as + ")"
+                }
+
+                msg += " is not associated to " + this.name + "!"
+
+                throw new Error(msg)
+              }
+            } else {
+              throw new Error('Include malformed. Expected attributes: daoFactory, as')
+            }
+          } else {
+            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
+          }
+        }.bind(this))
+      }
 
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
-      }.bind(this))
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
     }
 
     options.limit = 1
 
-    return this.QueryInterface.select(this, this.tableName, options, { plain: true })
+    return this.QueryInterface.select(this, this.tableName, options, {
+      plain: true,
+      type: 'SELECT',
+      hasJoin: hasJoin
+    })
   }
 
   DAOFactory.prototype.count = function(options) {
@@ -186,43 +189,12 @@
   }
 
   DAOFactory.prototype.build = function(values, options) {
-    var instance = new DAO(values, Utils._.extend(this.options, this.attributes, { hasPrimaryKeys: this.hasPrimaryKeys }))
-      , self     = this
-
-    options = options || {}
-    instance.__factory = this
+    options = options || {isNewRecord: true}
 
-    Utils._.each(this.attributes, function(definition, name) {
-      //transform integer 0,1 into boolean
-      if((definition.indexOf(DataTypes.BOOLEAN) !== -1) && (typeof instance[name] === "number")) {
-        instance[name] = (instance[name] !== 0)
-      }
-
-      //add default attributes
-      if(typeof instance[name] === 'undefined') {
-        var value = null
+    var self     = this
+      , instance = new this.DAO(values, this.options, options.isNewRecord)
 
-        if(self.rawAttributes.hasOwnProperty(name) && self.rawAttributes[name].hasOwnProperty('defaultValue')) {
-          value = Utils.toDefaultValue(self.rawAttributes[name].defaultValue)
-        }
-
-        instance[name] = value
-        instance.addAttribute(name, value)
-      }
-
-      // add validation
-      if (self.rawAttributes.hasOwnProperty(name) && self.rawAttributes[name].hasOwnProperty('validate')) {
-        instance.setValidators(name, self.rawAttributes[name].validate)
-      }
-    })
-
-    Utils._.each(this.options.instanceMethods || {}, function(fct, name) { instance[name] = fct })
-    Utils._.each(this.associations, function(association, associationName) {
-      association.injectGetter(instance)
-      association.injectSetter(instance)
-    })
-
-    instance.isNewRecord = options.hasOwnProperty('isNewRecord') ? options.isNewRecord : true
+    instance.isNewRecord = options.isNewRecord
 
     return instance
   }
@@ -231,25 +203,51 @@
     return this.build(values).save(fields)
   }
 
-  DAOFactory.prototype.__defineGetter__('primaryKeys', function() {
-    var result = {}
-    Utils._.each(this.attributes, function(dataTypeString, attributeName) {
-      if((attributeName != 'id') && (dataTypeString.indexOf('PRIMARY KEY') > -1))
-        result[attributeName] = dataTypeString
-    })
-
-    return result
-  })
+  DAOFactory.prototype.findOrCreate = function (params, defaults) {
+    var self = this;
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          for (var attrname in defaults) {
+            params[attrname] = defaults[attrname];
+          }
+
+          self.create(params)
+	    .success(function (instance) {
+              emitter.emit('success', instance)
+            })
+	    .error( function (error) {
+              emitter.emit('error', error)
+            });
+        } else {
+          emitter.emit('success', instance)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      });
+    }).run()
+  }
 
   // private
 
   var query = function() {
-    var args = Utils._.map(arguments, function(arg, _) { return arg })
-      , s    = this.daoFactoryManager.sequelize
+    var args      = Utils._.map(arguments, function(arg, _) { return arg })
+      , sequelize = this.daoFactoryManager.sequelize
 
     // add this as the second argument
-    if(arguments.length == 1) args.push(this)
-    return s.query.apply(s, args)
+    if (arguments.length === 1) {
+      args.push(this)
+    }
+
+    // add {} as options
+    if (args.length === 2) {
+      args.push({})
+    }
+
+    return sequelize.query.apply(sequelize, args)
   }
 
   var addOptionalClassMethods = function() {
@@ -268,13 +266,15 @@
         }
       }
 
-    if(this.hasPrimaryKeys) defaultAttributes = {}
+    if (this.hasPrimaryKeys) {
+      defaultAttributes = {}
+    }
 
-    if(this.options.timestamps) {
+    if (this.options.timestamps) {
       defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
       defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
 
-      if(this.options.paranoid)
+      if (this.options.paranoid)
         defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
     }
 
@@ -284,126 +284,30 @@
   }
 
   var findAutoIncrementField = function() {
-    var self   = this
-      , fields = this.QueryGenerator.findAutoIncrementField(this)
+    var fields = this.QueryGenerator.findAutoIncrementField(this)
 
     this.autoIncrementField = null
 
     fields.forEach(function(field) {
-      if(self.autoIncrementField)
+      if (this.autoIncrementField) {
         throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      else
-        self.autoIncrementField = field
-    })
+      } else {
+        this.autoIncrementField = field
+      }
+    }.bind(this))
   }
 
   Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
 
   return DAOFactory
-})()
                                      
\ No newline at end of file
+})()
                                      \ No newline at end of file diff --git a/docs/dao.js.html b/docs/dao.js.html index 8f250b63ece6..7de88d44232f 100644 --- a/docs/dao.js.html +++ b/docs/dao.js.html @@ -1,4 +1,4 @@ -Sequelize

                                      Sequelize

                                      method

                                      validate

                                      DAO.prototype.validate()

                                      Validate this dao's attribute values according to validation rules set in the dao definition.

                                      • @return: {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                      DAO.prototype.validate = function() {
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                      Sequelize
                                      method
                                      validate
                                      DAO.prototype.validate()
                                      Validate this dao's attribute values according to validation rules set in the dao definition.
                                      • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                      DAO.prototype.validate = function() {
     var self = this
     var failures = {}
 
@@ -47,8 +71,8 @@
           // is it a validator module function?
           else {
             // extra args
-            fn_args = details.hasOwnProperty("args") ? details.args : []
-            if (!Utils._.isArray(fn_args))
+            fn_args = details.hasOwnProperty("args") ? details.args : details
+            if (!Array.isArray(fn_args))
               fn_args = [fn_args]
             // error msg
             fn_msg = details.hasOwnProperty("msg") ? details.msg : false
@@ -83,15 +107,15 @@
   }
 
 
-  DAO.prototype.updateAttributes = function(updates) {
+  DAO.prototype.updateAttributes = function(updates, fields) {
     this.setAttributes(updates)
-    return this.save()
+    return this.save(fields)
   }
 
   DAO.prototype.setAttributes = function(updates) {
     var self = this
 
-    var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys)
+    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
 
     readOnlyAttributes.push('id')
     readOnlyAttributes.push('createdAt')
@@ -109,7 +133,7 @@
   }
 
   DAO.prototype.destroy = function() {
-    if(this.__options.timestamps && this.__options.paranoid) {
+    if (this.__options.timestamps && this.__options.paranoid) {
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
       this[attr] = new Date()
       return this.save()
@@ -141,7 +165,6 @@
 
   DAO.prototype.addAttribute = function(attribute, value) {
     this[attribute] = value
-    this.attributes.push(attribute)
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -154,7 +177,7 @@
 
   // private
 
-  var initAttributes = function(values) {
+  var initAttributes = function(values, isNewRecord) {
     // add all passed values to the dao and store the attribute names in this.attributes
     for (var key in values) {
       if (values.hasOwnProperty(key)) {
@@ -164,131 +187,37 @@
 
     // set id to null if not passed as value
     // a newly created dao has no id
-    var defaults = this.__options.hasPrimaryKeys ? {} : { id: null }
+    var defaults = this.hasPrimaryKeys ? {} : { id: null }
 
-    if(this.__options.timestamps) {
+    if (this.__options.timestamps && isNewRecord) {
       defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
       defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
 
-      if(this.__options.paranoid) {
+      if (this.__options.paranoid) {
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
     }
 
-    for (var attr in defaults) {
-      var value = defaults[attr]
+    if (Utils._.size(defaults)) {
+      for (var attr in defaults) {
+        var value = defaults[attr]
 
-      if(!this.hasOwnProperty(attr)) {
-        this.addAttribute(attr, Utils.toDefaultValue(value))
+        if (!this.hasOwnProperty(attr)) {
+          this.addAttribute(attr, Utils.toDefaultValue(value))
+        }
       }
     }
-  }
                                      Add the instance methods to DAO
                                        Utils._.extend(DAO.prototype, Mixin.prototype)
+  }
 
   return DAO
-})()
                                        
\ No newline at end of file
+})()
                                        \ No newline at end of file diff --git a/docs/data-types.js.html b/docs/data-types.js.html index 431695e88487..6c54776e06c9 100644 --- a/docs/data-types.js.html +++ b/docs/data-types.js.html @@ -1,4 +1,4 @@ -Sequelize

                                        Sequelize

                                        property

                                        exports

                                        module.exports
                                          module.exports = {
-  STRING: 'VARCHAR(255)',
-  TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  DATE: 'DATETIME',
-  BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
-  NOW: 'NOW'
-}
                                          \ No newline at end of file +

                                          Sequelize

                                          property

                                          exports

                                          module.exports
                                            module.exports = {
+  STRING: 'VARCHAR(255)',
+  TEXT: 'TEXT',
+  INTEGER: 'INTEGER',
+  BIGINT:  'BIGINT',
+  DATE: 'DATETIME',
+  BOOLEAN: 'TINYINT(1)',
+  FLOAT: 'FLOAT',
+  NOW: 'NOW',
+  ENUM: 'ENUM'
+}
                                            \ No newline at end of file diff --git a/docs/dialects/abstract/query.js.html b/docs/dialects/abstract/query.js.html index 13d6c3a60671..2eacee70289d 100644 --- a/docs/dialects/abstract/query.js.html +++ b/docs/dialects/abstract/query.js.html @@ -1,4 +1,4 @@ -Sequelize

                                            Sequelize

                                            Inherit from CustomEventEmitter

                                              Utils.inherit(AbstractQuery, CustomEventEmitter)
                                              method

                                              run

                                              AbstractQuery.prototype.run()

                                              Execute the passed sql query.

                                              +#folder-structure > ul li a:hover { + background: #eee; +} +#folder-structure > ul ul.active { + border-left: 4px solid #eee; + padding-left: 10px; +} +#folder-structure li.active { + font-weight: bold; + background: #FAFAFA; +} + +#folder-structure > ul > li a { + display: block; +} + +#folder-structure h6 { + background: #eee; + padding: 10px; + cursor: pointer; + margin: 10px 0 0 0; +} +

                                              Sequelize

                                              Inherit from CustomEventEmitter

                                                Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                method

                                                run

                                                AbstractQuery.prototype.run()

                                                Execute the passed sql query.

                                                Examples

                                                query.run('SELECT 1')
                                                • @param: {String} sql - The SQL query which should be executed.
                                                AbstractQuery.prototype.run = function(sql) {
     throw new Error("The run method wasn't overwritten!")
+  }
                                                method

                                                checkLoggingOption

                                                AbstractQuery.prototype.checkLoggingOption()

                                                Check the logging option of the instance and print deprecation warnings.

                                                • @return: {void} 
                                                AbstractQuery.prototype.checkLoggingOption = function() {
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging === console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
   }
                                                method

                                                formatResults

                                                AbstractQuery.prototype.formatResults()

                                                High level function that handles the results of a query execution.

                                                Example

                                                -

                                                query.formatResults([
                                                {
                                                UserWithNames: {
                                                name: 'barfooz',
                                                id: 1,
                                                createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST)
                                                },
                                                Tasks: {
                                                title: 'task',
                                                id: 1,
                                                createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                UserWithNameId: 1
                                                }
                                                }
                                                ])

                                                • @param: {Array} data - The result of the query execution.
                                                AbstractQuery.prototype.formatResults = function(data) {
+
                                                query.formatResults([
                                                   {
                                                     id: 1,              // this is from the main table
                                                     attr2: 'snafu',     // this is from the main table
                                                     Tasks.id: 1,        // this is from the associated table
                                                     Tasks.title: 'task' // this is from the associated table
                                                   }
                                                 ])
                                                • @param: {Array} data - The result of the query execution.
                                                AbstractQuery.prototype.formatResults = function(data) {
     var result  = this.callee
 
     if (isInsertQuery.call(this, data)) {
@@ -46,6 +80,8 @@ 
                                                Example
                                                
       result = handleShowTableQuery.call(this, data)
     } else if (isShowOrDescribeQuery.call(this)) {
       result = data
+    } else if (isCallQuery.call(this)) {
+      result = data[0]
     }
 
     return result
@@ -74,34 +110,85 @@ 
                                                Example
                                                
   function(fct) {
     this.on('error', fct)
     return this
+  }
                                                method

                                                send

                                                AbstractQuery.prototype.send()

                                                This function is a wrapper for private methods.

                                                • @param: {String} fctName The name of the private method.
                                                AbstractQuery.prototype.send = function(fctName

                                                arg1, arg2, arg3, ...

                                                  {
+    var args = Array.prototype.slice.call(arguments).slice(1)
+    return eval(fctName).apply(this, args)
+  }
                                                  method

                                                  getInsertIdField

                                                  AbstractQuery.prototype.getInsertIdField()

                                                  Get the attributes of an insert query, which contains the just inserted id.

                                                  • @return: {String} The field name.
                                                  AbstractQuery.prototype.getInsertIdField = function() {
+    return 'insertId'
+  }
+
+  /////////////
+  // private //
+  /////////////
                                                  function

                                                  findTableNameInAttribute

                                                  findTableNameInAttribute()

                                                  Iterate over all known tables and search their names inside the sql query.
                                                  This method will also check association aliases ('as' option).

                                                  • @param: {String} attribute An attribute of a SQL query. (?)
                                                  • @return: {String} The found tableName / alias.
                                                  var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
+        tableName = daoFactory.tableName
+      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
+        tableName = Utils.singularize(daoFactory.tableName)
+      } else {
+        for (var associationName in daoFactory.associations) {
+          if (daoFactory.associations.hasOwnProperty(associationName)) {
+            var association = daoFactory.associations[associationName]
+
+            if (attribute.indexOf(association.options.as + ".") === 0) {
+              tableName = association.options.as
+            }
+          }
+        }
+      }
+    })
+
+    return tableName
   }
 
   var queryResultHasJoin = function(results) {
-    var hasJoin = !!results[0]
+    if (!!results[0]) {
+      var keys = Object.keys(results[0])
 
-    hasJoin = hasJoin && (Utils._.keys(results[0]).length > 1)
-    hasJoin = hasJoin && (Utils.isHash(results[0][Utils._.keys(results[0])[0]]))
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
 
-    return hasJoin
+    return false
   }
 
-  var isInsertQuery = function(results) {
-    var result = !!this.callee
+  var isInsertQuery = function(results, metaData) {
+    var result = true
+
+    // is insert query if sql contains insert into
+    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
 
-    result = result && (this.sql.indexOf('INSERT INTO') === 0)
-    result = result && results.hasOwnProperty('insertId')
+    // is insert query if no results are passed or if the result has the inserted id
+    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
+
+    // is insert query if no metadata are passed or if the metadata has the inserted id
+    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
 
     return result
   }
 
-  var handleInsertQuery = function(results) {
-    // add the inserted row id to the instance
-    var autoIncrementField = this.callee.__factory.autoIncrementField
-    this.callee[autoIncrementField] = results.insertId
+  var handleInsertQuery = function(results, metaData) {
+    if (this.callee) {
+      // add the inserted row id to the instance
+      var autoIncrementField = this.callee.__factory.autoIncrementField
+        , id                 = null
+
+      id = id || (results && results[this.getInsertIdField()])
+      id = id || (metaData && metaData[this.getInsertIdField()])
+
+      this.callee[autoIncrementField] = id
+    }
   }
 
   var isShowTableQuery = function() {
-    return (this.sql.indexOf('SHOW TABLES') === 0)
+    return (this.sql.toLowerCase().indexOf('show tables') === 0)
   }
 
   var handleShowTableQuery = function(results) {
@@ -111,16 +198,21 @@ 
                                                  Example
                                                  
   }
 
   var isSelectQuery = function() {
-    return (this.sql.indexOf('SELECT') === 0)
+    return this.options.type === 'SELECT';
+  }
+
+  var isUpdateQuery = function() {
+    return (this.sql.toLowerCase().indexOf('update') === 0)
   }
 
   var handleSelectQuery = function(results) {
-    var result = null
+    var result = null, self = this;
 
     if (this.options.raw) {
       result = results
-    } else if (queryResultHasJoin(results)) {
-      result = groupDataByCalleeFactory.call(this, results).map(function(result) {
+    } else if (this.options.hasJoin === true) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
         // let's build the actual dao instance first...
         var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
 
@@ -140,7 +232,7 @@ 
                                                  Example
                                                  
     }
 
     // return the first real model instance if options.plain is set (e.g. Model.find)
-    if(this.options.plain) {
+    if (this.options.plain) {
       result = (result.length === 0) ? null : result[0]
     }
 
@@ -148,28 +240,57 @@ 
                                                  Example
                                                  
   }
 
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-    var associatedDao = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association   = this.callee.getAssociation(associatedDao)
-      , accessor      = Utils._.camelize(associatedDao.tableName)
+    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association          = null
+
+    if (!!associatedDaoFactory) {
+      association = this.callee.getAssociation(associatedDaoFactory)
+    } else {
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+
+      if (!!associatedDaoFactory) {
+        association = this.callee.getAssociation(associatedDaoFactory)
+      } else {
+        association          = this.callee.getAssociationByAlias(tableName)
+        associatedDaoFactory = association.target
+      }
+    }
+
+    var accessor = Utils._.camelize(tableName)
 
     // downcase the first char
     accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
 
     associationData.forEach(function(data) {
-      var daoInstance = associatedDao.build(data, { isNewRecord: false })
+      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
         accessor = Utils.singularize(accessor)
-        dao[accessor] = daoInstance
+        dao[accessor] = isEmpty ? null : daoInstance
       } else {
         dao[accessor] = dao[accessor] || []
-        dao[accessor].push(daoInstance)
+        if (! isEmpty)
+          dao[accessor].push(daoInstance)
       }
     })
   }
 
   var isShowOrDescribeQuery = function() {
-    return (this.sql.indexOf('SHOW') === 0) || (this.sql.indexOf('DESCRIBE') === 0)
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
+    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
+
+    return  result
+  }
+
+  var isCallQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
+
+    return result
   }
                                                  function

                                                  groupDataByCalleeFactory

                                                  groupDataByCalleeFactory()

                                                  The function takes the result of the query execution and groups
                                                  the associated data by the callee.

                                                  Example:
@@ -224,113 +345,39 @@ 
                                                  Example
                                                  
     })
 
     return result
-  }
-
-  return AbstractQuery
-})()
                                                  \ No newline at end of file + return AbstractQuery +})()
                                                  \ No newline at end of file diff --git a/docs/dialects/connector-manager.js.html b/docs/dialects/connector-manager.js.html index fd7f8f0f017c..a3101636ed7a 100644 --- a/docs/dialects/connector-manager.js.html +++ b/docs/dialects/connector-manager.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                  Sequelize

                                                  property

                                                  exports

                                                  module.exports
                                                    module.exports = (function(){
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                    Sequelize
                                                    property
                                                    exports
                                                    module.exports
                                                      module.exports = (function(){
   var ConnectorManager = function(sequelize, config) {
     throw new Error('Define the constructor!')
   }
@@ -45,110 +69,14 @@
   }
 
   return ConnectorManager
-})()
                                                      
\ No newline at end of file
+})()
                                                      \ No newline at end of file diff --git a/docs/dialects/mysql/connector-manager.js.html b/docs/dialects/mysql/connector-manager.js.html index 310eb1585663..602e0b98c045 100644 --- a/docs/dialects/mysql/connector-manager.js.html +++ b/docs/dialects/mysql/connector-manager.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                      Sequelize

                                                      declaration

                                                      mysql

                                                      mysql
                                                        var mysql   = require("mysql")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                        Sequelize
                                                        declaration
                                                        mysql
                                                        mysql
                                                          var mysql   = require("mysql")
   , Pooling = require('generic-pool')
   , Query   = require("./query")
   , Utils   = require("../../utils")
@@ -37,24 +61,105 @@
     this.queue = []
     this.activeQueue = []
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-    this.poolCfg = this.config.pool
+    this.poolCfg = Utils._.defaults(this.config.pool, {
+      maxConnections: 10,
+      minConnections: 0,
+      maxIdleTime: 1000
+    });
+    this.pendingQueries = 0;
+    this.useReplicaton = !!config.replication;
+    this.useQueue = config.queue !== undefined ? config.queue : true;
 
     var self = this
 
-    if (this.poolCfg) {
-      //the user has requested pooling, so create our connection pool
-      if (!this.poolCfg.maxConnections) {
-        this.poolCfg.maxConnections = 10
+    if (this.useReplicaton) {
+      var reads = 0,
+        writes = 0;
+
+      // Init configs with options from config if not present
+      for (var i in config.replication.read) {
+        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
+          host: this.config.host,
+          port: this.config.port,
+          username: this.config.username,
+          password: this.config.password,
+          database: this.config.database
+        });
       }
+      config.replication.write = Utils._.defaults(config.replication.write, {
+        host: this.config.host,
+        port: this.config.port,
+        username: this.config.username,
+        password: this.config.password,
+        database: this.config.database
+      });
+
+      // I'll make my own pool, with blackjack and hookers!
+      this.pool = {
+        release: function (client) {
+          if (client.queryType == 'read') {
+            return this.read.release(client);
+          } else {
+            return this.write.release(client);
+          }
+        },
+        acquire: function (callback, priority, queryType) {
+          if (queryType == 'SELECT') {
+            this.read.acquire(callback, priority);
+          } else {
+            this.write.acquire(callback, priority);
+          }
+        },
+        drain: function () {
+          this.read.drain();
+          this.write.drain();
+        },
+        read: Pooling.Pool({
+          name: 'sequelize-read',
+          create: function (done) {
+            if (reads >= self.config.replication.read.length) reads = 0;
+            var config = self.config.replication.read[reads++];
+
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'read'
+              done(null, connection)
+            }, config);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        }),
+        write: Pooling.Pool({
+          name: 'sequelize-write',
+          create: function (done) {
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'write'
+              done(null, connection)
+            }, self.config.replication.write);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        })
+      };
+    } else if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
       this.pool = Pooling.Pool({
         name: 'sequelize-mysql',
         create: function (done) {
-            connect.call(self, done)
+          connect.call(self, done)
         },
         destroy: function(client) {
-            disconnect.call(self, client)
+          disconnect.call(self, client)
         },
         max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
     }
@@ -71,48 +176,89 @@
     })
   }
 
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
 
-  var isConnecting = false
+  var isConnecting = false;
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
-    if(!this.isConnected && !this.pool) this.connect()
+    if (!this.isConnected && !this.pool) {
+      this.connect()
+    }
 
-    var queueItem = {
-      query: new Query(this.client, this.sequelize, callee, options || {}),
-      sql: sql
+    if (this.useQueue) {
+      var queueItem = {
+        query: new Query(this.client, this.sequelize, callee, options || {}),
+        sql: sql
+      };
+
+      enqueue.call(this, queueItem, options);
+      return queueItem.query;
     }
 
-    enqueue.call(this, queueItem)
+    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
+    this.pendingQueries++;
+
+    query.done(function() {
+      self.pendingQueries--;
+      if (self.pool) self.pool.release(query.client);
+      else {
+        if (self.pendingQueries === 0) {
+          setTimeout(function() {
+            self.pendingQueries === 0 && self.disconnect.call(self);
+          }, 100);
+        }
+      }
+    });
 
-    return queueItem.query
-  }
+    if (!this.pool) {
+      query.run(sql);
+    }
+
+    else {
+      this.pool.acquire(function(err, client) {
+        if (err) return query.emit('error', err);
+
+        query.client = client;
+        query.run(sql);
+        return;
+      }, undefined, options.type);
+    }
+
+    return query;
+  };
 
   ConnectorManager.prototype.connect = function() {
-    var self = this
+    var self = this;
     // in case database is slow to connect, prevent orphaning the client
     if (this.isConnecting || this.pool) {
-      return
+      return;
     }
     connect.call(self, function(err, client) {
-      self.client = client
-      return
-    })
-    return
-  }
+      self.client = client;
+      return;
+    });
+    return;
+  };
 
   ConnectorManager.prototype.disconnect = function() {
-    if (this.client)
-      disconnect.call(this, this.client)
-    return
-  }
+    if (this.client) disconnect.call(this, this.client);
+    return;
+  };
 
 
   // private
 
   var disconnect = function(client) {
-    var self = this
+    var self = this;
+    if (!this.useQueue) {
+      this.client = null;
+    }
+
     client.end(function() {
+      if (!self.useQueue) {
+        return client.destroy();
+      }
+
       var intervalObj = null
       var cleanup = function () {
         var retryCt = 0
@@ -133,13 +279,14 @@
     })
   }
 
-  var connect = function(done) {
+  var connect = function(done, config) {
+    config = config || this.config
     var connection = mysql.createConnection({
-      host: this.config.host,
-      port: this.config.port,
-      user: this.config.username,
-      password: this.config.password,
-      database: this.config.database
+      host: config.host,
+      port: config.port,
+      user: config.username,
+      password: config.password,
+      database: config.database
     })
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
@@ -147,8 +294,9 @@
     done(null, connection)
   }
 
-  var enqueue = function(queueItem) {
-    if(this.activeQueue.length < this.maxConcurrentQueries) {
+  var enqueue = function(queueItem, options) {
+    options = options || {}
+    if (this.activeQueue.length < this.maxConcurrentQueries) {
       this.activeQueue.push(queueItem)
       if (this.pool) {
         var self = this
@@ -163,10 +311,8 @@
           queueItem.client = client
           execQueueItem.call(self, queueItem)
           return
-        })
-      }
-      else
-      {
+        }, undefined, options.type)
+      } else {
         execQueueItem.call(this, queueItem)
       }
     } else {
@@ -184,10 +330,9 @@
 
   var transferQueuedItems = function(count) {
     for(var i = 0; i < count; i++) {
-      var queueItem = this.queue[0]
-      if(queueItem) {
+      var queueItem = this.queue.shift();
+      if (queueItem) {
         enqueue.call(this, queueItem)
-        this.queue = without(this.queue, queueItem)
       }
     }
   }
@@ -234,110 +379,14 @@
   }
 
   return ConnectorManager
-})()
                                                          
\ No newline at end of file
+})()
                                                          \ No newline at end of file diff --git a/docs/dialects/mysql/query-generator.js.html b/docs/dialects/mysql/query-generator.js.html index 22b4185358ce..728079f44989 100644 --- a/docs/dialects/mysql/query-generator.js.html +++ b/docs/dialects/mysql/query-generator.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                          Sequelize

                                                          declaration

                                                          Utils

                                                          Utils
                                                            var Utils     = require("../../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                            Sequelize
                                                            declaration
                                                            Utils
                                                            Utils
                                                              var Utils     = require("../../utils")
   , DataTypes = require("../../data-types")
   , util      = require("util")
 
@@ -39,13 +63,15 @@
         , attrStr = []
 
       for (var attr in attributes) {
-        var dataType = attributes[attr]
-
-        if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-          primaryKeys.push(attr)
-          attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
-        } else {
-          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
         }
       }
 
@@ -57,7 +83,7 @@
       }
       , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
 
-      if(pkString.length > 0) {
+      if (pkString.length > 0) {
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
       }
 
@@ -137,9 +163,10 @@
 
     selectQuery: function(tableName, options) {
       var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
 
-      options = options || {}
-      options.table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options            = options || {}
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
           return [attr[0], Utils.addTicks(attr[1])].join(' as ')
@@ -150,31 +177,72 @@
       options.attributes = options.attributes || '*'
 
       if (options.include) {
-        var tableNames = []
+        var optAttributes = [options.table + '.*']
 
         for (var daoName in options.include) {
-          tableNames.push(Utils.addTicks(options.include[daoName].tableName))
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = Utils.addTicks(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
+              query += Utils.addTicks(foreignIdentifier) + '='
+              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(dao.tableName) + '.'
+              query += Utils.addTicks('id') + '='
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += Utils.addTicks(association.identifier) + '='
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, Utils.addTicks(attr)].join('.') +
+                  ' AS ' +
+                  Utils.addTicks([aliasName, attr].join('.'))
+              })
+            )
+          }
         }
 
-        options.table = [options.table].concat(tableNames).join(', ')
+        options.attributes = optAttributes.join(', ')
       }
 
-      if(options.where) {
-        options.where = QueryGenerator.getWhereConditions(options.where, tableName)
+      if (options.where) {
+        options.where = this.getWhereConditions(options.where, tableName)
         query += " WHERE <%= where %>"
       }
 
-      if(options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
-      if(options.group) {
+      if (options.group) {
         options.group = Utils.addTicks(options.group)
         query += " GROUP BY <%= group %>"
       }
 
-      if(options.limit && !(options.include && (options.limit === 1))) {
-        if(options.offset) {
+      if (options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+
+      if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
           query += " LIMIT <%= offset %>, <%= limit %>"
         } else {
           query += " LIMIT <%= limit %>"
@@ -193,7 +261,7 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
-        attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -240,28 +308,31 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
-        if(typeof attribute == 'string')
+        if(typeof attribute === 'string') {
           return attribute
-        else {
+        } else {
           var result = ""
 
-          if(!attribute.attribute)
+          if (!attribute.attribute) {
             throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
 
           result += attribute.attribute
 
-          if(attribute.length)
+          if (attribute.length) {
             result += '(' + attribute.length + ')'
+          }
 
-          if(attribute.order)
+          if (attribute.order) {
             result += ' ' + attribute.order
+          }
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute == 'string') ? attribute : attribute.attribute
+        return (typeof attribute === 'string') ? attribute : attribute.attribute
       })
 
       options = Utils._.extend({
@@ -290,8 +361,9 @@
       var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
         , indexName = indexNameOrAttributes
 
-      if(typeof indexName != 'string')
+      if (typeof indexName !== 'string') {
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
 
       return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
     },
@@ -299,12 +371,12 @@
     getWhereConditions: function(smth, tableName) {
       var result = null
 
-      if(Utils.isHash(smth)) {
+      if (Utils.isHash(smth)) {
         smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = QueryGenerator.hashToWhereConditions(smth)
+        result = this.hashToWhereConditions(smth)
       } else if (typeof smth === 'number') {
         smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = QueryGenerator.hashToWhereConditions(smth)
+        result = this.hashToWhereConditions(smth)
       } else if (typeof smth === "string") {
         result = smth
       } else if (Array.isArray(smth)) {
@@ -326,7 +398,7 @@
 
         if (Array.isArray(value)) {
           // is value an array?
-
+          if (value.length == 0) { value = [null] }
           _value = "(" + value.map(function(subValue) {
             return Utils.escape(subValue);
           }).join(',') + ")"
@@ -353,28 +425,34 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
-        if(Utils.isHash(dataType)) {
+        if (Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
             template += " NOT NULL"
           }
 
-          if(dataType.autoIncrement) {
-            template +=" auto_increment"
+          if (dataType.autoIncrement) {
+            template += " auto_increment"
           }
 
-          if((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
-          if(dataType.unique) {
+          if (dataType.unique) {
             template += " UNIQUE"
           }
 
-          if(dataType.primaryKey) {
+          if (dataType.primaryKey) {
             template += " PRIMARY KEY"
           }
 
@@ -391,10 +469,12 @@
       var fields = []
 
       for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
 
-        if (definition && (definition.indexOf('auto_increment') > -1)) {
-          fields.push(name)
+          if (definition && (definition.indexOf('auto_increment') > -1)) {
+            fields.push(name)
+          }
         }
       }
 
@@ -403,110 +483,14 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                              
\ No newline at end of file
+})()
                                                              \ No newline at end of file diff --git a/docs/dialects/mysql/query.js.html b/docs/dialects/mysql/query.js.html index c7cc42b26c67..cf5e60b3430c 100644 --- a/docs/dialects/mysql/query.js.html +++ b/docs/dialects/mysql/query.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                              Sequelize

                                                              declaration

                                                              Utils

                                                              Utils
                                                                var Utils         = require("../../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                Sequelize
                                                                declaration
                                                                Utils
                                                                Utils
                                                                  var Utils         = require("../../utils")
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
-    var self = this
-
     this.client    = client
     this.callee    = callee
     this.sequelize = sequelize
@@ -38,175 +60,38 @@
       raw: false
     }, options || {})
 
-    if(this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if(this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-
-    this.bindClientFunction = function(err) { onFailure.call(self, err) }
+    this.checkLoggingOption()
   }
 
-  Utils.inherit(Query, require('../abstract/query'))
-
+  Utils.inherit(Query, AbstractQuery)
   Query.prototype.run = function(sql) {
-    var self = this
-
     this.sql = sql
 
-    bindClient.call(this)
-
-    if(this.options.logging !== false) {
+    if (this.options.logging !== false) {
       this.options.logging('Executing: ' + this.sql)
     }
 
-    this.client.query({ sql: this.sql, nestTables: true }, function(err, results, fields) {
-      self.emit('sql', self.sql)
+    this.client.query(this.sql, function(err, results, fields) {
+      this.emit('sql', this.sql)
 
       if (err) {
-        onFailure.call(self, err)
+        this.emit('error', err, this.callee)
       } else {
-        if (Array.isArray(results) && !!results[0] && Utils._.keys(results[0]).length === 1) {
-          results = results.map(function(result){ return Utils._.values(result)[0] })
-        }
-
-        onSuccess.call(self, results, fields)
+        this.emit('success', this.formatResults(results))
       }
-    }).setMaxListeners(100)
-
+    }.bind(this)).setMaxListeners(100)
     return this
   }
 
-  //private
-
-  var bindClient = function() {
-    this.client.on('error', this.bindClientFunction)
-  }
-
-  var unbindClient = function() {
-    this.client.removeListener('error', this.bindClientFunction)
-  }
-
-  var onSuccess = function(results, fields) {
-    unbindClient.call(this)
-    this.emit('success', this.formatResults(results))
-
-  }
-
-  var onFailure = function(err) {
-    unbindClient.call(this)
-    this.emit('error', err, this.callee)
-  }
-
   return Query
-})()
                                                                  
\ No newline at end of file
+})()
                                                                  \ No newline at end of file diff --git a/docs/dialects/postgres/connector-manager.js.html b/docs/dialects/postgres/connector-manager.js.html index 61a3be2c6c41..bdcce6ab56b6 100644 --- a/docs/dialects/postgres/connector-manager.js.html +++ b/docs/dialects/postgres/connector-manager.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                  Sequelize

                                                                  declaration

                                                                  Query

                                                                  Query
                                                                    var Query   = require("./query")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                    Sequelize
                                                                    declaration
                                                                    Query
                                                                    Query
                                                                      var Query   = require("./query")
   , Utils   = require("../../utils")
-  , pg  = require("pg")
-  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
 
 module.exports = (function() {
   var ConnectorManager = function(sequelize, config) {
     this.sequelize = sequelize
-    this.client = null
-    this.config = config || {}
-    this.pooling = (this.config.poolCfg != null && this.config.poolCfg.maxConnections > 0)
+    this.client    = null
+    this.config    = config || {}
+    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
+    this.pg        = this.config.native ? require('pg').native : require('pg')
+
     // set pooling parameters if specified
     if (this.pooling) {
-      pg.defaults.poolSize = this.config.poolCfg.maxConnections
-      pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
+      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
+      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
     }
+
     this.disconnectTimeoutId = null
     this.pendingQueries = 0
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
@@ -49,7 +74,10 @@
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
     var self = this
-    if (this.client == null) this.connect()
+    if (this.client == null) {
+      this.connect()
+    }
+
     var query = new Query(this.client, this.sequelize, callee, options || {})
     self.pendingQueries += 1
     return query.run(sql)
@@ -69,9 +97,13 @@
 
   ConnectorManager.prototype.connect = function() {
     var self = this
+    var emitter = new (require('events').EventEmitter)()
 
     // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting) return
+    if (this.isConnecting) {
+      return
+    }
+
     this.isConnecting = true
     this.isConnected  = false
 
@@ -79,7 +111,10 @@
 
     var connectCallback = function(err, client) {
       self.isConnecting = false
-      if (!err && client) {
+
+      if (!!err) {
+        emitter.emit('error', err)
+      } else if (client) {
         client.query("SET TIME ZONE 'UTC'")
           .on('end', function() {
             self.isConnected = true
@@ -92,13 +127,14 @@
 
     if (this.pooling) {
       // acquire client from pool
-      pg.connect(uri, connectCallback)
-
+      this.pg.connect(uri, connectCallback)
     } else {
       //create one-off client
-      this.client = new pg.Client(uri)
+      this.client = new this.pg.Client(uri)
       this.client.connect(connectCallback)
     }
+
+    return emitter
   }
 
   ConnectorManager.prototype.disconnect = function() {
@@ -110,110 +146,14 @@
   }
 
   return ConnectorManager
-})()
                                                                      
\ No newline at end of file
+})()
                                                                      \ No newline at end of file diff --git a/docs/dialects/postgres/query-generator.js.html b/docs/dialects/postgres/query-generator.js.html index 95a3629eb026..e4252619009b 100644 --- a/docs/dialects/postgres/query-generator.js.html +++ b/docs/dialects/postgres/query-generator.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                      Sequelize

                                                                      declaration

                                                                      Utils

                                                                      Utils
                                                                        var Utils = require("../../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                        Sequelize
                                                                        declaration
                                                                        Utils
                                                                        Utils
                                                                          var Utils = require("../../utils")
   , util  = require("util")
+  , DataTypes = require("../../data-types")
   , tables = {}
   , primaryKeys = {};
 
@@ -34,18 +59,38 @@
 
 function addQuotes(s, quoteChar) {
   quoteChar = quoteChar || '"'
-  return quoteChar + removeQuotes(s) + quoteChar
+  return removeQuotes(s, quoteChar)
+    .split('.')
+    .map(function(e) { return quoteChar + String(e) + quoteChar })
+    .join('.')
 }
 
-function pgEscape(s) {
-  s = Utils.escape(s)
+function pgEscape(val) {
+  if (val === undefined || val === null) {
+    return 'NULL';
+  }
+
+  switch (typeof val) {
+    case 'boolean': return (val) ? 'true' : 'false';
+    case 'number': return val+'';
+  }
 
-  if (typeof s == 'string') {
-    // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-    s = s.replace(/\\'/g, "''")
+  if (val instanceof Date) {
+    val = pgSqlDate(val);
   }
 
-  return s
+  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+  val = val.replace(/'/g, "''");
+  return "'"+val+"'";
+}
+
+function pgEscapeAndQuote(val) {
+  return addQuotes(removeQuotes(pgEscape(val), "'"))
+}
+
+function pgEnum(tableName, attr, dataType) {
+  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
 }
 
 function padInt(i) {
@@ -77,6 +122,10 @@
     tables[tableName][attr] = 'serial'
   }
 
+  if (dataType.match(/^ENUM\(/)) {
+    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
+  }
+
   return dataType
 }
 
@@ -97,6 +146,10 @@
       for (var attr in attributes) {
         var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
         attrStr.push(addQuotes(attr) + " " + dataType)
+
+        if (attributes[attr].match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attr, attributes[attr]) + query;
+        }
       }
 
       var values  = {
@@ -115,7 +168,7 @@
     dropTableQuery: function(tableName, options) {
       options = options || {}
       var query = "DROP TABLE IF EXISTS <%= table %>;"
-      return Utils._.template(query)({table: addQuotes(tableName)})
+      return Utils._.template(query)({ table: addQuotes(tableName) })
     },
 
     renameTableQuery: function(before, after) {
@@ -143,6 +196,10 @@
           attrName: addQuotes(attrName),
           definition: pgDataTypeMapping(tableName, attrName, definition)
         }))
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attrName, definition) + query
+        }
       }
 
       return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
@@ -158,6 +215,7 @@
         , sql   = []
 
       for (var attributeName in attributes) {
+        var definition = attributes[attributeName]
         var attrSql = ''
 
         if (definition.indexOf('NOT NULL') > 0) {
@@ -173,6 +231,11 @@
           })
         }
 
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attributeName, definition) + query
+          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
+        }
+
         attrSql += Utils._.template(query)({
           tableName: addQuotes(tableName),
           query: addQuotes(attributeName) + ' TYPE ' + definition
@@ -199,10 +262,13 @@
     },
 
     selectQuery: function(tableName, options) {
-      options = options || {}
-      options.table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr){
-        if(Array.isArray(attr) && attr.length == 2) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options = options || {}
+      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr) {
+        if (Array.isArray(attr) && attr.length === 2) {
           return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
         } else if (attr.indexOf('`') >= 0) {
           return attr.replace(/`/g, '"')
@@ -210,27 +276,85 @@
           return addQuotes(attr)
         }
       }).join(", ")
-
       options.attributes = options.attributes || '*'
 
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = addQuotes(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
+              query += addQuotes(association.connectorDAO.tableName) + '.'
+              query += addQuotes(foreignIdentifier) + '='
+              query += addQuotes(table) + '.' + addQuotes('id')
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(dao.tableName) + '.'
+              query += addQuotes('id') + '='
+              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += addQuotes(association.identifier) + '='
+              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, addQuotes(attr)].join('.') +
+                  ' AS "' +
+                  removeQuotes([aliasName, attr].join('.')) + '"'
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
 
       if(options.where) {
         options.where = QueryGenerator.getWhereConditions(options.where)
         query += " WHERE <%= where %>"
       }
+
       if(options.order) {
         options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
         query += " ORDER BY <%= order %>"
       }
+
       if(options.group) {
         options.group = addQuotes(options.group)
         query += " GROUP BY <%= group %>"
       }
-      if(options.limit) query += " LIMIT <%= limit %>"
-      if(options.offset) query += " OFFSET <%= offset %>"
+
+      if (!(options.include && (options.limit === 1))) {
+        if (options.limit) {
+          query += " LIMIT <%= limit %>"
+        }
+
+        if (options.offset) {
+          query += " OFFSET <%= offset %>"
+        }
+      }
 
       query += ";"
+
       return Utils._.template(query)(options)
     },
 
@@ -253,9 +377,9 @@
 
       var replacements  = {
         table: addQuotes(tableName),
-        attributes: Utils._.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
+        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape((value instanceof Date) ? pgSqlDate(value) : value)
+          return pgEscape(value)
         }).join(",")
       }
 
@@ -265,12 +389,12 @@
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
         , values = []
 
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + pgEscape((value instanceof Date) ? pgSqlDate(value) : value))
+        values.push(addQuotes(key) + "=" + pgEscape(value))
       }
 
       var replacements = {
@@ -310,33 +434,37 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
-        if(typeof attribute == 'string')
+        if (typeof attribute === 'string') {
           return addQuotes(attribute)
-        else {
+        } else {
           var result = ""
 
-          if(!attribute.attribute)
+          if (!attribute.attribute) {
             throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
 
           result += addQuotes(attribute.attribute)
 
-          if(attribute.length)
+          if (attribute.length) {
             result += '(' + attribute.length + ')'
+          }
 
-          if(attribute.order)
+          if (attribute.order) {
             result += ' ' + attribute.order
+          }
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute == 'string') ? attribute : attribute.attribute
+        return (typeof attribute === "string") ? attribute : attribute.attribute
       })
 
+      var indexTable = tableName.split('.')
       options = Utils._.extend({
         indicesType: null,
-        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
         parser: null
       }, options || {})
 
@@ -356,8 +484,9 @@
       var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
         , indexName = indexNameOrAttributes
 
-      if(typeof indexName != 'string')
+      if (typeof indexName !== "string") {
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
 
       return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
     },
@@ -365,14 +494,18 @@
     getWhereConditions: function(smth) {
       var result = null
 
-      if(Utils.isHash(smth))
+      if (Utils.isHash(smth)) {
         result = QueryGenerator.hashToWhereConditions(smth)
-      else if(typeof smth == 'number')
+      }
+      else if (typeof smth === "number") {
         result = '\"id\"' + "=" + pgEscape(smth)
-      else if(typeof smth == "string")
+      }
+      else if (typeof smth === "string") {
         result = smth
-      else if(Array.isArray(smth))
+      }
+      else if (Array.isArray(smth)) {
         result = Utils.format(smth)
+      }
 
       return result
     },
@@ -387,14 +520,15 @@
         var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
           , _value = null
 
-        if(Array.isArray(value)) {
+        if (Array.isArray(value)) {
+          if (value.length == 0) { value = [null] }
           _value = "(" + value.map(function(subValue) {
             return pgEscape(subValue);
           }).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
         }
-        else if ((value) && (typeof value == 'object')) {
+        else if ((value) && (typeof value === "object")) {
           //using as sentinel for join column => value
           _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
           result.push([_key, _value].join("="))
@@ -417,17 +551,40 @@
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if(dataType.type == 'TINYINT(1)') dataType.type = 'BOOLEAN'
-          if(dataType.type == 'DATETIME') dataType.type = 'TIMESTAMP'
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.type === "TINYINT(1)") {
+            dataType.type = 'BOOLEAN'
+          }
+
+          if (dataType.type === "DATETIME") {
+            dataType.type = 'TIMESTAMP'
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
 
-          if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) template += " NOT NULL"
-          if(dataType.autoIncrement) template +=" SERIAL"
-          if(dataType.defaultValue != undefined) {
+          if (dataType.autoIncrement) {
+            template +=" SERIAL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = pgEscape(dataType.defaultValue)
           }
-          if(dataType.unique) template += " UNIQUE"
-          if(dataType.primaryKey) template += " PRIMARY KEY"
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -456,8 +613,8 @@
       var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
 
       return Utils._.template(template)({
-        user: config.username,
-        password: config.password,
+        user: encodeURIComponent(config.username),
+        password: encodeURIComponent(config.password),
         database: config.database,
         host: config.host,
         port: config.port,
@@ -467,110 +624,14 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                          
\ No newline at end of file
+})()
                                                                          \ No newline at end of file diff --git a/docs/dialects/postgres/query.js.html b/docs/dialects/postgres/query.js.html index 91f09e1b2464..b67e513d4d48 100644 --- a/docs/dialects/postgres/query.js.html +++ b/docs/dialects/postgres/query.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                          Sequelize

                                                                          declaration

                                                                          Utils

                                                                          Utils
                                                                            var Utils         = require("../../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                            Sequelize
                                                                            declaration
                                                                            Utils
                                                                            Utils
                                                                              var Utils         = require("../../utils")
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
-    var self = this
-
     this.client = client
     this.sequelize = sequelize
     this.callee = callee
@@ -38,190 +60,90 @@
       raw: false
     }, options || {})
 
-    if(this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if(this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
+    this.checkLoggingOption()
   }
   Utils.inherit(Query, AbstractQuery)
 
   Query.prototype.run = function(sql) {
-    var self = this
-
     this.sql = sql
 
-    if(this.options.logging !== false) {
+    if (this.options.logging !== false) {
       this.options.logging('Executing: ' + this.sql)
     }
 
-    var results = [];
-    var receivedError = false;
+    var receivedError = false
+      , query         = this.client.query(sql)
+      , rows          = []
 
-    var query = this.client.query(sql)
     query.on('row', function(row) {
-      if (self.callee && (self.sql.indexOf('INSERT INTO') == 0 || self.sql.indexOf('UPDATE') == 0)) {
-        Utils._.forEach(row, function(value, key) {
-          self.callee[key] = value
-        })
-        results.push(self.callee)
-      }
+      rows.push(row)
+    })
 
-      if (self.sql.indexOf('SELECT table_name FROM information_schema.tables') == 0) {
-        results.push(Utils._.values(row))
-      } else if (self.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') == 0) {
-        results.push(Utils._.values(row))
-      } else if (self.sql.indexOf('SELECT') == 0) {
-        // transform results into real model instances
-        // return the first real model instance if options.plain is set (e.g. Model.find)
-        if (self.options.raw) {
-          results.push(row);
-        } else {
-          results.push(self.callee.build(row, { isNewRecord: false }))
-        }
-      } else if((self.sql.indexOf('SHOW') == 0) || (self.sql.indexOf('DESCRIBE') == 0)) {
-        results.push(row)
-      }
-    });
+    query.on('error', function(err) {
+      receivedError = true
+      this.emit('error', err, this.callee)
+    }.bind(this))
 
     query.on('end', function() {
-      self.emit('sql', self.sql)
-      if (receivedError) return;
-
-      if (self.sql.indexOf('SELECT') == 0) {
-        if (self.options.plain) {
-          self.emit('success', (results.length == 0) ? null : results[0])
-        } else {
-          self.emit('success', results)
-        }
-      } else if((self.sql.indexOf('SHOW') == 0) || (self.sql.indexOf('DESCRIBE') == 0)) {
-        self.emit('success', results)
-      } else if (self.sql.indexOf('INSERT INTO') == 0) {
-        self.emit('success', results[0])
-      } else if (self.sql.indexOf('UPDATE') == 0) {
-        self.emit('success', self.callee)
-      } else {
-        self.emit('success', results)
+      this.emit('sql', this.sql)
+
+      if (receivedError) {
+        return
       }
-    });
 
-    query.on('error', function(err) {
-      receivedError = true
-      self.emit('error', err, self.callee)
-    });
+      onSuccess.call(this, rows)
+    }.bind(this))
 
     return this
   }
 
-  return Query
-})()
                                                                              
\ No newline at end of file
+  return Query
+})()
                                                                              \ No newline at end of file diff --git a/docs/dialects/query-generator.js.html b/docs/dialects/query-generator.js.html index 3ebd02f14d9b..62e3e45d5a24 100644 --- a/docs/dialects/query-generator.js.html +++ b/docs/dialects/query-generator.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                              Sequelize

                                                                              Returns a query for creating a table.
                                                                              Parameters:
                                                                              - tableName: Name of the new table.
                                                                              - attributes: An object with containing attribute-attributeType-pairs.
                                                                              Attributes should have the format:
                                                                              {attributeName: type, attr2: type2}
                                                                              --> e.g. {title: 'VARCHAR(255)'}
                                                                              - options: An object with options.
                                                                              Defaults: { engine: 'InnoDB', charset: null }

                                                                                createTableQuery: function(tableName, attributes, options) {
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                Sequelize
                                                                                Returns a query for creating a table.
                                                                                      Parameters:
                                                                                        - tableName: Name of the new table.
                                                                                        - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                      Attributes should have the format:
                                                                                                      {attributeName: type, attr2: type2}
                                                                                                      --> e.g. {title: 'VARCHAR(255)'}
                                                                                        - options: An object with options.
                                                                                                   Defaults: { engine: 'InnoDB', charset: null }
                                                                                  createTableQuery: function(tableName, attributes, options) {
       throwMethodUndefined('createTableQuery')
     },
                                                                                  Returns a query for dropping a table.
                                                                                    dropTableQuery: function(tableName, options) {
       throwMethodUndefined('dropTableQuery')
@@ -68,110 +92,14 @@
   }
 
   return QueryGenerator
-})()
                                                                                    
\ No newline at end of file
+})()
                                                                                    \ No newline at end of file diff --git a/docs/dialects/sqlite/connector-manager.js.html b/docs/dialects/sqlite/connector-manager.js.html index 31a9cf651a14..06ad3a1a5c30 100644 --- a/docs/dialects/sqlite/connector-manager.js.html +++ b/docs/dialects/sqlite/connector-manager.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                    Sequelize

                                                                                    declaration

                                                                                    Utils

                                                                                    Utils
                                                                                      var Utils   = require("../../utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                      Sequelize
                                                                                      declaration
                                                                                      Utils
                                                                                      Utils
                                                                                        var Utils   = require("../../utils")
   , sqlite3 = require('sqlite3').verbose()
   , Query   = require("./query")
 
@@ -38,110 +62,14 @@
   }
 
   return ConnectorManager
-})()
                                                                                        
\ No newline at end of file
+})()
                                                                                        \ No newline at end of file diff --git a/docs/dialects/sqlite/query-generator.js.html b/docs/dialects/sqlite/query-generator.js.html index 553644a2df58..fe4032c42364 100644 --- a/docs/dialects/sqlite/query-generator.js.html +++ b/docs/dialects/sqlite/query-generator.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                        Sequelize

                                                                                        declaration

                                                                                        Utils

                                                                                        Utils
                                                                                          var Utils = require("../../utils")
-  , util  = require("util")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                          Sequelize
                                                                                          declaration
                                                                                          Utils
                                                                                          Utils
                                                                                            var Utils = require("../../utils")
+  , DataTypes = require("../../data-types")
+var MySqlQueryGenerator = Utils._.extend(
+  Utils._.clone(require("../query-generator")),
+  Utils._.clone(require("../mysql/query-generator"))
+)
+
+var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
 
 var escape = function(str) {
   if (typeof str === 'string') {
@@ -44,16 +74,24 @@
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
 
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , attrStr = []
+      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , primaryKeys = []
+        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
+                    return Utils._.includes(definition, 'PRIMARY KEY')
+                  }).length > 1)
+        , attrStr     = []
 
-      for (var attr in attributes) {
-        var dataType = attributes[attr]
 
-        if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-          attrStr.push(Utils.addTicks(attr) + " " + dataType)
-        } else {
-          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
         }
       }
 
@@ -62,12 +100,17 @@
         attributes: attrStr.join(", "),
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
 
       return Utils._.template(query)(values).trim() + ";"
     },
 
     showTablesQuery: function() {
-      return "SELECT name FROM sqlite_master WHERE type='table';"
+      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
     },
 
     insertQuery: function(tableName, attrValueHash) {
@@ -77,7 +120,7 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
-        attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
           return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -125,20 +168,34 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
-        if(Utils.isHash(dataType)) {
+        if (Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if(dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey)
+          if (dataType.type === DataTypes.ENUM) {
+	          replacements.type = "INTEGER"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
             template += " NOT NULL"
+          }
 
-          if(dataType.defaultValue != undefined) {
+          if (dataType.defaultValue !== undefined) {
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
-          if(dataType.unique) template += " UNIQUE"
-          if(dataType.primaryKey) template += " PRIMARY KEY"
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+
+            if (dataType.autoIncrement) {
+              template += ' AUTOINCREMENT'
+            }
+          }
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -153,127 +210,44 @@
       var fields = []
 
       for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
 
-        if (definition && (definition.indexOf('INTEGER PRIMARY KEY') == 0)) {
-          fields.push(name)
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
+            fields.push(name)
+          }
         }
       }
 
       return fields
-    }
-  }
-
-  var MySqlQueryGenerator = Utils._.extend(
-    Utils._.clone(require("../query-generator")),
-    Utils._.clone(require("../mysql/query-generator"))
-  )
-
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
-})()
                                                                                            
\ No newline at end of file
+  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+})()
                                                                                            \ No newline at end of file diff --git a/docs/dialects/sqlite/query.js.html b/docs/dialects/sqlite/query.js.html index 02ce096ab2cf..5636b2d34d35 100644 --- a/docs/dialects/sqlite/query.js.html +++ b/docs/dialects/sqlite/query.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                            Sequelize

                                                                                            declaration

                                                                                            Utils

                                                                                            Utils
                                                                                              var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
 
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                              Sequelize
                                                                                              declaration
                                                                                              Utils
                                                                                              Utils
                                                                                                var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(database, sequelize, callee, options) {
@@ -37,43 +60,37 @@
       raw: false
     }, options || {})
 
-    if(this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if(this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
+    this.checkLoggingOption()
   }
   Utils.inherit(Query, AbstractQuery)
 
+  Query.prototype.getInsertIdField = function() {
+    return 'lastID'
+  }
+
   Query.prototype.run = function(sql) {
     var self = this
 
     this.sql = sql
 
-    if(this.options.logging !== false) {
+    if (this.options.logging !== false) {
       this.options.logging('Executing: ' + this.sql)
     }
 
     var columnTypes = {};
     this.database.serialize(function() {
       var executeSql = function() {
-        self.database[databaseMethod](self.sql, function(err, results) {
-           //allow clients to listen to sql to do their own logging or whatnot
+        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
+          // allow clients to listen to sql to do their own logging or whatnot
           self.emit('sql', self.sql)
           this.columnTypes = columnTypes;
           err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
         })
       };
 
-      var isInsertCommand = (self.sql.toLowerCase().indexOf('insert') == 0)
-        , isUpdateCommand = (self.sql.toLowerCase().indexOf('update') == 0)
-        , databaseMethod  = (isInsertCommand || isUpdateCommand) ? 'run' : 'all'
-      if (databaseMethod === 'all' && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
+      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
         var tableName = RegExp.$1;
+
         if (tableName !== 'sqlite_master') {
           // get the column types
           self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
@@ -97,39 +114,43 @@
 
   //private
 
+  var getDatabaseMethod = function() {
+    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
+      return 'run'
+    } else {
+      return 'all'
+    }
+  }
+
   var onSuccess = function(results, metaData) {
     var result = this.callee
       , self   = this
 
     // add the inserted row id to the instance
-    if (this.callee && (this.sql.indexOf('INSERT INTO') == 0) && metaData.hasOwnProperty('lastID')) {
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-      this.callee[autoIncrementField] = metaData.lastID
+    if (this.send('isInsertQuery', results, metaData)) {
+      this.send('handleInsertQuery', results, metaData)
     }
 
-    if (this.sql.indexOf('sqlite_master') != -1) {
-      result = results.map(function(resultSet){ return resultSet.name })
-    } else if (this.sql.indexOf('SELECT') == 0) {
-      // transform results into real model instances
-      // return the first real model instance if options.plain is set (e.g. Model.find)
+    if (this.sql.indexOf('sqlite_master') !== -1) {
+      result = results.map(function(resultSet) { return resultSet.name })
+    } else if (this.send('isSelectQuery')) {
+      // we need to convert the timestamps into actual date objects
 
-      if(this.options.raw) {
-        result = results
-      } else {
-        result = results.map(function(result) {
+      if(!this.options.raw) {
+        results = results.map(function(result) {
           for (var name in result) {
-            if (metaData.columnTypes[name] === 'DATETIME') {
+            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
               result[name] = new Date(result[name]);
             }
           }
-          return self.callee.build(result, { isNewRecord: false })
+          return result
         })
       }
 
-      if(this.options.plain)
-        result = (result.length == 0) ? null : result[0]
-    } else if((this.sql.indexOf('SHOW') == 0) || (this.sql.indexOf('DESCRIBE') == 0))
+      result = this.send('handleSelectQuery', results)
+    } else if (this.send('isShowOrDescribeQuery')) {
       result = results
+    }
 
     this.emit('success', result)
   }
@@ -139,110 +160,14 @@
   }
 
   return Query
-})()
                                                                                                
\ No newline at end of file
+})()
                                                                                                \ No newline at end of file diff --git a/docs/emitters/custom-event-emitter.js.html b/docs/emitters/custom-event-emitter.js.html index e3f25876927f..196c5fb2263b 100644 --- a/docs/emitters/custom-event-emitter.js.html +++ b/docs/emitters/custom-event-emitter.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                Sequelize

                                                                                                declaration

                                                                                                util

                                                                                                util
                                                                                                  var util         = require("util")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                  Sequelize
                                                                                                  declaration
                                                                                                  util
                                                                                                  util
                                                                                                    var util         = require("util")
   , EventEmitter = require("events").EventEmitter
 
 module.exports = (function() {
@@ -67,110 +91,14 @@
 
 
   return CustomEventEmitter
-})()
                                                                                                    
\ No newline at end of file
+})()
                                                                                                    \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 5655e17894c5..58c3518aea0b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                    Sequelize

                                                                                                    index.html

                                                                                                    \ No newline at end of file +

                                                                                                    Sequelize

                                                                                                    \ No newline at end of file diff --git a/docs/lib/associations/belongs-to.js.html b/docs/lib/associations/belongs-to.js.html new file mode 100644 index 000000000000..c8fe5b78362c --- /dev/null +++ b/docs/lib/associations/belongs-to.js.html @@ -0,0 +1,116 @@ +Sequelize

                                                                                                    Sequelize

                                                                                                    declaration

                                                                                                    Utils

                                                                                                    Utils
                                                                                                      var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var BelongsTo = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'BelongsTo'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+  }
+
+  // the id is in the source table
+  BelongsTo.prototype.injectAttributes = function() {
+    var newAttributes  = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.defaults(this.source.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  BelongsTo.prototype.injectGetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function(params) {
+      var id = this[self.identifier]
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: {id:id}}, params)
+        }
+      } else {
+        params = id
+      }
+
+      return self.target.find(params)
+    }
+
+    return this
+  }
+
+  BelongsTo.prototype.injectSetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function(associatedObject) {
+      this[self.identifier] = associatedObject ? associatedObject.id : null
+
+      // passes the changed field to save, so only that field get updated.
+      return this.save([ self.identifier ])
+    }
+
+    return this
+  }
+
+  return BelongsTo
+})()
                                                                                                      \ No newline at end of file diff --git a/docs/lib/associations/has-many-double-linked.js.html b/docs/lib/associations/has-many-double-linked.js.html new file mode 100644 index 000000000000..53b55bbe4101 --- /dev/null +++ b/docs/lib/associations/has-many-double-linked.js.html @@ -0,0 +1,188 @@ +Sequelize

                                                                                                      Sequelize

                                                                                                      declaration

                                                                                                      Utils

                                                                                                      Utils
                                                                                                        var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManyDoubleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManyDoubleLinked.prototype.injectGetter = function(options) {
+    var self = this, _options = options
+
+    var customEventEmitter = new Utils.CustomEventEmitter(function() {
+      var where = {}, options = _options || {};
+
+      //fully qualify
+      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
+
+      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
+        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+
+      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
+
+      if (options.where) {
+        Utils._.each(options.where, function(value, index) {
+          delete options.where[index];
+          options.where[self.__factory.target.tableName+"."+index] = value;
+        });
+
+        Utils._.extend(options.where, where)
+      } else {
+        options.where = where;
+      }
+
+      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
+        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
+        .on('error', function(err){ customEventEmitter.emit('error', err) })
+        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
+    })
+
+    return customEventEmitter.run()
+  }
+
+  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
+    var self = this
+
+    destroyObsoleteAssociations
+      .call(this, oldAssociations, newAssociations)
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .success(function() {
+        var chainer             = new Utils.QueryChainer
+          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
+          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+          , unassociatedObjects = newAssociations.filter(function (obj) { 
+              return !Utils._.find(oldAssociations, function (old) {
+                return obj.id === old.id
+              }) 
+            })
+
+        unassociatedObjects.forEach(function(unassociatedObject) {
+          var attributes = {}
+          attributes[self.__factory.identifier] = self.instance.id
+          attributes[foreignIdentifier] = unassociatedObject.id
+
+          chainer.add(self.__factory.connectorDAO.create(attributes))
+        })
+
+        chainer
+          .run()
+          .success(function() { emitterProxy.emit('success', newAssociations) })
+          .error(function(err) { emitterProxy.emit('error', err) })
+          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      })
+  }
+
+  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    var attributes = {}
+      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
+
+    attributes[this.__factory.identifier] = this.instance.id
+    attributes[foreignIdentifier] = newAssociation.id
+
+    this.__factory.connectorDAO.create(attributes)
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
+  // private
+
+  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
+      var obsoleteAssociations = oldAssociations.filter(function (old) {
+        // Return only those old associations that are not found in new
+        return !Utils._.find(newAssociations, function (obj) {
+          return obj.id === old.id
+        })
+      })
+
+      if (obsoleteAssociations.length === 0) {
+        return emitter.emit('success', null)
+      }
+
+      obsoleteAssociations.forEach(function(associatedObject) {
+        var where            = {}
+          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
+          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+          , notFoundEmitters = []
+
+        where[self.__factory.identifier] = self.instance.id
+        where[foreignKey] = associatedObject.id
+
+        self.__factory.connectorDAO
+          .find({ where: where })
+          .success(function(connector) {
+            if (connector === null) {
+              notFoundEmitters.push(null)
+            } else {
+              chainer.add(connector.destroy())
+            }
+
+            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+              // found all obsolete connectors and will delete them now
+              chainer
+                .run()
+                .success(function() { emitter.emit('success', null) })
+                .error(function(err) { emitter.emit('error', err) })
+                .on('sql', function(sql) { emitter.emit('sql', sql) })
+            }
+          })
+          .error(function(err) { emitter.emit('error', err) })
+          .on('sql', function(sql) { emitter.emit('sql', sql) })
+      })
+    }).run()
+  }
+
+  return HasManyDoubleLinked
+})()
                                                                                                        \ No newline at end of file diff --git a/docs/lib/associations/has-many-single-linked.js.html b/docs/lib/associations/has-many-single-linked.js.html new file mode 100644 index 000000000000..e31294c02045 --- /dev/null +++ b/docs/lib/associations/has-many-single-linked.js.html @@ -0,0 +1,106 @@ +Sequelize

                                                                                                        Sequelize

                                                                                                        declaration

                                                                                                        Utils

                                                                                                        Utils
                                                                                                          var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManySingleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManySingleLinked.prototype.injectGetter = function(options) {
+    var where = {}, options = options || {}
+
+    where[this.__factory.identifier] = this.instance.id
+
+    options.where = options.where ? Utils._.extend(options.where, where) : where
+    return this.__factory.target.findAll(options)
+  }
+
+  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
+    var self    = this
+      , options = this.__factory.options
+      , chainer = new Utils.QueryChainer()
+      , obsoleteAssociations = oldAssociations.filter(function (old) { 
+          return !Utils._.find(newAssociations, function (obj) {
+            return obj.id === old.id
+          }) 
+        })
+      , unassociatedObjects = newAssociations.filter(function (obj) { 
+          return !Utils._.find(oldAssociations, function (old) {
+            return obj.id === old.id
+          }) 
+        })
+
+    // clear the old associations
+    obsoleteAssociations.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = null
+      chainer.add(associatedObject.save())
+    })
+
+    // set the new associations
+    unassociatedObjects.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = self.instance.id
+      chainer.add(associatedObject.save())
+    })
+
+    chainer
+      .run()
+      .success(function() { emitter.emit('success', newAssociations) })
+      .error(function(err) { emitter.emit('error', err) })
+  }
+
+  HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    newAssociation[this.__factory.identifier] = this.instance.id
+
+    newAssociation.save()
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
+  return HasManySingleLinked
+})()
                                                                                                          \ No newline at end of file diff --git a/docs/lib/associations/has-many.js.html b/docs/lib/associations/has-many.js.html new file mode 100644 index 000000000000..f5673f11ccfe --- /dev/null +++ b/docs/lib/associations/has-many.js.html @@ -0,0 +1,236 @@ +Sequelize

                                                                                                          Sequelize

                                                                                                          declaration

                                                                                                          Utils

                                                                                                          Utils
                                                                                                            var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+var HasManySingleLinked = require("./has-many-single-linked")
+  , HasManyMultiLinked  = require("./has-many-double-linked")
+
+module.exports = (function() {
+  var HasMany = function(srcDAO, targetDAO, options) {
+    this.associationType = 'HasMany'
+    this.source = srcDAO
+    this.target = targetDAO
+    this.options = options
+    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
+    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
+
+    var combinedTableName = Utils.combineTableNames(
+      this.source.tableName,
+      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
+    )
+    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
+
+    var as = (this.options.as || Utils.pluralize(this.target.tableName))
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + as),
+      set: Utils._.camelize('set_' + as),
+      add: Utils._.camelize(Utils.singularize('add_' + as)),
+      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
+      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
+      hasAll: Utils._.camelize('has_' + as)
+    }
+  }
+
+  // the id is in the target table
+  // or in an extra table which connects two tables
+  HasMany.prototype.injectAttributes = function() {
+    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+
+    // is there already a single sided association between the source and the target?
+    // or is the association on the model itself?
+    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
+      // remove the obsolete association identifier from the source
+      if (this.isSelfAssociation) {
+        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
+      } else {
+        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
+        delete this.source.rawAttributes[this.foreignIdentifier]
+      }
+
+      // define a new model, which connects the models
+      var combinedTableAttributes = {}
+      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
+
+      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
+
+      if (!this.isSelfAssociation) {
+        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
+      }
+
+      if (this.options.syncOnAssociation) {
+        this.connectorDAO.sync()
+      }
+    } else {
+      var newAttributes = {}
+      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      Utils._.defaults(this.target.rawAttributes, newAttributes)
+    }
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  HasMany.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function(options) {
+      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+      return new Class(self, this).injectGetter(options)
+    }
+
+   obj[this.accessors.hasAll] = function(objects) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.all(objects, function(o) {
+              return Utils._.any(associatedObjects, function(associatedObject) {
+                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                  return o[identifier] == associatedObject[identifier];
+                });
+              })
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    obj[this.accessors.hasSingle] = function(o) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.any(associatedObjects, function(associatedObject) {
+              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                return o[identifier] == associatedObject[identifier];
+              });
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+    return this
+  }
+
+  HasMany.prototype.injectSetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.set] = function(newAssociatedObjects) {
+      if (newAssociatedObjects === null) {
+        newAssociatedObjects = []
+      }
+
+      var instance = this
+
+      // define the returned customEventEmitter, which will emit the success event once everything is done
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]()
+          .success(function(oldAssociatedObjects) {
+            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
+          })
+          .error(function(err) {
+            emitter.emit('error', err)
+          })
+          .on('sql', function(sql) {
+            emitter.emit('sql', sql)
+          })
+      }).run()
+    }
+
+    obj[this.accessors.add] = function(newAssociatedObject) {
+      var instance = this
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
+          .error(function(err){ emitter.emit('error', err)})
+          .success(function(currentAssociatedObjects) {
+            if (currentAssociatedObjects.length === 0) {
+              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
+            } else {
+              emitter.emit('success', newAssociatedObject);
+            }
+          })
+      }).run()
+    }
+
+    obj[this.accessors.remove] = function(oldAssociatedObject) {
+      var instance = this
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
+          var newAssociations = []
+
+          currentAssociatedObjects.forEach(function(association) {
+            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+              newAssociations.push(association)
+          })
+
+          instance[self.accessors.set](newAssociations)
+            .success(function() { customEventEmitter.emit('success', null) })
+            .error(function(err) { customEventEmitter.emit('error', err) })
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    return this
+  }
+
+  return HasMany
+})()
                                                                                                            \ No newline at end of file diff --git a/docs/lib/associations/has-one.js.html b/docs/lib/associations/has-one.js.html new file mode 100644 index 000000000000..bb831a89a231 --- /dev/null +++ b/docs/lib/associations/has-one.js.html @@ -0,0 +1,139 @@ +Sequelize

                                                                                                            Sequelize

                                                                                                            declaration

                                                                                                            Utils

                                                                                                            Utils
                                                                                                              var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var HasOne = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'HasOne'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
+      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+    }
+  }
+
+  // the id is in the target table
+  HasOne.prototype.injectAttributes = function() {
+    var newAttributes = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.defaults(this.target.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  HasOne.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function(params) {
+      var id    = this.id
+        , where = {}
+
+      where[self.identifier] = id
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: where}, params)
+        }
+      } else {
+        params = {where: where}
+      }
+
+      return self.target.find(params)
+    }
+
+    return this
+  }
+
+  HasOne.prototype.injectSetter = function(obj) {
+    var self    = this
+      , options = self.options || {}
+
+    obj[this.accessors.set] = function(associatedObject) {
+      var instance = this;
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]().success(function(oldObj) {
+          if (oldObj) {
+            oldObj[self.identifier] = null
+            oldObj.save()
+          }
+
+          if (associatedObject) {
+            associatedObject[self.identifier] = instance.id
+            associatedObject
+              .save()
+              .success(function() { emitter.emit('success', associatedObject) })
+              .error(function(err) { emitter.emit('error', err) })
+          } else {
+            emitter.emit('success', null)
+          }
+
+        })
+      }).run()
+    }
+
+    return this
+  }
+
+  return HasOne
+})()
                                                                                                              \ No newline at end of file diff --git a/docs/lib/associations/mixin.js.html b/docs/lib/associations/mixin.js.html new file mode 100644 index 000000000000..6375d9c5bf22 --- /dev/null +++ b/docs/lib/associations/mixin.js.html @@ -0,0 +1,112 @@ +Sequelize

                                                                                                              Sequelize

                                                                                                              declaration

                                                                                                              Mixin

                                                                                                              Mixin

                                                                                                                Defines Mixin for all models.

                                                                                                                var Mixin = module.exports = function(){}
+
+Mixin.hasOne = function(associatedDAO, options) {
+  // the id is in the foreign table
+  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype);
+  association.injectSetter(this.DAO.prototype);
+
+  return this
+}
+
+Mixin.belongsTo = function(associatedDAO, options) {
+  // the id is in this table
+  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+  return this
+}
+
+Mixin.hasMany = function(associatedDAO, options) {
+  // the id is in the foreign table or in a connecting table
+  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+  return this
+}
+
+Mixin.getAssociation = function(target) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
+
+console.log(target.name, association.target.name)
+      if (!result && (association.target === target)) {
+        result = association
+      }
+    }
+  }
+
+  return result
+}
+
+Mixin.getAssociationByAlias = function(alias) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
+
+      if (!result && (association.options.as === alias)) {
+        result = association
+      }
+    }
+  }
+
+  return result
+}

                                                                                                                  example for instance methods:
                                                                                                                  Mixin.prototype.test = function() {
                                                                                                                  console.log('asd')
                                                                                                                  }

                                                                                                                  \ No newline at end of file diff --git a/docs/lib/dao-factory-manager.js.html b/docs/lib/dao-factory-manager.js.html new file mode 100644 index 000000000000..575fbf8362f4 --- /dev/null +++ b/docs/lib/dao-factory-manager.js.html @@ -0,0 +1,80 @@ +Sequelize

                                                                                                                  Sequelize

                                                                                                                  property

                                                                                                                  exports

                                                                                                                  module.exports
                                                                                                                    module.exports = (function() {
+  var DAOFactoryManager = function(sequelize) {
+    this.daos = []
+    this.sequelize = sequelize
+  }
+
+  DAOFactoryManager.prototype.addDAO = function(dao) {
+    this.daos.push(dao)
+
+    return dao
+  }
+
+  DAOFactoryManager.prototype.removeDAO = function(dao) {
+    this.daos = this.daos.filter(function(_dao) {
+      return _dao.name != dao.name
+    })
+  }
+
+  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
+    options = options || {}
+    options.attribute = options.attribute || 'name'
+
+    var dao = this.daos.filter(function(dao) {
+      return dao[options.attribute] === daoName
+    })
+
+    return !!dao ? dao[0] : null
+  }
+
+  DAOFactoryManager.prototype.__defineGetter__('all', function() {
+    return this.daos
+  })
+
+  return DAOFactoryManager
+})()
                                                                                                                    \ No newline at end of file diff --git a/docs/lib/dao-factory.js.html b/docs/lib/dao-factory.js.html new file mode 100644 index 000000000000..5c1b38fae016 --- /dev/null +++ b/docs/lib/dao-factory.js.html @@ -0,0 +1,300 @@ +Sequelize

                                                                                                                    Sequelize

                                                                                                                      ptions.include =

                                                                                                                      includes.map(function(include) {
+        console.log(include instanceof DAOFactory)
+      })
+
+      includes.forEach(function(daoName) {
+        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+
+        if (!options.include[daoName]) {
+          options.include[daoName] = this.getAssociationByAlias(daoName).target
+        }
+      }.bind(this))
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      type:    'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  //right now, the caller (has-many-double-linked) is in charge of the where clause
+  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
+    var optcpy = Utils._.clone(options)
+    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
+
+    // whereCollection is used for non-primary key updates
+    this.options.whereCollection = optcpy.where || null;
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+  }
                                                                                                                      method

                                                                                                                      find

                                                                                                                      DAOFactory.prototype.find()
                                                                                                                      • @param: {Object} options Options to describe the scope of the search.
                                                                                                                      • @: @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
                                                                                                                      • @return: {Object} A promise which fires `success`, `error`, `complete` and `sql`.

                                                                                                                      Search for an instance.

                                                                                                                      DAOFactory.prototype.find = function(options) {
+    var hasJoin = false
+
+    // no options defined?
+    // return an emitter which emits null
+    if ([null, undefined].indexOf(options) !== -1) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        setTimeout(function() { emitter.emit('success', null) }, 10)
+      }).run()
+    }
+
+    var primaryKeys = this.primaryKeys
+
+    // options is not a hash but an id
+    if (typeof options === 'number') {
+      options = { where: options }
+    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
+      var where = {}
+        , self  = this
+        , keys = Object.keys(primaryKeys)
+
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
+
+      options = { where: where }
+    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
+      var parsedId = parseInt(options, 10)
+
+      if (!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
+
+      options = { where: parsedId }
+    } else if (typeof options === 'object') {
+      var includes = null
+
+      options = Utils._.clone(options)
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          if (include instanceof DAOFactory) {
+            include = { daoFactory: include, as: include.tableName }
+          }
+
+          if (typeof include === 'object') {
+            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
+              var usesAlias = include.as !== include.tableName
+
+              // check if the current daoFactory is actually associated with the passed daoFactory
+              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
+                return include
+              } else {
+                var msg = include.daoFactory.name
+
+                if (usesAlias) {
+                  msg += " (" + include.as + ")"
+                }
+
+                msg += " is not associated to " + this.name + "!"
+
+                throw new Error(msg)
+              }
+            } else {
+              throw new Error('Include malformed. Expected attributes: daoFactory, as')
+            }
+          } else {
+            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
+          }
+        }.bind(this))
+      }
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    options.limit = 1
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      plain: true,
+      type: 'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  DAOFactory.prototype.count = function(options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['count(*)', 'count'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
+  }
+
+  DAOFactory.prototype.max = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['max(' + field + ')', 'max'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
+  }
+  DAOFactory.prototype.min = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['min(' + field + ')', 'min'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
+  }
+
+  DAOFactory.prototype.build = function(values, options) {
+    options = options || {isNewRecord: true}
+
+    var self     = this
+      , instance = new this.DAO(values, this.options, options.isNewRecord)
+
+    instance.isNewRecord = options.isNewRecord
+
+    return instance
+  }
+
+  DAOFactory.prototype.create = function(values, fields) {
+    return this.build(values).save(fields)
+  }
+
+  DAOFactory.prototype.findOrCreate = function (params, defaults) {
+    var self = this;
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          for (var attrname in defaults) {
+            params[attrname] = defaults[attrname];
+          }
+
+          self.create(params)
+	    .success(function (instance) {
+              emitter.emit('success', instance)
+            })
+	    .error( function (error) {
+              emitter.emit('error', error)
+            });
+        } else {
+          emitter.emit('success', instance)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      });
+    }).run()
+  }
+
+  // private
+
+  var query = function() {
+    var args      = Utils._.map(arguments, function(arg, _) { return arg })
+      , sequelize = this.daoFactoryManager.sequelize
+
+    // add this as the second argument
+    if (arguments.length === 1) {
+      args.push(this)
+    }
+
+    // add {} as options
+    if (args.length === 2) {
+      args.push({})
+    }
+
+    return sequelize.query.apply(sequelize, args)
+  }
+
+  var addOptionalClassMethods = function() {
+    var self = this
+    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
+  }
+
+  var addDefaultAttributes = function() {
+    var self              = this
+      , defaultAttributes = {
+        id: {
+          type: DataTypes.INTEGER,
+          allowNull: false,
+          primaryKey: true,
+          autoIncrement: true
+        }
+      }
+
+    if (this.hasPrimaryKeys) {
+      defaultAttributes = {}
+    }
+
+    if (this.options.timestamps) {
+      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+
+      if (this.options.paranoid)
+        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
+    }
+
+    Utils._.each(defaultAttributes, function(value, attr) {
+      self.rawAttributes[attr] = value
+    })
+  }
+
+  var findAutoIncrementField = function() {
+    var fields = this.QueryGenerator.findAutoIncrementField(this)
+
+    this.autoIncrementField = null
+
+    fields.forEach(function(field) {
+      if (this.autoIncrementField) {
+        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
+      } else {
+        this.autoIncrementField = field
+      }
+    }.bind(this))
+  }
+
+  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
+
+  return DAOFactory
+})()
                                                                                                                      \ No newline at end of file diff --git a/docs/lib/dao.js.html b/docs/lib/dao.js.html new file mode 100644 index 000000000000..d1ad7b8131b0 --- /dev/null +++ b/docs/lib/dao.js.html @@ -0,0 +1,210 @@ +Sequelize

                                                                                                                      Sequelize

                                                                                                                      method

                                                                                                                      validate

                                                                                                                      DAO.prototype.validate()
                                                                                                                      • @return: {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.

                                                                                                                      Validate this dao's attribute values according to validation rules set in the dao definition.

                                                                                                                      DAO.prototype.validate = function() {
+    var self = this
+    var failures = {}
+
+    // for each field and value
+    Utils._.each(self.values, function(value, field) {
+
+      // if field has validators
+      if (self.validators.hasOwnProperty(field)) {
+        // for each validator
+        Utils._.each(self.validators[field], function(details, validatorType) {
+
+          var is_custom_fn = false  // if true then it's a custom validation method
+          var fn_method = null      // the validation function to call
+          var fn_args = []          // extra arguments to pass to validation function
+          var fn_msg = ""           // the error message to return if validation fails
+
+          // is it a custom validator function?
+          if (Utils._.isFunction(details)) {
+            is_custom_fn = true
+            fn_method = Utils._.bind(details, self, value)
+          }
+          // is it a validator module function?
+          else {
+            // extra args
+            fn_args = details.hasOwnProperty("args") ? details.args : details
+            if (!Array.isArray(fn_args))
+              fn_args = [fn_args]
+            // error msg
+            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
+            // check method exists
+            var v = Validator.check(value, fn_msg)
+            if (!Utils._.isFunction(v[validatorType]))
+              throw new Error("Invalid validator function: " + validatorType)
+            // bind to validator obj
+            fn_method = Utils._.bind(v[validatorType], v)
+          }
+
+          try {
+            fn_method.apply(null, fn_args)
+          } catch (err) {
+            err = err.message
+            // if we didn't provide a custom error message then augment the default one returned by the validator
+            if (!fn_msg && !is_custom_fn)
+              err += ": " + field
+            // each field can have multiple validation failures stored against it
+            if (failures.hasOwnProperty(field)) {
+              failures[field].push(err)
+            } else {
+              failures[field] = [err]
+            }
+          }
+
+        }) // for each validator for this field
+      } // if field has validator set
+    }) // for each field
+
+    return (Utils._.isEmpty(failures) ? null : failures)
+  }
+
+
+  DAO.prototype.updateAttributes = function(updates, fields) {
+    this.setAttributes(updates)
+    return this.save(fields)
+  }
+
+  DAO.prototype.setAttributes = function(updates) {
+    var self = this
+
+    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
+
+    readOnlyAttributes.push('id')
+    readOnlyAttributes.push('createdAt')
+    readOnlyAttributes.push('updatedAt')
+    readOnlyAttributes.push('deletedAt')
+
+    Utils._.each(updates, function(value, attr) {
+      var updateAllowed = (
+        (readOnlyAttributes.indexOf(attr) == -1) &&
+        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
+        (self.attributes.indexOf(attr) > -1)
+      )
+      updateAllowed && (self[attr] = value)
+    })
+  }
+
+  DAO.prototype.destroy = function() {
+    if (this.__options.timestamps && this.__options.paranoid) {
+      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
+      this[attr] = new Date()
+      return this.save()
+    } else {
+      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
+      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
+    }
+  }
+
+  DAO.prototype.equals = function(other) {
+    var result = true
+      , self   = this
+
+    Utils._.each(this.values, function(value, key) {
+      result = result && (value == other[key])
+    })
+
+    return result
+  }
+
+  DAO.prototype.equalsOneOf = function(others) {
+    var result = false
+      , self   = this
+
+    others.forEach(function(other) { result = result || self.equals(other) })
+
+    return result
+  }
+
+  DAO.prototype.addAttribute = function(attribute, value) {
+    this[attribute] = value
+  }
+
+  DAO.prototype.setValidators = function(attribute, validators) {
+    this.validators[attribute] = validators
+  }
+
+  DAO.prototype.toJSON = function() {
+    return this.values;
+  }
+
+  // private
+
+  var initAttributes = function(values, isNewRecord) {
+    // add all passed values to the dao and store the attribute names in this.attributes
+    for (var key in values) {
+      if (values.hasOwnProperty(key)) {
+        this.addAttribute(key, values[key])
+      }
+    }
+
+    // set id to null if not passed as value
+    // a newly created dao has no id
+    var defaults = this.hasPrimaryKeys ? {} : { id: null }
+
+    if (this.__options.timestamps && isNewRecord) {
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+
+      if (this.__options.paranoid) {
+        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
+      }
+    }
+
+    if (Utils._.size(defaults)) {
+      for (var attr in defaults) {
+        var value = defaults[attr]
+
+        if (!this.hasOwnProperty(attr)) {
+          this.addAttribute(attr, Utils.toDefaultValue(value))
+        }
+      }
+    }
+  }
+
+  return DAO
+})()
                                                                                                                      \ No newline at end of file diff --git a/docs/lib/data-types.js.html b/docs/lib/data-types.js.html new file mode 100644 index 000000000000..2c8836782536 --- /dev/null +++ b/docs/lib/data-types.js.html @@ -0,0 +1,56 @@ +Sequelize

                                                                                                                      Sequelize

                                                                                                                      property

                                                                                                                      exports

                                                                                                                      module.exports
                                                                                                                        module.exports = {
+  STRING: 'VARCHAR(255)',
+  TEXT: 'TEXT',
+  INTEGER: 'INTEGER',
+  BIGINT:  'BIGINT',
+  DATE: 'DATETIME',
+  BOOLEAN: 'TINYINT(1)',
+  FLOAT: 'FLOAT',
+  NOW: 'NOW',
+  ENUM: 'ENUM'
+}
                                                                                                                        \ No newline at end of file diff --git a/docs/lib/dialects/abstract/query.js.html b/docs/lib/dialects/abstract/query.js.html new file mode 100644 index 000000000000..0d59cc648345 --- /dev/null +++ b/docs/lib/dialects/abstract/query.js.html @@ -0,0 +1,370 @@ +Sequelize

                                                                                                                        Sequelize

                                                                                                                          Inherit from CustomEventEmitter

                                                                                                                          Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                          method

                                                                                                                          run

                                                                                                                          AbstractQuery.prototype.run()
                                                                                                                          • @param: {String} sql - The SQL query which should be executed.

                                                                                                                          Execute the passed sql query.

                                                                                                                          + +

                                                                                                                          Examples

                                                                                                                          + +
                                                                                                                          query.run('SELECT 1')
+
                                                                                                                          AbstractQuery.prototype.run = function(sql) {
+    throw new Error("The run method wasn't overwritten!")
+  }
                                                                                                                          method

                                                                                                                          checkLoggingOption

                                                                                                                          AbstractQuery.prototype.checkLoggingOption()
                                                                                                                          • @return: {void}

                                                                                                                          Check the logging option of the instance and print deprecation warnings.

                                                                                                                          AbstractQuery.prototype.checkLoggingOption = function() {
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging === console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
                                                                                                                          method

                                                                                                                          formatResults

                                                                                                                          AbstractQuery.prototype.formatResults()
                                                                                                                          • @param: {Array} data - The result of the query execution.

                                                                                                                          High level function that handles the results of a query execution.

                                                                                                                          + +

                                                                                                                          Example

                                                                                                                          + +

                                                                                                                          query.formatResults([
                                                                                                                          {
                                                                                                                          id: 1, // this is from the main table
                                                                                                                          attr2: 'snafu', // this is from the main table
                                                                                                                          Tasks.id: 1, // this is from the associated table
                                                                                                                          Tasks.title: 'task' // this is from the associated table
                                                                                                                          }
                                                                                                                          ])

                                                                                                                          AbstractQuery.prototype.formatResults = function(data) {
+    var result  = this.callee
+
+    if (isInsertQuery.call(this, data)) {
+      handleInsertQuery.call(this, data)
+    }
+
+    if (isSelectQuery.call(this)) {
+      result = handleSelectQuery.call(this, data)
+    } else if (isShowTableQuery.call(this)) {
+      result = handleShowTableQuery.call(this, data)
+    } else if (isShowOrDescribeQuery.call(this)) {
+      result = data
+    } else if (isCallQuery.call(this)) {
+      result = data[0]
+    }
+
+    return result
+  }

                                                                                                                            Shortcut methods (success, ok) for listening for success events.

                                                                                                                            + +
                                                                                                                            Params:
+  - fct: A function that gets executed once the *success* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                            AbstractQuery.prototype.success =
+  AbstractQuery.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }

                                                                                                                              Shortcut methods (failure, fail, error) for listening for error events.

                                                                                                                              + +
                                                                                                                              Params:
+  - fct: A function that gets executed once the *error* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                              AbstractQuery.prototype.failure =
+  AbstractQuery.prototype.fail =
+  AbstractQuery.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
                                                                                                                              method

                                                                                                                              send

                                                                                                                              AbstractQuery.prototype.send()
                                                                                                                              • @param: {String} fctName The name of the private method.

                                                                                                                              This function is a wrapper for private methods.

                                                                                                                              AbstractQuery.prototype.send = function(fctName

                                                                                                                                arg1, arg2, arg3, ...

                                                                                                                                {
+    var args = Array.prototype.slice.call(arguments).slice(1)
+    return eval(fctName).apply(this, args)
+  }
                                                                                                                                method

                                                                                                                                getInsertIdField

                                                                                                                                AbstractQuery.prototype.getInsertIdField()
                                                                                                                                • @return: {String} The field name.

                                                                                                                                Get the attributes of an insert query, which contains the just inserted id.

                                                                                                                                AbstractQuery.prototype.getInsertIdField = function() {
+    return 'insertId'
+  }
+
+  /////////////
+  // private //
+  /////////////
                                                                                                                                function

                                                                                                                                findTableNameInAttribute

                                                                                                                                findTableNameInAttribute()
                                                                                                                                • @param: {String} attribute An attribute of a SQL query. (?)
                                                                                                                                • @return: {String} The found tableName / alias.

                                                                                                                                Iterate over all known tables and search their names inside the sql query.
                                                                                                                                This method will also check association aliases ('as' option).

                                                                                                                                var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
+        tableName = daoFactory.tableName
+      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
+        tableName = Utils.singularize(daoFactory.tableName)
+      } else {
+        for (var associationName in daoFactory.associations) {
+          if (daoFactory.associations.hasOwnProperty(associationName)) {
+            var association = daoFactory.associations[associationName]
+
+            if (attribute.indexOf(association.options.as + ".") === 0) {
+              tableName = association.options.as
+            }
+          }
+        }
+      }
+    })
+
+    return tableName
+  }
+
+  var queryResultHasJoin = function(results) {
+    if (!!results[0]) {
+      var keys = Object.keys(results[0])
+
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
+
+    return false
+  }
+
+  var isInsertQuery = function(results, metaData) {
+    var result = true
+
+    // is insert query if sql contains insert into
+    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
+
+    // is insert query if no results are passed or if the result has the inserted id
+    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
+
+    // is insert query if no metadata are passed or if the metadata has the inserted id
+    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
+
+    return result
+  }
+
+  var handleInsertQuery = function(results, metaData) {
+    if (this.callee) {
+      // add the inserted row id to the instance
+      var autoIncrementField = this.callee.__factory.autoIncrementField
+        , id                 = null
+
+      id = id || (results && results[this.getInsertIdField()])
+      id = id || (metaData && metaData[this.getInsertIdField()])
+
+      this.callee[autoIncrementField] = id
+    }
+  }
+
+  var isShowTableQuery = function() {
+    return (this.sql.toLowerCase().indexOf('show tables') === 0)
+  }
+
+  var handleShowTableQuery = function(results) {
+    return Utils._.flatten(results.map(function(resultSet) {
+      return Utils._.values(resultSet)
+    }))
+  }
+
+  var isSelectQuery = function() {
+    return this.options.type === 'SELECT';
+  }
+
+  var isUpdateQuery = function() {
+    return (this.sql.toLowerCase().indexOf('update') === 0)
+  }
+
+  var handleSelectQuery = function(results) {
+    var result = null, self = this;
+
+    if (this.options.raw) {
+      result = results
+    } else if (this.options.hasJoin === true) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+        // let's build the actual dao instance first...
+        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+        // ... and afterwards the prefetched associations
+        for (var tableName in result) {
+          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+          }
+        }
+
+        return dao
+      }.bind(this))
+    } else {
+      result = results.map(function(result) {
+        return this.callee.build(result, { isNewRecord: false })
+      }.bind(this))
+    }
+
+    // return the first real model instance if options.plain is set (e.g. Model.find)
+    if (this.options.plain) {
+      result = (result.length === 0) ? null : result[0]
+    }
+
+    return result
+  }
+
+  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
+    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association          = null
+
+    if (!!associatedDaoFactory) {
+      association = this.callee.getAssociation(associatedDaoFactory)
+    } else {
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+
+      if (!!associatedDaoFactory) {
+        association = this.callee.getAssociation(associatedDaoFactory)
+      } else {
+        association          = this.callee.getAssociationByAlias(tableName)
+        associatedDaoFactory = association.target
+      }
+    }
+
+    var accessor = Utils._.camelize(tableName)
+
+    // downcase the first char
+    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
+
+    associationData.forEach(function(data) {
+      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+
+      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
+        accessor = Utils.singularize(accessor)
+        dao[accessor] = isEmpty ? null : daoInstance
+      } else {
+        dao[accessor] = dao[accessor] || []
+        if (! isEmpty)
+          dao[accessor].push(daoInstance)
+      }
+    })
+  }
+
+  var isShowOrDescribeQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
+    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
+
+    return  result
+  }
+
+  var isCallQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
+
+    return result
+  }
                                                                                                                                function

                                                                                                                                groupDataByCalleeFactory

                                                                                                                                groupDataByCalleeFactory()

                                                                                                                                  The function takes the result of the query execution and groups
                                                                                                                                  the associated data by the callee.

                                                                                                                                  + +
                                                                                                                                  Example:
+  groupDataByCalleeFactory([
+    {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 1 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 2 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 3 }
+    }
+  ])
+
+Result:
+  Something like this:
+
+  [
+    {
+      callee:  { some: 'data', id: 1 },
+      association: [
+        { foo: 'bar', id: 1 },
+        { foo: 'bar', id: 2 },
+        { foo: 'bar', id: 3 }
+      ]
+    }
+  ]
+
                                                                                                                                  var groupDataByCalleeFactory = function(data) {
+    var result          = []
+      , calleeTableName = this.callee.tableName
+
+    data.forEach(function(row) {
+      var calleeData    = row[calleeTableName]
+        , existingEntry = result.filter(function(groupedRow) {
+            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
+          })[0]
+
+      if (!existingEntry) {
+        existingEntry = {}
+        result.push(existingEntry)
+        existingEntry[calleeTableName] = calleeData
+      }
+
+      for (var attrName in row) {
+        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
+          existingEntry[attrName] = existingEntry[attrName] || []
+          existingEntry[attrName].push(row[attrName])
+        }
+      }
+    })
+
+    return result
+  }
                                                                                                                                  function

                                                                                                                                  prepareJoinData

                                                                                                                                  prepareJoinData()
                                                                                                                                  • @param: {Array} data This array contains objects.
                                                                                                                                  • @return: {Array} The array will have the needed format for groupDataByCalleeFactory.

                                                                                                                                  This function will prepare the result of select queries with joins.

                                                                                                                                  var prepareJoinData = function(data) {
+    var result = data.map(function(row) {
+      var nestedRow = {}
+
+      for (var key in row) {
+        if (row.hasOwnProperty(key)) {
+          var tableName = findTableNameInAttribute.call(this, key)
+
+          if (!!tableName) {
+            nestedRow[tableName] = nestedRow[tableName] || {}
+            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
+          } else {
+            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
+            nestedRow[this.callee.tableName][key] = row[key]
+          }
+        }
+      }
+
+      return nestedRow
+    }.bind(this))
+
+    return result
+  }
+
+  return AbstractQuery
+})()
                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/dialects/connector-manager.js.html b/docs/lib/dialects/connector-manager.js.html new file mode 100644 index 000000000000..f4df4ed4c7c7 --- /dev/null +++ b/docs/lib/dialects/connector-manager.js.html @@ -0,0 +1,69 @@ +Sequelize

                                                                                                                                  Sequelize

                                                                                                                                  property

                                                                                                                                  exports

                                                                                                                                  module.exports
                                                                                                                                    module.exports = (function(){
+  var ConnectorManager = function(sequelize, config) {
+    throw new Error('Define the constructor!')
+  }
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    throw new Error('Define the query method!')
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    throw new Error('Define the connect method!')
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    throw new Error('Define the disconnect method!')
+  }
+
+  ConnectorManager.prototype.reconnect = function() {
+    this.disconnect()
+    this.connect()
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                    \ No newline at end of file diff --git a/docs/lib/dialects/mysql/connector-manager.js.html b/docs/lib/dialects/mysql/connector-manager.js.html new file mode 100644 index 000000000000..d2c59be8c783 --- /dev/null +++ b/docs/lib/dialects/mysql/connector-manager.js.html @@ -0,0 +1,379 @@ +Sequelize

                                                                                                                                    Sequelize

                                                                                                                                    declaration

                                                                                                                                    mysql

                                                                                                                                    mysql
                                                                                                                                      var mysql   = require("mysql")
+  , Pooling = require('generic-pool')
+  , Query   = require("./query")
+  , Utils   = require("../../utils")
+  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client = null
+    this.config = config || {}
+    this.disconnectTimeoutId = null
+    this.queue = []
+    this.activeQueue = []
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+    this.poolCfg = Utils._.defaults(this.config.pool, {
+      maxConnections: 10,
+      minConnections: 0,
+      maxIdleTime: 1000
+    });
+    this.pendingQueries = 0;
+    this.useReplicaton = !!config.replication;
+    this.useQueue = config.queue !== undefined ? config.queue : true;
+
+    var self = this
+
+    if (this.useReplicaton) {
+      var reads = 0,
+        writes = 0;
+
+      // Init configs with options from config if not present
+      for (var i in config.replication.read) {
+        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
+          host: this.config.host,
+          port: this.config.port,
+          username: this.config.username,
+          password: this.config.password,
+          database: this.config.database
+        });
+      }
+      config.replication.write = Utils._.defaults(config.replication.write, {
+        host: this.config.host,
+        port: this.config.port,
+        username: this.config.username,
+        password: this.config.password,
+        database: this.config.database
+      });
+
+      // I'll make my own pool, with blackjack and hookers!
+      this.pool = {
+        release: function (client) {
+          if (client.queryType == 'read') {
+            return this.read.release(client);
+          } else {
+            return this.write.release(client);
+          }
+        },
+        acquire: function (callback, priority, queryType) {
+          if (queryType == 'SELECT') {
+            this.read.acquire(callback, priority);
+          } else {
+            this.write.acquire(callback, priority);
+          }
+        },
+        drain: function () {
+          this.read.drain();
+          this.write.drain();
+        },
+        read: Pooling.Pool({
+          name: 'sequelize-read',
+          create: function (done) {
+            if (reads >= self.config.replication.read.length) reads = 0;
+            var config = self.config.replication.read[reads++];
+
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'read'
+              done(null, connection)
+            }, config);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        }),
+        write: Pooling.Pool({
+          name: 'sequelize-write',
+          create: function (done) {
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'write'
+              done(null, connection)
+            }, self.config.replication.write);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        })
+      };
+    } else if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
+      this.pool = Pooling.Pool({
+        name: 'sequelize-mysql',
+        create: function (done) {
+          connect.call(self, done)
+        },
+        destroy: function(client) {
+          disconnect.call(self, client)
+        },
+        max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
+        idleTimeoutMillis: self.poolCfg.maxIdleTime
+      })
+    }
+
+    process.on('exit', function () {
+      //be nice & close our connections on exit
+      if (self.pool) {
+        self.pool.drain()
+      } else if (self.client) {
+        disconnect(self.client)
+      }
+
+      return
+    })
+  }
+
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
+
+  var isConnecting = false;
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    if (!this.isConnected && !this.pool) {
+      this.connect()
+    }
+
+    if (this.useQueue) {
+      var queueItem = {
+        query: new Query(this.client, this.sequelize, callee, options || {}),
+        sql: sql
+      };
+
+      enqueue.call(this, queueItem, options);
+      return queueItem.query;
+    }
+
+    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
+    this.pendingQueries++;
+
+    query.done(function() {
+      self.pendingQueries--;
+      if (self.pool) self.pool.release(query.client);
+      else {
+        if (self.pendingQueries === 0) {
+          setTimeout(function() {
+            self.pendingQueries === 0 && self.disconnect.call(self);
+          }, 100);
+        }
+      }
+    });
+
+    if (!this.pool) {
+      query.run(sql);
+    }
+
+    else {
+      this.pool.acquire(function(err, client) {
+        if (err) return query.emit('error', err);
+
+        query.client = client;
+        query.run(sql);
+        return;
+      }, undefined, options.type);
+    }
+
+    return query;
+  };
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this;
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting || this.pool) {
+      return;
+    }
+    connect.call(self, function(err, client) {
+      self.client = client;
+      return;
+    });
+    return;
+  };
+
+  ConnectorManager.prototype.disconnect = function() {
+    if (this.client) disconnect.call(this, this.client);
+    return;
+  };
+
+
+  // private
+
+  var disconnect = function(client) {
+    var self = this;
+    if (!this.useQueue) {
+      this.client = null;
+    }
+
+    client.end(function() {
+      if (!self.useQueue) {
+        return client.destroy();
+      }
+
+      var intervalObj = null
+      var cleanup = function () {
+        var retryCt = 0
+        // make sure to let client finish before calling destroy
+        if (self && self.hasQueuedItems) {
+          return
+        }
+        // needed to prevent mysql connection leak
+        client.destroy()
+        if (self && self.client) {
+          self.client = null
+        }
+        clearInterval(intervalObj)
+      }
+      intervalObj = setInterval(cleanup, 10)
+      cleanup()
+      return
+    })
+  }
+
+  var connect = function(done, config) {
+    config = config || this.config
+    var connection = mysql.createConnection({
+      host: config.host,
+      port: config.port,
+      user: config.username,
+      password: config.password,
+      database: config.database
+    })
+    // client.setMaxListeners(self.maxConcurrentQueries)
+    this.isConnecting = false
+
+    done(null, connection)
+  }
+
+  var enqueue = function(queueItem, options) {
+    options = options || {}
+    if (this.activeQueue.length < this.maxConcurrentQueries) {
+      this.activeQueue.push(queueItem)
+      if (this.pool) {
+        var self = this
+        this.pool.acquire(function(err, client) {
+          if (err) {
+            queueItem.query.emit('error', err)
+            return
+          }
+          //we set the client here, asynchronously, when getting a pooled connection
+          //allowing the ConnectorManager.query method to remain synchronous
+          queueItem.query.client = client
+          queueItem.client = client
+          execQueueItem.call(self, queueItem)
+          return
+        }, undefined, options.type)
+      } else {
+        execQueueItem.call(this, queueItem)
+      }
+    } else {
+      this.queue.push(queueItem)
+    }
+  }
+
+  var dequeue = function(queueItem) {
+    //return the item's connection to the pool
+    if (this.pool) {
+      this.pool.release(queueItem.client)
+    }
+    this.activeQueue = without(this.activeQueue, queueItem)
+  }
+
+  var transferQueuedItems = function(count) {
+    for(var i = 0; i < count; i++) {
+      var queueItem = this.queue.shift();
+      if (queueItem) {
+        enqueue.call(this, queueItem)
+      }
+    }
+  }
+
+  var afterQuery = function(queueItem) {
+    var self = this
+
+    dequeue.call(this, queueItem)
+    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
+    disconnectIfNoConnections.call(this)
+  }
+
+
+  var execQueueItem = function(queueItem) {
+    var self = this
+
+    queueItem.query
+      .success(function(){ afterQuery.call(self, queueItem) })
+      .error(function(){ afterQuery.call(self, queueItem) })
+
+    queueItem.query.run(queueItem.sql, queueItem.client)
+  }
+
+  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
+    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
+  })
+
+  // legacy
+  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
+    return !this.hasQueuedItems
+  })
+
+  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
+    return this.client != null
+  })
+
+  var disconnectIfNoConnections = function() {
+    var self = this
+
+    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
+    this.disconnectTimeoutId = setTimeout(function() {
+      self.isConnected && !self.hasQueuedItems && self.disconnect()
+    }, 100)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/dialects/mysql/query-generator.js.html b/docs/lib/dialects/mysql/query-generator.js.html new file mode 100644 index 000000000000..37a073b4bafd --- /dev/null +++ b/docs/lib/dialects/mysql/query-generator.js.html @@ -0,0 +1,483 @@ +Sequelize

                                                                                                                                      Sequelize

                                                                                                                                      declaration

                                                                                                                                      Utils

                                                                                                                                      Utils
                                                                                                                                        var Utils     = require("../../utils")
+  , DataTypes = require("../../data-types")
+  , util      = require("util")
+
+module.exports = (function() {
+  var QueryGenerator = {
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+        engine: 'InnoDB',
+        charset: null
+      }, options || {})
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
+        , primaryKeys = []
+        , attrStr = []
+
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        engine: options.engine,
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+
+      return Utils._.template(query)({table: Utils.addTicks(tableName)})
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
+      return Utils._.template(query)({ before: before, after: after })
+    },
+
+    showTablesQuery: function() {
+      return 'SHOW TABLES;'
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
+      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
+          before: attrBefore,
+          after: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options            = options || {}
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr){
+        if(Array.isArray(attr) && attr.length == 2) {
+          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
+        } else {
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = Utils.addTicks(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
+              query += Utils.addTicks(foreignIdentifier) + '='
+              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(dao.tableName) + '.'
+              query += Utils.addTicks('id') + '='
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += Utils.addTicks(association.identifier) + '='
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, Utils.addTicks(attr)].join('.') +
+                  ' AS ' +
+                  Utils.addTicks([aliasName, attr].join('.'))
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      if (options.where) {
+        options.where = this.getWhereConditions(options.where, tableName)
+        query += " WHERE <%= where %>"
+      }
+
+      if (options.group) {
+        options.group = Utils.addTicks(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+
+      if (options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+
+      if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
+          query += " LIMIT <%= offset %>, <%= limit %>"
+        } else {
+          query += " LIMIT <%= limit %>"
+        }
+      }
+
+      query += ";"
+
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value  = attrValueHash[key]
+          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+
+        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if(typeof attribute === 'string') {
+          return attribute
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += attribute.attribute
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute === 'string') ? attribute : attribute.attribute
+      })
+
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", options.indexName,
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
+        (options.parser ? "WITH PARSER " + options.parser : undefined)
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
+      return Utils._.template(sql)({
+        tableName: tableName,
+        options: (options || {}).database ? ' FROM ' + options.database : ''
+      })
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
+        , indexName = indexNameOrAttributes
+
+      if (typeof indexName !== 'string') {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+
+      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
+    },
+
+    getWhereConditions: function(smth, tableName) {
+      var result = null
+
+      if (Utils.isHash(smth)) {
+        smth   = Utils.prependTableNameToHash(tableName, smth)
+        result = this.hashToWhereConditions(smth)
+      } else if (typeof smth === 'number') {
+        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
+        result = this.hashToWhereConditions(smth)
+      } else if (typeof smth === "string") {
+        result = smth
+      } else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+         //handle qualified key names
+        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
+          , _value = null
+
+        if (Array.isArray(value)) {
+          // is value an array?
+          if (value.length == 0) { value = [null] }
+          _value = "(" + value.map(function(subValue) {
+            return Utils.escape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        } else if ((value) && (typeof value == 'object')) {
+          // is value an object?
+
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = Utils.escape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(" AND ")
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template += " auto_increment"
+          }
+
+          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('auto_increment') > -1)) {
+            fields.push(name)
+          }
+        }
+      }
+
+      return fields
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                        \ No newline at end of file diff --git a/docs/lib/dialects/mysql/query.js.html b/docs/lib/dialects/mysql/query.js.html new file mode 100644 index 000000000000..887013c4c7fd --- /dev/null +++ b/docs/lib/dialects/mysql/query.js.html @@ -0,0 +1,84 @@ +Sequelize

                                                                                                                                        Sequelize

                                                                                                                                        declaration

                                                                                                                                        Utils

                                                                                                                                        Utils
                                                                                                                                          var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client    = client
+    this.callee    = callee
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+
+  Utils.inherit(Query, AbstractQuery)
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    this.client.query(this.sql, function(err, results, fields) {
+      this.emit('sql', this.sql)
+
+      if (err) {
+        this.emit('error', err, this.callee)
+      } else {
+        this.emit('success', this.formatResults(results))
+      }
+    }.bind(this)).setMaxListeners(100)
+    return this
+  }
+
+  return Query
+})()
                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/dialects/postgres/connector-manager.js.html b/docs/lib/dialects/postgres/connector-manager.js.html new file mode 100644 index 000000000000..34fdeea94af3 --- /dev/null +++ b/docs/lib/dialects/postgres/connector-manager.js.html @@ -0,0 +1,146 @@ +Sequelize

                                                                                                                                          Sequelize

                                                                                                                                          declaration

                                                                                                                                          Query

                                                                                                                                          Query
                                                                                                                                            var Query   = require("./query")
+  , Utils   = require("../../utils")
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client    = null
+    this.config    = config || {}
+    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
+    this.pg        = this.config.native ? require('pg').native : require('pg')
+
+    // set pooling parameters if specified
+    if (this.pooling) {
+      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
+      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
+    }
+
+    this.disconnectTimeoutId = null
+    this.pendingQueries = 0
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  var isConnecting = false
+  var isConnected  = false
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    var self = this
+    if (this.client == null) {
+      this.connect()
+    }
+
+    var query = new Query(this.client, this.sequelize, callee, options || {})
+    self.pendingQueries += 1
+    return query.run(sql)
+      .success(function() { self.endQuery.call(self) })
+      .error(function() { self.endQuery.call(self) })
+  }
+
+  ConnectorManager.prototype.endQuery = function() {
+    var self = this
+    self.pendingQueries -= 1
+    if (self.pendingQueries == 0) {
+      setTimeout(function() {
+        self.pendingQueries == 0 && self.disconnect.call(self)
+      }, 100)
+    }
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this
+    var emitter = new (require('events').EventEmitter)()
+
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting) {
+      return
+    }
+
+    this.isConnecting = true
+    this.isConnected  = false
+
+    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
+
+    var connectCallback = function(err, client) {
+      self.isConnecting = false
+
+      if (!!err) {
+        emitter.emit('error', err)
+      } else if (client) {
+        client.query("SET TIME ZONE 'UTC'")
+          .on('end', function() {
+            self.isConnected = true
+            this.client = client
+          });
+      } else {
+        this.client = null
+      }
+    }
+
+    if (this.pooling) {
+      // acquire client from pool
+      this.pg.connect(uri, connectCallback)
+    } else {
+      //create one-off client
+      this.client = new this.pg.Client(uri)
+      this.client.connect(connectCallback)
+    }
+
+    return emitter
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    var self = this
+    if (this.client) this.client.end()
+    this.client = null
+    this.isConnecting = false
+    this.isConnected  = false
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/dialects/postgres/query-generator.js.html b/docs/lib/dialects/postgres/query-generator.js.html new file mode 100644 index 000000000000..9fa2f4993154 --- /dev/null +++ b/docs/lib/dialects/postgres/query-generator.js.html @@ -0,0 +1,624 @@ +Sequelize

                                                                                                                                            Sequelize

                                                                                                                                            declaration

                                                                                                                                            Utils

                                                                                                                                            Utils
                                                                                                                                              var Utils = require("../../utils")
+  , util  = require("util")
+  , DataTypes = require("../../data-types")
+  , tables = {}
+  , primaryKeys = {};
+
+function removeQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return s.replace(new RegExp(quoteChar, 'g'), '')
+}
+
+function addQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return removeQuotes(s, quoteChar)
+    .split('.')
+    .map(function(e) { return quoteChar + String(e) + quoteChar })
+    .join('.')
+}
+
+function pgEscape(val) {
+  if (val === undefined || val === null) {
+    return 'NULL';
+  }
+
+  switch (typeof val) {
+    case 'boolean': return (val) ? 'true' : 'false';
+    case 'number': return val+'';
+  }
+
+  if (val instanceof Date) {
+    val = pgSqlDate(val);
+  }
+
+  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+  val = val.replace(/'/g, "''");
+  return "'"+val+"'";
+}
+
+function pgEscapeAndQuote(val) {
+  return addQuotes(removeQuotes(pgEscape(val), "'"))
+}
+
+function pgEnum(tableName, attr, dataType) {
+  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
+}
+
+function padInt(i) {
+  return (i < 10) ? '0' + i.toString() : i.toString()
+}
+function pgSqlDate(dt) {
+  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
+  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
+  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
+}
+
+function pgDataTypeMapping(tableName, attr, dataType) {
+  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+    primaryKeys[tableName].push(attr)
+    dataType = dataType.replace(/PRIMARY KEY/, '')
+  }
+
+  if (Utils._.includes(dataType, 'TINYINT(1)')) {
+    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
+  }
+
+  if (Utils._.includes(dataType, 'DATETIME')) {
+    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
+  }
+
+  if (Utils._.includes(dataType, 'SERIAL')) {
+    dataType = dataType.replace(/INTEGER/, '')
+    dataType = dataType.replace(/NOT NULL/, '')
+    tables[tableName][attr] = 'serial'
+  }
+
+  if (dataType.match(/^ENUM\(/)) {
+    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
+  }
+
+  return dataType
+}
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+      }, options || {})
+
+      primaryKeys[tableName] = []
+      tables[tableName] = {}
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , attrStr = []
+
+      for (var attr in attributes) {
+        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
+        attrStr.push(addQuotes(attr) + " " + dataType)
+
+        if (attributes[attr].match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attr, attributes[attr]) + query;
+        }
+      }
+
+      var values  = {
+        table: addQuotes(tableName),
+        attributes: attrStr.join(", "),
+      }
+
+      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
+      if (pks.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pks + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+      return Utils._.template(query)({ table: addQuotes(tableName) })
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
+      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
+    },
+
+    showTablesQuery: function() {
+      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
+    },
+
+    describeTableQuery: function(tableName) {
+      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
+      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
+          attrName: addQuotes(attrName),
+          definition: pgDataTypeMapping(tableName, attrName, definition)
+        }))
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attrName, definition) + query
+        }
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
+        , sql   = []
+
+      for (var attributeName in attributes) {
+        var definition = attributes[attributeName]
+        var attrSql = ''
+
+        if (definition.indexOf('NOT NULL') > 0) {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' SET NOT NULL'
+          })
+          definition = definition.replace('NOT NULL', '').trim()
+        } else {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' DROP NOT NULL'
+          })
+        }
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attributeName, definition) + query
+          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
+        }
+
+        attrSql += Utils._.template(query)({
+          tableName: addQuotes(tableName),
+          query: addQuotes(attributeName) + ' TYPE ' + definition
+        })
+
+        sql.push(attrSql)
+      }
+
+      return sql.join('')
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
+      var attrString = []
+
+      for (var attributeName in attributes) {
+        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
+          before: addQuotes(attrBefore),
+          after: addQuotes(attributeName),
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options = options || {}
+      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr) {
+        if (Array.isArray(attr) && attr.length === 2) {
+          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
+        } else if (attr.indexOf('`') >= 0) {
+          return attr.replace(/`/g, '"')
+        } else {
+          return addQuotes(attr)
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = addQuotes(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
+              query += addQuotes(association.connectorDAO.tableName) + '.'
+              query += addQuotes(foreignIdentifier) + '='
+              query += addQuotes(table) + '.' + addQuotes('id')
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(dao.tableName) + '.'
+              query += addQuotes('id') + '='
+              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += addQuotes(association.identifier) + '='
+              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, addQuotes(attr)].join('.') +
+                  ' AS "' +
+                  removeQuotes([aliasName, attr].join('.')) + '"'
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      if(options.where) {
+        options.where = QueryGenerator.getWhereConditions(options.where)
+        query += " WHERE <%= where %>"
+      }
+
+      if(options.order) {
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
+        query += " ORDER BY <%= order %>"
+      }
+
+      if(options.group) {
+        options.group = addQuotes(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+
+      if (!(options.include && (options.limit === 1))) {
+        if (options.limit) {
+          query += " LIMIT <%= limit %>"
+        }
+
+        if (options.offset) {
+          query += " OFFSET <%= offset %>"
+        }
+      }
+
+      query += ";"
+
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
+        , returning = []
+
+      Utils._.forEach(attrValueHash, function(value, key, hash) {
+        if (tables[tableName] && tables[tableName][key]) {
+          switch (tables[tableName][key]) {
+            case 'serial':
+              delete hash[key]
+              returning.push(key)
+              break
+          }
+        }
+      });
+
+      var replacements  = {
+        table: addQuotes(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return pgEscape(value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(addQuotes(key) + "=" + pgEscape(value))
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      primaryKeys[tableName] = primaryKeys[tableName] || [];
+
+      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
+
+      var pks;
+      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
+        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
+      } else {
+        pks = addQuotes('id')
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: pgEscape(options.limit),
+        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
+        primaryKeysSelection: pks
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if (typeof attribute === 'string') {
+          return addQuotes(attribute)
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += addQuotes(attribute.attribute)
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute === "string") ? attribute : attribute.attribute
+      })
+
+      var indexTable = tableName.split('.')
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
+      return Utils._.template(query)({ tableName: tableName });
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
+        , indexName = indexNameOrAttributes
+
+      if (typeof indexName !== "string") {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+
+      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
+    },
+
+    getWhereConditions: function(smth) {
+      var result = null
+
+      if (Utils.isHash(smth)) {
+        result = QueryGenerator.hashToWhereConditions(smth)
+      }
+      else if (typeof smth === "number") {
+        result = '\"id\"' + "=" + pgEscape(smth)
+      }
+      else if (typeof smth === "string") {
+        result = smth
+      }
+      else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+        //handle qualified key names
+        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
+          , _value = null
+
+        if (Array.isArray(value)) {
+          if (value.length == 0) { value = [null] }
+          _value = "(" + value.map(function(subValue) {
+            return pgEscape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        }
+        else if ((value) && (typeof value === "object")) {
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = pgEscape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(' AND ')
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if(Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.type === "TINYINT(1)") {
+            dataType.type = 'BOOLEAN'
+          }
+
+          if (dataType.type === "DATETIME") {
+            dataType.type = 'TIMESTAMP'
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template +=" SERIAL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = pgEscape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        var definition = factory.attributes[name]
+
+        if (definition && (definition.indexOf('SERIAL') > -1)) {
+          fields.push(name)
+        }
+      }
+
+      return fields
+    },
+
+    databaseConnectionUri: function(config) {
+      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
+
+      return Utils._.template(template)({
+        user: encodeURIComponent(config.username),
+        password: encodeURIComponent(config.password),
+        database: config.database,
+        host: config.host,
+        port: config.port,
+        protocol: config.protocol
+      })
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/dialects/postgres/query.js.html b/docs/lib/dialects/postgres/query.js.html new file mode 100644 index 000000000000..7cc35de3456d --- /dev/null +++ b/docs/lib/dialects/postgres/query.js.html @@ -0,0 +1,136 @@ +Sequelize

                                                                                                                                              Sequelize

                                                                                                                                              declaration

                                                                                                                                              Utils

                                                                                                                                              Utils
                                                                                                                                                var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client = client
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var receivedError = false
+      , query         = this.client.query(sql)
+      , rows          = []
+
+    query.on('row', function(row) {
+      rows.push(row)
+    })
+
+    query.on('error', function(err) {
+      receivedError = true
+      this.emit('error', err, this.callee)
+    }.bind(this))
+
+    query.on('end', function() {
+      this.emit('sql', this.sql)
+
+      if (receivedError) {
+        return
+      }
+
+      onSuccess.call(this, rows)
+    }.bind(this))
+
+    return this
+  }
+
+  Query.prototype.getInsertIdField = function() {
+    return 'id'
+  }
+
+  var onSuccess = function(rows) {
+    var results          = []
+      , isTableNameQuery = (this.sql.indexOf('SELECT table_name FROM information_schema.tables') === 0)
+      , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
+
+    if (isTableNameQuery || isRelNameQuery) {
+      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
+    }
+
+    if (this.send('isSelectQuery')) {
+      this.emit('success', this.send('handleSelectQuery', rows))
+    } else if (this.send('isShowOrDescribeQuery')) {
+      this.emit('success', results)
+    } else if (this.send('isInsertQuery')) {
+      for (var key in rows[0]) {
+        if (rows[0].hasOwnProperty(key)) {
+          this.callee[key] = rows[0][key]
+        }
+      }
+
+      this.emit('success', this.callee)
+    } else if (this.send('isUpdateQuery')) {
+      for (var key in rows[0]) {
+        if (rows[0].hasOwnProperty(key)) {
+          this.callee[key] = rows[0][key]
+        }
+      }
+
+      this.emit('success', this.callee)
+    } else {
+      this.emit('success', results)
+    }
+  }
+
+  return Query
+})()
                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/dialects/query-generator.js.html b/docs/lib/dialects/query-generator.js.html new file mode 100644 index 000000000000..5756467cb969 --- /dev/null +++ b/docs/lib/dialects/query-generator.js.html @@ -0,0 +1,92 @@ +Sequelize

                                                                                                                                                Sequelize

                                                                                                                                                  Returns a query for creating a table.
                                                                                                                                                  Parameters:
                                                                                                                                                  - tableName: Name of the new table.
                                                                                                                                                  - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                  Attributes should have the format:
                                                                                                                                                  {attributeName: type, attr2: type2}
                                                                                                                                                  --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                  - options: An object with options.
                                                                                                                                                  Defaults: { engine: 'InnoDB', charset: null }

                                                                                                                                                  createTableQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('createTableQuery')
+    },

                                                                                                                                                    Returns a query for dropping a table.

                                                                                                                                                    dropTableQuery: function(tableName, options) {
+      throwMethodUndefined('dropTableQuery')
+    },

                                                                                                                                                      Returns a rename table query.
                                                                                                                                                      Parameters:
                                                                                                                                                      - originalTableName: Name of the table before execution.
                                                                                                                                                      - futureTableName: Name of the table after execution.

                                                                                                                                                      renameTableQuery: function(originalTableName, futureTableName) {
+      throwMethodUndefined('renameTableQuery')
+    },

                                                                                                                                                        Returns a query, which gets all available table names in the database.

                                                                                                                                                        showTablesQuery: function() {
+      throwMethodUndefined('showTablesQuery')
+    },

                                                                                                                                                          Returns a query, which adds an attribute to an existing table.
                                                                                                                                                          Parameters:
                                                                                                                                                          - tableName: Name of the existing table.
                                                                                                                                                          - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                          - key: attributeName
                                                                                                                                                          - value: A hash with attribute specific options:
                                                                                                                                                          - type: DataType
                                                                                                                                                          - defaultValue: A String with the default value
                                                                                                                                                          - allowNull: Boolean

                                                                                                                                                          addColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('addColumnQuery')
+    },

                                                                                                                                                            Returns a query, which removes an attribute from an existing table.
                                                                                                                                                            Parameters:
                                                                                                                                                            - tableName: Name of the existing table
                                                                                                                                                            - attributeName: Name of the obsolete attribute.

                                                                                                                                                            removeColumnQuery: function(tableName, attributeName) {
+      throwMethodUndefined('removeColumnQuery')
+    },

                                                                                                                                                              Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                              Parameters:
                                                                                                                                                              - tableName: Name of the existing table.
                                                                                                                                                              - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                              - key: attributeName
                                                                                                                                                              - value: A hash with attribute specific options:
                                                                                                                                                              - type: DataType
                                                                                                                                                              - defaultValue: A String with the default value
                                                                                                                                                              - allowNull: Boolean

                                                                                                                                                              changeColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('changeColumnQuery')
+    },

                                                                                                                                                                Returns a query, which renames an existing attribute.
                                                                                                                                                                Parameters:
                                                                                                                                                                - tableName: Name of an existing table.
                                                                                                                                                                - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                - attrNameAfter: The name of the attribute, after renaming.

                                                                                                                                                                renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
+      throwMethodUndefined('renameColumnQuery')
+    },

                                                                                                                                                                  Returns a query for selecting elements in the table .
                                                                                                                                                                  Options:
                                                                                                                                                                  - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                  - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                  OR an ID as integer
                                                                                                                                                                  OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                  If you use a string, you have to escape it on your own.
                                                                                                                                                                  - order -> e.g. 'id DESC'
                                                                                                                                                                  - group
                                                                                                                                                                  - limit -> The maximum count you want to get.
                                                                                                                                                                  - offset -> An offset value to start from. Only useable with limit!

                                                                                                                                                                  selectQuery: function(tableName, options) {
+      throwMethodUndefined('selectQuery')
+    },

                                                                                                                                                                    Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.

                                                                                                                                                                    insertQuery: function(tableName, attrValueHash) {
+      throwMethodUndefined('insertQuery')
+    },

                                                                                                                                                                      Returns an update query.
                                                                                                                                                                      Parameters:
                                                                                                                                                                      - tableName -> Name of the table
                                                                                                                                                                      - values -> A hash with attribute-value-pairs
                                                                                                                                                                      - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                      OR an ID as integer
                                                                                                                                                                      OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                      If you use a string, you have to escape it on your own.

                                                                                                                                                                      updateQuery: function(tableName, values, where) {
+      throwMethodUndefined('updateQuery')
+    },

                                                                                                                                                                        Returns a deletion query.
                                                                                                                                                                        Parameters:
                                                                                                                                                                        - tableName -> Name of the table
                                                                                                                                                                        - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                        OR an ID as integer
                                                                                                                                                                        OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                        If you use a string, you have to escape it on your own.
                                                                                                                                                                        Options:
                                                                                                                                                                        - limit -> Maximaum count of lines to delete

                                                                                                                                                                        deleteQuery: function(tableName, where, options) {
+      throwMethodUndefined('deleteQuery')
+    },

                                                                                                                                                                          Returns an add index query.
                                                                                                                                                                          Parameters:
                                                                                                                                                                          - tableName -> Name of an existing table.
                                                                                                                                                                          - attributes:
                                                                                                                                                                          An array of attributes as string or as hash.
                                                                                                                                                                          If the attribute is a hash, it must have the following content:
                                                                                                                                                                          - attribute: The name of the attribute/column
                                                                                                                                                                          - length: An integer. Optional
                                                                                                                                                                          - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                          - options:
                                                                                                                                                                          - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                          - indexName: The name of the index. Default is
                                                                                                                                                                          - parser

                                                                                                                                                                          addIndexQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('addIndexQuery')
+    },

                                                                                                                                                                            Returns an show index query.
                                                                                                                                                                            Parameters:
                                                                                                                                                                            - tableName: Name of an existing table.
                                                                                                                                                                            - options:
                                                                                                                                                                            - database: Name of the database.

                                                                                                                                                                            showIndexQuery: function(tableName, options) {
+      throwMethodUndefined('showIndexQuery')
+    },

                                                                                                                                                                              Returns a remove index query.
                                                                                                                                                                              Parameters:
                                                                                                                                                                              - tableName: Name of an existing table.
                                                                                                                                                                              - indexNameOrAttributes: The name of the index as string or an array of attribute names.

                                                                                                                                                                              removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      throwMethodUndefined('removeIndexQuery')
+    },

                                                                                                                                                                                Takes something and transforms it into values of a where condition.

                                                                                                                                                                                getWhereConditions: function(smth) {
+      throwMethodUndefined('getWhereConditions')
+    },

                                                                                                                                                                                  Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                  The values are transformed by the relevant datatype.

                                                                                                                                                                                  hashToWhereConditions: function(hash) {
+      throwMethodUndefined('hashToWhereConditions')
+    },

                                                                                                                                                                                    This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                    sql attribute definition.

                                                                                                                                                                                    attributesToSQL: function(attributes) {
+      throwMethodUndefined('attributesToSQL')
+    },

                                                                                                                                                                                      Returns all auto increment fields of a factory.

                                                                                                                                                                                      findAutoIncrementField: function(factory) {
+      throwMethodUndefined('findAutoIncrementField')
+    }
+  }
+
+  var throwMethodUndefined = function(methodName) {
+    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
+  }
+
+  return QueryGenerator
+})()
                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/connector-manager.js.html b/docs/lib/dialects/sqlite/connector-manager.js.html new file mode 100644 index 000000000000..a9c529724116 --- /dev/null +++ b/docs/lib/dialects/sqlite/connector-manager.js.html @@ -0,0 +1,62 @@ +Sequelize

                                                                                                                                                                                      Sequelize

                                                                                                                                                                                      declaration

                                                                                                                                                                                      Utils

                                                                                                                                                                                      Utils
                                                                                                                                                                                        var Utils   = require("../../utils")
+  , sqlite3 = require('sqlite3').verbose()
+  , Query   = require("./query")
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize) {
+    this.sequelize = sequelize
+    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    return new Query(this.database, this.sequelize, callee, options).run(sql)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/query-generator.js.html b/docs/lib/dialects/sqlite/query-generator.js.html new file mode 100644 index 000000000000..22fab71dfb54 --- /dev/null +++ b/docs/lib/dialects/sqlite/query-generator.js.html @@ -0,0 +1,240 @@ +Sequelize

                                                                                                                                                                                        Sequelize

                                                                                                                                                                                        declaration

                                                                                                                                                                                        Utils

                                                                                                                                                                                        Utils
                                                                                                                                                                                          var Utils = require("../../utils")
+  , DataTypes = require("../../data-types")
+var MySqlQueryGenerator = Utils._.extend(
+  Utils._.clone(require("../query-generator")),
+  Utils._.clone(require("../mysql/query-generator"))
+)
+
+var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
+
+var escape = function(str) {
+  if (typeof str === 'string') {
+    return "'" + str.replace(/'/g, "''") + "'";
+  } else if (typeof str === 'boolean') {
+    return str ? 1 : 0; // SQLite has no type boolean
+  } else if (str === null || str === undefined) {
+    return 'NULL';
+  } else {
+    return str;
+  }
+};
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = options || {}
+
+      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , primaryKeys = []
+        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
+                    return Utils._.includes(definition, 'PRIMARY KEY')
+                  }).length > 1)
+        , attrStr     = []
+
+
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    showTablesQuery: function() {
+      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: MySqlQueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: this.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM) {
+	          replacements.type = "INTEGER"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+
+            if (dataType.autoIncrement) {
+              template += ' AUTOINCREMENT'
+            }
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
+            fields.push(name)
+          }
+        }
+      }
+
+      return fields
+    },
+
+    hashToWhereConditions: function(hash) {
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          var value = hash[key]
+
+          if (typeof value === 'boolean') {
+            value = !!value ? 1 : 0
+          }
+
+          hash[key] = value
+        }
+      }
+
+      return hashToWhereConditions(hash).replace(/\\'/g, "''");
+    }
+  }
+
+  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+})()
                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/query.js.html b/docs/lib/dialects/sqlite/query.js.html new file mode 100644 index 000000000000..009ae88f2f7f --- /dev/null +++ b/docs/lib/dialects/sqlite/query.js.html @@ -0,0 +1,160 @@ +Sequelize

                                                                                                                                                                                          Sequelize

                                                                                                                                                                                          declaration

                                                                                                                                                                                          Utils

                                                                                                                                                                                          Utils
                                                                                                                                                                                            var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(database, sequelize, callee, options) {
+    this.database = database
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.getInsertIdField = function() {
+    return 'lastID'
+  }
+
+  Query.prototype.run = function(sql) {
+    var self = this
+
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var columnTypes = {};
+    this.database.serialize(function() {
+      var executeSql = function() {
+        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
+          // allow clients to listen to sql to do their own logging or whatnot
+          self.emit('sql', self.sql)
+          this.columnTypes = columnTypes;
+          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
+        })
+      };
+
+      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
+        var tableName = RegExp.$1;
+
+        if (tableName !== 'sqlite_master') {
+          // get the column types
+          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
+            if (!err) {
+              for (var i=0, l=results.length; i<l; i++) {
+                columnTypes[results[i].name] = results[i].type;
+              }
+            }
+            executeSql();
+          });
+        } else {
+          executeSql();
+        }
+      } else {
+        executeSql();
+      }
+    })
+
+    return this
+  }
+
+  //private
+
+  var getDatabaseMethod = function() {
+    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
+      return 'run'
+    } else {
+      return 'all'
+    }
+  }
+
+  var onSuccess = function(results, metaData) {
+    var result = this.callee
+      , self   = this
+
+    // add the inserted row id to the instance
+    if (this.send('isInsertQuery', results, metaData)) {
+      this.send('handleInsertQuery', results, metaData)
+    }
+
+    if (this.sql.indexOf('sqlite_master') !== -1) {
+      result = results.map(function(resultSet) { return resultSet.name })
+    } else if (this.send('isSelectQuery')) {
+      // we need to convert the timestamps into actual date objects
+
+      if(!this.options.raw) {
+        results = results.map(function(result) {
+          for (var name in result) {
+            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
+              result[name] = new Date(result[name]);
+            }
+          }
+          return result
+        })
+      }
+
+      result = this.send('handleSelectQuery', results)
+    } else if (this.send('isShowOrDescribeQuery')) {
+      result = results
+    }
+
+    this.emit('success', result)
+  }
+
+  var onFailure = function(err) {
+    this.emit('error', err, this.callee)
+  }
+
+  return Query
+})()
                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/emitters/custom-event-emitter.js.html b/docs/lib/emitters/custom-event-emitter.js.html new file mode 100644 index 000000000000..20612915a3d6 --- /dev/null +++ b/docs/lib/emitters/custom-event-emitter.js.html @@ -0,0 +1,91 @@ +Sequelize

                                                                                                                                                                                            Sequelize

                                                                                                                                                                                            declaration

                                                                                                                                                                                            util

                                                                                                                                                                                            util
                                                                                                                                                                                              var util         = require("util")
+  , EventEmitter = require("events").EventEmitter
+
+module.exports = (function() {
+  var CustomEventEmitter = function(fct) {
+    this.fct = fct
+  }
+  util.inherits(CustomEventEmitter, EventEmitter)
+
+  CustomEventEmitter.prototype.run = function() {
+    var self = this
+
+    // delay the function call and return the emitter
+    setTimeout(function(){
+      self.fct.call(self, self)
+    }, 1)
+
+    return this
+  }
+
+  CustomEventEmitter.prototype.success =
+  CustomEventEmitter.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.failure =
+  CustomEventEmitter.prototype.fail =
+  CustomEventEmitter.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.done =
+  CustomEventEmitter.prototype.complete =
+  function(fct) {
+    this.on('error', function(err) { fct(err, null) })
+        .on('success', function(result) { fct(null, result) })
+    return this
+  }
+
+
+  return CustomEventEmitter
+})()
                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/migration.js.html b/docs/lib/migration.js.html new file mode 100644 index 000000000000..7e103cf9a4d7 --- /dev/null +++ b/docs/lib/migration.js.html @@ -0,0 +1,177 @@ +Sequelize

                                                                                                                                                                                              Sequelize

                                                                                                                                                                                              declaration

                                                                                                                                                                                              moment

                                                                                                                                                                                              moment
                                                                                                                                                                                                var moment         = require("moment")
+  , Utils          = require("./utils")
+  , DataTypes      = require("./data-types")
+  , QueryInterface = require("./query-interface")
+
+module.exports = (function() {
+  var Migration = function(migrator, path) {
+    var split = path.split('/')
+
+    this.migrator       = migrator
+    this.path           = path
+    this.filename       = Utils._.last(this.path.split('/'))
+
+    var parsed          = Migration.parseFilename(this.filename)
+
+    this.migrationId    = parsed.id
+    this.date           = parsed.date;
+    this.queryInterface = this.migrator.queryInterface
+    this.undoneMethods  = 0
+  }
+
+  ///////////////
+  // static /////
+  ///////////////
+
+  Migration.parseFilename = function(s) {
+    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
+
+    if (matches === null) {
+      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
+    }
+
+    return {
+      id: parseInt(matches[1]),
+      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
+    }
+  }
+
+  Migration.migrationHasInterfaceCalls = function(func) {
+    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
+      , hasCalls       = false
+
+    for(var method in QueryInterface.prototype) {
+      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
+      hasCalls = hasCalls || regex.test(functionString)
+    }
+
+    return hasCalls
+  }
+
+  ///////////////
+  // member /////
+  ///////////////
+
+  Object.defineProperty(Migration.prototype, 'migration', {
+    get: function() {
+      return require(this.path)
+    }
+  })
+
+  Migration.prototype.execute = function(options) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      options = Utils._.extend({
+        method: 'up'
+      }, options || {})
+
+      var onSuccess = function() { emitter.emit('success', null) }
+        , func      = self.migration[options.method]
+
+      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
+      func.call(null, self, DataTypes)
+
+      if (!Migration.migrationHasInterfaceCalls(func))
+        onSuccess()
+    }).run()
+  }
+
+  Migration.prototype.isBefore = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date > this.date) : (date >= this.date)
+  }
+
+  Migration.prototype.isAfter = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date < this.date) : (date <= this.date)
+  }
+
+  // extends the Migration prototype with all methods of QueryInterface.prototype
+  // with additional tracking of start and finish. this is done in order to minimize
+  // asynchronous handling in migrations
+  var extendMigrationWithQueryInterfaceMethods = function(callback) {
+    var self = this
+
+    for(var method in QueryInterface.prototype) {
+      (function(_method) {
+        self[_method] = function() {
+          var emitter = self.QueryInterface
+            , args    = Utils._.map(arguments, function(arg, _) { return arg })
+
+          self.undoneMethods++
+
+          // bind listeners to the query interface
+          // the event will have the same name like the method
+          self.queryInterface.on(_method, function(err) {
+            self.undoneMethods--
+            if (err) {
+              throw new Error(err)
+            } else {
+              (self.undoneMethods == 0) && callback && callback()
+            }
+          })
+
+          return self.queryInterface[_method].apply(self.queryInterface, args)
+        }
+      })(method)
+    }
+  }
+
+  return Migration
+})()
                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/migrator.js.html b/docs/lib/migrator.js.html new file mode 100644 index 000000000000..bd080fb8c64e --- /dev/null +++ b/docs/lib/migrator.js.html @@ -0,0 +1,282 @@ +Sequelize

                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                  const fs     = require("fs")
+    , path   = require("path")
+    , moment = require("moment")
+
+var Utils          = require("./utils")
+  , Migration      = require("./migration")
+  , DataTypes      = require("./data-types")
+
+module.exports = (function() {
+  var Migrator = function(sequelize, options) {
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      path: __dirname + '/../migrations',
+      from: null,
+      to: null,
+      logging: console.log
+    }, options || {})
+
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+
+  Object.defineProperty(Migrator.prototype, "queryInterface", {
+    get: function() {
+      return this.sequelize.getQueryInterface()
+    }
+  })
+
+  Migrator.prototype.migrate = function(options) {
+    var self = this
+
+    options = Utils._.extend({
+      method: 'up'
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.getUndoneMigrations(function(err, migrations) {
+        if (err) {
+          emitter.emit('error', err)
+        } else {
+          var chainer = new Utils.QueryChainer
+            , from    = migrations[0]
+
+          if (options.method === 'down') {
+            from = migrations[0]
+            migrations.reverse()
+          }
+
+          migrations.forEach(function(migration) {
+            chainer.add(migration, 'execute', [options], {
+              before: function(migration) {
+                if (self.options.logging !== false) {
+                  self.options.logging('Executing migration: ' + migration.filename)
+                }
+              },
+              after: function(migration) {
+                if (self.options.logging !== false) {
+                  self.options.logging('Executed migration: ' + migration.filename)
+                }
+              },
+              success: function(migration, callback) {
+                if (options.method === 'down') {
+                  deleteUndoneMigration.call(self, from, migration, callback)
+                } else {
+                  saveSuccessfulMigration.call(self, from, migration, callback)
+                }
+              }
+            })
+          })
+
+          chainer
+            .runSerially({ skipOnError: true })
+            .success(function() { emitter.emit('success', null) })
+            .error(function(err) { emitter.emit('error', err) })
+        }
+      })
+    }).run()
+  }
+
+  Migrator.prototype.getUndoneMigrations = function(callback)  {
+    var self = this
+
+    var filterFrom = function(migrations, from, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
+      callback && callback(null, result)
+    }
+    var filterTo = function(migrations, to, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
+      callback && callback(null, result)
+    }
+
+    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
+      return /\.js$/.test(file)
+    })
+
+    var migrations = migrationFiles.map(function(file) {
+      return new Migration(self, self.options.path + '/' + file)
+    })
+
+    migrations = migrations.sort(function(a,b){
+      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
+    })
+
+    if (this.options.from) {
+      filterFrom(migrations, this.options.from, function(err, migrations) {
+        if (self.options.to) {
+          filterTo(migrations, self.options.to, callback)
+        } else {
+          callback && callback(null, migrations)
+        }
+      })
+    } else {
+      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
+        if (lastMigrationId) {
+          filterFrom(migrations, lastMigrationId, function(err, migrations) {
+            if (self.options.to) {
+              filterTo(migrations, self.options.to, callback)
+            } else {
+              callback && callback(null, migrations)
+            }
+          }, { withoutEqual: true })
+        } else {
+          if (self.options.to) {
+            filterTo(migrations, self.options.to, callback)
+          } else {
+            callback && callback(null, migrations)
+          }
+        }
+      }).error(function(err) {
+        callback && callback(err, null)
+      })
+    }
+  }
+
+  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
+        , SequelizeMeta = storedDAO
+
+      if (!storedDAO) {
+        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
+          from: DataTypes.STRING,
+          to:   DataTypes.STRING
+        }, {
+          timestamps: false
+        })
+      }
+
+      // force sync when model has newly created or if syncOptions are passed
+      if (!storedDAO || syncOptions) {
+        SequelizeMeta
+          .sync(syncOptions || {})
+          .success(function() { emitter.emit('success', SequelizeMeta) })
+          .error(function(err) { emitter.emit('error', err) })
+      } else {
+        emitter.emit('success', SequelizeMeta)
+      }
+    }).run()
+  }
+
+  // private
+
+  var getLastMigrationFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
+          emitter.emit('success', meta ? meta : null)
+        }).error(function(err) { emitter.emit('error', err) })
+      }).error(function(err) { emitter.emit(err) })
+    }).run()
+  }
+
+  var getLastMigrationIdFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      getLastMigrationFromDatabase.call(self)
+        .success(function(meta) {
+          emitter.emit('success', meta ? meta.to : null)
+        })
+        .error(function(err) {
+          emitter.emit('error', err)
+        })
+    }).run()
+  }
+
+  var getFormattedDateString = function(s) {
+    var result = null
+
+    try {
+      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
+    } catch(e) {
+      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
+    }
+
+    return result
+  }
+
+  var stringToDate = function(s) {
+    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
+  }
+
+  var saveSuccessfulMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .create({ from: from.migrationId, to: to.migrationId })
+        .success(callback)
+    })
+  }
+
+  var deleteUndoneMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
+        .success(function(meta) {
+          meta.destroy().success(callback)
+        })
+    })
+  }
+
+  return Migrator
+})()
                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/query-chainer.js.html b/docs/lib/query-chainer.js.html new file mode 100644 index 000000000000..2b39bd8beafe --- /dev/null +++ b/docs/lib/query-chainer.js.html @@ -0,0 +1,188 @@ +Sequelize

                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                  declaration

                                                                                                                                                                                                  Utils

                                                                                                                                                                                                  Utils
                                                                                                                                                                                                    var Utils = require("./utils")
+
+module.exports = (function() {
+  var QueryChainer = function(emitters) {
+    var self = this
+
+    this.finishedEmits  = 0
+    this.emitters       = []
+    this.serials        = []
+    this.fails          = []
+    this.serialResults  = []
+    this.emitterResults = []
+    this.finished       = false
+    this.wasRunning     = false
+    this.eventEmitter   = null
+
+    emitters = emitters || []
+    emitters.forEach(function(emitter) {
+      if (Array.isArray(emitter)) {
+        self.add.apply(self, emitter)
+      } else {
+        self.add(emitter)
+      }
+    })
+  }
+
+  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
+    if (!!method) {
+      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
+    } else {
+      observeEmitter.call(this, emitterOrKlass)
+      this.emitters.push(emitterOrKlass)
+    }
+
+    return this
+  }
+
+  QueryChainer.prototype.run = function() {
+    var self = this
+    this.eventEmitter = new Utils.CustomEventEmitter(function() {
+      self.wasRunning = true
+      finish.call(self, 'emitterResults')
+    })
+    return this.eventEmitter.run()
+  }
+
+  QueryChainer.prototype.runSerially = function(options) {
+    var self       = this
+      , serialCopy = Utils._.clone(this.serials)
+
+    options = Utils._.extend({
+      skipOnError: false
+    }, options)
+
+    var exec = function() {
+      var serial = self.serials.pop()
+
+      if (serial) {
+        serial.options = serial.options || {}
+        serial.options.before && serial.options.before(serial.klass)
+
+        var onSuccess = function() {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          exec()
+        }
+
+        var onError = function(err) {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          self.fails.push(err)
+          exec()
+        }
+
+        if (options.skipOnError && (self.fails.length > 0)) {
+          onError('Skipped due to earlier error!')
+        } else {
+          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
+
+          emitter.success(function(result) {
+            self.serialResults[serialCopy.indexOf(serial)] = result
+
+            if (serial.options.success) {
+              serial.options.success(serial.klass, onSuccess)
+            } else {
+              onSuccess()
+            }
+          }).error(onError)
+        }
+      } else {
+        self.wasRunning = true
+        finish.call(self, 'serialResults')
+      }
+    }
+
+    this.serials.reverse()
+    this.eventEmitter = new Utils.CustomEventEmitter(exec)
+    return this.eventEmitter.run()
+  }
+
+  // private
+
+  var observeEmitter = function(emitter) {
+    var self = this
+
+    emitter
+      .success(function(result) {
+        self.emitterResults[self.emitters.indexOf(emitter)] = result
+        self.finishedEmits++
+        finish.call(self, 'emitterResults')
+      })
+      .error(function(err) {
+        self.finishedEmits++
+        self.fails.push(err)
+        finish.call(self, 'emitterResults')
+      })
+      .on('sql', function(sql) {
+        if (self.eventEmitter) {
+          self.eventEmitter.emit('sql', sql)
+        }
+      })
+  }
+
+  var finish = function(resultsName) {
+    this.finished = true
+
+    if (this.emitters.length > 0) {
+      this.finished = (this.finishedEmits == this.emitters.length)
+    }
+    else if (this.serials.length > 0) {
+      this.finished = (this.finishedEmits == this.serials.length)
+    }
+
+    if (this.finished && this.wasRunning) {
+      var status = (this.fails.length == 0 ? 'success' : 'error')
+        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
+
+      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
+    }
+  }
+
+  return QueryChainer
+})()
                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/lib/query-interface.js.html b/docs/lib/query-interface.js.html new file mode 100644 index 000000000000..950173235ccd --- /dev/null +++ b/docs/lib/query-interface.js.html @@ -0,0 +1,329 @@ +Sequelize

                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                    declaration

                                                                                                                                                                                                    Utils

                                                                                                                                                                                                    Utils
                                                                                                                                                                                                      var Utils     = require('./utils')
+  , DataTypes = require('./data-types')
+
+module.exports = (function() {
+  var QueryInterface = function(sequelize) {
+    this.sequelize = sequelize
+    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+   this.QueryGenerator.options = this.sequelize.options;
+  }
+  Utils.addEventEmitter(QueryInterface)
+
+  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
+    var attributeHashes = {}
+
+    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
+      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+        attributeHashes[attributeName] = { type: dataTypeOrOptions }
+      } else {
+        attributeHashes[attributeName] = dataTypeOrOptions
+      }
+    })
+
+    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
+
+    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'createTable')
+  }
+
+  QueryInterface.prototype.dropTable = function(tableName) {
+    var sql = this.QueryGenerator.dropTableQuery(tableName)
+    return queryAndEmit.call(this, sql, 'dropTable')
+  }
+
+  QueryInterface.prototype.dropAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+
+      self.showAllTables().success(function(tableNames) {
+        tableNames.forEach(function(tableName) {
+          chainer.add(self.dropTable(tableName))
+        })
+        chainer
+          .run()
+          .success(function() {
+            self.emit('dropAllTables', null)
+            emitter.emit('success', null)
+          })
+          .error(function(err) {
+            self.emit('dropAllTables', err)
+            emitter.emit('error', err)
+          })
+      }).error(function(err) {
+        self.emit('dropAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.renameTable = function(before, after) {
+    var sql = this.QueryGenerator.renameTableQuery(before, after)
+    return queryAndEmit.call(this, sql, 'renameTable')
+  }
+
+  QueryInterface.prototype.showAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var showTablesSql = self.QueryGenerator.showTablesQuery()
+      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
+        self.emit('showAllTables', null)
+        emitter.emit('success', Utils._.flatten(tableNames))
+      }).error(function(err) {
+        self.emit('showAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.describeTable = function(tableName) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql;
+      if (self.QueryGenerator.describeTableQuery) {
+        sql = self.QueryGenerator.describeTableQuery(tableName)
+      } else {
+        sql = 'DESCRIBE `' + tableName + '`;'
+      }
+      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
+        emitter.emit('success', data)
+      }).error(function(err) {
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'addColumn')
+  }
+
+  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
+    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
+    return queryAndEmit.call(this, sql, 'removeColumn')
+  }
+
+  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'changeColumn')
+  }
+
+  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.describeTable(tableName).success(function(data) {
+        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
+
+        var options =  {}
+
+        options[attrNameAfter] = {
+          type: data.Type,
+          allowNull: data.Null == 'YES',
+          defaultValue: data.Default
+        }
+
+        var sql = self.QueryGenerator.renameColumnQuery(tableName,
+          attrNameBefore,
+          self.QueryGenerator.attributesToSQL(options)
+        )
+
+        self.sequelize.query(sql, null, {}).success(function() {
+          self.emit('renameColumn', null)
+          emitter.emit('success', null)
+        }).error(function(err) {
+          self.emit('renameColumn', err)
+          emitter.emit('error', err)
+        })
+      }).error(function(err) {
+        self.emit('renameColumn', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
+    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'addIndex')
+  }
+
+  QueryInterface.prototype.showIndex = function(tableName, options) {
+    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
+    return queryAndEmit.call(this, sql, 'showIndex')
+  }
+
+  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
+    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
+    return queryAndEmit.call(this, sql, "removeIndex")
+  }
+
+  QueryInterface.prototype.insert = function(dao, tableName, values) {
+    var sql = this.QueryGenerator.insertQuery(tableName, values)
+    return queryAndEmit.call(this, [sql, dao], 'insert', {
+      success: function(obj) { obj.isNewRecord = false }
+    })
+  }
+
+  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
+    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'update')
+  }
+
+  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
+    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'delete')
+  }
+
+  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
+    var sql = this.QueryGenerator.selectQuery(tableName, options)
+    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
+    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
+  }
+
+  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
+    var self = this
+
+    if (attributeSelector === undefined) {
+      throw new Error('Please pass an attribute selector!')
+    }
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql = self.QueryGenerator.selectQuery(tableName, options)
+        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
+
+      qry
+        .success(function(data) {
+          var result = data[attributeSelector]
+
+          if (options && options.parseInt) {
+            result = parseInt(result)
+          }
+
+          self.emit('rawSelect', null)
+          emitter.emit('success', result)
+        })
+        .error(function(err) {
+          self.emit('rawSelect', err)
+          emitter.emit('error', err)
+        })
+        .on('sql', function(sql) {
+          emitter.emit('sql', sql)
+        })
+    }).run()
+  }
+
+  // private
+
+  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
+    var self = this
+
+    options = Utils._.extend({
+      success: function(){},
+      error: function(){}
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var query = null
+
+      if (Array.isArray(sqlOrQueryParams)) {
+        if (sqlOrQueryParams.length === 1) {
+          sqlOrQueryParams.push(null)
+        }
+
+        if (sqlOrQueryParams.length === 2) {
+          sqlOrQueryParams.push({})
+        }
+
+        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
+      } else {
+        query = self.sequelize.query(sqlOrQueryParams, null, {})
+      }
+
+      // append the query for better testing
+      emitter.query = query
+
+      query.success(function(obj) {
+        options.success && options.success(obj)
+        self.emit(methodName, null)
+        emitter.emit('success', obj)
+      }).error(function(err) {
+        options.error && options.error(err)
+        self.emit(methodName, err)
+        emitter.emit('error', err)
+      })
+      query.on('sql', function(sql) {
+        emitter.emit('sql', sql)
+      });
+    }).run()
+  }
+
+  return QueryInterface
+})()
                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/sequelize.js.html b/docs/lib/sequelize.js.html new file mode 100644 index 000000000000..44a5a046b894 --- /dev/null +++ b/docs/lib/sequelize.js.html @@ -0,0 +1,210 @@ +Sequelize

                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                      function

                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                      Sequelize()

                                                                                                                                                                                                        Main constructor of the project.

                                                                                                                                                                                                        + +
                                                                                                                                                                                                        Params:
+
+  - `database`
+  - `username`
+  - `password`, optional, default: null
+  - `options`, optional, default: {}
+
+Examples:
+
+    mymodule.write('foo')
+    mymodule.write('foo', { stream: process.stderr })
+
                                                                                                                                                                                                        var Sequelize = function(database, username, password, options) {
+    this.options = Utils._.extend({
+      dialect: 'mysql',
+      host: 'localhost',
+      port: 3306,
+      protocol: 'tcp',
+      define: {},
+      query: {},
+      sync: {},
+      logging: console.log,
+      omitNull: false,
+      queue: true,
+      native: false,
+      replication: false,
+      pool: {}
+    }, options || {})
+
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    this.config = {
+      database: database,
+      username: username,
+      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
+      host    : this.options.host,
+      port    : this.options.port,
+      pool    : this.options.pool,
+      protocol: this.options.protocol,
+      queue   : this.options.queue,
+      native  : this.options.native,
+      replication: this.options.replication,
+      maxConcurrentQueries: this.options.maxConcurrentQueries
+    }
+
+    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
+
+    this.daoFactoryManager = new DAOFactoryManager(this)
+    this.connectorManager  = new ConnectorManager(this, this.config)
+
+    this.importCache = {}
+  }
                                                                                                                                                                                                        property

                                                                                                                                                                                                        Utils

                                                                                                                                                                                                        Sequelize.Utils

                                                                                                                                                                                                          Reference to Utils

                                                                                                                                                                                                          Sequelize.Utils = Utils
+
+  for (var dataType in DataTypes) {
+    Sequelize[dataType] = DataTypes[dataType]
+  }
+
+  Sequelize.prototype.getQueryInterface = function() {
+    this.queryInterface = this.queryInterface || new QueryInterface(this)
+    return this.queryInterface
+  }
+
+  Sequelize.prototype.getMigrator = function(options, force) {
+    if (force) {
+      this.migrator = new Migrator(this, options)
+    } else {
+      this.migrator = this.migrator || new Migrator(this, options)
+    }
+
+    return this.migrator
+  }
+
+  Sequelize.prototype.define = function(daoName, attributes, options) {
+    options = options || {}
+    var globalOptions = this.options
+
+    if (globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if (globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
+    }
+    options.omitNull = globalOptions.omitNull
+
+    var factory = new DAOFactory(daoName, attributes, options)
+    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
+    return factory
+  }
+
+  Sequelize.prototype.isDefined = function(daoName) {
+    var daos = this.daoFactoryManager.daos
+    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
+  }
+
+  Sequelize.prototype.import = function(path) {
+    if (!this.importCache[path]) {
+      var defineCall = require(path)
+      this.importCache[path] = defineCall(this, DataTypes)
+    }
+
+    return this.importCache[path]
+  }
+
+  Sequelize.prototype.migrate = function(options) {
+    this.getMigrator().migrate(options)
+  }
+
+  Sequelize.prototype.query = function(sql, callee, options) {
+    if (arguments.length === 3) {
+      options = options
+    } else if (arguments.length === 2) {
+      options = {}
+    } else {
+      options = { raw: true }
+    }
+
+    options = Utils._.extend(Utils._.clone(this.options.query), options)
+    options = Utils._.defaults(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
+      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
+    })
+
+    return this.connectorManager.query(sql, callee, options)
+  }
+
+  Sequelize.prototype.sync = function(options) {
+    options = options || {}
+
+    if (this.options.sync) {
+      options = Utils._.extend({}, this.options.sync, options)
+    }
+
+    var chainer = new Utils.QueryChainer()
+
+    this.daoFactoryManager.daos.forEach(function(dao) {
+      chainer.add(dao.sync(options))
+    })
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.drop = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer
+
+      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
+
+      chainer
+        .run()
+        .success(function() { emitter.emit('success', null) })
+        .error(function(err) { emitter.emit('error', err) })
+    }).run()
+  }
+
+  return Sequelize
+})()
                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/utils.js.html b/docs/lib/utils.js.html new file mode 100644 index 000000000000..ea21c0b3a1b8 --- /dev/null +++ b/docs/lib/utils.js.html @@ -0,0 +1,225 @@ +Sequelize

                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                          declaration

                                                                                                                                                                                                          mysql

                                                                                                                                                                                                          mysql
                                                                                                                                                                                                            var mysql      = require("mysql")
+  , connection = mysql.createConnection({})
+  , util       = require("util")
+  , DataTypes  = require("./data-types")
+
+var Utils = module.exports = {
+  _: (function() {
+    var _  = require("underscore")
+      , _s = require('underscore.string')
+
+    _.mixin(_s.exports())
+    _.mixin({
+      includes: _s.include,
+      camelizeIf: function(string, condition) {
+        var result = string
+
+        if (condition) {
+          result = _.camelize(string)
+        }
+
+        return result
+      },
+      underscoredIf: function(string, condition) {
+        var result = string
+
+        if (condition) {
+          result = _.underscored(string)
+        }
+
+        return result
+      }
+    })
+
+    return _
+  })(),
+  addEventEmitter: function(_class) {
+    util.inherits(_class, require('events').EventEmitter)
+  },
+  TICK_CHAR: '`',
+  addTicks: function(s) {
+    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
+  },
+  removeTicks: function(s) {
+    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
+  },
+  escape: function(s) {
+    return connection.escape(s).replace(/\\"/g, '"')
+  },
+  format: function(arr) {
+    return connection.format.apply(connection, [arr.shift(), arr])
+  },
+  isHash: function(obj) {
+    return Utils._.isObject(obj) && !Array.isArray(obj);
+  },
+  toSqlDate: function(date) {
+    return [
+      [
+        date.getFullYear(),
+        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
+        ((date.getDate() < 10 ? '0' : '') + date.getDate())
+      ].join("-"),
+      date.toLocaleTimeString()
+    ].join(" ")
+  },
+  argsArePrimaryKeys: function(args, primaryKeys) {
+    var result = (args.length == Object.keys(primaryKeys).length)
+    if (result) {
+      Utils._.each(args, function(arg) {
+        if (result) {
+          if (['number', 'string'].indexOf(typeof arg) !== -1) {
+            result = true
+          } else {
+            result = (arg instanceof Date)
+          }
+        }
+      })
+    }
+    return result
+  },
+  combineTableNames: function(tableName1, tableName2) {
+    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
+  },
+
+  singularize: function(s) {
+    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
+  },
+
+  pluralize: function(s) {
+    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
+  },
+
+  removeCommentsFromFunctionString: function(s) {
+    s = s.replace(/\s*(\/\/.*)/g, '')
+    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
+
+    return s
+  },
+
+  toDefaultValue: function(value) {
+    return (value == DataTypes.NOW) ? new Date() : value
+  },
+
+  setAttributes: function(hash, identifier, instance, prefix) {
+    prefix = prefix || ''
+    if (this.isHash(identifier)) {
+      this._.each(identifier, function(elem, key) {
+        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
+      })
+    } else {
+      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
+    }
+
+    return hash
+  },
+
+  removeNullValuesFromHash: function(hash, omitNull) {
+    var result = hash
+
+    if (omitNull) {
+      var _hash = {}
+
+      Utils._.each(hash, function(val, key) {
+        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
+          _hash[key] = val;
+        }
+      })
+
+      result = _hash
+    }
+
+    return result
+  },
+
+  prependTableNameToHash: function(tableName, hash) {
+    if (tableName) {
+      var _hash = {}
+
+      for (var key in hash) {
+        if (key.indexOf('.') === -1) {
+          _hash[tableName + '.' + key] = hash[key]
+        } else {
+          _hash[key] = hash[key]
+        }
+      }
+
+      return _hash
+    } else {
+      return hash
+    }
+  },
+
+  firstValueOfHash: function(obj) {
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key))
+        return obj[key]
+    }
+    return null
+  },
+
+  inherit: function(subClass, superClass) {
+    if (superClass.constructor == Function) {
+      // Normal Inheritance
+      subClass.prototype = new superClass();
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass.prototype;
+    } else {
+      // Pure Virtual Inheritance
+      subClass.prototype = superClass;
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass;
+    }
+
+    return subClass;
+  }
+
+}
+
+Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
+Utils.QueryChainer = require("./query-chainer")
+Utils.Lingo = require("lingo")
                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/migration.js.html b/docs/migration.js.html index 451555136c36..9899fc2e67a5 100644 --- a/docs/migration.js.html +++ b/docs/migration.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                            declaration

                                                                                                                                                                                                            moment

                                                                                                                                                                                                            moment
                                                                                                                                                                                                              var moment         = require("moment")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                              declaration
                                                                                                                                                                                                              moment
                                                                                                                                                                                                              moment
                                                                                                                                                                                                                var moment         = require("moment")
   , Utils          = require("./utils")
   , DataTypes      = require("./data-types")
   , QueryInterface = require("./query-interface")
@@ -50,7 +74,7 @@
   Migration.parseFilename = function(s) {
     var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
 
-    if(matches === null) {
+    if (matches === null) {
       throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
     }
 
@@ -96,7 +120,7 @@
       extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
       func.call(null, self, DataTypes)
 
-      if(!Migration.migrationHasInterfaceCalls(func))
+      if (!Migration.migrationHasInterfaceCalls(func))
         onSuccess()
     }).run()
   }
@@ -139,123 +163,28 @@
           // the event will have the same name like the method
           self.queryInterface.on(_method, function(err) {
             self.undoneMethods--
-            if(err)
+            if (err) {
               throw new Error(err)
-            else
+            } else {
               (self.undoneMethods == 0) && callback && callback()
+            }
           })
 
-          self.queryInterface[_method].apply(self.queryInterface, args)
+          return self.queryInterface[_method].apply(self.queryInterface, args)
         }
       })(method)
     }
   }
 
   return Migration
-})()
                                                                                                                                                                                                                
\ No newline at end of file
+})()
                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/migrator.js.html b/docs/migrator.js.html index 788e2cea7654..02a61c651b3a 100644 --- a/docs/migrator.js.html +++ b/docs/migrator.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                  const fs     = require("fs")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                    const fs     = require("fs")
     , path   = require("path")
     , moment = require("moment")
 
@@ -40,12 +64,12 @@
       logging: console.log
     }, options || {})
 
-    if(this.options.logging === true) {
+    if (this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
 
-    if(this.options.logging == console.log) {
+    if (this.options.logging == console.log) {
       // using just console.log will break in node < 0.6
       this.options.logging = function(s) { console.log(s) }
     }
@@ -66,32 +90,35 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.getUndoneMigrations(function(err, migrations) {
-        if(err) {
+        if (err) {
           emitter.emit('error', err)
         } else {
           var chainer = new Utils.QueryChainer
             , from    = migrations[0]
 
-          if(options.method == 'down') {
-            migrations.reverse()
+          if (options.method === 'down') {
             from = migrations[0]
+            migrations.reverse()
           }
 
           migrations.forEach(function(migration) {
             chainer.add(migration, 'execute', [options], {
               before: function(migration) {
-                if(self.options.logging !== false)
+                if (self.options.logging !== false) {
                   self.options.logging('Executing migration: ' + migration.filename)
+                }
               },
               after: function(migration) {
-                if(self.options.logging !== false)
+                if (self.options.logging !== false) {
                   self.options.logging('Executed migration: ' + migration.filename)
+                }
               },
               success: function(migration, callback) {
-                if(options.method == 'down')
+                if (options.method === 'down') {
                   deleteUndoneMigration.call(self, from, migration, callback)
-                else
+                } else {
                   saveSuccessfulMigration.call(self, from, migration, callback)
+                }
               }
             })
           })
@@ -117,7 +144,9 @@
       callback && callback(null, result)
     }
 
-    var migrationFiles = fs.readdirSync(this.options.path)
+    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
+      return /\.js$/.test(file)
+    })
 
     var migrations = migrationFiles.map(function(file) {
       return new Migration(self, self.options.path + '/' + file)
@@ -127,27 +156,30 @@
       return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
     })
 
-    if(this.options.from) {
+    if (this.options.from) {
       filterFrom(migrations, this.options.from, function(err, migrations) {
-        if(self.options.to)
+        if (self.options.to) {
           filterTo(migrations, self.options.to, callback)
-        else
+        } else {
           callback && callback(null, migrations)
+        }
       })
     } else {
       getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
-        if(lastMigrationId) {
+        if (lastMigrationId) {
           filterFrom(migrations, lastMigrationId, function(err, migrations) {
-            if(self.options.to)
+            if (self.options.to) {
               filterTo(migrations, self.options.to, callback)
-            else
+            } else {
               callback && callback(null, migrations)
+            }
           }, { withoutEqual: true })
         } else {
-          if(self.options.to)
+          if (self.options.to) {
             filterTo(migrations, self.options.to, callback)
-          else
+          } else {
             callback && callback(null, migrations)
+          }
         }
       }).error(function(err) {
         callback && callback(err, null)
@@ -162,7 +194,7 @@
       var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
         , SequelizeMeta = storedDAO
 
-      if(!storedDAO) {
+      if (!storedDAO) {
         SequelizeMeta = self.sequelize.define('SequelizeMeta', {
           from: DataTypes.STRING,
           to:   DataTypes.STRING
@@ -172,7 +204,7 @@
       }
 
       // force sync when model has newly created or if syncOptions are passed
-      if(!storedDAO || syncOptions) {
+      if (!storedDAO || syncOptions) {
         SequelizeMeta
           .sync(syncOptions || {})
           .success(function() { emitter.emit('success', SequelizeMeta) })
@@ -242,7 +274,7 @@
 
     self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
       SequelizeMeta
-        .find({ from: from.migrationId, to: to.migrationId })
+        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
         .success(function(meta) {
           meta.destroy().success(callback)
         })
@@ -250,110 +282,14 @@
   }
 
   return Migrator
-})()
                                                                                                                                                                                                                    
\ No newline at end of file
+})()
                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/query-chainer.js.html b/docs/query-chainer.js.html index 25cbcb95a163..835eea3a6633 100644 --- a/docs/query-chainer.js.html +++ b/docs/query-chainer.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                      var Utils = require("./utils")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                        var Utils = require("./utils")
 
 module.exports = (function() {
   var QueryChainer = function(emitters) {
@@ -40,7 +64,7 @@
 
     emitters = emitters || []
     emitters.forEach(function(emitter) {
-      if(Array.isArray(emitter)) {
+      if (Array.isArray(emitter)) {
         self.add.apply(self, emitter)
       } else {
         self.add(emitter)
@@ -49,7 +73,7 @@
   }
 
   QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
-    if(!!method) {
+    if (!!method) {
       this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
     } else {
       observeEmitter.call(this, emitterOrKlass)
@@ -79,7 +103,7 @@
     var exec = function() {
       var serial = self.serials.pop()
 
-      if(serial) {
+      if (serial) {
         serial.options = serial.options || {}
         serial.options.before && serial.options.before(serial.klass)
 
@@ -96,7 +120,7 @@
           exec()
         }
 
-        if(options.skipOnError && (self.fails.length > 0)) {
+        if (options.skipOnError && (self.fails.length > 0)) {
           onError('Skipped due to earlier error!')
         } else {
           var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
@@ -104,7 +128,7 @@
           emitter.success(function(result) {
             self.serialResults[serialCopy.indexOf(serial)] = result
 
-            if(serial.options.success) {
+            if (serial.options.success) {
               serial.options.success(serial.klass, onSuccess)
             } else {
               onSuccess()
@@ -139,7 +163,7 @@
         finish.call(self, 'emitterResults')
       })
       .on('sql', function(sql) {
-        if(self.eventEmitter) {
+        if (self.eventEmitter) {
           self.eventEmitter.emit('sql', sql)
         }
       })
@@ -148,13 +172,14 @@
   var finish = function(resultsName) {
     this.finished = true
 
-    if(this.emitters.length > 0) {
+    if (this.emitters.length > 0) {
       this.finished = (this.finishedEmits == this.emitters.length)
-    } else if(this.serials.length > 0) {
+    }
+    else if (this.serials.length > 0) {
       this.finished = (this.finishedEmits == this.serials.length)
     }
 
-    if(this.finished && this.wasRunning) {
+    if (this.finished && this.wasRunning) {
       var status = (this.fails.length == 0 ? 'success' : 'error')
         , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
 
@@ -163,110 +188,14 @@
   }
 
   return QueryChainer
-})()
                                                                                                                                                                                                                        
\ No newline at end of file
+})()
                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/query-interface.js.html b/docs/query-interface.js.html index 76dc08524f3c..63306f65c85c 100644 --- a/docs/query-interface.js.html +++ b/docs/query-interface.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                        declaration

                                                                                                                                                                                                                        Utils

                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                          var Utils     = require('./utils')
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                            var Utils     = require('./utils')
   , DataTypes = require('./data-types')
 
 module.exports = (function() {
   var QueryInterface = function(sequelize) {
     this.sequelize = sequelize
     this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-	 this.QueryGenerator.options = this.sequelize.options;
+   this.QueryGenerator.options = this.sequelize.options;
   }
   Utils.addEventEmitter(QueryInterface)
 
@@ -37,10 +61,11 @@
     var attributeHashes = {}
 
     Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
-      if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
         attributeHashes[attributeName] = { type: dataTypeOrOptions }
-      else
+      } else {
         attributeHashes[attributeName] = dataTypeOrOptions
+      }
     })
 
     attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
@@ -122,10 +147,11 @@
   QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
-    if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    else
+    } else {
       attributes[attributeName] = dataTypeOrOptions
+    }
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
@@ -141,10 +167,11 @@
   QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
-    if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    else
+    } else {
       attributes[attributeName] = dataTypeOrOptions
+    }
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
@@ -157,7 +184,7 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0]
+        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
 
         var options =  {}
 
@@ -172,7 +199,7 @@
           self.QueryGenerator.attributesToSQL(options)
         )
 
-        self.sequelize.query(sql).success(function() {
+        self.sequelize.query(sql, null, {}).success(function() {
           self.emit('renameColumn', null)
           emitter.emit('success', null)
         }).error(function(err) {
@@ -220,19 +247,20 @@
 
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
     var sql = this.QueryGenerator.selectQuery(tableName, options)
+    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
   }
 
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
 
-    if(attributeSelector == undefined) {
+    if (attributeSelector === undefined) {
       throw new Error('Please pass an attribute selector!')
     }
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var sql = self.QueryGenerator.selectQuery(tableName, options)
-        , qry = self.sequelize.query(sql, null, { plain: true, raw: true })
+        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
 
       qry
         .success(function(data) {
@@ -261,17 +289,25 @@
     var self = this
 
     options = Utils._.extend({
-      success: function(obj){},
-      error: function(err){}
+      success: function(){},
+      error: function(){}
     }, options || {})
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var query = null
 
-      if(Array.isArray(sqlOrQueryParams)) {
+      if (Array.isArray(sqlOrQueryParams)) {
+        if (sqlOrQueryParams.length === 1) {
+          sqlOrQueryParams.push(null)
+        }
+
+        if (sqlOrQueryParams.length === 2) {
+          sqlOrQueryParams.push({})
+        }
+
         query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
       } else {
-        query = self.sequelize.query(sqlOrQueryParams)
+        query = self.sequelize.query(sqlOrQueryParams, null, {})
       }
 
       // append the query for better testing
@@ -288,115 +324,19 @@
       })
       query.on('sql', function(sql) {
         emitter.emit('sql', sql)
-      })
+      });
     }).run()
   }
 
   return QueryInterface
-})()
                                                                                                                                                                                                                            
\ No newline at end of file
+})()
                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/sequelize.js.html b/docs/sequelize.js.html index ccb1a00ef7f1..962146260313 100644 --- a/docs/sequelize.js.html +++ b/docs/sequelize.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                            function

                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                            Sequelize()

                                                                                                                                                                                                                            Main constructor of the project.

                                                                                                                                                                                                                            +#folder-structure > ul li a:hover { + background: #eee; +} +#folder-structure > ul ul.active { + border-left: 4px solid #eee; + padding-left: 10px; +} +#folder-structure li.active { + font-weight: bold; + background: #FAFAFA; +} + +#folder-structure > ul > li a { + display: block; +} + +#folder-structure h6 { + background: #eee; + padding: 10px; + cursor: pointer; + margin: 10px 0 0 0; +} +

                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                            function

                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                            Sequelize()

                                                                                                                                                                                                                            Main constructor of the project.

                                                                                                                                                                                                                            Params:
 
@@ -45,10 +69,14 @@
       query: {},
       sync: {},
       logging: console.log,
-      omitNull: false
+      omitNull: false,
+      queue: true,
+      native: false,
+      replication: false,
+      pool: {}
     }, options || {})
 
-    if(this.options.logging === true) {
+    if (this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
@@ -60,7 +88,11 @@
       host    : this.options.host,
       port    : this.options.port,
       pool    : this.options.pool,
-      protocol: this.options.protocol
+      protocol: this.options.protocol,
+      queue   : this.options.queue,
+      native  : this.options.native,
+      replication: this.options.replication,
+      maxConcurrentQueries: this.options.maxConcurrentQueries
     }
 
     var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
@@ -81,7 +113,7 @@
   }
 
   Sequelize.prototype.getMigrator = function(options, force) {
-    if(force) {
+    if (force) {
       this.migrator = new Migrator(this, options)
     } else {
       this.migrator = this.migrator || new Migrator(this, options)
@@ -92,10 +124,18 @@
 
   Sequelize.prototype.define = function(daoName, attributes, options) {
     options = options || {}
-    if(this.options.define) {
-      options = Sequelize.Utils.merge(options, this.options.define)
+    var globalOptions = this.options
+
+    if (globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if (globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
     }
-    options.omitNull = this.options.omitNull
+    options.omitNull = globalOptions.omitNull
 
     var factory = new DAOFactory(daoName, attributes, options)
     this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
@@ -121,9 +161,18 @@
   }
 
   Sequelize.prototype.query = function(sql, callee, options) {
-    options = Utils._.extend(Utils._.clone(this.options.query), options || {})
-    options = Utils._.extend(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log
+    if (arguments.length === 3) {
+      options = options
+    } else if (arguments.length === 2) {
+      options = {}
+    } else {
+      options = { raw: true }
+    }
+
+    options = Utils._.extend(Utils._.clone(this.options.query), options)
+    options = Utils._.defaults(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
+      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
     })
 
     return this.connectorManager.query(sql, callee, options)
@@ -132,8 +181,8 @@
   Sequelize.prototype.sync = function(options) {
     options = options || {}
 
-    if(this.options.sync) {
-      options = Sequelize.Utils.merge(options, this.options.sync)
+    if (this.options.sync) {
+      options = Utils._.extend({}, this.options.sync, options)
     }
 
     var chainer = new Utils.QueryChainer()
@@ -161,110 +210,14 @@
   }
 
   return Sequelize
-})()
                                                                                                                                                                                                                            \ No newline at end of file +})()
                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/utils.js.html b/docs/utils.js.html index 4625d2238245..ebb9bf55ff5c 100644 --- a/docs/utils.js.html +++ b/docs/utils.js.html @@ -1,4 +1,4 @@ -Sequelize

                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                            declaration

                                                                                                                                                                                                                            mysql

                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                              var mysql      = require("mysql")
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                                var mysql      = require("mysql")
   , connection = mysql.createConnection({})
   , util       = require("util")
   , DataTypes  = require("./data-types")
@@ -38,7 +62,7 @@
       camelizeIf: function(string, condition) {
         var result = string
 
-        if(condition) {
+        if (condition) {
           result = _.camelize(string)
         }
 
@@ -47,7 +71,7 @@
       underscoredIf: function(string, condition) {
         var result = string
 
-        if(condition) {
+        if (condition) {
           result = _.underscored(string)
         }
 
@@ -65,19 +89,16 @@
     return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
   },
   removeTicks: function(s) {
-    return s.replace("`", "")
+    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
   },
   escape: function(s) {
     return connection.escape(s).replace(/\\"/g, '"')
   },
   format: function(arr) {
-    var query        = arr[0]
-      , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
-
-    return connection.format.apply(connection, [query, replacements])
+    return connection.format.apply(connection, [arr.shift(), arr])
   },
   isHash: function(obj) {
-    return Utils._.isObject(obj) && !Utils._.isArray(obj);
+    return Utils._.isObject(obj) && !Array.isArray(obj);
   },
   toSqlDate: function(date) {
     return [
@@ -90,16 +111,18 @@
     ].join(" ")
   },
   argsArePrimaryKeys: function(args, primaryKeys) {
-    var result = (args.length == Utils._.keys(primaryKeys).length)
-    Utils._.each(args, function(arg) {
-      if(result) {
-        if(['number', 'string'].indexOf(typeof arg) > -1)
-          result = true
-        else
-          result = (arg instanceof Date)
-
-      }
-    })
+    var result = (args.length == Object.keys(primaryKeys).length)
+    if (result) {
+      Utils._.each(args, function(arg) {
+        if (result) {
+          if (['number', 'string'].indexOf(typeof arg) !== -1) {
+            result = true
+          } else {
+            result = (arg instanceof Date)
+          }
+        }
+      })
+    }
     return result
   },
   combineTableNames: function(tableName1, tableName2) {
@@ -114,13 +137,6 @@
     return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
   },
 
-  merge: function(a, b){
-    for(var key in b) {
-      a[key] = b[key]
-    }
-    return a
-  },
-
   removeCommentsFromFunctionString: function(s) {
     s = s.replace(/\s*(\/\/.*)/g, '')
     s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
@@ -148,7 +164,7 @@
   removeNullValuesFromHash: function(hash, omitNull) {
     var result = hash
 
-    if(omitNull) {
+    if (omitNull) {
       var _hash = {}
 
       Utils._.each(hash, function(val, key) {
@@ -181,6 +197,14 @@
     }
   },
 
+  firstValueOfHash: function(obj) {
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key))
+        return obj[key]
+    }
+    return null
+  },
+
   inherit: function(subClass, superClass) {
     if (superClass.constructor == Function) {
       // Normal Inheritance
@@ -196,114 +220,19 @@
 
     return subClass;
   }
+
 }
 
 Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
 Utils.QueryChainer = require("./query-chainer")
-Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                
\ No newline at end of file
+Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                \ No newline at end of file From b37f5ff5ea3dcd4567e04ea27f7f498e34c1d5cf Mon Sep 17 00:00:00 2001 From: Mick Hansen Date: Mon, 25 Feb 2013 13:21:19 +0100 Subject: [PATCH 110/360] Update changelog.md --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index a8148bbfec62..0a69b552379b 100644 --- a/changelog.md +++ b/changelog.md @@ -28,6 +28,7 @@ - [FEATURE] allow definition of a models table name (thanks to slamkajs) - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin) - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz) +- [DEPENDENCIES] mysql is now an optional dependency # v1.5.0 # - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence) From c15977e3d3c402a974b0a5afab55bc8658c241fc Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 25 Feb 2013 18:27:20 +0100 Subject: [PATCH 111/360] first attempt at converting all dates to utc --- changelog.md | 3 ++ lib/dialects/abstract/query.js | 10 ++-- lib/dialects/mysql/connector-manager.js | 1 + lib/dialects/mysql/query.js | 14 +++++- lib/dialects/postgres/query-generator.js | 6 +-- lib/dialects/sqlite/query.js | 2 +- lib/utils.js | 50 +++++++++++-------- package.json | 2 +- spec-jasmine/dao.spec.js | 2 +- spec-jasmine/mysql/query-generator.spec.js | 8 +-- spec-jasmine/postgres/query-generator.spec.js | 10 ++-- spec-jasmine/sequelize.spec.js | 2 +- spec-jasmine/sqlite/query-generator.spec.js | 2 +- 13 files changed, 67 insertions(+), 45 deletions(-) diff --git a/changelog.md b/changelog.md index 0a69b552379b..d98e83e6c652 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v2.0.0 # +- [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work + # v1.6.0 # - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3 - [REFACTORING] separated tests for dialects diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index 0686b9f65fca..42a4e04ef22d 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -56,7 +56,7 @@ module.exports = (function() { * * @param {Array} data - The result of the query execution. */ - AbstractQuery.prototype.formatResults = function(data) { + AbstractQuery.prototype.formatResults = function(data, metaData) { var result = this.callee if (isInsertQuery.call(this, data)) { @@ -64,7 +64,7 @@ module.exports = (function() { } if (isSelectQuery.call(this)) { - result = handleSelectQuery.call(this, data) + result = handleSelectQuery.call(this, data, metaData) } else if (isShowTableQuery.call(this)) { result = handleShowTableQuery.call(this, data) } else if (isShowOrDescribeQuery.call(this)) { @@ -226,12 +226,12 @@ module.exports = (function() { return (this.sql.toLowerCase().indexOf('update') === 0) } - var handleSelectQuery = function(results) { + var handleSelectQuery = function(results, metaData) { var result = null, self = this; if (this.options.raw) { result = results - } else if (this.options.hasJoin === true) { + } else if (this.options.hasJoin === true) { result = prepareJoinData.call(this, results) result = groupDataByCalleeFactory.call(this, result).map(function(result) { // let's build the actual dao instance first... @@ -251,7 +251,7 @@ module.exports = (function() { return this.callee.build(result, { isNewRecord: false }) }.bind(this)) } - + // return the first real model instance if options.plain is set (e.g. Model.find) if (this.options.plain) { result = (result.length === 0) ? null : result[0] diff --git a/lib/dialects/mysql/connector-manager.js b/lib/dialects/mysql/connector-manager.js index 5879435eefff..7c503f6258b0 100644 --- a/lib/dialects/mysql/connector-manager.js +++ b/lib/dialects/mysql/connector-manager.js @@ -243,6 +243,7 @@ module.exports = (function() { password: config.password, database: config.database }) + connection.query("SET time_zone = '+0:00'"); // client.setMaxListeners(self.maxConcurrentQueries) this.isConnecting = false diff --git a/lib/dialects/mysql/query.js b/lib/dialects/mysql/query.js index 8feec01c98e9..1ae8711d2514 100644 --- a/lib/dialects/mysql/query.js +++ b/lib/dialects/mysql/query.js @@ -23,13 +23,21 @@ module.exports = (function() { this.options.logging('Executing: ' + this.sql) } - this.client.query(this.sql, function(err, results, fields) { + this.client.query({ + sql: this.sql, + typeCast: function (field, next) { + if (field.type == 'DATETIME') { + return new Date(field.string()+'Z') + } + return next(); + } + }, function(err, results, fields) { this.emit('sql', this.sql) if (err) { this.emit('error', err, this.callee) } else { - this.emit('success', this.formatResults(results)) + this.emit('success', this.formatResults(results, fields)) } }.bind(this)).setMaxListeners(100) return this @@ -37,3 +45,5 @@ module.exports = (function() { return Query })() + + diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 09ec178dbb99..790fd9cd423c 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -51,7 +51,7 @@ function padInt(i) { function pgSqlDate(dt) { var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-') var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':') - return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000) + return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000) + 'Z' } function pgDataTypeMapping(tableName, attr, dataType) { @@ -65,7 +65,7 @@ function pgDataTypeMapping(tableName, attr, dataType) { } if (Utils._.includes(dataType, 'DATETIME')) { - dataType = dataType.replace(/DATETIME/, 'TIMESTAMP') + dataType = dataType.replace(/DATETIME/, 'TIMESTAMP WITH TIME ZONE') } if (Utils._.includes(dataType, 'SERIAL')) { @@ -514,7 +514,7 @@ module.exports = (function() { } if (dataType.type === "DATETIME") { - dataType.type = 'TIMESTAMP' + dataType.type = 'TIMESTAMP WITH TIME ZONE' } if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) { diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js index bb1aaa9fbe72..071c232e0e2c 100644 --- a/lib/dialects/sqlite/query.js +++ b/lib/dialects/sqlite/query.js @@ -92,7 +92,7 @@ module.exports = (function() { results = results.map(function(result) { for (var name in result) { if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) { - result[name] = new Date(result[name]); + result[name] = new Date(result[name]+'Z'); // Z means UTC } } return result diff --git a/lib/utils.js b/lib/utils.js index 9c770a399023..205b89b6e122 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,6 +1,7 @@ -var util = require("util") +var mysql = require("mysql") + , connection = mysql.createConnection({}) + , util = require("util") , DataTypes = require("./data-types") - , SqlString = require("./SqlString") var Utils = module.exports = { _: (function() { @@ -43,23 +44,39 @@ var Utils = module.exports = { return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "") }, escape: function(s) { - return SqlString.escape(s, true, "local").replace(/\\"/g, '"') + return connection.escape(s).replace(/\\"/g, '"') }, format: function(arr) { - return SqlString.format(arr.shift(), arr) + return connection.format.apply(connection, [arr.shift(), arr]) }, isHash: function(obj) { return Utils._.isObject(obj) && !Array.isArray(obj); }, + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + pad: function (s) { + return s < 10 ? '0' + s : s + }, toSqlDate: function(date) { - return [ - [ - date.getFullYear(), - ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)), - ((date.getDate() < 10 ? '0' : '') + date.getDate()) - ].join("-"), - date.toLocaleTimeString() - ].join(" ") + // return [ + // [ + // date.getFullYear(), + // ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)), + // ((date.getDate() < 10 ? '0' : '') + date.getDate()) + // ].join("-"), + // date.toLocaleTimeString() + // ].join(" ") + + return date.getUTCFullYear() + '-' + + this.pad(date.getUTCMonth()+1) + '-' + + this.pad(date.getUTCDate()) + ' ' + + this.pad(date.getUTCHours()) + ':' + + this.pad(date.getUTCMinutes()) + ':' + + this.pad(date.getUTCSeconds()) }, argsArePrimaryKeys: function(args, primaryKeys) { var result = (args.length == Object.keys(primaryKeys).length) @@ -148,14 +165,6 @@ var Utils = module.exports = { } }, - firstValueOfHash: function(obj) { - for (var key in obj) { - if (obj.hasOwnProperty(key)) - return obj[key] - } - return null - }, - inherit: function(subClass, superClass) { if (superClass.constructor == Function) { // Normal Inheritance @@ -171,7 +180,6 @@ var Utils = module.exports = { return subClass; } - } Utils.CustomEventEmitter = require("./emitters/custom-event-emitter") diff --git a/package.json b/package.json index b501b7b64ad5..ed48789059a6 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "devDependencies": { "jasmine-node": "1.0.17", "sqlite3": "~2.1.5", - "mysql": "~2.0.0-alpha3", + "mysql": "~2.0.0-alpha7", "pg": "~0.10.2", "buster": "~0.6.0", "dox-foundation": "~0.3.0", diff --git a/spec-jasmine/dao.spec.js b/spec-jasmine/dao.spec.js index 704165accbc8..c7a9b726bedb 100644 --- a/spec-jasmine/dao.spec.js +++ b/spec-jasmine/dao.spec.js @@ -181,7 +181,7 @@ describe('DAO', function() { expect(users.length).toEqual(1) expect(users[0].username).toEqual(username) expect(users[0].birthDate instanceof Date).toBe(true) - expect(users[0].birthDate.getTime()).toEqual(new Date(1984, 8, 23).getTime()) + expect(users[0].birthDate).toEqual(new Date(1984, 8, 23)) done() }) }) diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js index ffe0e29141dd..319cbc9b6eff 100644 --- a/spec-jasmine/mysql/query-generator.spec.js +++ b/spec-jasmine/mysql/query-generator.spec.js @@ -105,7 +105,7 @@ describe('QueryGenerator', function() { arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}], expectation: "INSERT INTO `myTable` (`name`) VALUES ('foo\\';DROP TABLE myTable;');" }, { - arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}], + arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}], expectation: "INSERT INTO `myTable` (`name`,`birthday`) VALUES ('foo','2011-03-27 10:01:55');" }, { arguments: ['myTable', {name: 'foo', foo: 1}], @@ -130,10 +130,10 @@ describe('QueryGenerator', function() { updateQuery: [ { - arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}, {id: 2}], + arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}], expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2" }, { - arguments: ['myTable', {name: 'foo', birthday: new Date(2011, 2, 27, 10, 1, 55)}, 2], + arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, 2], expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2" }, { arguments: ['myTable', {bar: 2}, {name: 'foo'}], @@ -226,7 +226,7 @@ describe('QueryGenerator', function() { Sequelize.Utils._.each(suites, function(tests, suiteTitle) { describe(suiteTitle, function() { tests.forEach(function(test) { - var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) + var title = test.title || 'MySQL correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) it(title, function() { // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly var context = test.context || {options: {}}; diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js index 52402682b7ae..2440ae78712e 100644 --- a/spec-jasmine/postgres/query-generator.spec.js +++ b/spec-jasmine/postgres/query-generator.spec.js @@ -99,7 +99,7 @@ describe('QueryGenerator', function() { expectation: "INSERT INTO \"myTable\" (\"name\") VALUES ('foo'';DROP TABLE myTable;') RETURNING *;" }, { arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}], - expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.0') RETURNING *;" + expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.0Z') RETURNING *;" }, { arguments: ['myTable', {name: 'foo', foo: 1}], expectation: "INSERT INTO \"myTable\" (\"name\",\"foo\") VALUES ('foo',1) RETURNING *;" @@ -133,10 +133,10 @@ describe('QueryGenerator', function() { updateQuery: [ { arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}], - expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *" + expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *" }, { arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, 2], - expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *" + expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *" }, { arguments: ['myTable', {bar: 2}, {name: 'foo'}], expectation: "UPDATE \"myTable\" SET \"bar\"=2 WHERE \"name\"='foo' RETURNING *" @@ -160,7 +160,7 @@ describe('QueryGenerator', function() { context: {options: {omitNull: true}} }, { arguments: ['mySchema.myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}], - expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0' WHERE \"id\"=2 RETURNING *" + expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.0Z' WHERE \"id\"=2 RETURNING *" }, { arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {name: 'foo'}], expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo'';DROP TABLE mySchema.myTable;' WHERE \"name\"='foo' RETURNING *" @@ -251,7 +251,7 @@ describe('QueryGenerator', function() { Sequelize.Utils._.each(suites, function(tests, suiteTitle) { describe(suiteTitle, function() { tests.forEach(function(test) { - var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) + var title = test.title || 'Postgres correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) it(title, function() { // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly var context = test.context || {options: {}}; diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js index ceeb68df2680..a5b6e59b18a0 100644 --- a/spec-jasmine/sequelize.spec.js +++ b/spec-jasmine/sequelize.spec.js @@ -76,7 +76,7 @@ describe('Sequelize', function() { Photo.sync({ force: true }).success(function() { sequelize.getQueryInterface().showAllTables().success(function(tableNames) { expect(tableNames.indexOf('photos') !== -1).toBeTruthy() - done + done(); }) }) }) diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js index dea921eff8f6..40fce4870cde 100644 --- a/spec-jasmine/sqlite/query-generator.spec.js +++ b/spec-jasmine/sqlite/query-generator.spec.js @@ -83,7 +83,7 @@ describe('QueryGenerator', function() { Sequelize.Utils._.each(suites, function(tests, suiteTitle) { describe(suiteTitle, function() { tests.forEach(function(test) { - var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) + var title = test.title || 'SQLite correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments) it(title, function() { // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly var context = test.context || {options: {}}; From 2bf0668ede51c2cfb45f0438471121733a36ea72 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 25 Feb 2013 18:35:43 +0100 Subject: [PATCH 112/360] first attempt at converting all dates to utc --- lib/utils.js | 8 ++++++++ spec/dao-factory.spec.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/utils.js b/lib/utils.js index 205b89b6e122..bf20c0d8ff36 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -165,6 +165,14 @@ var Utils = module.exports = { } }, + firstValueOfHash: function(obj) { + for (var key in obj) { + if (obj.hasOwnProperty(key)) + return obj[key] + } + return null + }, + inherit: function(subClass, superClass) { if (superClass.constructor == Function) { // Normal Inheritance diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index fbc678412046..db07afed75bf 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -352,7 +352,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - ;(dialect.match(/^postgres/) ? itEventually : it)('stores the current date in createdAt', function(done) { + it('stores the current date in createdAt', function(done) { this.User.create({ username: 'foo' }).success(function(user) { expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000)) done() From 721eef267eccef65ef1ebafcc8269709dbf682db Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 25 Feb 2013 18:40:40 +0100 Subject: [PATCH 113/360] A bit of cleanup --- lib/dialects/abstract/query.js | 8 ++++---- lib/utils.js | 18 ++++-------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js index 42a4e04ef22d..b1a48dff7a0d 100644 --- a/lib/dialects/abstract/query.js +++ b/lib/dialects/abstract/query.js @@ -56,7 +56,7 @@ module.exports = (function() { * * @param {Array} data - The result of the query execution. */ - AbstractQuery.prototype.formatResults = function(data, metaData) { + AbstractQuery.prototype.formatResults = function(data) { var result = this.callee if (isInsertQuery.call(this, data)) { @@ -64,7 +64,7 @@ module.exports = (function() { } if (isSelectQuery.call(this)) { - result = handleSelectQuery.call(this, data, metaData) + result = handleSelectQuery.call(this, data) } else if (isShowTableQuery.call(this)) { result = handleShowTableQuery.call(this, data) } else if (isShowOrDescribeQuery.call(this)) { @@ -226,12 +226,12 @@ module.exports = (function() { return (this.sql.toLowerCase().indexOf('update') === 0) } - var handleSelectQuery = function(results, metaData) { + var handleSelectQuery = function(results) { var result = null, self = this; if (this.options.raw) { result = results - } else if (this.options.hasJoin === true) { + } else if (this.options.hasJoin === true) { result = prepareJoinData.call(this, results) result = groupDataByCalleeFactory.call(this, result).map(function(result) { // let's build the actual dao instance first... diff --git a/lib/utils.js b/lib/utils.js index bf20c0d8ff36..cc58a4e3adf2 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,7 +1,6 @@ -var mysql = require("mysql") - , connection = mysql.createConnection({}) - , util = require("util") +var util = require("util") , DataTypes = require("./data-types") + , SqlString = require("./SqlString") var Utils = module.exports = { _: (function() { @@ -44,10 +43,10 @@ var Utils = module.exports = { return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "") }, escape: function(s) { - return connection.escape(s).replace(/\\"/g, '"') + return SqlString.escape(s, true, "local").replace(/\\"/g, '"') }, format: function(arr) { - return connection.format.apply(connection, [arr.shift(), arr]) + return SqlString.format(arr.shift(), arr) }, isHash: function(obj) { return Utils._.isObject(obj) && !Array.isArray(obj); @@ -62,15 +61,6 @@ var Utils = module.exports = { return s < 10 ? '0' + s : s }, toSqlDate: function(date) { - // return [ - // [ - // date.getFullYear(), - // ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)), - // ((date.getDate() < 10 ? '0' : '') + date.getDate()) - // ].join("-"), - // date.toLocaleTimeString() - // ].join(" ") - return date.getUTCFullYear() + '-' + this.pad(date.getUTCMonth()+1) + '-' + this.pad(date.getUTCDate()) + ' ' + From 13b862f2eea71391793c9fe9180f5a7196a77817 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 25 Feb 2013 18:52:24 +0100 Subject: [PATCH 114/360] specify timezone option instead of typecaster --- lib/dialects/mysql/connector-manager.js | 3 ++- lib/dialects/mysql/query.js | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/dialects/mysql/connector-manager.js b/lib/dialects/mysql/connector-manager.js index 7c503f6258b0..2de43ad9603a 100644 --- a/lib/dialects/mysql/connector-manager.js +++ b/lib/dialects/mysql/connector-manager.js @@ -241,7 +241,8 @@ module.exports = (function() { port: config.port, user: config.username, password: config.password, - database: config.database + database: config.database, + timezone: 'Z' }) connection.query("SET time_zone = '+0:00'"); // client.setMaxListeners(self.maxConcurrentQueries) diff --git a/lib/dialects/mysql/query.js b/lib/dialects/mysql/query.js index 1ae8711d2514..41d113dd83ee 100644 --- a/lib/dialects/mysql/query.js +++ b/lib/dialects/mysql/query.js @@ -23,21 +23,13 @@ module.exports = (function() { this.options.logging('Executing: ' + this.sql) } - this.client.query({ - sql: this.sql, - typeCast: function (field, next) { - if (field.type == 'DATETIME') { - return new Date(field.string()+'Z') - } - return next(); - } - }, function(err, results, fields) { + this.client.query(this.sql, function(err, results, fields) { this.emit('sql', this.sql) if (err) { this.emit('error', err, this.callee) } else { - this.emit('success', this.formatResults(results, fields)) + this.emit('success', this.formatResults(results)) } }.bind(this)).setMaxListeners(100) return this From 82c8115402e27a12e6736525fc02fab34942d385 Mon Sep 17 00:00:00 2001 From: Jan Aagaard Meier Date: Mon, 25 Feb 2013 19:03:42 +0100 Subject: [PATCH 115/360] remove isEmptyObject - something weird happened in merge --- lib/utils.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index cc58a4e3adf2..682cc48ee1fc 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -51,12 +51,6 @@ var Utils = module.exports = { isHash: function(obj) { return Utils._.isObject(obj) && !Array.isArray(obj); }, - isEmptyObject: function( obj ) { - for ( var name in obj ) { - return false; - } - return true; - }, pad: function (s) { return s < 10 ? '0' + s : s }, From feca1473cd72971d5bad93c6efcbdd36b77307ce Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Mon, 25 Feb 2013 21:19:38 +0100 Subject: [PATCH 116/360] belongsTo, hasOne and hasMany working for find. --- lib/associations/mixin.js | 10 +- lib/dao-factory.js | 82 ++- lib/dialects/mysql/query-generator.js | 110 ++-- lib/query-interface.js | 3 +- spec/dao-factory.spec.js | 893 +++++++++++++++----------- 5 files changed, 648 insertions(+), 450 deletions(-) diff --git a/lib/associations/mixin.js b/lib/associations/mixin.js index 01f4bd0453f3..16a2161ddd7a 100644 --- a/lib/associations/mixin.js +++ b/lib/associations/mixin.js @@ -19,11 +19,11 @@ Mixin.hasOne = function(associatedDAO, options) { Mixin.belongsTo = function(associatedDAO, options) { // the id is in this table - var association = new BelongsTo(this, associatedDAO, Utils._.extend((options||{}), this.options)) + var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options)) this.associations[association.associationAccessor] = association.injectAttributes() - association.injectGetter(this.DAO.prototype); - association.injectSetter(this.DAO.prototype); + association.injectGetter(this.DAO.prototype) + association.injectSetter(this.DAO.prototype) return this } @@ -33,8 +33,8 @@ Mixin.hasMany = function(associatedDAO, options) { var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options)) this.associations[association.associationAccessor] = association.injectAttributes() - association.injectGetter(this.DAO.prototype); - association.injectSetter(this.DAO.prototype); + association.injectGetter(this.DAO.prototype) + association.injectSetter(this.DAO.prototype) return this } diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 8b325d22f34a..3cdaa920f083 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -146,9 +146,13 @@ module.exports = (function() { if ((typeof options === 'object') && (options.hasOwnProperty('include'))) { var includes = options.include - hasJoin = true + hasJoin = true options.include = {} + /*options.include =*/ includes.map(function(include) { + console.log(include instanceof DAOFactory) + }) + includes.forEach(function(daoName) { options.include[daoName] = this.daoFactoryManager.getDAO(daoName) @@ -161,7 +165,10 @@ module.exports = (function() { this.options.whereCollection = options.where || null } - return this.QueryInterface.select(this, this.tableName, options, { type: 'SELECT', hasJoin: hasJoin }) + return this.QueryInterface.select(this, this.tableName, options, { + type: 'SELECT', + hasJoin: hasJoin + }) } //right now, the caller (has-many-double-linked) is in charge of the where clause @@ -175,8 +182,16 @@ module.exports = (function() { return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' }) } + /** + * Search for an instance. + * + * @param {Object} options Options to describe the scope of the search. + * @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }. + * @return {Object} A promise which fires `success`, `error`, `complete` and `sql`. + */ DAOFactory.prototype.find = function(options) { var hasJoin = false + // no options defined? // return an emitter which emits null if ([null, undefined].indexOf(options) !== -1) { @@ -210,20 +225,13 @@ module.exports = (function() { options = { where: parsedId } } else if (typeof options === 'object') { - var options = Utils._.clone(options) - var includes + options = Utils._.clone(options) if (options.hasOwnProperty('include')) { hasJoin = true - includes = options.include - options.include = {} - - includes.forEach(function(daoName) { - options.include[daoName] = this.daoFactoryManager.getDAO(daoName) - if (!options.include[daoName]) { - options.include[daoName] = this.getAssociationByAlias(daoName).target - } + options.include = options.include.map(function(include) { + return validateIncludedElement.call(this, include) }.bind(this)) } @@ -233,7 +241,11 @@ module.exports = (function() { options.limit = 1 - return this.QueryInterface.select(this, this.tableName, options, { plain: true, type: 'SELECT', hasJoin: hasJoin }) + return this.QueryInterface.select(this, this.tableName, options, { + plain: true, + type: 'SELECT', + hasJoin: hasJoin + }) } DAOFactory.prototype.count = function(options) { @@ -260,7 +272,7 @@ module.exports = (function() { } DAOFactory.prototype.build = function(values, options) { - options = options || {isNewRecord: true} + options = options || { isNewRecord: true } var self = this , instance = new this.DAO(values, this.options, options.isNewRecord) @@ -283,16 +295,16 @@ module.exports = (function() { }).success(function (instance) { if (instance === null) { for (var attrname in defaults) { - params[attrname] = defaults[attrname]; + params[attrname] = defaults[attrname] } self.create(params) - .success(function (instance) { + .success(function (instance) { emitter.emit('success', instance) }) - .error( function (error) { + .error( function (error) { emitter.emit('error', error) - }); + }) } else { emitter.emit('success', instance) } @@ -368,6 +380,40 @@ module.exports = (function() { }.bind(this)) } + var validateIncludedElement = function(include) { + if (include instanceof DAOFactory) { + include = { daoFactory: include, as: include.tableName } + } + + if (typeof include === 'object') { + if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) { + var usesAlias = (include.as !== include.daoFactory.tableName) + , association = (usesAlias ? this.getAssociationByAlias(include.as) : this.getAssociation(include.daoFactory)) + + // check if the current daoFactory is actually associated with the passed daoFactory + if (!!association) { + include.association = association + + return include + } else { + var msg = include.daoFactory.name + + if (usesAlias) { + msg += " (" + include.as + ")" + } + + msg += " is not associated to " + this.name + "!" + + throw new Error(msg) + } + } else { + throw new Error('Include malformed. Expected attributes: daoFactory, as') + } + } else { + throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.') + } + } + Utils._.extend(DAOFactory.prototype, require("./associations/mixin")) return DAOFactory diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index 4dc435ca922b..6e0527bb875a 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -131,49 +131,73 @@ module.exports = (function() { if (options.include) { var optAttributes = [options.table + '.*'] - for (var daoName in options.include) { - if (options.include.hasOwnProperty(daoName)) { - var dao = options.include[daoName] - , daoFactory = dao.daoFactoryManager.getDAO(tableName, { - attribute: 'tableName' - }) - , _tableName = Utils.addTicks(dao.tableName) - , association = dao.getAssociation(daoFactory) - - if (association.connectorDAO) { - var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { - return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier) - })[0] - - query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON ' - query += Utils.addTicks(association.connectorDAO.tableName) + '.' - query += Utils.addTicks(foreignIdentifier) + '=' - query += Utils.addTicks(table) + '.' + Utils.addTicks('id') - - query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' - query += Utils.addTicks(dao.tableName) + '.' - query += Utils.addTicks('id') + '=' - query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier) - } else { - query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' - query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.' - query += Utils.addTicks(association.identifier) + '=' - query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id') - } - - var aliasAssoc = daoFactory.getAssociationByAlias(daoName) - , aliasName = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName - - optAttributes = optAttributes.concat( - Object.keys(dao.attributes).map(function(attr) { - return '' + - [_tableName, Utils.addTicks(attr)].join('.') + - ' AS ' + - Utils.addTicks([aliasName, attr].join('.')) - }) - ) - } - } + options.include.forEach(function(include) { + //SELECT `UserWithNames`.*, `Tasks`.`title` AS `Tasks.title`, `Tasks`.`id` AS `Tasks.id`, `Tasks`.`createdAt` AS `Tasks.createdAt`, `Tasks`.`updatedAt` AS `Tasks.updatedAt`, `TaskFROM `UserWithNames` LEFT OUTER JOIN `Tasks` ON `Tasks`.`UserWithNameId`=`UserWithNames`.`id` WHERE `UserWithNames`.`id`=1; + //SELECT `Tasks`.*, `Workers`.`name` AS `Workers.name`, `Workers`.`id` AS `Workers.id`, `Workers`.`createdAt` AS `Workers.createdAt`, `Workers`.`updatedAt` AS `Workers.updatedAt` FROM `Tasks` LEFT OUTER JOIN `Workers` ON `Workers`.`WorkerId` = `Tasks`.`id` WHERE `Tasks`.`id`=1; + var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) { + var template = Utils._.template("`<%= table %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`") + return template({ + table: include.daoFactory.tableName, + as: include.as, + attr: attr + }) + }) + + optAttributes = optAttributes.concat(attributes) + + var joinQuery = " LEFT OUTER JOIN `<%= table %>` ON `<%= tableLeft %>`.`<%= attrLeft %>` = `<%= tableRight %>`.`<%= attrRight %>`" + query += Utils._.template(joinQuery)({ + table: include.daoFactory.tableName, + tableLeft: ((include.association.associationType === 'BelongsTo') ? include.daoFactory.tableName : tableName), + attrLeft: 'id', + tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.daoFactory.tableName), + attrRight: include.association.identifier + }) + }) + + // for (var daoFactory in options.include) { + // if (options.include.hasOwnProperty(daoFactory)) { + // var dao = options.include[daoName] + // , daoFactory = dao.daoFactoryManager.getDAO(tableName, { + // attribute: 'tableName' + // }) + // , _tableName = Utils.addTicks(dao.tableName) + // , association = dao.getAssociation(daoFactory) + + // if (association.connectorDAO) { + // var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { + // return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier) + // })[0] + + // query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON ' + // query += Utils.addTicks(association.connectorDAO.tableName) + '.' + // query += Utils.addTicks(foreignIdentifier) + '=' + // query += Utils.addTicks(table) + '.' + Utils.addTicks('id') + + // query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' + // query += Utils.addTicks(dao.tableName) + '.' + // query += Utils.addTicks('id') + '=' + // query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier) + // } else { + // query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' + // query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.' + // query += Utils.addTicks(association.identifier) + '=' + // query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id') + // } + + // var aliasAssoc = daoFactory.getAssociationByAlias(daoName) + // , aliasName = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName + + // optAttributes = optAttributes.concat( + // Object.keys(dao.attributes).map(function(attr) { + // return '' + + // [_tableName, Utils.addTicks(attr)].join('.') + + // ' AS ' + + // Utils.addTicks([aliasName, attr].join('.')) + // }) + // ) + // } + // } options.attributes = optAttributes.join(', ') } diff --git a/lib/query-interface.js b/lib/query-interface.js index 7a85664e5463..36fe74023297 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -199,13 +199,14 @@ module.exports = (function() { QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) { var sql = this.QueryGenerator.selectQuery(tableName, options) + queryOptions = Utils._.extend({}, queryOptions, { include: options.include }) return queryAndEmit.call(this, [sql, factory, queryOptions], 'select') } QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) { var self = this - if (attributeSelector == undefined) { + if (attributeSelector === undefined) { throw new Error('Please pass an attribute selector!') } diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index fbc678412046..38630bca41f3 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -466,417 +466,544 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) }) - describe('association fetching', function() { + describe('eager loading', function() { before(function() { - this.Task = this.sequelize.define('Task', { - title: Sequelize.STRING - }) - - this.User = this.sequelize.define('UserWithName', { - name: Sequelize.STRING - }) + this.Task = this.sequelize.define('Task', { title: Sequelize.STRING }) + this.Worker = this.sequelize.define('Worker', { name: Sequelize.STRING }) }) - describe('1:1 associations', function() { - it('fetches associated objects (1st direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) + describe('=>belongsTo only', function() { + before(function(done) { + this.Task.belongsTo(this.Worker) - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.task).toBeDefined() - expect(user.task.id).toEqual(task.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task - it('fetches no associated object if none is set (1st direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.task).toEqual(null) - done() - }) - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + this.task.setWorker(this.worker).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) }) - it('fetches associated objects via "as" param (1st direction)', function(done) { - this.User.hasOne(this.Task, { as: 'Homework' }) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setHomework(task).success(function() { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Homework' ] - }).success(function(user) { - expect(user.homework).toBeDefined() - expect(user.homework.id).toEqual(task.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('throws an error about unexpected input if include contains a non-object', function() { + expect(function() { + this.Worker.find({ include: [ 1 ] }) + }.bind(this)).toThrow() }) - it('fetches associated object (2nd direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.User.create({ name: 'another user' }).success(function(another_user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.Task.find({ - where: { 'Tasks.id': 1 }, - include: [ 'UserWithName' ] - }).success(function(task) { - expect(task.userWithName).toBeDefined() - expect(task.userWithName.id).toEqual(user.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('throws an error about missing attributes if include contains an object with daoFactory', function() { + expect(function() { + this.Worker.find({ include: [ { daoFactory: this.Worker } ] }) + }.bind(this)).toThrow() }) - it('fetches no associated object if none is set (2nd direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.User.create({ name: 'another user' }).success(function(another_user) { - this.Task.create({ title: 'task' }).success(function(task) { - this.Task.find({ - where: { 'Tasks.id': 1 }, - include: [ 'UserWithName' ] - }).success(function(task) { - expect(task.userWithName).toEqual(null) - done() - }) - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('throws an error if included DaoFactory is not associated', function() { + expect(function() { + this.Worker.find({ include: [ this.Task ] }) + }.bind(this)).toThrow() }) - it('fetches associated object via "as" param (2nd direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User, { as: 'Owner' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.User.create({ name: 'another user' }).success(function(another_user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.Task.find({ - where: { 'Tasks.id': 1 }, - include: [ 'Owner' ] - }).success(function(task) { - expect(task.owner).toBeDefined() - expect(task.owner.id).toEqual(user.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('returns the associated worker via task.worker', function(done) { + this.Task.find({ + where: { id: this.task.id }, + include: [ this.Worker ] + }).complete(function(err, task) { + expect(err).toBeNull() + expect(task).toBeDefined() + expect(task.worker).toBeDefined() + expect(task.worker.name).toEqual('worker') + done() + }.bind(this)) }) }) - it('fetches associated objects for 1:N associations (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User) + describe('=>hasOne only', function() { + before(function(done) { + this.Worker.hasOne(this.Task) - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.tasks).toBeDefined() - expect( - user.tasks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects via "as" param for 1:N associations (1st direction)', function(done) { - this.User.hasMany(this.Task, { as: 'Homeworks' }) - this.Task.belongsTo(this.User) + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setHomeworks([task1, task2]).success(function() { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Homeworks' ] - }).success(function(user) { - expect(user.homeworks).toBeDefined() - expect( - user.homeworks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches no associated objects for 1:N associations if none are set (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.User.find({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.tasks.length).toEqual(0) - done() - }) - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects for 1:N associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.Task.find({ - where: { 'Tasks.id': 1 }, - include: [ 'UserWithName' ] - }).success(function(task) { - expect(task.userWithName).toBeDefined() - expect(task.userWithName.name).toEqual(user.name) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects via "as" param for 1:N associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User, { as: 'Owner'}) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.Task.find({ - where: { 'Tasks.id': 1 }, - include: [ 'Owner' ] - }).success(function(task) { - expect(task.owner).toBeDefined() - expect(task.owner.name).toEqual(user.name) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects for N:M associations (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setTasks([task1, task2]).success(function() { - this.User.find({ - where: { 'UserWithNames.id': user1.id }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.tasks).toBeDefined() - expect( - user.tasks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches no associated objects for N:M associations if none are set (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - this.User.find({ - where: { 'UserWithNames.id': user1.id }, - include: [ 'Task' ] - }).success(function(user) { - expect(user.tasks.length).toEqual(0) - done() - }) - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects via "as" param for N:M associations (1st direction)', function(done) { - this.User.hasMany(this.Task, { as: 'Homeworks' }) - this.Task.hasMany(this.User, { as: 'Owners' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { + this.worker.setTask(this.task).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setHomeworks([task1, task2]).success(function() { - this.User.find({ - where: { 'UserWithNames.id': user1.id }, - include: [ 'Homeworks' ] - }).success(function(user) { - expect(user.homeworks).toBeDefined() - expect( - user.homeworks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create + it('throws an error if included DaoFactory is not associated', function() { + expect(function() { + this.Task.find({ include: [ this.Worker ] }) + }.bind(this)).toThrow() + }) - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('returns the associated task via worker.task', function(done) { + this.Worker.find({ + where: { id: this.worker.id }, + include: [ this.Task ] + }).complete(function(err, worker) { + expect(err).toBeNull() + expect(worker).toBeDefined() + expect(worker.task).toBeDefined() + expect(worker.task.title).toEqual('homework') + done() + }.bind(this)) + }) }) - it('fetches associated objects for N:M associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User) + describe('=>hasMany only', function() { + before(function(done) { + this.Worker.hasMany(this.Task) - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setTasks([task1, task2]).success(function() { - this.Task.find({ - where: { 'Tasks.id': task1.id }, - include: [ 'UserWithName' ] - }).success(function(task) { - expect(task.userWithNames).toBeDefined() - expect( - task.userWithNames.map(function(u) { return u.id }) - ).toEqual( - [ user1.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) - - it('fetches associated objects via "as" param for N:M associations (2nd direction)', function(done) { - this.User.hasMany(this.Task, { as: 'Homeworks' }) - this.Task.hasMany(this.User, { as: 'Owners' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { + this.worker.setTasks([ this.task ]).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setHomeworks([task1, task2]).success(function() { - this.Task.find({ - where: { 'Tasks.id': task1.id }, - include: [ 'Owners' ] - }).success(function(task) { - expect(task.owners).toBeDefined() - expect( - task.owners.map(function(u) { return u.id }) - ).toEqual( - [ user1.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create + it('throws an error if included DaoFactory is not associated', function() { + expect(function() { + this.Task.find({ include: [ this.Worker ] }) + }.bind(this)).toThrow() + }) - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('returns the associated tasks via worker.tasks', function(done) { + this.Worker.find({ + where: { id: this.worker.id }, + include: [ this.Task ] + }).complete(function(err, worker) { + expect(err).toBeNull() + expect(worker).toBeDefined() + expect(worker.tasks).toBeDefined() + expect(worker.tasks[0].title).toEqual('homework') + done() + }.bind(this)) + }) }) }) + + // describe('association fetching', function() { + // before(function() { + // this.Task = this.sequelize.define('Task', { + // title: Sequelize.STRING + // }) + + // this.User = this.sequelize.define('UserWithName', { + // name: Sequelize.STRING + // }) + // }) + + // describe('1:1 associations', function() { + // it('fetches associated objects (1st direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.task).toBeDefined() + // expect(user.task.id).toEqual(task.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches no associated object if none is set (1st direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.task).toEqual(null) + // done() + // }) + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param (1st direction)', function(done) { + // this.User.hasOne(this.Task, { as: 'Homework' }) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setHomework(task).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Homework' ] + // }).success(function(user) { + // expect(user.homework).toBeDefined() + // expect(user.homework.id).toEqual(task.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated object (2nd direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.User.create({ name: 'another user' }).success(function(another_user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': 1 }, + // include: [ 'UserWithName' ] + // }).success(function(task) { + // expect(task.userWithName).toBeDefined() + // expect(task.userWithName.id).toEqual(user.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches no associated object if none is set (2nd direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.User.create({ name: 'another user' }).success(function(another_user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // this.Task.find({ + // where: { 'Tasks.id': 1 }, + // include: [ 'UserWithName' ] + // }).success(function(task) { + // expect(task.userWithName).toEqual(null) + // done() + // }) + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated object via "as" param (2nd direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User, { as: 'Owner' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.User.create({ name: 'another user' }).success(function(another_user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': 1 }, + // include: [ 'Owner' ] + // }).success(function(task) { + // expect(task.owner).toBeDefined() + // expect(task.owner.id).toEqual(user.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + // }) + + // it('fetches associated objects for 1:N associations (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.tasks).toBeDefined() + // expect( + // user.tasks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param for 1:N associations (1st direction)', function(done) { + // this.User.hasMany(this.Task, { as: 'Homeworks' }) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setHomeworks([task1, task2]).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Homeworks' ] + // }).success(function(user) { + // expect(user.homeworks).toBeDefined() + // expect( + // user.homeworks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches no associated objects for 1:N associations if none are set (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.User.find({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.tasks.length).toEqual(0) + // done() + // }) + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:N associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': 1 }, + // include: [ 'UserWithName' ] + // }).success(function(task) { + // expect(task.userWithName).toBeDefined() + // expect(task.userWithName.name).toEqual(user.name) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param for 1:N associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User, { as: 'Owner'}) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': 1 }, + // include: [ 'Owner' ] + // }).success(function(task) { + // expect(task.owner).toBeDefined() + // expect(task.owner.name).toEqual(user.name) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setTasks([task1, task2]).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': user1.id }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.tasks).toBeDefined() + // expect( + // user.tasks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches no associated objects for N:M associations if none are set (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // this.User.find({ + // where: { 'UserWithNames.id': user1.id }, + // include: [ 'Task' ] + // }).success(function(user) { + // expect(user.tasks.length).toEqual(0) + // done() + // }) + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param for N:M associations (1st direction)', function(done) { + // this.User.hasMany(this.Task, { as: 'Homeworks' }) + // this.Task.hasMany(this.User, { as: 'Owners' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setHomeworks([task1, task2]).success(function() { + // this.User.find({ + // where: { 'UserWithNames.id': user1.id }, + // include: [ 'Homeworks' ] + // }).success(function(user) { + // expect(user.homeworks).toBeDefined() + // expect( + // user.homeworks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setTasks([task1, task2]).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': task1.id }, + // include: [ 'UserWithName' ] + // }).success(function(task) { + // expect(task.userWithNames).toBeDefined() + // expect( + // task.userWithNames.map(function(u) { return u.id }) + // ).toEqual( + // [ user1.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param for N:M associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task, { as: 'Homeworks' }) + // this.Task.hasMany(this.User, { as: 'Owners' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setHomeworks([task1, task2]).success(function() { + // this.Task.find({ + // where: { 'Tasks.id': task1.id }, + // include: [ 'Owners' ] + // }).success(function(task) { + // expect(task.owners).toBeDefined() + // expect( + // task.owners.map(function(u) { return u.id }) + // ).toEqual( + // [ user1.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + // }) }) //- describe: find describe('findAll', function findAll() { From a3185504592b0a306d2f35a599feb7db8dd96257 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Wed, 6 Feb 2013 22:35:49 +0800 Subject: [PATCH 117/360] construct postgresql array from js array --- lib/dialects/postgres/query-generator.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index 09ec178dbb99..d047627df780 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -25,6 +25,9 @@ function pgEscape(val) { switch (typeof val) { case 'boolean': return (val) ? 'true' : 'false'; case 'number': return val+''; + case 'object': + if ({}.toString.call(val).slice(8, -1) === "Array") + return 'ARRAY['+ val.map(function(it) { return pgEscape(it) }).join(',') +']'; } if (val instanceof Date) { From d984a6f53c9391ad75c4ddd080cbcfe4df9dcba1 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Fri, 22 Feb 2013 11:50:02 +0800 Subject: [PATCH 118/360] use Array.isArray and fix if-block style --- lib/dialects/postgres/query-generator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js index d047627df780..1579381b56e1 100644 --- a/lib/dialects/postgres/query-generator.js +++ b/lib/dialects/postgres/query-generator.js @@ -26,8 +26,9 @@ function pgEscape(val) { case 'boolean': return (val) ? 'true' : 'false'; case 'number': return val+''; case 'object': - if ({}.toString.call(val).slice(8, -1) === "Array") + if (Array.isArray(val)) { return 'ARRAY['+ val.map(function(it) { return pgEscape(it) }).join(',') +']'; + } } if (val instanceof Date) { From d7bca298b48755238eef5d7779cba7b38fcb7fb8 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Fri, 22 Feb 2013 12:19:56 +0800 Subject: [PATCH 119/360] add tests for array serialization --- spec/postgres/dao.spec.js | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 spec/postgres/dao.spec.js diff --git a/spec/postgres/dao.spec.js b/spec/postgres/dao.spec.js new file mode 100644 index 000000000000..80a506d5c056 --- /dev/null +++ b/spec/postgres/dao.spec.js @@ -0,0 +1,46 @@ +if(typeof require === 'function') { + const buster = require("buster") + , Helpers = require('../buster-helpers') + , dialect = Helpers.getTestDialect() +} + +buster.spec.expose() + +if (dialect.match(/^postgres/)) { + describe('[POSTGRES] DAO', function() { + before(function(done) { + var self = this + console.log("to init"); + Helpers.initTests({ + dialect: dialect, + beforeComplete: function(sequelize, DataTypes) { + self.sequelize = sequelize + + self.User = sequelize.define('User', { + username: DataTypes.STRING, + email: {type: 'text[]'} + }) + }, + onComplete: function() { + self.User.sync({ force: true }).success(done) + } + }) + }) + + describe('model', function() { + it("create handles array correctly", function(done) { + var self = this + + this.User + .create({ username: 'user', email: ['foo@bar.com', 'bar@baz.com'] }) + .success(function(oldUser) { + expect(oldUser.email).toEqual(['foo@bar.com', 'bar@baz.com']); + done(); + }) + .error(function(err) { + console.log(err) + }) + }) + }) + }) +} From bda00ef68bc6530aae2c903f7d3650457eaea6a5 Mon Sep 17 00:00:00 2001 From: Chia-liang Kao Date: Tue, 26 Feb 2013 12:34:03 +0800 Subject: [PATCH 120/360] DataTypes.ARRAY helper --- lib/data-types.js | 3 ++- spec/postgres/dao.spec.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/data-types.js b/lib/data-types.js index 1048a87f65e4..2e542beb1d1a 100644 --- a/lib/data-types.js +++ b/lib/data-types.js @@ -7,5 +7,6 @@ module.exports = { BOOLEAN: 'TINYINT(1)', FLOAT: 'FLOAT', NOW: 'NOW', - ENUM: 'ENUM' + ENUM: 'ENUM', + ARRAY: function(type) { return type + '[]' } } diff --git a/spec/postgres/dao.spec.js b/spec/postgres/dao.spec.js index 80a506d5c056..30108d4356ca 100644 --- a/spec/postgres/dao.spec.js +++ b/spec/postgres/dao.spec.js @@ -18,7 +18,7 @@ if (dialect.match(/^postgres/)) { self.User = sequelize.define('User', { username: DataTypes.STRING, - email: {type: 'text[]'} + email: {type: DataTypes.ARRAY(DataTypes.TEXT)} }) }, onComplete: function() { From bf8246bce7b27d59bb12ddb803a59ad1d32f499a Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 12:01:58 +0100 Subject: [PATCH 121/360] added assertion for error messages --- lib/dao-factory.js | 2 +- spec/buster-helpers.js | 10 ++++++++++ spec/dao-factory.spec.js | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 3cdaa920f083..f22b50eb63cf 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -407,7 +407,7 @@ module.exports = (function() { throw new Error(msg) } } else { - throw new Error('Include malformed. Expected attributes: daoFactory, as') + throw new Error('Include malformed. Expected attributes: daoFactory, as!') } } else { throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.') diff --git a/spec/buster-helpers.js b/spec/buster-helpers.js index 545bfec4ee6f..209f4535829a 100644 --- a/spec/buster-helpers.js +++ b/spec/buster-helpers.js @@ -2,6 +2,7 @@ const Sequelize = require(__dirname + "/../index") , DataTypes = require(__dirname + "/../lib/data-types") , config = require(__dirname + "/config/config") , fs = require('fs') + , buster = require("buster") var BusterHelpers = module.exports = { Sequelize: Sequelize, @@ -95,5 +96,14 @@ var BusterHelpers = module.exports = { } else { throw new Error('Undefined expectation for "' + dialect + '"!') } + }, + + assertException: function(block, msg) { + try { + block() + throw new Error('Passed function did not throw an error') + } catch(e) { + buster.assert.equals(e.message, msg) + } } } diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 38630bca41f3..75d45ca3e4d1 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -489,21 +489,21 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) it('throws an error about unexpected input if include contains a non-object', function() { - expect(function() { + Helpers.assertException(function() { this.Worker.find({ include: [ 1 ] }) - }.bind(this)).toThrow() + }.bind(this), 'Include unexpected. Element has to be either an instance of DAOFactory or an object.') }) it('throws an error about missing attributes if include contains an object with daoFactory', function() { - expect(function() { + Helpers.assertException(function() { this.Worker.find({ include: [ { daoFactory: this.Worker } ] }) - }.bind(this)).toThrow() + }.bind(this), 'Include malformed. Expected attributes: daoFactory, as!') }) it('throws an error if included DaoFactory is not associated', function() { - expect(function() { + Helpers.assertException(function() { this.Worker.find({ include: [ this.Task ] }) - }.bind(this)).toThrow() + }.bind(this), 'Task is not associated to Worker!') }) it('returns the associated worker via task.worker', function(done) { @@ -537,9 +537,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) it('throws an error if included DaoFactory is not associated', function() { - expect(function() { + Helpers.assertException(function() { this.Task.find({ include: [ this.Worker ] }) - }.bind(this)).toThrow() + }.bind(this), 'Worker is not associated to Task!') }) it('returns the associated task via worker.task', function(done) { @@ -573,9 +573,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) it('throws an error if included DaoFactory is not associated', function() { - expect(function() { + Helpers.assertException(function() { this.Task.find({ include: [ this.Worker ] }) - }.bind(this)).toThrow() + }.bind(this), 'Worker is not associated to Task!') }) it('returns the associated tasks via worker.tasks', function(done) { From f5f3adf65eff8c81052f8b793f3a47a015996656 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 13:25:48 +0100 Subject: [PATCH 122/360] check if the association uses the right alias --- lib/dao-factory.js | 2 +- spec/dao-factory.spec.js | 48 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index f22b50eb63cf..6afd20100e14 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -391,7 +391,7 @@ module.exports = (function() { , association = (usesAlias ? this.getAssociationByAlias(include.as) : this.getAssociation(include.daoFactory)) // check if the current daoFactory is actually associated with the passed daoFactory - if (!!association) { + if (!!association && (!association.options.as || (association.options.as === include.as))) { include.association = association return include diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 75d45ca3e4d1..8e0d7f7886f8 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -472,7 +472,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { this.Worker = this.sequelize.define('Worker', { name: Sequelize.STRING }) }) - describe('=>belongsTo only', function() { + describe('=>belongsTo', function() { before(function(done) { this.Task.belongsTo(this.Worker) @@ -520,7 +520,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasOne only', function() { + describe('=>hasOne', function() { before(function(done) { this.Worker.hasOne(this.Task) @@ -556,7 +556,49 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasMany only', function() { + describe('=>hasOne with alias', function() { + before(function(done) { + this.Worker.hasOne(this.Task, { as: 'ToDo' }) + + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.worker.setToDo(this.task).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + + it('throws an error if included DaoFactory is not referenced by alias', function() { + Helpers.assertException(function() { + this.Worker.find({ include: [ this.Task ] }) + }.bind(this), 'Task is not associated to Worker!') + }) + + it('throws an error if alias is not associated', function() { + Helpers.assertException(function() { + this.Worker.find({ include: [ { daoFactory: this.Task, as: 'Work' } ] }) + }.bind(this), 'Task (Work) is not associated to Worker!') + }) + + it('returns the associated task via worker.task', function(done) { + this.Worker.find({ + where: { id: this.worker.id }, + include: [ { daoFactory: this.Task, as: 'ToDo' } ] + }).complete(function(err, worker) { + expect(err).toBeNull() + expect(worker).toBeDefined() + expect(worker.toDo).toBeDefined() + expect(worker.toDo.title).toEqual('homework') + done() + }.bind(this)) + }) + }) + + describe('=>hasMany', function() { before(function(done) { this.Worker.hasMany(this.Task) From 4281e79987c63967c5cacc58c574fe798f1f8862 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 13:30:58 +0100 Subject: [PATCH 123/360] hasMany alias --- spec/dao-factory.spec.js | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index 8e0d7f7886f8..d53089285e46 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -633,6 +633,48 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }.bind(this)) }) }) + + describe('=>hasMany with alias', function() { + before(function(done) { + this.Worker.hasMany(this.Task, { as: 'ToDos' }) + + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.worker.setToDos([ this.task ]).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + + it('throws an error if included DaoFactory is not referenced by alias', function() { + Helpers.assertException(function() { + this.Worker.find({ include: [ this.Task ] }) + }.bind(this), 'Task is not associated to Worker!') + }) + + it('throws an error if alias is not associated', function() { + Helpers.assertException(function() { + this.Worker.find({ include: [ { daoFactory: this.Task, as: 'Work' } ] }) + }.bind(this), 'Task (Work) is not associated to Worker!') + }) + + it('returns the associated task via worker.task', function(done) { + this.Worker.find({ + where: { id: this.worker.id }, + include: [ { daoFactory: this.Task, as: 'ToDos' } ] + }).complete(function(err, worker) { + expect(err).toBeNull() + expect(worker).toBeDefined() + expect(worker.toDos).toBeDefined() + expect(worker.toDos[0].title).toEqual('homework') + done() + }.bind(this)) + }) + }) }) // describe('association fetching', function() { From 14ca4e6e3b888a040d9453aad6059fee69e6a62a Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 14:41:29 +0100 Subject: [PATCH 124/360] mysql is working :) --- lib/dao-factory.js | 23 +- lib/query-interface.js | 2 + spec/dao-factory.spec.js | 871 ++++++++++++++++++++++++--------------- 3 files changed, 551 insertions(+), 345 deletions(-) diff --git a/lib/dao-factory.js b/lib/dao-factory.js index 6afd20100e14..04202ecfe85e 100644 --- a/lib/dao-factory.js +++ b/lib/dao-factory.js @@ -143,23 +143,16 @@ module.exports = (function() { var hasJoin = false var options = Utils._.clone(options) - if ((typeof options === 'object') && (options.hasOwnProperty('include'))) { - var includes = options.include + if (typeof options === 'object') { + hasJoin = true - hasJoin = true - options.include = {} - - /*options.include =*/ includes.map(function(include) { - console.log(include instanceof DAOFactory) - }) - - includes.forEach(function(daoName) { - options.include[daoName] = this.daoFactoryManager.getDAO(daoName) + if (options.hasOwnProperty('include')) { + hasJoin = true - if (!options.include[daoName]) { - options.include[daoName] = this.getAssociationByAlias(daoName).target - } - }.bind(this)) + options.include = options.include.map(function(include) { + return validateIncludedElement.call(this, include) + }.bind(this)) + } // whereCollection is used for non-primary key updates this.options.whereCollection = options.where || null diff --git a/lib/query-interface.js b/lib/query-interface.js index 36fe74023297..f508ac59e5c4 100644 --- a/lib/query-interface.js +++ b/lib/query-interface.js @@ -198,6 +198,8 @@ module.exports = (function() { } QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) { + options = options || {} + var sql = this.QueryGenerator.selectQuery(tableName, options) queryOptions = Utils._.extend({}, queryOptions, { include: options.include }) return queryAndEmit.call(this, [sql, factory, queryOptions], 'select') diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js index d53089285e46..247040609fc6 100644 --- a/spec/dao-factory.spec.js +++ b/spec/dao-factory.spec.js @@ -472,7 +472,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { this.Worker = this.sequelize.define('Worker', { name: Sequelize.STRING }) }) - describe('=>belongsTo', function() { + describe('belongsTo', function() { before(function(done) { this.Task.belongsTo(this.Worker) @@ -520,7 +520,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasOne', function() { + describe('hasOne', function() { before(function(done) { this.Worker.hasOne(this.Task) @@ -556,7 +556,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasOne with alias', function() { + describe('hasOne with alias', function() { before(function(done) { this.Worker.hasOne(this.Task, { as: 'ToDo' }) @@ -598,7 +598,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasMany', function() { + describe('hasMany', function() { before(function(done) { this.Worker.hasMany(this.Task) @@ -634,7 +634,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) }) - describe('=>hasMany with alias', function() { + describe('hasMany with alias', function() { before(function(done) { this.Worker.hasMany(this.Task, { as: 'ToDos' }) @@ -1091,357 +1091,568 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() { }) //- describe: find describe('findAll', function findAll() { - describe('include', function() { + describe('eager loading', function() { before(function() { - this.Task = this.sequelize.define('Task', { - title: Sequelize.STRING + this.Task = this.sequelize.define('Task', { title: Sequelize.STRING }) + this.Worker = this.sequelize.define('Worker', { name: Sequelize.STRING }) + }) + + describe('belongsTo', function() { + before(function(done) { + this.Task.belongsTo(this.Worker) + + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.task.setWorker(this.worker).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + + it('throws an error about unexpected input if include contains a non-object', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ 1 ] }) + }.bind(this), 'Include unexpected. Element has to be either an instance of DAOFactory or an object.') + }) + + it('throws an error about missing attributes if include contains an object with daoFactory', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ { daoFactory: this.Worker } ] }) + }.bind(this), 'Include malformed. Expected attributes: daoFactory, as!') + }) + + it('throws an error if included DaoFactory is not associated', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ this.Task ] }) + }.bind(this), 'Task is not associated to Worker!') }) - this.User = this.sequelize.define('UserWithName', { - name: Sequelize.STRING + it('returns the associated worker via task.worker', function(done) { + this.Task.findAll({ + where: { id: this.task.id }, + include: [ this.Worker ] + }).complete(function(err, tasks) { + expect(err).toBeNull() + expect(tasks).toBeDefined() + expect(tasks[0].worker).toBeDefined() + expect(tasks[0].worker.name).toEqual('worker') + done() + }.bind(this)) }) }) - it('fetches data only for the relevant where clause', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - this.User.create({ name: 'barfooz' }).success(function(user2) { - this.Task.create({ title: 'task' }).success(function(task) { - var where = [Sequelize.Utils.addTicks(this.User.tableName) + ".`id`=?", user1.id] - - if (dialect === 'postgres') { - where = ['"' + this.User.tableName + '"."id"=?', user1.id] - } - - this.User.findAll({ - where: where, - include: [ 'Task' ] - }).success(function(users){ - expect(users.length).toEqual(1) - // console.log(users[0]) - done() - }.bind(this)) + describe('hasOne', function() { + before(function(done) { + this.Worker.hasOne(this.Task) + + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.worker.setTask(this.task).success(done) }.bind(this)) }.bind(this)) }.bind(this)) - }.bind(this)) - }) + }) - it('fetches associated objects for 1:1 associations (1st direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(users) { - expect(users[0].task).toBeDefined() - expect(users[0].task.id).toEqual(task.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + it('throws an error if included DaoFactory is not associated', function() { + Helpers.assertException(function() { + this.Task.findAll({ include: [ this.Worker ] }) + }.bind(this), 'Worker is not associated to Task!') + }) - it('fetches associated objects via "as" param for 1:1 associations (1st direction)', function(done) { - this.User.hasOne(this.Task, { as: 'Homework' }) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setHomework(task).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Homework' ] - }).success(function(users) { - expect(users[0].homework).toBeDefined() - expect(users[0].homework.id).toEqual(task.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('returns the associated task via worker.task', function(done) { + this.Worker.findAll({ + where: { id: this.worker.id }, + include: [ this.Task ] + }).complete(function(err, workers) { + expect(err).toBeNull() + expect(workers).toBeDefined() + expect(workers[0].task).toBeDefined() + expect(workers[0].task.title).toEqual('homework') + done() + }.bind(this)) + }) }) - it('fetches associated objects for 1:1 associations (2nd direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': 1 }, - include: [ 'UserWithName' ] - }).success(function(tasks) { - expect(tasks[0].userWithName).toBeDefined() - expect(tasks[0].userWithName.id).toEqual(user.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + describe('hasOne with alias', function() { + before(function(done) { + this.Worker.hasOne(this.Task, { as: 'ToDo' }) - it('fetches associated objects for 1:1 associations (2nd direction)', function(done) { - this.User.hasOne(this.Task) - this.Task.belongsTo(this.User, { as: 'Owner' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task' }).success(function(task) { - user.setTask(task).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': 1 }, - include: [ 'Owner' ] - }).success(function(tasks) { - expect(tasks[0].owner).toBeDefined() - expect(tasks[0].owner.id).toEqual(user.id) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task - it('fetches associated objects for 1:N associations (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Task' ] - }).success(function(users) { - expect(users[0].tasks).toBeDefined() - expect( - users[0].tasks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + this.worker.setToDo(this.task).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) - it('fetches associated objects for 1:N associations (1st direction)', function(done) { - this.User.hasMany(this.Task, { as: 'Homeworks' }) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setHomeworks([task1, task2]).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': 1 }, - include: [ 'Homeworks' ] - }).success(function(users) { - expect(users[0].homeworks).toBeDefined() - expect( - users[0].homeworks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + it('throws an error if included DaoFactory is not referenced by alias', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ this.Task ] }) + }.bind(this), 'Task is not associated to Worker!') + }) - it('fetches associated objects for 1:N associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': 1 }, - include: [ 'UserWithName' ] - }).success(function(tasks) { - expect(tasks[0].userWithName).toBeDefined() - expect(tasks[0].userWithName.name).toEqual(user.name) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + it('throws an error if alias is not associated', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ { daoFactory: this.Task, as: 'Work' } ] }) + }.bind(this), 'Task (Work) is not associated to Worker!') + }) - it('fetches associated objects for 1:N associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.belongsTo(this.User, { as: 'Owner' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user) { - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user.setTasks([task1, task2]).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': 1 }, - include: [ 'Owner' ] - }).success(function(tasks) { - expect(tasks[0].owner).toBeDefined() - expect(tasks[0].owner.name).toEqual(user.name) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('returns the associated task via worker.task', function(done) { + this.Worker.findAll({ + where: { id: this.worker.id }, + include: [ { daoFactory: this.Task, as: 'ToDo' } ] + }).complete(function(err, workers) { + expect(err).toBeNull() + expect(workers).toBeDefined() + expect(workers[0].toDo).toBeDefined() + expect(workers[0].toDo.title).toEqual('homework') + done() + }.bind(this)) + }) }) - it('fetches associated objects for N:M associations (1st direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setTasks([task1, task2]).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': user1.id }, - include: [ 'Task' ] - }).success(function(users) { - expect(users[0].tasks).toBeDefined() - expect( - users[0].tasks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + describe('hasMany', function() { + before(function(done) { + this.Worker.hasMany(this.Task) - it('fetches associated objects for N:M associations (1st direction)', function(done) { - this.User.hasMany(this.Task, { as: 'Homeworks' }) - this.Task.hasMany(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setHomeworks([task1, task2]).success(function() { - this.User.findAll({ - where: { 'UserWithNames.id': user1.id }, - include: [ 'Homeworks' ] - }).success(function(users) { - expect(users[0].homeworks).toBeDefined() - expect( - users[0].homeworks.map(function(t) { return t.id }) - ).toEqual( - [ task1.id, task2.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync - }) + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.worker.setTasks([ this.task ]).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) - it('fetches associated objects for N:M associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setTasks([task1, task2]).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': task1.id }, - include: [ 'UserWithName' ] - }).success(function(tasks) { - expect(tasks[0].userWithNames).toBeDefined() - expect( - tasks[0].userWithNames.map(function(u) { return u.id }) - ).toEqual( - [ user1.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + it('throws an error if included DaoFactory is not associated', function() { + Helpers.assertException(function() { + this.Task.findAll({ include: [ this.Worker ] }) + }.bind(this), 'Worker is not associated to Task!') + }) + + it('returns the associated tasks via worker.tasks', function(done) { + this.Worker.findAll({ + where: { id: this.worker.id }, + include: [ this.Task ] + }).complete(function(err, workers) { + expect(err).toBeNull() + expect(workers).toBeDefined() + expect(workers[0].tasks).toBeDefined() + expect(workers[0].tasks[0].title).toEqual('homework') + done() + }.bind(this)) + }) }) - it('fetches associated objects for N:M associations (2nd direction)', function(done) { - this.User.hasMany(this.Task) - this.Task.hasMany(this.User, { as: 'Owners' }) - - this.sequelize.sync({ force: true }).success(function() { - this.User.create({ name: 'barfooz' }).success(function(user1) { - - this.Task.create({ title: 'task1' }).success(function(task1) { - this.Task.create({ title: 'task2' }).success(function(task2) { - user1.setTasks([task1, task2]).success(function() { - this.Task.findAll({ - where: { 'Tasks.id': task1.id }, - include: [ 'Owners' ] - }).success(function(tasks) { - expect(tasks[0].owners).toBeDefined() - expect( - tasks[0].owners.map(function(u) { return u.id }) - ).toEqual( - [ user1.id ] - ) - done() - }) - }.bind(this)) //- setTask - }.bind(this)) //- Task.create - }.bind(this)) //- Task.create - - }.bind(this)) //- User.create - }.bind(this)) //- sequelize.sync + describe('hasMany with alias', function() { + before(function(done) { + this.Worker.hasMany(this.Task, { as: 'ToDos' }) + + this.sequelize.sync({ force: true }).complete(function() { + this.Worker.create({ name: 'worker' }).success(function(worker) { + this.Task.create({ title: 'homework' }).success(function(task) { + this.worker = worker + this.task = task + + this.worker.setToDos([ this.task ]).success(done) + }.bind(this)) + }.bind(this)) + }.bind(this)) + }) + + it('throws an error if included DaoFactory is not referenced by alias', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ this.Task ] }) + }.bind(this), 'Task is not associated to Worker!') + }) + + it('throws an error if alias is not associated', function() { + Helpers.assertException(function() { + this.Worker.findAll({ include: [ { daoFactory: this.Task, as: 'Work' } ] }) + }.bind(this), 'Task (Work) is not associated to Worker!') + }) + + it('returns the associated task via worker.task', function(done) { + this.Worker.findAll({ + where: { id: this.worker.id }, + include: [ { daoFactory: this.Task, as: 'ToDos' } ] + }).complete(function(err, workers) { + expect(err).toBeNull() + expect(workers).toBeDefined() + expect(workers[0].toDos).toBeDefined() + expect(workers[0].toDos[0].title).toEqual('homework') + done() + }.bind(this)) + }) }) }) + + // describe('include', function() { + // before(function() { + // this.Task = this.sequelize.define('Task', { + // title: Sequelize.STRING + // }) + + // this.User = this.sequelize.define('UserWithName', { + // name: Sequelize.STRING + // }) + // }) + + // it('fetches data only for the relevant where clause', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + // this.User.create({ name: 'barfooz' }).success(function(user2) { + // this.Task.create({ title: 'task' }).success(function(task) { + // var where = [Sequelize.Utils.addTicks(this.User.tableName) + ".`id`=?", user1.id] + + // if (dialect === 'postgres') { + // where = ['"' + this.User.tableName + '"."id"=?', user1.id] + // } + + // this.User.findAll({ + // where: where, + // include: [ 'Task' ] + // }).success(function(users){ + // expect(users.length).toEqual(1) + // // console.log(users[0]) + // done() + // }.bind(this)) + // }.bind(this)) + // }.bind(this)) + // }.bind(this)) + // }.bind(this)) + // }) + + // it('fetches associated objects for 1:1 associations (1st direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(users) { + // expect(users[0].task).toBeDefined() + // expect(users[0].task.id).toEqual(task.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects via "as" param for 1:1 associations (1st direction)', function(done) { + // this.User.hasOne(this.Task, { as: 'Homework' }) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setHomework(task).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Homework' ] + // }).success(function(users) { + // expect(users[0].homework).toBeDefined() + // expect(users[0].homework.id).toEqual(task.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:1 associations (2nd direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': 1 }, + // include: [ 'UserWithName' ] + // }).success(function(tasks) { + // expect(tasks[0].userWithName).toBeDefined() + // expect(tasks[0].userWithName.id).toEqual(user.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:1 associations (2nd direction)', function(done) { + // this.User.hasOne(this.Task) + // this.Task.belongsTo(this.User, { as: 'Owner' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task' }).success(function(task) { + // user.setTask(task).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': 1 }, + // include: [ 'Owner' ] + // }).success(function(tasks) { + // expect(tasks[0].owner).toBeDefined() + // expect(tasks[0].owner.id).toEqual(user.id) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:N associations (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Task' ] + // }).success(function(users) { + // expect(users[0].tasks).toBeDefined() + // expect( + // users[0].tasks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:N associations (1st direction)', function(done) { + // this.User.hasMany(this.Task, { as: 'Homeworks' }) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setHomeworks([task1, task2]).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': 1 }, + // include: [ 'Homeworks' ] + // }).success(function(users) { + // expect(users[0].homeworks).toBeDefined() + // expect( + // users[0].homeworks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:N associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': 1 }, + // include: [ 'UserWithName' ] + // }).success(function(tasks) { + // expect(tasks[0].userWithName).toBeDefined() + // expect(tasks[0].userWithName.name).toEqual(user.name) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for 1:N associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.belongsTo(this.User, { as: 'Owner' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user) { + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user.setTasks([task1, task2]).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': 1 }, + // include: [ 'Owner' ] + // }).success(function(tasks) { + // expect(tasks[0].owner).toBeDefined() + // expect(tasks[0].owner.name).toEqual(user.name) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (1st direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setTasks([task1, task2]).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': user1.id }, + // include: [ 'Task' ] + // }).success(function(users) { + // expect(users[0].tasks).toBeDefined() + // expect( + // users[0].tasks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (1st direction)', function(done) { + // this.User.hasMany(this.Task, { as: 'Homeworks' }) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setHomeworks([task1, task2]).success(function() { + // this.User.findAll({ + // where: { 'UserWithNames.id': user1.id }, + // include: [ 'Homeworks' ] + // }).success(function(users) { + // expect(users[0].homeworks).toBeDefined() + // expect( + // users[0].homeworks.map(function(t) { return t.id }) + // ).toEqual( + // [ task1.id, task2.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setTasks([task1, task2]).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': task1.id }, + // include: [ 'UserWithName' ] + // }).success(function(tasks) { + // expect(tasks[0].userWithNames).toBeDefined() + // expect( + // tasks[0].userWithNames.map(function(u) { return u.id }) + // ).toEqual( + // [ user1.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + + // it('fetches associated objects for N:M associations (2nd direction)', function(done) { + // this.User.hasMany(this.Task) + // this.Task.hasMany(this.User, { as: 'Owners' }) + + // this.sequelize.sync({ force: true }).success(function() { + // this.User.create({ name: 'barfooz' }).success(function(user1) { + + // this.Task.create({ title: 'task1' }).success(function(task1) { + // this.Task.create({ title: 'task2' }).success(function(task2) { + // user1.setTasks([task1, task2]).success(function() { + // this.Task.findAll({ + // where: { 'Tasks.id': task1.id }, + // include: [ 'Owners' ] + // }).success(function(tasks) { + // expect(tasks[0].owners).toBeDefined() + // expect( + // tasks[0].owners.map(function(u) { return u.id }) + // ).toEqual( + // [ user1.id ] + // ) + // done() + // }) + // }.bind(this)) //- setTask + // }.bind(this)) //- Task.create + // }.bind(this)) //- Task.create + + // }.bind(this)) //- User.create + // }.bind(this)) //- sequelize.sync + // }) + // }) }) //- describe: findAll describe('min', function() { From 0b78aee28176488cf3ea9ba193f3e1bf52f1bbef Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 14:58:30 +0100 Subject: [PATCH 125/360] removed old eager loading code --- lib/dialects/mysql/query-generator.js | 46 --------------------------- 1 file changed, 46 deletions(-) diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js index 6e0527bb875a..da06ff5b0458 100644 --- a/lib/dialects/mysql/query-generator.js +++ b/lib/dialects/mysql/query-generator.js @@ -132,8 +132,6 @@ module.exports = (function() { var optAttributes = [options.table + '.*'] options.include.forEach(function(include) { - //SELECT `UserWithNames`.*, `Tasks`.`title` AS `Tasks.title`, `Tasks`.`id` AS `Tasks.id`, `Tasks`.`createdAt` AS `Tasks.createdAt`, `Tasks`.`updatedAt` AS `Tasks.updatedAt`, `TaskFROM `UserWithNames` LEFT OUTER JOIN `Tasks` ON `Tasks`.`UserWithNameId`=`UserWithNames`.`id` WHERE `UserWithNames`.`id`=1; - //SELECT `Tasks`.*, `Workers`.`name` AS `Workers.name`, `Workers`.`id` AS `Workers.id`, `Workers`.`createdAt` AS `Workers.createdAt`, `Workers`.`updatedAt` AS `Workers.updatedAt` FROM `Tasks` LEFT OUTER JOIN `Workers` ON `Workers`.`WorkerId` = `Tasks`.`id` WHERE `Tasks`.`id`=1; var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) { var template = Utils._.template("`<%= table %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`") return template({ @@ -155,50 +153,6 @@ module.exports = (function() { }) }) - // for (var daoFactory in options.include) { - // if (options.include.hasOwnProperty(daoFactory)) { - // var dao = options.include[daoName] - // , daoFactory = dao.daoFactoryManager.getDAO(tableName, { - // attribute: 'tableName' - // }) - // , _tableName = Utils.addTicks(dao.tableName) - // , association = dao.getAssociation(daoFactory) - - // if (association.connectorDAO) { - // var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) { - // return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier) - // })[0] - - // query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON ' - // query += Utils.addTicks(association.connectorDAO.tableName) + '.' - // query += Utils.addTicks(foreignIdentifier) + '=' - // query += Utils.addTicks(table) + '.' + Utils.addTicks('id') - - // query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' - // query += Utils.addTicks(dao.tableName) + '.' - // query += Utils.addTicks('id') + '=' - // query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier) - // } else { - // query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON ' - // query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.' - // query += Utils.addTicks(association.identifier) + '=' - // query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id') - // } - - // var aliasAssoc = daoFactory.getAssociationByAlias(daoName) - // , aliasName = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName - - // optAttributes = optAttributes.concat( - // Object.keys(dao.attributes).map(function(attr) { - // return '' + - // [_tableName, Utils.addTicks(attr)].join('.') + - // ' AS ' + - // Utils.addTicks([aliasName, attr].join('.')) - // }) - // ) - // } - // } - options.attributes = optAttributes.join(', ') } From db9f87efc2e78678073c5b3c912a82f66919fc01 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 16:32:59 +0100 Subject: [PATCH 126/360] removed old docs --- docs/associations/belongs-to.js.html | 129 ---- .../has-many-double-linked.js.html | 201 ------ .../has-many-single-linked.js.html | 119 ---- docs/associations/has-many.js.html | 249 ------- docs/associations/has-one.js.html | 152 ----- docs/associations/mixin.js.html | 125 ---- docs/dao-factory-manager.js.html | 93 --- docs/dao-factory.js.html | 313 --------- docs/dao.js.html | 223 ------ docs/data-types.js.html | 69 -- docs/dialects/abstract/query.js.html | 383 ----------- docs/dialects/connector-manager.js.html | 82 --- docs/dialects/mysql/connector-manager.js.html | 392 ----------- docs/dialects/mysql/query-generator.js.html | 496 -------------- docs/dialects/mysql/query.js.html | 97 --- .../postgres/connector-manager.js.html | 159 ----- .../dialects/postgres/query-generator.js.html | 637 ------------------ docs/dialects/postgres/query.js.html | 149 ---- docs/dialects/query-generator.js.html | 105 --- docs/dialects/query.js.html | 216 ------ .../dialects/sqlite/connector-manager.js.html | 75 --- docs/dialects/sqlite/query-generator.js.html | 253 ------- docs/dialects/sqlite/query.js.html | 173 ----- docs/emitters/custom-event-emitter.js.html | 104 --- docs/lib/associations/belongs-to.js.html | 116 ---- .../has-many-double-linked.js.html | 188 ------ .../has-many-single-linked.js.html | 106 --- docs/lib/associations/has-many.js.html | 236 ------- docs/lib/associations/has-one.js.html | 139 ---- docs/lib/associations/mixin.js.html | 112 --- docs/lib/dao-factory-manager.js.html | 80 --- docs/lib/dao-factory.js.html | 300 --------- docs/lib/dao.js.html | 210 ------ docs/lib/data-types.js.html | 56 -- docs/lib/dialects/abstract/query.js.html | 370 ---------- docs/lib/dialects/connector-manager.js.html | 69 -- .../dialects/mysql/connector-manager.js.html | 379 ----------- .../dialects/mysql/query-generator.js.html | 483 ------------- docs/lib/dialects/mysql/query.js.html | 84 --- .../postgres/connector-manager.js.html | 146 ---- .../dialects/postgres/query-generator.js.html | 624 ----------------- docs/lib/dialects/postgres/query.js.html | 136 ---- docs/lib/dialects/query-generator.js.html | 92 --- .../dialects/sqlite/connector-manager.js.html | 62 -- .../dialects/sqlite/query-generator.js.html | 240 ------- docs/lib/dialects/sqlite/query.js.html | 160 ----- .../lib/emitters/custom-event-emitter.js.html | 91 --- docs/lib/migration.js.html | 177 ----- docs/lib/migrator.js.html | 282 -------- docs/lib/query-chainer.js.html | 188 ------ docs/lib/query-interface.js.html | 329 --------- docs/lib/sequelize.js.html | 210 ------ docs/lib/utils.js.html | 225 ------- docs/migration.js.html | 190 ------ docs/migrator.js.html | 295 -------- docs/query-chainer.js.html | 201 ------ docs/query-interface.js.html | 342 ---------- docs/sequelize.js.html | 223 ------ docs/utils.js.html | 238 ------- 59 files changed, 12373 deletions(-) delete mode 100644 docs/associations/belongs-to.js.html delete mode 100644 docs/associations/has-many-double-linked.js.html delete mode 100644 docs/associations/has-many-single-linked.js.html delete mode 100644 docs/associations/has-many.js.html delete mode 100644 docs/associations/has-one.js.html delete mode 100644 docs/associations/mixin.js.html delete mode 100644 docs/dao-factory-manager.js.html delete mode 100644 docs/dao-factory.js.html delete mode 100644 docs/dao.js.html delete mode 100644 docs/data-types.js.html delete mode 100644 docs/dialects/abstract/query.js.html delete mode 100644 docs/dialects/connector-manager.js.html delete mode 100644 docs/dialects/mysql/connector-manager.js.html delete mode 100644 docs/dialects/mysql/query-generator.js.html delete mode 100644 docs/dialects/mysql/query.js.html delete mode 100644 docs/dialects/postgres/connector-manager.js.html delete mode 100644 docs/dialects/postgres/query-generator.js.html delete mode 100644 docs/dialects/postgres/query.js.html delete mode 100644 docs/dialects/query-generator.js.html delete mode 100644 docs/dialects/query.js.html delete mode 100644 docs/dialects/sqlite/connector-manager.js.html delete mode 100644 docs/dialects/sqlite/query-generator.js.html delete mode 100644 docs/dialects/sqlite/query.js.html delete mode 100644 docs/emitters/custom-event-emitter.js.html delete mode 100644 docs/lib/associations/belongs-to.js.html delete mode 100644 docs/lib/associations/has-many-double-linked.js.html delete mode 100644 docs/lib/associations/has-many-single-linked.js.html delete mode 100644 docs/lib/associations/has-many.js.html delete mode 100644 docs/lib/associations/has-one.js.html delete mode 100644 docs/lib/associations/mixin.js.html delete mode 100644 docs/lib/dao-factory-manager.js.html delete mode 100644 docs/lib/dao-factory.js.html delete mode 100644 docs/lib/dao.js.html delete mode 100644 docs/lib/data-types.js.html delete mode 100644 docs/lib/dialects/abstract/query.js.html delete mode 100644 docs/lib/dialects/connector-manager.js.html delete mode 100644 docs/lib/dialects/mysql/connector-manager.js.html delete mode 100644 docs/lib/dialects/mysql/query-generator.js.html delete mode 100644 docs/lib/dialects/mysql/query.js.html delete mode 100644 docs/lib/dialects/postgres/connector-manager.js.html delete mode 100644 docs/lib/dialects/postgres/query-generator.js.html delete mode 100644 docs/lib/dialects/postgres/query.js.html delete mode 100644 docs/lib/dialects/query-generator.js.html delete mode 100644 docs/lib/dialects/sqlite/connector-manager.js.html delete mode 100644 docs/lib/dialects/sqlite/query-generator.js.html delete mode 100644 docs/lib/dialects/sqlite/query.js.html delete mode 100644 docs/lib/emitters/custom-event-emitter.js.html delete mode 100644 docs/lib/migration.js.html delete mode 100644 docs/lib/migrator.js.html delete mode 100644 docs/lib/query-chainer.js.html delete mode 100644 docs/lib/query-interface.js.html delete mode 100644 docs/lib/sequelize.js.html delete mode 100644 docs/lib/utils.js.html delete mode 100644 docs/migration.js.html delete mode 100644 docs/migrator.js.html delete mode 100644 docs/query-chainer.js.html delete mode 100644 docs/query-interface.js.html delete mode 100644 docs/sequelize.js.html delete mode 100644 docs/utils.js.html diff --git a/docs/associations/belongs-to.js.html b/docs/associations/belongs-to.js.html deleted file mode 100644 index 32e93d68f1c7..000000000000 --- a/docs/associations/belongs-to.js.html +++ /dev/null @@ -1,129 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                Utils

                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                  var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var BelongsTo = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'BelongsTo'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-  }
-
-  // the id is in the source table
-  BelongsTo.prototype.injectAttributes = function() {
-    var newAttributes  = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.source.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  BelongsTo.prototype.injectGetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(params) {
-      var id = this[self.identifier]
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: {id:id}}, params)
-        }
-      } else {
-        params = id
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  BelongsTo.prototype.injectSetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(associatedObject) {
-      this[self.identifier] = associatedObject ? associatedObject.id : null
-
-      // passes the changed field to save, so only that field get updated.
-      return this.save([ self.identifier ])
-    }
-
-    return this
-  }
-
-  return BelongsTo
-})()
                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/associations/has-many-double-linked.js.html b/docs/associations/has-many-double-linked.js.html deleted file mode 100644 index 6e072dbaa37b..000000000000 --- a/docs/associations/has-many-double-linked.js.html +++ /dev/null @@ -1,201 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                  Utils

                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                    var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManyDoubleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManyDoubleLinked.prototype.injectGetter = function(options) {
-    var self = this, _options = options
-
-    var customEventEmitter = new Utils.CustomEventEmitter(function() {
-      var where = {}, options = _options || {};
-
-      //fully qualify
-      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
-
-      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
-        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-
-      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
-
-      if (options.where) {
-        Utils._.each(options.where, function(value, index) {
-          delete options.where[index];
-          options.where[self.__factory.target.tableName+"."+index] = value;
-        });
-
-        Utils._.extend(options.where, where)
-      } else {
-        options.where = where;
-      }
-
-      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
-        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
-        .on('error', function(err){ customEventEmitter.emit('error', err) })
-        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
-    })
-
-    return customEventEmitter.run()
-  }
-
-  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
-    var self = this
-
-    destroyObsoleteAssociations
-      .call(this, oldAssociations, newAssociations)
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .success(function() {
-        var chainer             = new Utils.QueryChainer
-          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
-          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
-          , unassociatedObjects = newAssociations.filter(function (obj) { 
-              return !Utils._.find(oldAssociations, function (old) {
-                return obj.id === old.id
-              }) 
-            })
-
-        unassociatedObjects.forEach(function(unassociatedObject) {
-          var attributes = {}
-          attributes[self.__factory.identifier] = self.instance.id
-          attributes[foreignIdentifier] = unassociatedObject.id
-
-          chainer.add(self.__factory.connectorDAO.create(attributes))
-        })
-
-        chainer
-          .run()
-          .success(function() { emitterProxy.emit('success', newAssociations) })
-          .error(function(err) { emitterProxy.emit('error', err) })
-          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      })
-  }
-
-  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    var attributes = {}
-      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
-
-    attributes[this.__factory.identifier] = this.instance.id
-    attributes[foreignIdentifier] = newAssociation.id
-
-    this.__factory.connectorDAO.create(attributes)
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  // private
-
-  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
-      var obsoleteAssociations = oldAssociations.filter(function (old) {
-        // Return only those old associations that are not found in new
-        return !Utils._.find(newAssociations, function (obj) {
-          return obj.id === old.id
-        })
-      })
-
-      if (obsoleteAssociations.length === 0) {
-        return emitter.emit('success', null)
-      }
-
-      obsoleteAssociations.forEach(function(associatedObject) {
-        var where            = {}
-          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
-          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-          , notFoundEmitters = []
-
-        where[self.__factory.identifier] = self.instance.id
-        where[foreignKey] = associatedObject.id
-
-        self.__factory.connectorDAO
-          .find({ where: where })
-          .success(function(connector) {
-            if (connector === null) {
-              notFoundEmitters.push(null)
-            } else {
-              chainer.add(connector.destroy())
-            }
-
-            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
-              // found all obsolete connectors and will delete them now
-              chainer
-                .run()
-                .success(function() { emitter.emit('success', null) })
-                .error(function(err) { emitter.emit('error', err) })
-                .on('sql', function(sql) { emitter.emit('sql', sql) })
-            }
-          })
-          .error(function(err) { emitter.emit('error', err) })
-          .on('sql', function(sql) { emitter.emit('sql', sql) })
-      })
-    }).run()
-  }
-
-  return HasManyDoubleLinked
-})()
                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/associations/has-many-single-linked.js.html b/docs/associations/has-many-single-linked.js.html deleted file mode 100644 index 9d83917a30d6..000000000000 --- a/docs/associations/has-many-single-linked.js.html +++ /dev/null @@ -1,119 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                      var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManySingleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManySingleLinked.prototype.injectGetter = function(options) {
-    var where = {}, options = options || {}
-
-    where[this.__factory.identifier] = this.instance.id
-
-    options.where = options.where ? Utils._.extend(options.where, where) : where
-    return this.__factory.target.findAll(options)
-  }
-
-  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
-    var self    = this
-      , options = this.__factory.options
-      , chainer = new Utils.QueryChainer()
-      , obsoleteAssociations = oldAssociations.filter(function (old) { 
-          return !Utils._.find(newAssociations, function (obj) {
-            return obj.id === old.id
-          }) 
-        })
-      , unassociatedObjects = newAssociations.filter(function (obj) { 
-          return !Utils._.find(oldAssociations, function (old) {
-            return obj.id === old.id
-          }) 
-        })
-
-    // clear the old associations
-    obsoleteAssociations.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = null
-      chainer.add(associatedObject.save())
-    })
-
-    // set the new associations
-    unassociatedObjects.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = self.instance.id
-      chainer.add(associatedObject.save())
-    })
-
-    chainer
-      .run()
-      .success(function() { emitter.emit('success', newAssociations) })
-      .error(function(err) { emitter.emit('error', err) })
-  }
-
-  HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    newAssociation[this.__factory.identifier] = this.instance.id
-
-    newAssociation.save()
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  return HasManySingleLinked
-})()
                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/associations/has-many.js.html b/docs/associations/has-many.js.html deleted file mode 100644 index 41f0e36531a8..000000000000 --- a/docs/associations/has-many.js.html +++ /dev/null @@ -1,249 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                      Utils

                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                        var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-var HasManySingleLinked = require("./has-many-single-linked")
-  , HasManyMultiLinked  = require("./has-many-double-linked")
-
-module.exports = (function() {
-  var HasMany = function(srcDAO, targetDAO, options) {
-    this.associationType = 'HasMany'
-    this.source = srcDAO
-    this.target = targetDAO
-    this.options = options
-    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
-    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
-
-    var combinedTableName = Utils.combineTableNames(
-      this.source.tableName,
-      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
-    )
-    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
-
-    var as = (this.options.as || Utils.pluralize(this.target.tableName))
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + as),
-      set: Utils._.camelize('set_' + as),
-      add: Utils._.camelize(Utils.singularize('add_' + as)),
-      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
-      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
-      hasAll: Utils._.camelize('has_' + as)
-    }
-  }
-
-  // the id is in the target table
-  // or in an extra table which connects two tables
-  HasMany.prototype.injectAttributes = function() {
-    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-
-    // is there already a single sided association between the source and the target?
-    // or is the association on the model itself?
-    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
-      // remove the obsolete association identifier from the source
-      if (this.isSelfAssociation) {
-        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
-      } else {
-        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
-        delete this.source.rawAttributes[this.foreignIdentifier]
-      }
-
-      // define a new model, which connects the models
-      var combinedTableAttributes = {}
-      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
-
-      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
-
-      if (!this.isSelfAssociation) {
-        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
-      }
-
-      if (this.options.syncOnAssociation) {
-        this.connectorDAO.sync()
-      }
-    } else {
-      var newAttributes = {}
-      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-      Utils._.defaults(this.target.rawAttributes, newAttributes)
-    }
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasMany.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(options) {
-      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-      return new Class(self, this).injectGetter(options)
-    }
-
-   obj[this.accessors.hasAll] = function(objects) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.all(objects, function(o) {
-              return Utils._.any(associatedObjects, function(associatedObject) {
-                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                  return o[identifier] == associatedObject[identifier];
-                });
-              })
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    obj[this.accessors.hasSingle] = function(o) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.any(associatedObjects, function(associatedObject) {
-              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                return o[identifier] == associatedObject[identifier];
-              });
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-    return this
-  }
-
-  HasMany.prototype.injectSetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.set] = function(newAssociatedObjects) {
-      if (newAssociatedObjects === null) {
-        newAssociatedObjects = []
-      }
-
-      var instance = this
-
-      // define the returned customEventEmitter, which will emit the success event once everything is done
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]()
-          .success(function(oldAssociatedObjects) {
-            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
-          })
-          .error(function(err) {
-            emitter.emit('error', err)
-          })
-          .on('sql', function(sql) {
-            emitter.emit('sql', sql)
-          })
-      }).run()
-    }
-
-    obj[this.accessors.add] = function(newAssociatedObject) {
-      var instance = this
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
-          .error(function(err){ emitter.emit('error', err)})
-          .success(function(currentAssociatedObjects) {
-            if (currentAssociatedObjects.length === 0) {
-              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
-            } else {
-              emitter.emit('success', newAssociatedObject);
-            }
-          })
-      }).run()
-    }
-
-    obj[this.accessors.remove] = function(oldAssociatedObject) {
-      var instance = this
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
-          var newAssociations = []
-
-          currentAssociatedObjects.forEach(function(association) {
-            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
-              newAssociations.push(association)
-          })
-
-          instance[self.accessors.set](newAssociations)
-            .success(function() { customEventEmitter.emit('success', null) })
-            .error(function(err) { customEventEmitter.emit('error', err) })
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    return this
-  }
-
-  return HasMany
-})()
                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/associations/has-one.js.html b/docs/associations/has-one.js.html deleted file mode 100644 index 811582c3e759..000000000000 --- a/docs/associations/has-one.js.html +++ /dev/null @@ -1,152 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                        declaration

                                                                                                                                                                                                                                        Utils

                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                          var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var HasOne = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'HasOne'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
-      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-    }
-  }
-
-  // the id is in the target table
-  HasOne.prototype.injectAttributes = function() {
-    var newAttributes = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.target.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasOne.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(params) {
-      var id    = this.id
-        , where = {}
-
-      where[self.identifier] = id
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: where}, params)
-        }
-      } else {
-        params = {where: where}
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  HasOne.prototype.injectSetter = function(obj) {
-    var self    = this
-      , options = self.options || {}
-
-    obj[this.accessors.set] = function(associatedObject) {
-      var instance = this;
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]().success(function(oldObj) {
-          if (oldObj) {
-            oldObj[self.identifier] = null
-            oldObj.save()
-          }
-
-          if (associatedObject) {
-            associatedObject[self.identifier] = instance.id
-            associatedObject
-              .save()
-              .success(function() { emitter.emit('success', associatedObject) })
-              .error(function(err) { emitter.emit('error', err) })
-          } else {
-            emitter.emit('success', null)
-          }
-
-        })
-      }).run()
-    }
-
-    return this
-  }
-
-  return HasOne
-})()
                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/associations/mixin.js.html b/docs/associations/mixin.js.html deleted file mode 100644 index 57dd2695c0b6..000000000000 --- a/docs/associations/mixin.js.html +++ /dev/null @@ -1,125 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                          declaration

                                                                                                                                                                                                                                          Mixin

                                                                                                                                                                                                                                          Mixin

                                                                                                                                                                                                                                          Defines Mixin for all models.

                                                                                                                                                                                                                                            var Mixin = module.exports = function(){}
-
-Mixin.hasOne = function(associatedDAO, options) {
-  // the id is in the foreign table
-  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype);
-  association.injectSetter(this.DAO.prototype);
-
-  return this
-}
-
-Mixin.belongsTo = function(associatedDAO, options) {
-  // the id is in this table
-  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.hasMany = function(associatedDAO, options) {
-  // the id is in the foreign table or in a connecting table
-  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.getAssociation = function(target) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-console.log(target.name, association.target.name)
-      if (!result && (association.target === target)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}
-
-Mixin.getAssociationByAlias = function(alias) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-      if (!result && (association.options.as === alias)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}

                                                                                                                                                                                                                                            example for instance methods:
                                                                                                                                                                                                                                            Mixin.prototype.test = function() {
                                                                                                                                                                                                                                            console.log('asd')
                                                                                                                                                                                                                                            }

                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/dao-factory-manager.js.html b/docs/dao-factory-manager.js.html deleted file mode 100644 index de1c575a24d8..000000000000 --- a/docs/dao-factory-manager.js.html +++ /dev/null @@ -1,93 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                              property

                                                                                                                                                                                                                                              exports

                                                                                                                                                                                                                                              module.exports
                                                                                                                                                                                                                                                module.exports = (function() {
-  var DAOFactoryManager = function(sequelize) {
-    this.daos = []
-    this.sequelize = sequelize
-  }
-
-  DAOFactoryManager.prototype.addDAO = function(dao) {
-    this.daos.push(dao)
-
-    return dao
-  }
-
-  DAOFactoryManager.prototype.removeDAO = function(dao) {
-    this.daos = this.daos.filter(function(_dao) {
-      return _dao.name != dao.name
-    })
-  }
-
-  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
-    options = options || {}
-    options.attribute = options.attribute || 'name'
-
-    var dao = this.daos.filter(function(dao) {
-      return dao[options.attribute] === daoName
-    })
-
-    return !!dao ? dao[0] : null
-  }
-
-  DAOFactoryManager.prototype.__defineGetter__('all', function() {
-    return this.daos
-  })
-
-  return DAOFactoryManager
-})()
                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/dao-factory.js.html b/docs/dao-factory.js.html deleted file mode 100644 index 4b0f4733a5d9..000000000000 --- a/docs/dao-factory.js.html +++ /dev/null @@ -1,313 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                ptions.include =

                                                                                                                                                                                                                                                  includes.map(function(include) {
-        console.log(include instanceof DAOFactory)
-      })
-
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
-
-        if (!options.include[daoName]) {
-          options.include[daoName] = this.getAssociationByAlias(daoName).target
-        }
-      }.bind(this))
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      type:    'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  //right now, the caller (has-many-double-linked) is in charge of the where clause
-  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
-    var optcpy = Utils._.clone(options)
-    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
-
-    // whereCollection is used for non-primary key updates
-    this.options.whereCollection = optcpy.where || null;
-
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
-  }
                                                                                                                                                                                                                                                  method

                                                                                                                                                                                                                                                  find

                                                                                                                                                                                                                                                  DAOFactory.prototype.find()

                                                                                                                                                                                                                                                  Search for an instance.

                                                                                                                                                                                                                                                  • @param: {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                  • @:
                                                                                                                                                                                                                                                  • @return: {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                                                                                                                                                                                                                                  DAOFactory.prototype.find = function(options) {
-    var hasJoin = false
-
-    // no options defined?
-    // return an emitter which emits null
-    if ([null, undefined].indexOf(options) !== -1) {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        setTimeout(function() { emitter.emit('success', null) }, 10)
-      }).run()
-    }
-
-    var primaryKeys = this.primaryKeys
-
-    // options is not a hash but an id
-    if (typeof options === 'number') {
-      options = { where: options }
-    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-      var where = {}
-        , self  = this
-        , keys = Object.keys(primaryKeys)
-
-      Utils._.each(arguments, function(arg, i) {
-        var key = keys[i]
-        where[key] = arg
-      })
-
-      options = { where: where }
-    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
-      var parsedId = parseInt(options, 10)
-
-      if (!Utils._.isFinite(parsedId)) {
-        throw new Error('Invalid argument to find(). Must be an id or an options object.')
-      }
-
-      options = { where: parsedId }
-    } else if (typeof options === 'object') {
-      var includes = null
-
-      options = Utils._.clone(options)
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          if (include instanceof DAOFactory) {
-            include = { daoFactory: include, as: include.tableName }
-          }
-
-          if (typeof include === 'object') {
-            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
-              var usesAlias = include.as !== include.tableName
-
-              // check if the current daoFactory is actually associated with the passed daoFactory
-              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
-                return include
-              } else {
-                var msg = include.daoFactory.name
-
-                if (usesAlias) {
-                  msg += " (" + include.as + ")"
-                }
-
-                msg += " is not associated to " + this.name + "!"
-
-                throw new Error(msg)
-              }
-            } else {
-              throw new Error('Include malformed. Expected attributes: daoFactory, as')
-            }
-          } else {
-            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
-          }
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    options.limit = 1
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      plain: true,
-      type: 'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  DAOFactory.prototype.count = function(options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['count(*)', 'count'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
-  }
-
-  DAOFactory.prototype.max = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['max(' + field + ')', 'max'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
-  }
-  DAOFactory.prototype.min = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['min(' + field + ')', 'min'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
-  }
-
-  DAOFactory.prototype.build = function(values, options) {
-    options = options || {isNewRecord: true}
-
-    var self     = this
-      , instance = new this.DAO(values, this.options, options.isNewRecord)
-
-    instance.isNewRecord = options.isNewRecord
-
-    return instance
-  }
-
-  DAOFactory.prototype.create = function(values, fields) {
-    return this.build(values).save(fields)
-  }
-
-  DAOFactory.prototype.findOrCreate = function (params, defaults) {
-    var self = this;
-
-    return new Utils.CustomEventEmitter(function (emitter) {
-      self.find({
-        where: params
-      }).success(function (instance) {
-        if (instance === null) {
-          for (var attrname in defaults) {
-            params[attrname] = defaults[attrname];
-          }
-
-          self.create(params)
-	    .success(function (instance) {
-              emitter.emit('success', instance)
-            })
-	    .error( function (error) {
-              emitter.emit('error', error)
-            });
-        } else {
-          emitter.emit('success', instance)
-        }
-      }).error(function (error) {
-        emitter.emit('error', error)
-      });
-    }).run()
-  }
-
-  // private
-
-  var query = function() {
-    var args      = Utils._.map(arguments, function(arg, _) { return arg })
-      , sequelize = this.daoFactoryManager.sequelize
-
-    // add this as the second argument
-    if (arguments.length === 1) {
-      args.push(this)
-    }
-
-    // add {} as options
-    if (args.length === 2) {
-      args.push({})
-    }
-
-    return sequelize.query.apply(sequelize, args)
-  }
-
-  var addOptionalClassMethods = function() {
-    var self = this
-    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
-  }
-
-  var addDefaultAttributes = function() {
-    var self              = this
-      , defaultAttributes = {
-        id: {
-          type: DataTypes.INTEGER,
-          allowNull: false,
-          primaryKey: true,
-          autoIncrement: true
-        }
-      }
-
-    if (this.hasPrimaryKeys) {
-      defaultAttributes = {}
-    }
-
-    if (this.options.timestamps) {
-      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-
-      if (this.options.paranoid)
-        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
-    }
-
-    Utils._.each(defaultAttributes, function(value, attr) {
-      self.rawAttributes[attr] = value
-    })
-  }
-
-  var findAutoIncrementField = function() {
-    var fields = this.QueryGenerator.findAutoIncrementField(this)
-
-    this.autoIncrementField = null
-
-    fields.forEach(function(field) {
-      if (this.autoIncrementField) {
-        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      } else {
-        this.autoIncrementField = field
-      }
-    }.bind(this))
-  }
-
-  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
-
-  return DAOFactory
-})()
                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/dao.js.html b/docs/dao.js.html deleted file mode 100644 index 7de88d44232f..000000000000 --- a/docs/dao.js.html +++ /dev/null @@ -1,223 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                  method

                                                                                                                                                                                                                                                  validate

                                                                                                                                                                                                                                                  DAO.prototype.validate()

                                                                                                                                                                                                                                                  Validate this dao's attribute values according to validation rules set in the dao definition.

                                                                                                                                                                                                                                                  • @return: {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                  DAO.prototype.validate = function() {
-    var self = this
-    var failures = {}
-
-    // for each field and value
-    Utils._.each(self.values, function(value, field) {
-
-      // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
-        // for each validator
-        Utils._.each(self.validators[field], function(details, validatorType) {
-
-          var is_custom_fn = false  // if true then it's a custom validation method
-          var fn_method = null      // the validation function to call
-          var fn_args = []          // extra arguments to pass to validation function
-          var fn_msg = ""           // the error message to return if validation fails
-
-          // is it a custom validator function?
-          if (Utils._.isFunction(details)) {
-            is_custom_fn = true
-            fn_method = Utils._.bind(details, self, value)
-          }
-          // is it a validator module function?
-          else {
-            // extra args
-            fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Array.isArray(fn_args))
-              fn_args = [fn_args]
-            // error msg
-            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
-            // check method exists
-            var v = Validator.check(value, fn_msg)
-            if (!Utils._.isFunction(v[validatorType]))
-              throw new Error("Invalid validator function: " + validatorType)
-            // bind to validator obj
-            fn_method = Utils._.bind(v[validatorType], v)
-          }
-
-          try {
-            fn_method.apply(null, fn_args)
-          } catch (err) {
-            err = err.message
-            // if we didn't provide a custom error message then augment the default one returned by the validator
-            if (!fn_msg && !is_custom_fn)
-              err += ": " + field
-            // each field can have multiple validation failures stored against it
-            if (failures.hasOwnProperty(field)) {
-              failures[field].push(err)
-            } else {
-              failures[field] = [err]
-            }
-          }
-
-        }) // for each validator for this field
-      } // if field has validator set
-    }) // for each field
-
-    return (Utils._.isEmpty(failures) ? null : failures)
-  }
-
-
-  DAO.prototype.updateAttributes = function(updates, fields) {
-    this.setAttributes(updates)
-    return this.save(fields)
-  }
-
-  DAO.prototype.setAttributes = function(updates) {
-    var self = this
-
-    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
-
-    readOnlyAttributes.push('id')
-    readOnlyAttributes.push('createdAt')
-    readOnlyAttributes.push('updatedAt')
-    readOnlyAttributes.push('deletedAt')
-
-    Utils._.each(updates, function(value, attr) {
-      var updateAllowed = (
-        (readOnlyAttributes.indexOf(attr) == -1) &&
-        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
-        (self.attributes.indexOf(attr) > -1)
-      )
-      updateAllowed && (self[attr] = value)
-    })
-  }
-
-  DAO.prototype.destroy = function() {
-    if (this.__options.timestamps && this.__options.paranoid) {
-      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
-      this[attr] = new Date()
-      return this.save()
-    } else {
-      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
-    }
-  }
-
-  DAO.prototype.equals = function(other) {
-    var result = true
-      , self   = this
-
-    Utils._.each(this.values, function(value, key) {
-      result = result && (value == other[key])
-    })
-
-    return result
-  }
-
-  DAO.prototype.equalsOneOf = function(others) {
-    var result = false
-      , self   = this
-
-    others.forEach(function(other) { result = result || self.equals(other) })
-
-    return result
-  }
-
-  DAO.prototype.addAttribute = function(attribute, value) {
-    this[attribute] = value
-  }
-
-  DAO.prototype.setValidators = function(attribute, validators) {
-    this.validators[attribute] = validators
-  }
-
-  DAO.prototype.toJSON = function() {
-    return this.values;
-  }
-
-  // private
-
-  var initAttributes = function(values, isNewRecord) {
-    // add all passed values to the dao and store the attribute names in this.attributes
-    for (var key in values) {
-      if (values.hasOwnProperty(key)) {
-        this.addAttribute(key, values[key])
-      }
-    }
-
-    // set id to null if not passed as value
-    // a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
-
-    if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
-
-      if (this.__options.paranoid) {
-        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
-      }
-    }
-
-    if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        var value = defaults[attr]
-
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
-        }
-      }
-    }
-  }
-
-  return DAO
-})()
                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/data-types.js.html b/docs/data-types.js.html deleted file mode 100644 index 6c54776e06c9..000000000000 --- a/docs/data-types.js.html +++ /dev/null @@ -1,69 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                  property

                                                                                                                                                                                                                                                  exports

                                                                                                                                                                                                                                                  module.exports
                                                                                                                                                                                                                                                    module.exports = {
-  STRING: 'VARCHAR(255)',
-  TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
-  DATE: 'DATETIME',
-  BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
-  NOW: 'NOW',
-  ENUM: 'ENUM'
-}
                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/dialects/abstract/query.js.html b/docs/dialects/abstract/query.js.html deleted file mode 100644 index 2eacee70289d..000000000000 --- a/docs/dialects/abstract/query.js.html +++ /dev/null @@ -1,383 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                    Inherit from CustomEventEmitter

                                                                                                                                                                                                                                                      Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                      method

                                                                                                                                                                                                                                                      run

                                                                                                                                                                                                                                                      AbstractQuery.prototype.run()

                                                                                                                                                                                                                                                      Execute the passed sql query.

                                                                                                                                                                                                                                                      - -

                                                                                                                                                                                                                                                      Examples

                                                                                                                                                                                                                                                      - -
                                                                                                                                                                                                                                                      query.run('SELECT 1')
-
                                                                                                                                                                                                                                                      • @param: {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                      AbstractQuery.prototype.run = function(sql) {
-    throw new Error("The run method wasn't overwritten!")
-  }
                                                                                                                                                                                                                                                      method

                                                                                                                                                                                                                                                      checkLoggingOption

                                                                                                                                                                                                                                                      AbstractQuery.prototype.checkLoggingOption()

                                                                                                                                                                                                                                                      Check the logging option of the instance and print deprecation warnings.

                                                                                                                                                                                                                                                      • @return: {void} 
                                                                                                                                                                                                                                                      AbstractQuery.prototype.checkLoggingOption = function() {
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging === console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
                                                                                                                                                                                                                                                      method

                                                                                                                                                                                                                                                      formatResults

                                                                                                                                                                                                                                                      AbstractQuery.prototype.formatResults()

                                                                                                                                                                                                                                                      High level function that handles the results of a query execution.

                                                                                                                                                                                                                                                      - -

                                                                                                                                                                                                                                                      Example

                                                                                                                                                                                                                                                      - -

                                                                                                                                                                                                                                                      query.formatResults([
                                                                                                                                                                                                                                                      {
                                                                                                                                                                                                                                                      id: 1, // this is from the main table
                                                                                                                                                                                                                                                      attr2: 'snafu', // this is from the main table
                                                                                                                                                                                                                                                      Tasks.id: 1, // this is from the associated table
                                                                                                                                                                                                                                                      Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                      }
                                                                                                                                                                                                                                                      ])

                                                                                                                                                                                                                                                      • @param: {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                      AbstractQuery.prototype.formatResults = function(data) {
-    var result  = this.callee
-
-    if (isInsertQuery.call(this, data)) {
-      handleInsertQuery.call(this, data)
-    }
-
-    if (isSelectQuery.call(this)) {
-      result = handleSelectQuery.call(this, data)
-    } else if (isShowTableQuery.call(this)) {
-      result = handleShowTableQuery.call(this, data)
-    } else if (isShowOrDescribeQuery.call(this)) {
-      result = data
-    } else if (isCallQuery.call(this)) {
-      result = data[0]
-    }
-
-    return result
-  }

                                                                                                                                                                                                                                                      Shortcut methods (success, ok) for listening for success events.

                                                                                                                                                                                                                                                      - -
                                                                                                                                                                                                                                                      Params:
-  - fct: A function that gets executed once the *success* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                        AbstractQuery.prototype.success =
-  AbstractQuery.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }

                                                                                                                                                                                                                                                        Shortcut methods (failure, fail, error) for listening for error events.

                                                                                                                                                                                                                                                        - -
                                                                                                                                                                                                                                                        Params:
-  - fct: A function that gets executed once the *error* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                          AbstractQuery.prototype.failure =
-  AbstractQuery.prototype.fail =
-  AbstractQuery.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
                                                                                                                                                                                                                                                          method

                                                                                                                                                                                                                                                          send

                                                                                                                                                                                                                                                          AbstractQuery.prototype.send()

                                                                                                                                                                                                                                                          This function is a wrapper for private methods.

                                                                                                                                                                                                                                                          • @param: {String} fctName The name of the private method.
                                                                                                                                                                                                                                                          AbstractQuery.prototype.send = function(fctName

                                                                                                                                                                                                                                                          arg1, arg2, arg3, ...

                                                                                                                                                                                                                                                            {
-    var args = Array.prototype.slice.call(arguments).slice(1)
-    return eval(fctName).apply(this, args)
-  }
                                                                                                                                                                                                                                                            method

                                                                                                                                                                                                                                                            getInsertIdField

                                                                                                                                                                                                                                                            AbstractQuery.prototype.getInsertIdField()

                                                                                                                                                                                                                                                            Get the attributes of an insert query, which contains the just inserted id.

                                                                                                                                                                                                                                                            • @return: {String} The field name.
                                                                                                                                                                                                                                                            AbstractQuery.prototype.getInsertIdField = function() {
-    return 'insertId'
-  }
-
-  /////////////
-  // private //
-  /////////////
                                                                                                                                                                                                                                                            function

                                                                                                                                                                                                                                                            findTableNameInAttribute

                                                                                                                                                                                                                                                            findTableNameInAttribute()

                                                                                                                                                                                                                                                            Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                            This method will also check association aliases ('as' option).

                                                                                                                                                                                                                                                            • @param: {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                            • @return: {String} The found tableName / alias.
                                                                                                                                                                                                                                                            var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
-
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
-    })
-
-    return tableName
-  }
-
-  var queryResultHasJoin = function(results) {
-    if (!!results[0]) {
-      var keys = Object.keys(results[0])
-
-      for (var i = 0; i < keys.length; i++) {
-        if (!!findTableNameInAttribute.call(this, keys[i])) {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
-  var isInsertQuery = function(results, metaData) {
-    var result = true
-
-    // is insert query if sql contains insert into
-    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
-
-    // is insert query if no results are passed or if the result has the inserted id
-    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
-
-    // is insert query if no metadata are passed or if the metadata has the inserted id
-    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
-
-    return result
-  }
-
-  var handleInsertQuery = function(results, metaData) {
-    if (this.callee) {
-      // add the inserted row id to the instance
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-        , id                 = null
-
-      id = id || (results && results[this.getInsertIdField()])
-      id = id || (metaData && metaData[this.getInsertIdField()])
-
-      this.callee[autoIncrementField] = id
-    }
-  }
-
-  var isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0)
-  }
-
-  var handleShowTableQuery = function(results) {
-    return Utils._.flatten(results.map(function(resultSet) {
-      return Utils._.values(resultSet)
-    }))
-  }
-
-  var isSelectQuery = function() {
-    return this.options.type === 'SELECT';
-  }
-
-  var isUpdateQuery = function() {
-    return (this.sql.toLowerCase().indexOf('update') === 0)
-  }
-
-  var handleSelectQuery = function(results) {
-    var result = null, self = this;
-
-    if (this.options.raw) {
-      result = results
-    } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
-    } else {
-      result = results.map(function(result) {
-        return this.callee.build(result, { isNewRecord: false })
-      }.bind(this))
-    }
-
-    // return the first real model instance if options.plain is set (e.g. Model.find)
-    if (this.options.plain) {
-      result = (result.length === 0) ? null : result[0]
-    }
-
-    return result
-  }
-
-  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association          = null
-
-    if (!!associatedDaoFactory) {
-      association = this.callee.getAssociation(associatedDaoFactory)
-    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
-
-      if (!!associatedDaoFactory) {
-        association = this.callee.getAssociation(associatedDaoFactory)
-      } else {
-        association          = this.callee.getAssociationByAlias(tableName)
-        associatedDaoFactory = association.target
-      }
-    }
-
-    var accessor = Utils._.camelize(tableName)
-
-    // downcase the first char
-    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
-
-    associationData.forEach(function(data) {
-      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
-
-      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
-        dao[accessor] = isEmpty ? null : daoInstance
-      } else {
-        dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
-          dao[accessor].push(daoInstance)
-      }
-    })
-  }
-
-  var isShowOrDescribeQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
-    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
-
-    return  result
-  }
-
-  var isCallQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
-
-    return result
-  }
                                                                                                                                                                                                                                                            function

                                                                                                                                                                                                                                                            groupDataByCalleeFactory

                                                                                                                                                                                                                                                            groupDataByCalleeFactory()

                                                                                                                                                                                                                                                            The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                            the associated data by the callee.

                                                                                                                                                                                                                                                            - -
                                                                                                                                                                                                                                                            Example:
-  groupDataByCalleeFactory([
-    {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 1 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 2 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 3 }
-    }
-  ])
-
-Result:
-  Something like this:
-
-  [
-    {
-      callee:  { some: 'data', id: 1 },
-      association: [
-        { foo: 'bar', id: 1 },
-        { foo: 'bar', id: 2 },
-        { foo: 'bar', id: 3 }
-      ]
-    }
-  ]
-
                                                                                                                                                                                                                                                              var groupDataByCalleeFactory = function(data) {
-    var result          = []
-      , calleeTableName = this.callee.tableName
-
-    data.forEach(function(row) {
-      var calleeData    = row[calleeTableName]
-        , existingEntry = result.filter(function(groupedRow) {
-            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
-          })[0]
-
-      if (!existingEntry) {
-        existingEntry = {}
-        result.push(existingEntry)
-        existingEntry[calleeTableName] = calleeData
-      }
-
-      for (var attrName in row) {
-        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
-          existingEntry[attrName] = existingEntry[attrName] || []
-          existingEntry[attrName].push(row[attrName])
-        }
-      }
-    })
-
-    return result
-  }
                                                                                                                                                                                                                                                              function

                                                                                                                                                                                                                                                              prepareJoinData

                                                                                                                                                                                                                                                              prepareJoinData()

                                                                                                                                                                                                                                                              This function will prepare the result of select queries with joins.

                                                                                                                                                                                                                                                              • @param: {Array} data This array contains objects.
                                                                                                                                                                                                                                                              • @return: {Array} The array will have the needed format for groupDataByCalleeFactory.
                                                                                                                                                                                                                                                              var prepareJoinData = function(data) {
-    var result = data.map(function(row) {
-      var nestedRow = {}
-
-      for (var key in row) {
-        if (row.hasOwnProperty(key)) {
-          var tableName = findTableNameInAttribute.call(this, key)
-
-          if (!!tableName) {
-            nestedRow[tableName] = nestedRow[tableName] || {}
-            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
-          } else {
-            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
-            nestedRow[this.callee.tableName][key] = row[key]
-          }
-        }
-      }
-
-      return nestedRow
-    }.bind(this))
-
-    return result
-  }
-
-  return AbstractQuery
-})()
                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/dialects/connector-manager.js.html b/docs/dialects/connector-manager.js.html deleted file mode 100644 index a3101636ed7a..000000000000 --- a/docs/dialects/connector-manager.js.html +++ /dev/null @@ -1,82 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                              property

                                                                                                                                                                                                                                                              exports

                                                                                                                                                                                                                                                              module.exports
                                                                                                                                                                                                                                                                module.exports = (function(){
-  var ConnectorManager = function(sequelize, config) {
-    throw new Error('Define the constructor!')
-  }
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    throw new Error('Define the query method!')
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    throw new Error('Define the connect method!')
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    throw new Error('Define the disconnect method!')
-  }
-
-  ConnectorManager.prototype.reconnect = function() {
-    this.disconnect()
-    this.connect()
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/dialects/mysql/connector-manager.js.html b/docs/dialects/mysql/connector-manager.js.html deleted file mode 100644 index 602e0b98c045..000000000000 --- a/docs/dialects/mysql/connector-manager.js.html +++ /dev/null @@ -1,392 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                                                mysql

                                                                                                                                                                                                                                                                mysql
                                                                                                                                                                                                                                                                  var mysql   = require("mysql")
-  , Pooling = require('generic-pool')
-  , Query   = require("./query")
-  , Utils   = require("../../utils")
-  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client = null
-    this.config = config || {}
-    this.disconnectTimeoutId = null
-    this.queue = []
-    this.activeQueue = []
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-    this.poolCfg = Utils._.defaults(this.config.pool, {
-      maxConnections: 10,
-      minConnections: 0,
-      maxIdleTime: 1000
-    });
-    this.pendingQueries = 0;
-    this.useReplicaton = !!config.replication;
-    this.useQueue = config.queue !== undefined ? config.queue : true;
-
-    var self = this
-
-    if (this.useReplicaton) {
-      var reads = 0,
-        writes = 0;
-
-      // Init configs with options from config if not present
-      for (var i in config.replication.read) {
-        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
-          host: this.config.host,
-          port: this.config.port,
-          username: this.config.username,
-          password: this.config.password,
-          database: this.config.database
-        });
-      }
-      config.replication.write = Utils._.defaults(config.replication.write, {
-        host: this.config.host,
-        port: this.config.port,
-        username: this.config.username,
-        password: this.config.password,
-        database: this.config.database
-      });
-
-      // I'll make my own pool, with blackjack and hookers!
-      this.pool = {
-        release: function (client) {
-          if (client.queryType == 'read') {
-            return this.read.release(client);
-          } else {
-            return this.write.release(client);
-          }
-        },
-        acquire: function (callback, priority, queryType) {
-          if (queryType == 'SELECT') {
-            this.read.acquire(callback, priority);
-          } else {
-            this.write.acquire(callback, priority);
-          }
-        },
-        drain: function () {
-          this.read.drain();
-          this.write.drain();
-        },
-        read: Pooling.Pool({
-          name: 'sequelize-read',
-          create: function (done) {
-            if (reads >= self.config.replication.read.length) reads = 0;
-            var config = self.config.replication.read[reads++];
-
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'read'
-              done(null, connection)
-            }, config);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        }),
-        write: Pooling.Pool({
-          name: 'sequelize-write',
-          create: function (done) {
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'write'
-              done(null, connection)
-            }, self.config.replication.write);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        })
-      };
-    } else if (this.poolCfg) {
-      //the user has requested pooling, so create our connection pool
-      this.pool = Pooling.Pool({
-        name: 'sequelize-mysql',
-        create: function (done) {
-          connect.call(self, done)
-        },
-        destroy: function(client) {
-          disconnect.call(self, client)
-        },
-        max: self.poolCfg.maxConnections,
-        min: self.poolCfg.minConnections,
-        idleTimeoutMillis: self.poolCfg.maxIdleTime
-      })
-    }
-
-    process.on('exit', function () {
-      //be nice & close our connections on exit
-      if (self.pool) {
-        self.pool.drain()
-      } else if (self.client) {
-        disconnect(self.client)
-      }
-
-      return
-    })
-  }
-
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
-
-  var isConnecting = false;
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    if (!this.isConnected && !this.pool) {
-      this.connect()
-    }
-
-    if (this.useQueue) {
-      var queueItem = {
-        query: new Query(this.client, this.sequelize, callee, options || {}),
-        sql: sql
-      };
-
-      enqueue.call(this, queueItem, options);
-      return queueItem.query;
-    }
-
-    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
-    this.pendingQueries++;
-
-    query.done(function() {
-      self.pendingQueries--;
-      if (self.pool) self.pool.release(query.client);
-      else {
-        if (self.pendingQueries === 0) {
-          setTimeout(function() {
-            self.pendingQueries === 0 && self.disconnect.call(self);
-          }, 100);
-        }
-      }
-    });
-
-    if (!this.pool) {
-      query.run(sql);
-    }
-
-    else {
-      this.pool.acquire(function(err, client) {
-        if (err) return query.emit('error', err);
-
-        query.client = client;
-        query.run(sql);
-        return;
-      }, undefined, options.type);
-    }
-
-    return query;
-  };
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this;
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting || this.pool) {
-      return;
-    }
-    connect.call(self, function(err, client) {
-      self.client = client;
-      return;
-    });
-    return;
-  };
-
-  ConnectorManager.prototype.disconnect = function() {
-    if (this.client) disconnect.call(this, this.client);
-    return;
-  };
-
-
-  // private
-
-  var disconnect = function(client) {
-    var self = this;
-    if (!this.useQueue) {
-      this.client = null;
-    }
-
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
-      }
-
-      var intervalObj = null
-      var cleanup = function () {
-        var retryCt = 0
-        // make sure to let client finish before calling destroy
-        if (self && self.hasQueuedItems) {
-          return
-        }
-        // needed to prevent mysql connection leak
-        client.destroy()
-        if (self && self.client) {
-          self.client = null
-        }
-        clearInterval(intervalObj)
-      }
-      intervalObj = setInterval(cleanup, 10)
-      cleanup()
-      return
-    })
-  }
-
-  var connect = function(done, config) {
-    config = config || this.config
-    var connection = mysql.createConnection({
-      host: config.host,
-      port: config.port,
-      user: config.username,
-      password: config.password,
-      database: config.database
-    })
-    // client.setMaxListeners(self.maxConcurrentQueries)
-    this.isConnecting = false
-
-    done(null, connection)
-  }
-
-  var enqueue = function(queueItem, options) {
-    options = options || {}
-    if (this.activeQueue.length < this.maxConcurrentQueries) {
-      this.activeQueue.push(queueItem)
-      if (this.pool) {
-        var self = this
-        this.pool.acquire(function(err, client) {
-          if (err) {
-            queueItem.query.emit('error', err)
-            return
-          }
-          //we set the client here, asynchronously, when getting a pooled connection
-          //allowing the ConnectorManager.query method to remain synchronous
-          queueItem.query.client = client
-          queueItem.client = client
-          execQueueItem.call(self, queueItem)
-          return
-        }, undefined, options.type)
-      } else {
-        execQueueItem.call(this, queueItem)
-      }
-    } else {
-      this.queue.push(queueItem)
-    }
-  }
-
-  var dequeue = function(queueItem) {
-    //return the item's connection to the pool
-    if (this.pool) {
-      this.pool.release(queueItem.client)
-    }
-    this.activeQueue = without(this.activeQueue, queueItem)
-  }
-
-  var transferQueuedItems = function(count) {
-    for(var i = 0; i < count; i++) {
-      var queueItem = this.queue.shift();
-      if (queueItem) {
-        enqueue.call(this, queueItem)
-      }
-    }
-  }
-
-  var afterQuery = function(queueItem) {
-    var self = this
-
-    dequeue.call(this, queueItem)
-    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
-    disconnectIfNoConnections.call(this)
-  }
-
-
-  var execQueueItem = function(queueItem) {
-    var self = this
-
-    queueItem.query
-      .success(function(){ afterQuery.call(self, queueItem) })
-      .error(function(){ afterQuery.call(self, queueItem) })
-
-    queueItem.query.run(queueItem.sql, queueItem.client)
-  }
-
-  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
-    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
-  })
-
-  // legacy
-  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
-    return !this.hasQueuedItems
-  })
-
-  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
-    return this.client != null
-  })
-
-  var disconnectIfNoConnections = function() {
-    var self = this
-
-    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
-    this.disconnectTimeoutId = setTimeout(function() {
-      self.isConnected && !self.hasQueuedItems && self.disconnect()
-    }, 100)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/dialects/mysql/query-generator.js.html b/docs/dialects/mysql/query-generator.js.html deleted file mode 100644 index 728079f44989..000000000000 --- a/docs/dialects/mysql/query-generator.js.html +++ /dev/null @@ -1,496 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                  Utils

                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                    var Utils     = require("../../utils")
-  , DataTypes = require("../../data-types")
-  , util      = require("util")
-
-module.exports = (function() {
-  var QueryGenerator = {
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-        engine: 'InnoDB',
-        charset: null
-      }, options || {})
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
-        , primaryKeys = []
-        , attrStr = []
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        engine: options.engine,
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-
-      return Utils._.template(query)({table: Utils.addTicks(tableName)})
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
-      return Utils._.template(query)({ before: before, after: after })
-    },
-
-    showTablesQuery: function() {
-      return 'SHOW TABLES;'
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
-      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
-          before: attrBefore,
-          after: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr){
-        if(Array.isArray(attr) && attr.length == 2) {
-          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
-        } else {
-          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = Utils.addTicks(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
-              query += Utils.addTicks(foreignIdentifier) + '='
-              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(dao.tableName) + '.'
-              query += Utils.addTicks('id') + '='
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += Utils.addTicks(association.identifier) + '='
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, Utils.addTicks(attr)].join('.') +
-                  ' AS ' +
-                  Utils.addTicks([aliasName, attr].join('.'))
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if (options.where) {
-        options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
-      }
-
-      if (options.group) {
-        options.group = Utils.addTicks(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
-
-      if (options.limit && !(options.include && (options.limit === 1))) {
-        if (options.offset) {
-          query += " LIMIT <%= offset %>, <%= limit %>"
-        } else {
-          query += " LIMIT <%= limit %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
-
-        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if(typeof attribute === 'string') {
-          return attribute
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += attribute.attribute
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === 'string') ? attribute : attribute.attribute
-      })
-
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", options.indexName,
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
-        (options.parser ? "WITH PARSER " + options.parser : undefined)
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
-      return Utils._.template(sql)({
-        tableName: tableName,
-        options: (options || {}).database ? ' FROM ' + options.database : ''
-      })
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== 'string') {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
-    },
-
-    getWhereConditions: function(smth, tableName) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === 'number') {
-        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === "string") {
-        result = smth
-      } else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-         //handle qualified key names
-        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          // is value an array?
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return Utils.escape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        } else if ((value) && (typeof value == 'object')) {
-          // is value an object?
-
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = Utils.escape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(" AND ")
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template += " auto_increment"
-          }
-
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('auto_increment') > -1)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/dialects/mysql/query.js.html b/docs/dialects/mysql/query.js.html deleted file mode 100644 index cf5e60b3430c..000000000000 --- a/docs/dialects/mysql/query.js.html +++ /dev/null @@ -1,97 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                      var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client    = client
-    this.callee    = callee
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-
-  Utils.inherit(Query, AbstractQuery)
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    this.client.query(this.sql, function(err, results, fields) {
-      this.emit('sql', this.sql)
-
-      if (err) {
-        this.emit('error', err, this.callee)
-      } else {
-        this.emit('success', this.formatResults(results))
-      }
-    }.bind(this)).setMaxListeners(100)
-    return this
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/dialects/postgres/connector-manager.js.html b/docs/dialects/postgres/connector-manager.js.html deleted file mode 100644 index bdcce6ab56b6..000000000000 --- a/docs/dialects/postgres/connector-manager.js.html +++ /dev/null @@ -1,159 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                                                      Query

                                                                                                                                                                                                                                                                      Query
                                                                                                                                                                                                                                                                        var Query   = require("./query")
-  , Utils   = require("../../utils")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client    = null
-    this.config    = config || {}
-    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
-    this.pg        = this.config.native ? require('pg').native : require('pg')
-
-    // set pooling parameters if specified
-    if (this.pooling) {
-      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
-      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
-    }
-
-    this.disconnectTimeoutId = null
-    this.pendingQueries = 0
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  var isConnecting = false
-  var isConnected  = false
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    var self = this
-    if (this.client == null) {
-      this.connect()
-    }
-
-    var query = new Query(this.client, this.sequelize, callee, options || {})
-    self.pendingQueries += 1
-    return query.run(sql)
-      .success(function() { self.endQuery.call(self) })
-      .error(function() { self.endQuery.call(self) })
-  }
-
-  ConnectorManager.prototype.endQuery = function() {
-    var self = this
-    self.pendingQueries -= 1
-    if (self.pendingQueries == 0) {
-      setTimeout(function() {
-        self.pendingQueries == 0 && self.disconnect.call(self)
-      }, 100)
-    }
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this
-    var emitter = new (require('events').EventEmitter)()
-
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting) {
-      return
-    }
-
-    this.isConnecting = true
-    this.isConnected  = false
-
-    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
-
-    var connectCallback = function(err, client) {
-      self.isConnecting = false
-
-      if (!!err) {
-        emitter.emit('error', err)
-      } else if (client) {
-        client.query("SET TIME ZONE 'UTC'")
-          .on('end', function() {
-            self.isConnected = true
-            this.client = client
-          });
-      } else {
-        this.client = null
-      }
-    }
-
-    if (this.pooling) {
-      // acquire client from pool
-      this.pg.connect(uri, connectCallback)
-    } else {
-      //create one-off client
-      this.client = new this.pg.Client(uri)
-      this.client.connect(connectCallback)
-    }
-
-    return emitter
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    var self = this
-    if (this.client) this.client.end()
-    this.client = null
-    this.isConnecting = false
-    this.isConnected  = false
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/dialects/postgres/query-generator.js.html b/docs/dialects/postgres/query-generator.js.html deleted file mode 100644 index e4252619009b..000000000000 --- a/docs/dialects/postgres/query-generator.js.html +++ /dev/null @@ -1,637 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                                                        declaration

                                                                                                                                                                                                                                                                        Utils

                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                          var Utils = require("../../utils")
-  , util  = require("util")
-  , DataTypes = require("../../data-types")
-  , tables = {}
-  , primaryKeys = {};
-
-function removeQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return s.replace(new RegExp(quoteChar, 'g'), '')
-}
-
-function addQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return removeQuotes(s, quoteChar)
-    .split('.')
-    .map(function(e) { return quoteChar + String(e) + quoteChar })
-    .join('.')
-}
-
-function pgEscape(val) {
-  if (val === undefined || val === null) {
-    return 'NULL';
-  }
-
-  switch (typeof val) {
-    case 'boolean': return (val) ? 'true' : 'false';
-    case 'number': return val+'';
-  }
-
-  if (val instanceof Date) {
-    val = pgSqlDate(val);
-  }
-
-  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-  val = val.replace(/'/g, "''");
-  return "'"+val+"'";
-}
-
-function pgEscapeAndQuote(val) {
-  return addQuotes(removeQuotes(pgEscape(val), "'"))
-}
-
-function pgEnum(tableName, attr, dataType) {
-  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
-  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
-}
-
-function padInt(i) {
-  return (i < 10) ? '0' + i.toString() : i.toString()
-}
-function pgSqlDate(dt) {
-  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
-  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
-  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
-}
-
-function pgDataTypeMapping(tableName, attr, dataType) {
-  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-    primaryKeys[tableName].push(attr)
-    dataType = dataType.replace(/PRIMARY KEY/, '')
-  }
-
-  if (Utils._.includes(dataType, 'TINYINT(1)')) {
-    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
-  }
-
-  if (Utils._.includes(dataType, 'DATETIME')) {
-    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
-  }
-
-  if (Utils._.includes(dataType, 'SERIAL')) {
-    dataType = dataType.replace(/INTEGER/, '')
-    dataType = dataType.replace(/NOT NULL/, '')
-    tables[tableName][attr] = 'serial'
-  }
-
-  if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
-  }
-
-  return dataType
-}
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-      }, options || {})
-
-      primaryKeys[tableName] = []
-      tables[tableName] = {}
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , attrStr = []
-
-      for (var attr in attributes) {
-        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
-        attrStr.push(addQuotes(attr) + " " + dataType)
-
-        if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr]) + query;
-        }
-      }
-
-      var values  = {
-        table: addQuotes(tableName),
-        attributes: attrStr.join(", "),
-      }
-
-      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
-      if (pks.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pks + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-      return Utils._.template(query)({ table: addQuotes(tableName) })
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
-      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
-    },
-
-    showTablesQuery: function() {
-      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
-    },
-
-    describeTableQuery: function(tableName) {
-      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
-      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
-          attrName: addQuotes(attrName),
-          definition: pgDataTypeMapping(tableName, attrName, definition)
-        }))
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attrName, definition) + query
-        }
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
-        , sql   = []
-
-      for (var attributeName in attributes) {
-        var definition = attributes[attributeName]
-        var attrSql = ''
-
-        if (definition.indexOf('NOT NULL') > 0) {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' SET NOT NULL'
-          })
-          definition = definition.replace('NOT NULL', '').trim()
-        } else {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' DROP NOT NULL'
-          })
-        }
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attributeName, definition) + query
-          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
-        }
-
-        attrSql += Utils._.template(query)({
-          tableName: addQuotes(tableName),
-          query: addQuotes(attributeName) + ' TYPE ' + definition
-        })
-
-        sql.push(attrSql)
-      }
-
-      return sql.join('')
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
-      var attrString = []
-
-      for (var attributeName in attributes) {
-        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
-          before: addQuotes(attrBefore),
-          after: addQuotes(attributeName),
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options = options || {}
-      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr) {
-        if (Array.isArray(attr) && attr.length === 2) {
-          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
-        } else if (attr.indexOf('`') >= 0) {
-          return attr.replace(/`/g, '"')
-        } else {
-          return addQuotes(attr)
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = addQuotes(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
-              query += addQuotes(association.connectorDAO.tableName) + '.'
-              query += addQuotes(foreignIdentifier) + '='
-              query += addQuotes(table) + '.' + addQuotes('id')
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(dao.tableName) + '.'
-              query += addQuotes('id') + '='
-              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += addQuotes(association.identifier) + '='
-              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, addQuotes(attr)].join('.') +
-                  ' AS "' +
-                  removeQuotes([aliasName, attr].join('.')) + '"'
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if(options.where) {
-        options.where = QueryGenerator.getWhereConditions(options.where)
-        query += " WHERE <%= where %>"
-      }
-
-      if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
-        query += " ORDER BY <%= order %>"
-      }
-
-      if(options.group) {
-        options.group = addQuotes(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (!(options.include && (options.limit === 1))) {
-        if (options.limit) {
-          query += " LIMIT <%= limit %>"
-        }
-
-        if (options.offset) {
-          query += " OFFSET <%= offset %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
-        , returning = []
-
-      Utils._.forEach(attrValueHash, function(value, key, hash) {
-        if (tables[tableName] && tables[tableName][key]) {
-          switch (tables[tableName][key]) {
-            case 'serial':
-              delete hash[key]
-              returning.push(key)
-              break
-          }
-        }
-      });
-
-      var replacements  = {
-        table: addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape(value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + pgEscape(value))
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      primaryKeys[tableName] = primaryKeys[tableName] || [];
-
-      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
-
-      var pks;
-      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
-        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
-      } else {
-        pks = addQuotes('id')
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: pgEscape(options.limit),
-        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
-        primaryKeysSelection: pks
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if (typeof attribute === 'string') {
-          return addQuotes(attribute)
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += addQuotes(attribute.attribute)
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === "string") ? attribute : attribute.attribute
-      })
-
-      var indexTable = tableName.split('.')
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
-      return Utils._.template(query)({ tableName: tableName });
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== "string") {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
-    },
-
-    getWhereConditions: function(smth) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        result = QueryGenerator.hashToWhereConditions(smth)
-      }
-      else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + pgEscape(smth)
-      }
-      else if (typeof smth === "string") {
-        result = smth
-      }
-      else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-        //handle qualified key names
-        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return pgEscape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        }
-        else if ((value) && (typeof value === "object")) {
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = pgEscape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(' AND ')
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if(Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.type === "TINYINT(1)") {
-            dataType.type = 'BOOLEAN'
-          }
-
-          if (dataType.type === "DATETIME") {
-            dataType.type = 'TIMESTAMP'
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template +=" SERIAL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = pgEscape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
-
-        if (definition && (definition.indexOf('SERIAL') > -1)) {
-          fields.push(name)
-        }
-      }
-
-      return fields
-    },
-
-    databaseConnectionUri: function(config) {
-      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
-
-      return Utils._.template(template)({
-        user: encodeURIComponent(config.username),
-        password: encodeURIComponent(config.password),
-        database: config.database,
-        host: config.host,
-        port: config.port,
-        protocol: config.protocol
-      })
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/dialects/postgres/query.js.html b/docs/dialects/postgres/query.js.html deleted file mode 100644 index b67e513d4d48..000000000000 --- a/docs/dialects/postgres/query.js.html +++ /dev/null @@ -1,149 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                          declaration

                                                                                                                                                                                                                                                                          Utils

                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                            var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client = client
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var receivedError = false
-      , query         = this.client.query(sql)
-      , rows          = []
-
-    query.on('row', function(row) {
-      rows.push(row)
-    })
-
-    query.on('error', function(err) {
-      receivedError = true
-      this.emit('error', err, this.callee)
-    }.bind(this))
-
-    query.on('end', function() {
-      this.emit('sql', this.sql)
-
-      if (receivedError) {
-        return
-      }
-
-      onSuccess.call(this, rows)
-    }.bind(this))
-
-    return this
-  }
-
-  Query.prototype.getInsertIdField = function() {
-    return 'id'
-  }
-
-  var onSuccess = function(rows) {
-    var results          = []
-      , isTableNameQuery = (this.sql.indexOf('SELECT table_name FROM information_schema.tables') === 0)
-      , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
-
-    if (isTableNameQuery || isRelNameQuery) {
-      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
-    }
-
-    if (this.send('isSelectQuery')) {
-      this.emit('success', this.send('handleSelectQuery', rows))
-    } else if (this.send('isShowOrDescribeQuery')) {
-      this.emit('success', results)
-    } else if (this.send('isInsertQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else if (this.send('isUpdateQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else {
-      this.emit('success', results)
-    }
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/dialects/query-generator.js.html b/docs/dialects/query-generator.js.html deleted file mode 100644 index 62e3e45d5a24..000000000000 --- a/docs/dialects/query-generator.js.html +++ /dev/null @@ -1,105 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                            Returns a query for creating a table.
                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                            - tableName: Name of the new table.
                                                                                                                                                                                                                                                                            - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                            Attributes should have the format:
                                                                                                                                                                                                                                                                            {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                            --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                            - options: An object with options.
                                                                                                                                                                                                                                                                            Defaults: { engine: 'InnoDB', charset: null }

                                                                                                                                                                                                                                                                              createTableQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('createTableQuery')
-    },

                                                                                                                                                                                                                                                                              Returns a query for dropping a table.

                                                                                                                                                                                                                                                                                dropTableQuery: function(tableName, options) {
-      throwMethodUndefined('dropTableQuery')
-    },

                                                                                                                                                                                                                                                                                Returns a rename table query.
                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                - originalTableName: Name of the table before execution.
                                                                                                                                                                                                                                                                                - futureTableName: Name of the table after execution.

                                                                                                                                                                                                                                                                                  renameTableQuery: function(originalTableName, futureTableName) {
-      throwMethodUndefined('renameTableQuery')
-    },

                                                                                                                                                                                                                                                                                  Returns a query, which gets all available table names in the database.

                                                                                                                                                                                                                                                                                    showTablesQuery: function() {
-      throwMethodUndefined('showTablesQuery')
-    },

                                                                                                                                                                                                                                                                                    Returns a query, which adds an attribute to an existing table.
                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                    - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                    - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                    - key: attributeName
                                                                                                                                                                                                                                                                                    - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                    - type: DataType
                                                                                                                                                                                                                                                                                    - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                    - allowNull: Boolean

                                                                                                                                                                                                                                                                                      addColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('addColumnQuery')
-    },

                                                                                                                                                                                                                                                                                      Returns a query, which removes an attribute from an existing table.
                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                      - tableName: Name of the existing table
                                                                                                                                                                                                                                                                                      - attributeName: Name of the obsolete attribute.

                                                                                                                                                                                                                                                                                        removeColumnQuery: function(tableName, attributeName) {
-      throwMethodUndefined('removeColumnQuery')
-    },

                                                                                                                                                                                                                                                                                        Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                        - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                        - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                        - key: attributeName
                                                                                                                                                                                                                                                                                        - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                        - type: DataType
                                                                                                                                                                                                                                                                                        - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                        - allowNull: Boolean

                                                                                                                                                                                                                                                                                          changeColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('changeColumnQuery')
-    },

                                                                                                                                                                                                                                                                                          Returns a query, which renames an existing attribute.
                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                          - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                          - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                                                                                                                                          - attrNameAfter: The name of the attribute, after renaming.

                                                                                                                                                                                                                                                                                            renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
-      throwMethodUndefined('renameColumnQuery')
-    },

                                                                                                                                                                                                                                                                                            Returns a query for selecting elements in the table .
                                                                                                                                                                                                                                                                                            Options:
                                                                                                                                                                                                                                                                                            - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                                                                                                                                            - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                            OR an ID as integer
                                                                                                                                                                                                                                                                                            OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                            If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                            - order -> e.g. 'id DESC'
                                                                                                                                                                                                                                                                                            - group
                                                                                                                                                                                                                                                                                            - limit -> The maximum count you want to get.
                                                                                                                                                                                                                                                                                            - offset -> An offset value to start from. Only useable with limit!

                                                                                                                                                                                                                                                                                              selectQuery: function(tableName, options) {
-      throwMethodUndefined('selectQuery')
-    },

                                                                                                                                                                                                                                                                                              Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.

                                                                                                                                                                                                                                                                                                insertQuery: function(tableName, attrValueHash) {
-      throwMethodUndefined('insertQuery')
-    },

                                                                                                                                                                                                                                                                                                Returns an update query.
                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                - values -> A hash with attribute-value-pairs
                                                                                                                                                                                                                                                                                                - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                OR an ID as integer
                                                                                                                                                                                                                                                                                                OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                If you use a string, you have to escape it on your own.

                                                                                                                                                                                                                                                                                                  updateQuery: function(tableName, values, where) {
-      throwMethodUndefined('updateQuery')
-    },

                                                                                                                                                                                                                                                                                                  Returns a deletion query.
                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                  - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                  - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                  OR an ID as integer
                                                                                                                                                                                                                                                                                                  OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                  If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                  Options:
                                                                                                                                                                                                                                                                                                  - limit -> Maximaum count of lines to delete

                                                                                                                                                                                                                                                                                                    deleteQuery: function(tableName, where, options) {
-      throwMethodUndefined('deleteQuery')
-    },

                                                                                                                                                                                                                                                                                                    Returns an add index query.
                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                    - tableName -> Name of an existing table.
                                                                                                                                                                                                                                                                                                    - attributes:
                                                                                                                                                                                                                                                                                                    An array of attributes as string or as hash.
                                                                                                                                                                                                                                                                                                    If the attribute is a hash, it must have the following content:
                                                                                                                                                                                                                                                                                                    - attribute: The name of the attribute/column
                                                                                                                                                                                                                                                                                                    - length: An integer. Optional
                                                                                                                                                                                                                                                                                                    - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                                                                                                                                                    - options:
                                                                                                                                                                                                                                                                                                    - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                                                                                                                                                    - indexName: The name of the index. Default is
                                                                                                                                                                                                                                                                                                    - parser

                                                                                                                                                                                                                                                                                                      addIndexQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('addIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                      Returns an show index query.
                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                      - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                      - options:
                                                                                                                                                                                                                                                                                                      - database: Name of the database.

                                                                                                                                                                                                                                                                                                        showIndexQuery: function(tableName, options) {
-      throwMethodUndefined('showIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                        Returns a remove index query.
                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                        - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                        - indexNameOrAttributes: The name of the index as string or an array of attribute names.

                                                                                                                                                                                                                                                                                                          removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      throwMethodUndefined('removeIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                          Takes something and transforms it into values of a where condition.

                                                                                                                                                                                                                                                                                                            getWhereConditions: function(smth) {
-      throwMethodUndefined('getWhereConditions')
-    },

                                                                                                                                                                                                                                                                                                            Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                                                                                                                                            The values are transformed by the relevant datatype.

                                                                                                                                                                                                                                                                                                              hashToWhereConditions: function(hash) {
-      throwMethodUndefined('hashToWhereConditions')
-    },

                                                                                                                                                                                                                                                                                                              This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                                                                                                                                              sql attribute definition.

                                                                                                                                                                                                                                                                                                                attributesToSQL: function(attributes) {
-      throwMethodUndefined('attributesToSQL')
-    },

                                                                                                                                                                                                                                                                                                                Returns all auto increment fields of a factory.

                                                                                                                                                                                                                                                                                                                  findAutoIncrementField: function(factory) {
-      throwMethodUndefined('findAutoIncrementField')
-    }
-  }
-
-  var throwMethodUndefined = function(methodName) {
-    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
-  }
-
-  return QueryGenerator
-})()
                                                                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/dialects/query.js.html b/docs/dialects/query.js.html deleted file mode 100644 index ce09e58f7558..000000000000 --- a/docs/dialects/query.js.html +++ /dev/null @@ -1,216 +0,0 @@ -Documentation

                                                                                                                                                                                                                                                                                                                  Documentation

                                                                                                                                                                                                                                                                                                                  ./lib/dialects/query.js

                                                                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                                                                  Utils

                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                    var Utils = require("../utils")
-
-module.exports = (function() {
-  var Query = function(database, sequelize, callee, options) {
-    throw new Error('Constructor was not overwritten!')
-  }
-  Utils._.extend(Query.prototype, require("../emitters/custom-event-emitter").prototype)
-
-  Query.prototype.run = function(sql) {
-    throw new Error("The run method wasn't overwritten!")
-  }
-
-  Query.prototype.success = Query.prototype.ok = function(fct) {
-    this.on('success', fct)
-    return this
-  }
-
-  Query.prototype.failure = Query.prototype.fail = Query.prototype.error = function(fct) {
-    this.on('error', fct)
-    return this
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/dialects/sqlite/connector-manager.js.html b/docs/dialects/sqlite/connector-manager.js.html deleted file mode 100644 index 06ad3a1a5c30..000000000000 --- a/docs/dialects/sqlite/connector-manager.js.html +++ /dev/null @@ -1,75 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                      var Utils   = require("../../utils")
-  , sqlite3 = require('sqlite3').verbose()
-  , Query   = require("./query")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize) {
-    this.sequelize = sequelize
-    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    return new Query(this.database, this.sequelize, callee, options).run(sql)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/dialects/sqlite/query-generator.js.html b/docs/dialects/sqlite/query-generator.js.html deleted file mode 100644 index fe4032c42364..000000000000 --- a/docs/dialects/sqlite/query-generator.js.html +++ /dev/null @@ -1,253 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                                                                                                      Utils

                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                        var Utils = require("../../utils")
-  , DataTypes = require("../../data-types")
-var MySqlQueryGenerator = Utils._.extend(
-  Utils._.clone(require("../query-generator")),
-  Utils._.clone(require("../mysql/query-generator"))
-)
-
-var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
-
-var escape = function(str) {
-  if (typeof str === 'string') {
-    return "'" + str.replace(/'/g, "''") + "'";
-  } else if (typeof str === 'boolean') {
-    return str ? 1 : 0; // SQLite has no type boolean
-  } else if (str === null || str === undefined) {
-    return 'NULL';
-  } else {
-    return str;
-  }
-};
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = options || {}
-
-      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , primaryKeys = []
-        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
-                    return Utils._.includes(definition, 'PRIMARY KEY')
-                  }).length > 1)
-        , attrStr     = []
-
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    showTablesQuery: function() {
-      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: MySqlQueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: this.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM) {
-	          replacements.type = "INTEGER"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-
-            if (dataType.autoIncrement) {
-              template += ' AUTOINCREMENT'
-            }
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    },
-
-    hashToWhereConditions: function(hash) {
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          var value = hash[key]
-
-          if (typeof value === 'boolean') {
-            value = !!value ? 1 : 0
-          }
-
-          hash[key] = value
-        }
-      }
-
-      return hashToWhereConditions(hash).replace(/\\'/g, "''");
-    }
-  }
-
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/dialects/sqlite/query.js.html b/docs/dialects/sqlite/query.js.html deleted file mode 100644 index 5636b2d34d35..000000000000 --- a/docs/dialects/sqlite/query.js.html +++ /dev/null @@ -1,173 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                                                                                                        declaration

                                                                                                                                                                                                                                                                                                                        Utils

                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                          var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(database, sequelize, callee, options) {
-    this.database = database
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.getInsertIdField = function() {
-    return 'lastID'
-  }
-
-  Query.prototype.run = function(sql) {
-    var self = this
-
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var columnTypes = {};
-    this.database.serialize(function() {
-      var executeSql = function() {
-        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
-          // allow clients to listen to sql to do their own logging or whatnot
-          self.emit('sql', self.sql)
-          this.columnTypes = columnTypes;
-          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
-        })
-      };
-
-      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
-        var tableName = RegExp.$1;
-
-        if (tableName !== 'sqlite_master') {
-          // get the column types
-          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
-            if (!err) {
-              for (var i=0, l=results.length; i
                                                                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/emitters/custom-event-emitter.js.html b/docs/emitters/custom-event-emitter.js.html deleted file mode 100644 index 196c5fb2263b..000000000000 --- a/docs/emitters/custom-event-emitter.js.html +++ /dev/null @@ -1,104 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                                                                          declaration

                                                                                                                                                                                                                                                                                                                          util

                                                                                                                                                                                                                                                                                                                          util
                                                                                                                                                                                                                                                                                                                            var util         = require("util")
-  , EventEmitter = require("events").EventEmitter
-
-module.exports = (function() {
-  var CustomEventEmitter = function(fct) {
-    this.fct = fct
-  }
-  util.inherits(CustomEventEmitter, EventEmitter)
-
-  CustomEventEmitter.prototype.run = function() {
-    var self = this
-
-    // delay the function call and return the emitter
-    setTimeout(function(){
-      self.fct.call(self, self)
-    }, 1)
-
-    return this
-  }
-
-  CustomEventEmitter.prototype.success =
-  CustomEventEmitter.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.failure =
-  CustomEventEmitter.prototype.fail =
-  CustomEventEmitter.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.done =
-  CustomEventEmitter.prototype.complete =
-  function(fct) {
-    this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
-    return this
-  }
-
-
-  return CustomEventEmitter
-})()
                                                                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/associations/belongs-to.js.html b/docs/lib/associations/belongs-to.js.html deleted file mode 100644 index c8fe5b78362c..000000000000 --- a/docs/lib/associations/belongs-to.js.html +++ /dev/null @@ -1,116 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                            declaration

                                                                                                                                                                                                                                                                                                                            Utils

                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var BelongsTo = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'BelongsTo'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-  }
-
-  // the id is in the source table
-  BelongsTo.prototype.injectAttributes = function() {
-    var newAttributes  = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.source.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  BelongsTo.prototype.injectGetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(params) {
-      var id = this[self.identifier]
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: {id:id}}, params)
-        }
-      } else {
-        params = id
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  BelongsTo.prototype.injectSetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(associatedObject) {
-      this[self.identifier] = associatedObject ? associatedObject.id : null
-
-      // passes the changed field to save, so only that field get updated.
-      return this.save([ self.identifier ])
-    }
-
-    return this
-  }
-
-  return BelongsTo
-})()
                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/associations/has-many-double-linked.js.html b/docs/lib/associations/has-many-double-linked.js.html deleted file mode 100644 index 53b55bbe4101..000000000000 --- a/docs/lib/associations/has-many-double-linked.js.html +++ /dev/null @@ -1,188 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                              declaration

                                                                                                                                                                                                                                                                                                                              Utils

                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManyDoubleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManyDoubleLinked.prototype.injectGetter = function(options) {
-    var self = this, _options = options
-
-    var customEventEmitter = new Utils.CustomEventEmitter(function() {
-      var where = {}, options = _options || {};
-
-      //fully qualify
-      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
-
-      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
-        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-
-      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
-
-      if (options.where) {
-        Utils._.each(options.where, function(value, index) {
-          delete options.where[index];
-          options.where[self.__factory.target.tableName+"."+index] = value;
-        });
-
-        Utils._.extend(options.where, where)
-      } else {
-        options.where = where;
-      }
-
-      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
-        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
-        .on('error', function(err){ customEventEmitter.emit('error', err) })
-        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
-    })
-
-    return customEventEmitter.run()
-  }
-
-  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
-    var self = this
-
-    destroyObsoleteAssociations
-      .call(this, oldAssociations, newAssociations)
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .success(function() {
-        var chainer             = new Utils.QueryChainer
-          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
-          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
-          , unassociatedObjects = newAssociations.filter(function (obj) { 
-              return !Utils._.find(oldAssociations, function (old) {
-                return obj.id === old.id
-              }) 
-            })
-
-        unassociatedObjects.forEach(function(unassociatedObject) {
-          var attributes = {}
-          attributes[self.__factory.identifier] = self.instance.id
-          attributes[foreignIdentifier] = unassociatedObject.id
-
-          chainer.add(self.__factory.connectorDAO.create(attributes))
-        })
-
-        chainer
-          .run()
-          .success(function() { emitterProxy.emit('success', newAssociations) })
-          .error(function(err) { emitterProxy.emit('error', err) })
-          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      })
-  }
-
-  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    var attributes = {}
-      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
-
-    attributes[this.__factory.identifier] = this.instance.id
-    attributes[foreignIdentifier] = newAssociation.id
-
-    this.__factory.connectorDAO.create(attributes)
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  // private
-
-  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
-      var obsoleteAssociations = oldAssociations.filter(function (old) {
-        // Return only those old associations that are not found in new
-        return !Utils._.find(newAssociations, function (obj) {
-          return obj.id === old.id
-        })
-      })
-
-      if (obsoleteAssociations.length === 0) {
-        return emitter.emit('success', null)
-      }
-
-      obsoleteAssociations.forEach(function(associatedObject) {
-        var where            = {}
-          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
-          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-          , notFoundEmitters = []
-
-        where[self.__factory.identifier] = self.instance.id
-        where[foreignKey] = associatedObject.id
-
-        self.__factory.connectorDAO
-          .find({ where: where })
-          .success(function(connector) {
-            if (connector === null) {
-              notFoundEmitters.push(null)
-            } else {
-              chainer.add(connector.destroy())
-            }
-
-            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
-              // found all obsolete connectors and will delete them now
-              chainer
-                .run()
-                .success(function() { emitter.emit('success', null) })
-                .error(function(err) { emitter.emit('error', err) })
-                .on('sql', function(sql) { emitter.emit('sql', sql) })
-            }
-          })
-          .error(function(err) { emitter.emit('error', err) })
-          .on('sql', function(sql) { emitter.emit('sql', sql) })
-      })
-    }).run()
-  }
-
-  return HasManyDoubleLinked
-})()
                                                                                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/associations/has-many-single-linked.js.html b/docs/lib/associations/has-many-single-linked.js.html deleted file mode 100644 index e31294c02045..000000000000 --- a/docs/lib/associations/has-many-single-linked.js.html +++ /dev/null @@ -1,106 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                                                                                                                Utils

                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                  var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManySingleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManySingleLinked.prototype.injectGetter = function(options) {
-    var where = {}, options = options || {}
-
-    where[this.__factory.identifier] = this.instance.id
-
-    options.where = options.where ? Utils._.extend(options.where, where) : where
-    return this.__factory.target.findAll(options)
-  }
-
-  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
-    var self    = this
-      , options = this.__factory.options
-      , chainer = new Utils.QueryChainer()
-      , obsoleteAssociations = oldAssociations.filter(function (old) { 
-          return !Utils._.find(newAssociations, function (obj) {
-            return obj.id === old.id
-          }) 
-        })
-      , unassociatedObjects = newAssociations.filter(function (obj) { 
-          return !Utils._.find(oldAssociations, function (old) {
-            return obj.id === old.id
-          }) 
-        })
-
-    // clear the old associations
-    obsoleteAssociations.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = null
-      chainer.add(associatedObject.save())
-    })
-
-    // set the new associations
-    unassociatedObjects.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = self.instance.id
-      chainer.add(associatedObject.save())
-    })
-
-    chainer
-      .run()
-      .success(function() { emitter.emit('success', newAssociations) })
-      .error(function(err) { emitter.emit('error', err) })
-  }
-
-  HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    newAssociation[this.__factory.identifier] = this.instance.id
-
-    newAssociation.save()
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  return HasManySingleLinked
-})()
                                                                                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/associations/has-many.js.html b/docs/lib/associations/has-many.js.html deleted file mode 100644 index f5673f11ccfe..000000000000 --- a/docs/lib/associations/has-many.js.html +++ /dev/null @@ -1,236 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                                                                                  Utils

                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-var HasManySingleLinked = require("./has-many-single-linked")
-  , HasManyMultiLinked  = require("./has-many-double-linked")
-
-module.exports = (function() {
-  var HasMany = function(srcDAO, targetDAO, options) {
-    this.associationType = 'HasMany'
-    this.source = srcDAO
-    this.target = targetDAO
-    this.options = options
-    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
-    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
-
-    var combinedTableName = Utils.combineTableNames(
-      this.source.tableName,
-      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
-    )
-    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
-
-    var as = (this.options.as || Utils.pluralize(this.target.tableName))
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + as),
-      set: Utils._.camelize('set_' + as),
-      add: Utils._.camelize(Utils.singularize('add_' + as)),
-      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
-      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
-      hasAll: Utils._.camelize('has_' + as)
-    }
-  }
-
-  // the id is in the target table
-  // or in an extra table which connects two tables
-  HasMany.prototype.injectAttributes = function() {
-    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-
-    // is there already a single sided association between the source and the target?
-    // or is the association on the model itself?
-    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
-      // remove the obsolete association identifier from the source
-      if (this.isSelfAssociation) {
-        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
-      } else {
-        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
-        delete this.source.rawAttributes[this.foreignIdentifier]
-      }
-
-      // define a new model, which connects the models
-      var combinedTableAttributes = {}
-      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
-
-      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
-
-      if (!this.isSelfAssociation) {
-        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
-      }
-
-      if (this.options.syncOnAssociation) {
-        this.connectorDAO.sync()
-      }
-    } else {
-      var newAttributes = {}
-      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-      Utils._.defaults(this.target.rawAttributes, newAttributes)
-    }
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasMany.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(options) {
-      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-      return new Class(self, this).injectGetter(options)
-    }
-
-   obj[this.accessors.hasAll] = function(objects) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.all(objects, function(o) {
-              return Utils._.any(associatedObjects, function(associatedObject) {
-                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                  return o[identifier] == associatedObject[identifier];
-                });
-              })
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    obj[this.accessors.hasSingle] = function(o) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.any(associatedObjects, function(associatedObject) {
-              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                return o[identifier] == associatedObject[identifier];
-              });
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-    return this
-  }
-
-  HasMany.prototype.injectSetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.set] = function(newAssociatedObjects) {
-      if (newAssociatedObjects === null) {
-        newAssociatedObjects = []
-      }
-
-      var instance = this
-
-      // define the returned customEventEmitter, which will emit the success event once everything is done
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]()
-          .success(function(oldAssociatedObjects) {
-            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
-          })
-          .error(function(err) {
-            emitter.emit('error', err)
-          })
-          .on('sql', function(sql) {
-            emitter.emit('sql', sql)
-          })
-      }).run()
-    }
-
-    obj[this.accessors.add] = function(newAssociatedObject) {
-      var instance = this
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
-          .error(function(err){ emitter.emit('error', err)})
-          .success(function(currentAssociatedObjects) {
-            if (currentAssociatedObjects.length === 0) {
-              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
-            } else {
-              emitter.emit('success', newAssociatedObject);
-            }
-          })
-      }).run()
-    }
-
-    obj[this.accessors.remove] = function(oldAssociatedObject) {
-      var instance = this
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
-          var newAssociations = []
-
-          currentAssociatedObjects.forEach(function(association) {
-            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
-              newAssociations.push(association)
-          })
-
-          instance[self.accessors.set](newAssociations)
-            .success(function() { customEventEmitter.emit('success', null) })
-            .error(function(err) { customEventEmitter.emit('error', err) })
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    return this
-  }
-
-  return HasMany
-})()
                                                                                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/lib/associations/has-one.js.html b/docs/lib/associations/has-one.js.html deleted file mode 100644 index bb831a89a231..000000000000 --- a/docs/lib/associations/has-one.js.html +++ /dev/null @@ -1,139 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                      var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var HasOne = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'HasOne'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
-      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-    }
-  }
-
-  // the id is in the target table
-  HasOne.prototype.injectAttributes = function() {
-    var newAttributes = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.target.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasOne.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(params) {
-      var id    = this.id
-        , where = {}
-
-      where[self.identifier] = id
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: where}, params)
-        }
-      } else {
-        params = {where: where}
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  HasOne.prototype.injectSetter = function(obj) {
-    var self    = this
-      , options = self.options || {}
-
-    obj[this.accessors.set] = function(associatedObject) {
-      var instance = this;
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]().success(function(oldObj) {
-          if (oldObj) {
-            oldObj[self.identifier] = null
-            oldObj.save()
-          }
-
-          if (associatedObject) {
-            associatedObject[self.identifier] = instance.id
-            associatedObject
-              .save()
-              .success(function() { emitter.emit('success', associatedObject) })
-              .error(function(err) { emitter.emit('error', err) })
-          } else {
-            emitter.emit('success', null)
-          }
-
-        })
-      }).run()
-    }
-
-    return this
-  }
-
-  return HasOne
-})()
                                                                                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/associations/mixin.js.html b/docs/lib/associations/mixin.js.html deleted file mode 100644 index 6375d9c5bf22..000000000000 --- a/docs/lib/associations/mixin.js.html +++ /dev/null @@ -1,112 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                                                                                                                      Mixin

                                                                                                                                                                                                                                                                                                                                      Mixin

                                                                                                                                                                                                                                                                                                                                        Defines Mixin for all models.

                                                                                                                                                                                                                                                                                                                                        var Mixin = module.exports = function(){}
-
-Mixin.hasOne = function(associatedDAO, options) {
-  // the id is in the foreign table
-  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype);
-  association.injectSetter(this.DAO.prototype);
-
-  return this
-}
-
-Mixin.belongsTo = function(associatedDAO, options) {
-  // the id is in this table
-  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.hasMany = function(associatedDAO, options) {
-  // the id is in the foreign table or in a connecting table
-  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.getAssociation = function(target) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-console.log(target.name, association.target.name)
-      if (!result && (association.target === target)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}
-
-Mixin.getAssociationByAlias = function(alias) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-      if (!result && (association.options.as === alias)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}

                                                                                                                                                                                                                                                                                                                                          example for instance methods:
                                                                                                                                                                                                                                                                                                                                          Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                          console.log('asd')
                                                                                                                                                                                                                                                                                                                                          }

                                                                                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/dao-factory-manager.js.html b/docs/lib/dao-factory-manager.js.html deleted file mode 100644 index 575fbf8362f4..000000000000 --- a/docs/lib/dao-factory-manager.js.html +++ /dev/null @@ -1,80 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                                                                                          property

                                                                                                                                                                                                                                                                                                                                          exports

                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                            module.exports = (function() {
-  var DAOFactoryManager = function(sequelize) {
-    this.daos = []
-    this.sequelize = sequelize
-  }
-
-  DAOFactoryManager.prototype.addDAO = function(dao) {
-    this.daos.push(dao)
-
-    return dao
-  }
-
-  DAOFactoryManager.prototype.removeDAO = function(dao) {
-    this.daos = this.daos.filter(function(_dao) {
-      return _dao.name != dao.name
-    })
-  }
-
-  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
-    options = options || {}
-    options.attribute = options.attribute || 'name'
-
-    var dao = this.daos.filter(function(dao) {
-      return dao[options.attribute] === daoName
-    })
-
-    return !!dao ? dao[0] : null
-  }
-
-  DAOFactoryManager.prototype.__defineGetter__('all', function() {
-    return this.daos
-  })
-
-  return DAOFactoryManager
-})()
                                                                                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/dao-factory.js.html b/docs/lib/dao-factory.js.html deleted file mode 100644 index 5c1b38fae016..000000000000 --- a/docs/lib/dao-factory.js.html +++ /dev/null @@ -1,300 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                                              ptions.include =

                                                                                                                                                                                                                                                                                                                                              includes.map(function(include) {
-        console.log(include instanceof DAOFactory)
-      })
-
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
-
-        if (!options.include[daoName]) {
-          options.include[daoName] = this.getAssociationByAlias(daoName).target
-        }
-      }.bind(this))
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      type:    'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  //right now, the caller (has-many-double-linked) is in charge of the where clause
-  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
-    var optcpy = Utils._.clone(options)
-    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
-
-    // whereCollection is used for non-primary key updates
-    this.options.whereCollection = optcpy.where || null;
-
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
-  }
                                                                                                                                                                                                                                                                                                                                              method

                                                                                                                                                                                                                                                                                                                                              find

                                                                                                                                                                                                                                                                                                                                              DAOFactory.prototype.find()
                                                                                                                                                                                                                                                                                                                                              • @param: {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                                                                                                              • @: @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
                                                                                                                                                                                                                                                                                                                                              • @return: {Object} A promise which fires `success`, `error`, `complete` and `sql`.

                                                                                                                                                                                                                                                                                                                                              Search for an instance.

                                                                                                                                                                                                                                                                                                                                              DAOFactory.prototype.find = function(options) {
-    var hasJoin = false
-
-    // no options defined?
-    // return an emitter which emits null
-    if ([null, undefined].indexOf(options) !== -1) {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        setTimeout(function() { emitter.emit('success', null) }, 10)
-      }).run()
-    }
-
-    var primaryKeys = this.primaryKeys
-
-    // options is not a hash but an id
-    if (typeof options === 'number') {
-      options = { where: options }
-    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-      var where = {}
-        , self  = this
-        , keys = Object.keys(primaryKeys)
-
-      Utils._.each(arguments, function(arg, i) {
-        var key = keys[i]
-        where[key] = arg
-      })
-
-      options = { where: where }
-    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
-      var parsedId = parseInt(options, 10)
-
-      if (!Utils._.isFinite(parsedId)) {
-        throw new Error('Invalid argument to find(). Must be an id or an options object.')
-      }
-
-      options = { where: parsedId }
-    } else if (typeof options === 'object') {
-      var includes = null
-
-      options = Utils._.clone(options)
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          if (include instanceof DAOFactory) {
-            include = { daoFactory: include, as: include.tableName }
-          }
-
-          if (typeof include === 'object') {
-            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
-              var usesAlias = include.as !== include.tableName
-
-              // check if the current daoFactory is actually associated with the passed daoFactory
-              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
-                return include
-              } else {
-                var msg = include.daoFactory.name
-
-                if (usesAlias) {
-                  msg += " (" + include.as + ")"
-                }
-
-                msg += " is not associated to " + this.name + "!"
-
-                throw new Error(msg)
-              }
-            } else {
-              throw new Error('Include malformed. Expected attributes: daoFactory, as')
-            }
-          } else {
-            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
-          }
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    options.limit = 1
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      plain: true,
-      type: 'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  DAOFactory.prototype.count = function(options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['count(*)', 'count'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
-  }
-
-  DAOFactory.prototype.max = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['max(' + field + ')', 'max'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
-  }
-  DAOFactory.prototype.min = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['min(' + field + ')', 'min'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
-  }
-
-  DAOFactory.prototype.build = function(values, options) {
-    options = options || {isNewRecord: true}
-
-    var self     = this
-      , instance = new this.DAO(values, this.options, options.isNewRecord)
-
-    instance.isNewRecord = options.isNewRecord
-
-    return instance
-  }
-
-  DAOFactory.prototype.create = function(values, fields) {
-    return this.build(values).save(fields)
-  }
-
-  DAOFactory.prototype.findOrCreate = function (params, defaults) {
-    var self = this;
-
-    return new Utils.CustomEventEmitter(function (emitter) {
-      self.find({
-        where: params
-      }).success(function (instance) {
-        if (instance === null) {
-          for (var attrname in defaults) {
-            params[attrname] = defaults[attrname];
-          }
-
-          self.create(params)
-	    .success(function (instance) {
-              emitter.emit('success', instance)
-            })
-	    .error( function (error) {
-              emitter.emit('error', error)
-            });
-        } else {
-          emitter.emit('success', instance)
-        }
-      }).error(function (error) {
-        emitter.emit('error', error)
-      });
-    }).run()
-  }
-
-  // private
-
-  var query = function() {
-    var args      = Utils._.map(arguments, function(arg, _) { return arg })
-      , sequelize = this.daoFactoryManager.sequelize
-
-    // add this as the second argument
-    if (arguments.length === 1) {
-      args.push(this)
-    }
-
-    // add {} as options
-    if (args.length === 2) {
-      args.push({})
-    }
-
-    return sequelize.query.apply(sequelize, args)
-  }
-
-  var addOptionalClassMethods = function() {
-    var self = this
-    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
-  }
-
-  var addDefaultAttributes = function() {
-    var self              = this
-      , defaultAttributes = {
-        id: {
-          type: DataTypes.INTEGER,
-          allowNull: false,
-          primaryKey: true,
-          autoIncrement: true
-        }
-      }
-
-    if (this.hasPrimaryKeys) {
-      defaultAttributes = {}
-    }
-
-    if (this.options.timestamps) {
-      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-
-      if (this.options.paranoid)
-        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
-    }
-
-    Utils._.each(defaultAttributes, function(value, attr) {
-      self.rawAttributes[attr] = value
-    })
-  }
-
-  var findAutoIncrementField = function() {
-    var fields = this.QueryGenerator.findAutoIncrementField(this)
-
-    this.autoIncrementField = null
-
-    fields.forEach(function(field) {
-      if (this.autoIncrementField) {
-        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      } else {
-        this.autoIncrementField = field
-      }
-    }.bind(this))
-  }
-
-  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
-
-  return DAOFactory
-})()
                                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/dao.js.html b/docs/lib/dao.js.html deleted file mode 100644 index d1ad7b8131b0..000000000000 --- a/docs/lib/dao.js.html +++ /dev/null @@ -1,210 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                              method

                                                                                                                                                                                                                                                                                                                                              validate

                                                                                                                                                                                                                                                                                                                                              DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                              • @return: {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.

                                                                                                                                                                                                                                                                                                                                              Validate this dao's attribute values according to validation rules set in the dao definition.

                                                                                                                                                                                                                                                                                                                                              DAO.prototype.validate = function() {
-    var self = this
-    var failures = {}
-
-    // for each field and value
-    Utils._.each(self.values, function(value, field) {
-
-      // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
-        // for each validator
-        Utils._.each(self.validators[field], function(details, validatorType) {
-
-          var is_custom_fn = false  // if true then it's a custom validation method
-          var fn_method = null      // the validation function to call
-          var fn_args = []          // extra arguments to pass to validation function
-          var fn_msg = ""           // the error message to return if validation fails
-
-          // is it a custom validator function?
-          if (Utils._.isFunction(details)) {
-            is_custom_fn = true
-            fn_method = Utils._.bind(details, self, value)
-          }
-          // is it a validator module function?
-          else {
-            // extra args
-            fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Array.isArray(fn_args))
-              fn_args = [fn_args]
-            // error msg
-            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
-            // check method exists
-            var v = Validator.check(value, fn_msg)
-            if (!Utils._.isFunction(v[validatorType]))
-              throw new Error("Invalid validator function: " + validatorType)
-            // bind to validator obj
-            fn_method = Utils._.bind(v[validatorType], v)
-          }
-
-          try {
-            fn_method.apply(null, fn_args)
-          } catch (err) {
-            err = err.message
-            // if we didn't provide a custom error message then augment the default one returned by the validator
-            if (!fn_msg && !is_custom_fn)
-              err += ": " + field
-            // each field can have multiple validation failures stored against it
-            if (failures.hasOwnProperty(field)) {
-              failures[field].push(err)
-            } else {
-              failures[field] = [err]
-            }
-          }
-
-        }) // for each validator for this field
-      } // if field has validator set
-    }) // for each field
-
-    return (Utils._.isEmpty(failures) ? null : failures)
-  }
-
-
-  DAO.prototype.updateAttributes = function(updates, fields) {
-    this.setAttributes(updates)
-    return this.save(fields)
-  }
-
-  DAO.prototype.setAttributes = function(updates) {
-    var self = this
-
-    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
-
-    readOnlyAttributes.push('id')
-    readOnlyAttributes.push('createdAt')
-    readOnlyAttributes.push('updatedAt')
-    readOnlyAttributes.push('deletedAt')
-
-    Utils._.each(updates, function(value, attr) {
-      var updateAllowed = (
-        (readOnlyAttributes.indexOf(attr) == -1) &&
-        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
-        (self.attributes.indexOf(attr) > -1)
-      )
-      updateAllowed && (self[attr] = value)
-    })
-  }
-
-  DAO.prototype.destroy = function() {
-    if (this.__options.timestamps && this.__options.paranoid) {
-      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
-      this[attr] = new Date()
-      return this.save()
-    } else {
-      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
-    }
-  }
-
-  DAO.prototype.equals = function(other) {
-    var result = true
-      , self   = this
-
-    Utils._.each(this.values, function(value, key) {
-      result = result && (value == other[key])
-    })
-
-    return result
-  }
-
-  DAO.prototype.equalsOneOf = function(others) {
-    var result = false
-      , self   = this
-
-    others.forEach(function(other) { result = result || self.equals(other) })
-
-    return result
-  }
-
-  DAO.prototype.addAttribute = function(attribute, value) {
-    this[attribute] = value
-  }
-
-  DAO.prototype.setValidators = function(attribute, validators) {
-    this.validators[attribute] = validators
-  }
-
-  DAO.prototype.toJSON = function() {
-    return this.values;
-  }
-
-  // private
-
-  var initAttributes = function(values, isNewRecord) {
-    // add all passed values to the dao and store the attribute names in this.attributes
-    for (var key in values) {
-      if (values.hasOwnProperty(key)) {
-        this.addAttribute(key, values[key])
-      }
-    }
-
-    // set id to null if not passed as value
-    // a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
-
-    if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
-
-      if (this.__options.paranoid) {
-        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
-      }
-    }
-
-    if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        var value = defaults[attr]
-
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
-        }
-      }
-    }
-  }
-
-  return DAO
-})()
                                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/data-types.js.html b/docs/lib/data-types.js.html deleted file mode 100644 index 2c8836782536..000000000000 --- a/docs/lib/data-types.js.html +++ /dev/null @@ -1,56 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                              property

                                                                                                                                                                                                                                                                                                                                              exports

                                                                                                                                                                                                                                                                                                                                              module.exports
                                                                                                                                                                                                                                                                                                                                                module.exports = {
-  STRING: 'VARCHAR(255)',
-  TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
-  DATE: 'DATETIME',
-  BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
-  NOW: 'NOW',
-  ENUM: 'ENUM'
-}
                                                                                                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/dialects/abstract/query.js.html b/docs/lib/dialects/abstract/query.js.html deleted file mode 100644 index 0d59cc648345..000000000000 --- a/docs/lib/dialects/abstract/query.js.html +++ /dev/null @@ -1,370 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                                                                                                  Inherit from CustomEventEmitter

                                                                                                                                                                                                                                                                                                                                                  Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                  method

                                                                                                                                                                                                                                                                                                                                                  run

                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                  • @param: {String} sql - The SQL query which should be executed.

                                                                                                                                                                                                                                                                                                                                                  Execute the passed sql query.

                                                                                                                                                                                                                                                                                                                                                  - -

                                                                                                                                                                                                                                                                                                                                                  Examples

                                                                                                                                                                                                                                                                                                                                                  - -
                                                                                                                                                                                                                                                                                                                                                  query.run('SELECT 1')
-
                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run = function(sql) {
-    throw new Error("The run method wasn't overwritten!")
-  }
                                                                                                                                                                                                                                                                                                                                                  method

                                                                                                                                                                                                                                                                                                                                                  checkLoggingOption

                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption()
                                                                                                                                                                                                                                                                                                                                                  • @return: {void}

                                                                                                                                                                                                                                                                                                                                                  Check the logging option of the instance and print deprecation warnings.

                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption = function() {
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging === console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
                                                                                                                                                                                                                                                                                                                                                  method

                                                                                                                                                                                                                                                                                                                                                  formatResults

                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                  • @param: {Array} data - The result of the query execution.

                                                                                                                                                                                                                                                                                                                                                  High level function that handles the results of a query execution.

                                                                                                                                                                                                                                                                                                                                                  - -

                                                                                                                                                                                                                                                                                                                                                  Example

                                                                                                                                                                                                                                                                                                                                                  - -

                                                                                                                                                                                                                                                                                                                                                  query.formatResults([
                                                                                                                                                                                                                                                                                                                                                  {
                                                                                                                                                                                                                                                                                                                                                  id: 1, // this is from the main table
                                                                                                                                                                                                                                                                                                                                                  attr2: 'snafu', // this is from the main table
                                                                                                                                                                                                                                                                                                                                                  Tasks.id: 1, // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                  Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                  }
                                                                                                                                                                                                                                                                                                                                                  ])

                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults = function(data) {
-    var result  = this.callee
-
-    if (isInsertQuery.call(this, data)) {
-      handleInsertQuery.call(this, data)
-    }
-
-    if (isSelectQuery.call(this)) {
-      result = handleSelectQuery.call(this, data)
-    } else if (isShowTableQuery.call(this)) {
-      result = handleShowTableQuery.call(this, data)
-    } else if (isShowOrDescribeQuery.call(this)) {
-      result = data
-    } else if (isCallQuery.call(this)) {
-      result = data[0]
-    }
-
-    return result
-  }

                                                                                                                                                                                                                                                                                                                                                    Shortcut methods (success, ok) for listening for success events.

                                                                                                                                                                                                                                                                                                                                                    - -
                                                                                                                                                                                                                                                                                                                                                    Params:
-  - fct: A function that gets executed once the *success* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                                                                                                                    AbstractQuery.prototype.success =
-  AbstractQuery.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }

                                                                                                                                                                                                                                                                                                                                                      Shortcut methods (failure, fail, error) for listening for error events.

                                                                                                                                                                                                                                                                                                                                                      - -
                                                                                                                                                                                                                                                                                                                                                      Params:
-  - fct: A function that gets executed once the *error* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.failure =
-  AbstractQuery.prototype.fail =
-  AbstractQuery.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
                                                                                                                                                                                                                                                                                                                                                      method

                                                                                                                                                                                                                                                                                                                                                      send

                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send()
                                                                                                                                                                                                                                                                                                                                                      • @param: {String} fctName The name of the private method.

                                                                                                                                                                                                                                                                                                                                                      This function is a wrapper for private methods.

                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send = function(fctName

                                                                                                                                                                                                                                                                                                                                                        arg1, arg2, arg3, ...

                                                                                                                                                                                                                                                                                                                                                        {
-    var args = Array.prototype.slice.call(arguments).slice(1)
-    return eval(fctName).apply(this, args)
-  }
                                                                                                                                                                                                                                                                                                                                                        method

                                                                                                                                                                                                                                                                                                                                                        getInsertIdField

                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField()
                                                                                                                                                                                                                                                                                                                                                        • @return: {String} The field name.

                                                                                                                                                                                                                                                                                                                                                        Get the attributes of an insert query, which contains the just inserted id.

                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField = function() {
-    return 'insertId'
-  }
-
-  /////////////
-  // private //
-  /////////////
                                                                                                                                                                                                                                                                                                                                                        function

                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute

                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute()
                                                                                                                                                                                                                                                                                                                                                        • @param: {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                                                                                                                        • @return: {String} The found tableName / alias.

                                                                                                                                                                                                                                                                                                                                                        Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                                                                                                                        This method will also check association aliases ('as' option).

                                                                                                                                                                                                                                                                                                                                                        var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
-
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
-    })
-
-    return tableName
-  }
-
-  var queryResultHasJoin = function(results) {
-    if (!!results[0]) {
-      var keys = Object.keys(results[0])
-
-      for (var i = 0; i < keys.length; i++) {
-        if (!!findTableNameInAttribute.call(this, keys[i])) {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
-  var isInsertQuery = function(results, metaData) {
-    var result = true
-
-    // is insert query if sql contains insert into
-    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
-
-    // is insert query if no results are passed or if the result has the inserted id
-    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
-
-    // is insert query if no metadata are passed or if the metadata has the inserted id
-    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
-
-    return result
-  }
-
-  var handleInsertQuery = function(results, metaData) {
-    if (this.callee) {
-      // add the inserted row id to the instance
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-        , id                 = null
-
-      id = id || (results && results[this.getInsertIdField()])
-      id = id || (metaData && metaData[this.getInsertIdField()])
-
-      this.callee[autoIncrementField] = id
-    }
-  }
-
-  var isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0)
-  }
-
-  var handleShowTableQuery = function(results) {
-    return Utils._.flatten(results.map(function(resultSet) {
-      return Utils._.values(resultSet)
-    }))
-  }
-
-  var isSelectQuery = function() {
-    return this.options.type === 'SELECT';
-  }
-
-  var isUpdateQuery = function() {
-    return (this.sql.toLowerCase().indexOf('update') === 0)
-  }
-
-  var handleSelectQuery = function(results) {
-    var result = null, self = this;
-
-    if (this.options.raw) {
-      result = results
-    } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
-    } else {
-      result = results.map(function(result) {
-        return this.callee.build(result, { isNewRecord: false })
-      }.bind(this))
-    }
-
-    // return the first real model instance if options.plain is set (e.g. Model.find)
-    if (this.options.plain) {
-      result = (result.length === 0) ? null : result[0]
-    }
-
-    return result
-  }
-
-  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association          = null
-
-    if (!!associatedDaoFactory) {
-      association = this.callee.getAssociation(associatedDaoFactory)
-    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
-
-      if (!!associatedDaoFactory) {
-        association = this.callee.getAssociation(associatedDaoFactory)
-      } else {
-        association          = this.callee.getAssociationByAlias(tableName)
-        associatedDaoFactory = association.target
-      }
-    }
-
-    var accessor = Utils._.camelize(tableName)
-
-    // downcase the first char
-    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
-
-    associationData.forEach(function(data) {
-      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
-
-      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
-        dao[accessor] = isEmpty ? null : daoInstance
-      } else {
-        dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
-          dao[accessor].push(daoInstance)
-      }
-    })
-  }
-
-  var isShowOrDescribeQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
-    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
-
-    return  result
-  }
-
-  var isCallQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
-
-    return result
-  }
                                                                                                                                                                                                                                                                                                                                                        function

                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory

                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory()

                                                                                                                                                                                                                                                                                                                                                          The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                          the associated data by the callee.

                                                                                                                                                                                                                                                                                                                                                          - -
                                                                                                                                                                                                                                                                                                                                                          Example:
-  groupDataByCalleeFactory([
-    {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 1 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 2 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 3 }
-    }
-  ])
-
-Result:
-  Something like this:
-
-  [
-    {
-      callee:  { some: 'data', id: 1 },
-      association: [
-        { foo: 'bar', id: 1 },
-        { foo: 'bar', id: 2 },
-        { foo: 'bar', id: 3 }
-      ]
-    }
-  ]
-
                                                                                                                                                                                                                                                                                                                                                          var groupDataByCalleeFactory = function(data) {
-    var result          = []
-      , calleeTableName = this.callee.tableName
-
-    data.forEach(function(row) {
-      var calleeData    = row[calleeTableName]
-        , existingEntry = result.filter(function(groupedRow) {
-            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
-          })[0]
-
-      if (!existingEntry) {
-        existingEntry = {}
-        result.push(existingEntry)
-        existingEntry[calleeTableName] = calleeData
-      }
-
-      for (var attrName in row) {
-        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
-          existingEntry[attrName] = existingEntry[attrName] || []
-          existingEntry[attrName].push(row[attrName])
-        }
-      }
-    })
-
-    return result
-  }
                                                                                                                                                                                                                                                                                                                                                          function

                                                                                                                                                                                                                                                                                                                                                          prepareJoinData

                                                                                                                                                                                                                                                                                                                                                          prepareJoinData()
                                                                                                                                                                                                                                                                                                                                                          • @param: {Array} data This array contains objects.
                                                                                                                                                                                                                                                                                                                                                          • @return: {Array} The array will have the needed format for groupDataByCalleeFactory.

                                                                                                                                                                                                                                                                                                                                                          This function will prepare the result of select queries with joins.

                                                                                                                                                                                                                                                                                                                                                          var prepareJoinData = function(data) {
-    var result = data.map(function(row) {
-      var nestedRow = {}
-
-      for (var key in row) {
-        if (row.hasOwnProperty(key)) {
-          var tableName = findTableNameInAttribute.call(this, key)
-
-          if (!!tableName) {
-            nestedRow[tableName] = nestedRow[tableName] || {}
-            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
-          } else {
-            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
-            nestedRow[this.callee.tableName][key] = row[key]
-          }
-        }
-      }
-
-      return nestedRow
-    }.bind(this))
-
-    return result
-  }
-
-  return AbstractQuery
-})()
                                                                                                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/dialects/connector-manager.js.html b/docs/lib/dialects/connector-manager.js.html deleted file mode 100644 index f4df4ed4c7c7..000000000000 --- a/docs/lib/dialects/connector-manager.js.html +++ /dev/null @@ -1,69 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                                                                                                          property

                                                                                                                                                                                                                                                                                                                                                          exports

                                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                                            module.exports = (function(){
-  var ConnectorManager = function(sequelize, config) {
-    throw new Error('Define the constructor!')
-  }
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    throw new Error('Define the query method!')
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    throw new Error('Define the connect method!')
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    throw new Error('Define the disconnect method!')
-  }
-
-  ConnectorManager.prototype.reconnect = function() {
-    this.disconnect()
-    this.connect()
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/dialects/mysql/connector-manager.js.html b/docs/lib/dialects/mysql/connector-manager.js.html deleted file mode 100644 index d2c59be8c783..000000000000 --- a/docs/lib/dialects/mysql/connector-manager.js.html +++ /dev/null @@ -1,379 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                                                            declaration

                                                                                                                                                                                                                                                                                                                                                            mysql

                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                              var mysql   = require("mysql")
-  , Pooling = require('generic-pool')
-  , Query   = require("./query")
-  , Utils   = require("../../utils")
-  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client = null
-    this.config = config || {}
-    this.disconnectTimeoutId = null
-    this.queue = []
-    this.activeQueue = []
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-    this.poolCfg = Utils._.defaults(this.config.pool, {
-      maxConnections: 10,
-      minConnections: 0,
-      maxIdleTime: 1000
-    });
-    this.pendingQueries = 0;
-    this.useReplicaton = !!config.replication;
-    this.useQueue = config.queue !== undefined ? config.queue : true;
-
-    var self = this
-
-    if (this.useReplicaton) {
-      var reads = 0,
-        writes = 0;
-
-      // Init configs with options from config if not present
-      for (var i in config.replication.read) {
-        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
-          host: this.config.host,
-          port: this.config.port,
-          username: this.config.username,
-          password: this.config.password,
-          database: this.config.database
-        });
-      }
-      config.replication.write = Utils._.defaults(config.replication.write, {
-        host: this.config.host,
-        port: this.config.port,
-        username: this.config.username,
-        password: this.config.password,
-        database: this.config.database
-      });
-
-      // I'll make my own pool, with blackjack and hookers!
-      this.pool = {
-        release: function (client) {
-          if (client.queryType == 'read') {
-            return this.read.release(client);
-          } else {
-            return this.write.release(client);
-          }
-        },
-        acquire: function (callback, priority, queryType) {
-          if (queryType == 'SELECT') {
-            this.read.acquire(callback, priority);
-          } else {
-            this.write.acquire(callback, priority);
-          }
-        },
-        drain: function () {
-          this.read.drain();
-          this.write.drain();
-        },
-        read: Pooling.Pool({
-          name: 'sequelize-read',
-          create: function (done) {
-            if (reads >= self.config.replication.read.length) reads = 0;
-            var config = self.config.replication.read[reads++];
-
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'read'
-              done(null, connection)
-            }, config);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        }),
-        write: Pooling.Pool({
-          name: 'sequelize-write',
-          create: function (done) {
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'write'
-              done(null, connection)
-            }, self.config.replication.write);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        })
-      };
-    } else if (this.poolCfg) {
-      //the user has requested pooling, so create our connection pool
-      this.pool = Pooling.Pool({
-        name: 'sequelize-mysql',
-        create: function (done) {
-          connect.call(self, done)
-        },
-        destroy: function(client) {
-          disconnect.call(self, client)
-        },
-        max: self.poolCfg.maxConnections,
-        min: self.poolCfg.minConnections,
-        idleTimeoutMillis: self.poolCfg.maxIdleTime
-      })
-    }
-
-    process.on('exit', function () {
-      //be nice & close our connections on exit
-      if (self.pool) {
-        self.pool.drain()
-      } else if (self.client) {
-        disconnect(self.client)
-      }
-
-      return
-    })
-  }
-
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
-
-  var isConnecting = false;
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    if (!this.isConnected && !this.pool) {
-      this.connect()
-    }
-
-    if (this.useQueue) {
-      var queueItem = {
-        query: new Query(this.client, this.sequelize, callee, options || {}),
-        sql: sql
-      };
-
-      enqueue.call(this, queueItem, options);
-      return queueItem.query;
-    }
-
-    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
-    this.pendingQueries++;
-
-    query.done(function() {
-      self.pendingQueries--;
-      if (self.pool) self.pool.release(query.client);
-      else {
-        if (self.pendingQueries === 0) {
-          setTimeout(function() {
-            self.pendingQueries === 0 && self.disconnect.call(self);
-          }, 100);
-        }
-      }
-    });
-
-    if (!this.pool) {
-      query.run(sql);
-    }
-
-    else {
-      this.pool.acquire(function(err, client) {
-        if (err) return query.emit('error', err);
-
-        query.client = client;
-        query.run(sql);
-        return;
-      }, undefined, options.type);
-    }
-
-    return query;
-  };
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this;
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting || this.pool) {
-      return;
-    }
-    connect.call(self, function(err, client) {
-      self.client = client;
-      return;
-    });
-    return;
-  };
-
-  ConnectorManager.prototype.disconnect = function() {
-    if (this.client) disconnect.call(this, this.client);
-    return;
-  };
-
-
-  // private
-
-  var disconnect = function(client) {
-    var self = this;
-    if (!this.useQueue) {
-      this.client = null;
-    }
-
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
-      }
-
-      var intervalObj = null
-      var cleanup = function () {
-        var retryCt = 0
-        // make sure to let client finish before calling destroy
-        if (self && self.hasQueuedItems) {
-          return
-        }
-        // needed to prevent mysql connection leak
-        client.destroy()
-        if (self && self.client) {
-          self.client = null
-        }
-        clearInterval(intervalObj)
-      }
-      intervalObj = setInterval(cleanup, 10)
-      cleanup()
-      return
-    })
-  }
-
-  var connect = function(done, config) {
-    config = config || this.config
-    var connection = mysql.createConnection({
-      host: config.host,
-      port: config.port,
-      user: config.username,
-      password: config.password,
-      database: config.database
-    })
-    // client.setMaxListeners(self.maxConcurrentQueries)
-    this.isConnecting = false
-
-    done(null, connection)
-  }
-
-  var enqueue = function(queueItem, options) {
-    options = options || {}
-    if (this.activeQueue.length < this.maxConcurrentQueries) {
-      this.activeQueue.push(queueItem)
-      if (this.pool) {
-        var self = this
-        this.pool.acquire(function(err, client) {
-          if (err) {
-            queueItem.query.emit('error', err)
-            return
-          }
-          //we set the client here, asynchronously, when getting a pooled connection
-          //allowing the ConnectorManager.query method to remain synchronous
-          queueItem.query.client = client
-          queueItem.client = client
-          execQueueItem.call(self, queueItem)
-          return
-        }, undefined, options.type)
-      } else {
-        execQueueItem.call(this, queueItem)
-      }
-    } else {
-      this.queue.push(queueItem)
-    }
-  }
-
-  var dequeue = function(queueItem) {
-    //return the item's connection to the pool
-    if (this.pool) {
-      this.pool.release(queueItem.client)
-    }
-    this.activeQueue = without(this.activeQueue, queueItem)
-  }
-
-  var transferQueuedItems = function(count) {
-    for(var i = 0; i < count; i++) {
-      var queueItem = this.queue.shift();
-      if (queueItem) {
-        enqueue.call(this, queueItem)
-      }
-    }
-  }
-
-  var afterQuery = function(queueItem) {
-    var self = this
-
-    dequeue.call(this, queueItem)
-    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
-    disconnectIfNoConnections.call(this)
-  }
-
-
-  var execQueueItem = function(queueItem) {
-    var self = this
-
-    queueItem.query
-      .success(function(){ afterQuery.call(self, queueItem) })
-      .error(function(){ afterQuery.call(self, queueItem) })
-
-    queueItem.query.run(queueItem.sql, queueItem.client)
-  }
-
-  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
-    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
-  })
-
-  // legacy
-  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
-    return !this.hasQueuedItems
-  })
-
-  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
-    return this.client != null
-  })
-
-  var disconnectIfNoConnections = function() {
-    var self = this
-
-    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
-    this.disconnectTimeoutId = setTimeout(function() {
-      self.isConnected && !self.hasQueuedItems && self.disconnect()
-    }, 100)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/dialects/mysql/query-generator.js.html b/docs/lib/dialects/mysql/query-generator.js.html deleted file mode 100644 index 37a073b4bafd..000000000000 --- a/docs/lib/dialects/mysql/query-generator.js.html +++ /dev/null @@ -1,483 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                                              declaration

                                                                                                                                                                                                                                                                                                                                                              Utils

                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("../../utils")
-  , DataTypes = require("../../data-types")
-  , util      = require("util")
-
-module.exports = (function() {
-  var QueryGenerator = {
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-        engine: 'InnoDB',
-        charset: null
-      }, options || {})
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
-        , primaryKeys = []
-        , attrStr = []
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        engine: options.engine,
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-
-      return Utils._.template(query)({table: Utils.addTicks(tableName)})
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
-      return Utils._.template(query)({ before: before, after: after })
-    },
-
-    showTablesQuery: function() {
-      return 'SHOW TABLES;'
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
-      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
-          before: attrBefore,
-          after: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr){
-        if(Array.isArray(attr) && attr.length == 2) {
-          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
-        } else {
-          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = Utils.addTicks(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
-              query += Utils.addTicks(foreignIdentifier) + '='
-              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(dao.tableName) + '.'
-              query += Utils.addTicks('id') + '='
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += Utils.addTicks(association.identifier) + '='
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, Utils.addTicks(attr)].join('.') +
-                  ' AS ' +
-                  Utils.addTicks([aliasName, attr].join('.'))
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if (options.where) {
-        options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
-      }
-
-      if (options.group) {
-        options.group = Utils.addTicks(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
-
-      if (options.limit && !(options.include && (options.limit === 1))) {
-        if (options.offset) {
-          query += " LIMIT <%= offset %>, <%= limit %>"
-        } else {
-          query += " LIMIT <%= limit %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
-
-        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if(typeof attribute === 'string') {
-          return attribute
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += attribute.attribute
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === 'string') ? attribute : attribute.attribute
-      })
-
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", options.indexName,
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
-        (options.parser ? "WITH PARSER " + options.parser : undefined)
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
-      return Utils._.template(sql)({
-        tableName: tableName,
-        options: (options || {}).database ? ' FROM ' + options.database : ''
-      })
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== 'string') {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
-    },
-
-    getWhereConditions: function(smth, tableName) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === 'number') {
-        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === "string") {
-        result = smth
-      } else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-         //handle qualified key names
-        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          // is value an array?
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return Utils.escape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        } else if ((value) && (typeof value == 'object')) {
-          // is value an object?
-
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = Utils.escape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(" AND ")
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template += " auto_increment"
-          }
-
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('auto_increment') > -1)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/dialects/mysql/query.js.html b/docs/lib/dialects/mysql/query.js.html deleted file mode 100644 index 887013c4c7fd..000000000000 --- a/docs/lib/dialects/mysql/query.js.html +++ /dev/null @@ -1,84 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                                                                                                                                                Utils

                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                  var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client    = client
-    this.callee    = callee
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-
-  Utils.inherit(Query, AbstractQuery)
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    this.client.query(this.sql, function(err, results, fields) {
-      this.emit('sql', this.sql)
-
-      if (err) {
-        this.emit('error', err, this.callee)
-      } else {
-        this.emit('success', this.formatResults(results))
-      }
-    }.bind(this)).setMaxListeners(100)
-    return this
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/dialects/postgres/connector-manager.js.html b/docs/lib/dialects/postgres/connector-manager.js.html deleted file mode 100644 index 34fdeea94af3..000000000000 --- a/docs/lib/dialects/postgres/connector-manager.js.html +++ /dev/null @@ -1,146 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                                                                                                                  Query

                                                                                                                                                                                                                                                                                                                                                                  Query
                                                                                                                                                                                                                                                                                                                                                                    var Query   = require("./query")
-  , Utils   = require("../../utils")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client    = null
-    this.config    = config || {}
-    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
-    this.pg        = this.config.native ? require('pg').native : require('pg')
-
-    // set pooling parameters if specified
-    if (this.pooling) {
-      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
-      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
-    }
-
-    this.disconnectTimeoutId = null
-    this.pendingQueries = 0
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  var isConnecting = false
-  var isConnected  = false
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    var self = this
-    if (this.client == null) {
-      this.connect()
-    }
-
-    var query = new Query(this.client, this.sequelize, callee, options || {})
-    self.pendingQueries += 1
-    return query.run(sql)
-      .success(function() { self.endQuery.call(self) })
-      .error(function() { self.endQuery.call(self) })
-  }
-
-  ConnectorManager.prototype.endQuery = function() {
-    var self = this
-    self.pendingQueries -= 1
-    if (self.pendingQueries == 0) {
-      setTimeout(function() {
-        self.pendingQueries == 0 && self.disconnect.call(self)
-      }, 100)
-    }
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this
-    var emitter = new (require('events').EventEmitter)()
-
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting) {
-      return
-    }
-
-    this.isConnecting = true
-    this.isConnected  = false
-
-    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
-
-    var connectCallback = function(err, client) {
-      self.isConnecting = false
-
-      if (!!err) {
-        emitter.emit('error', err)
-      } else if (client) {
-        client.query("SET TIME ZONE 'UTC'")
-          .on('end', function() {
-            self.isConnected = true
-            this.client = client
-          });
-      } else {
-        this.client = null
-      }
-    }
-
-    if (this.pooling) {
-      // acquire client from pool
-      this.pg.connect(uri, connectCallback)
-    } else {
-      //create one-off client
-      this.client = new this.pg.Client(uri)
-      this.client.connect(connectCallback)
-    }
-
-    return emitter
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    var self = this
-    if (this.client) this.client.end()
-    this.client = null
-    this.isConnecting = false
-    this.isConnected  = false
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/lib/dialects/postgres/query-generator.js.html b/docs/lib/dialects/postgres/query-generator.js.html deleted file mode 100644 index 9fa2f4993154..000000000000 --- a/docs/lib/dialects/postgres/query-generator.js.html +++ /dev/null @@ -1,624 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                                                                                                                    Utils

                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                      var Utils = require("../../utils")
-  , util  = require("util")
-  , DataTypes = require("../../data-types")
-  , tables = {}
-  , primaryKeys = {};
-
-function removeQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return s.replace(new RegExp(quoteChar, 'g'), '')
-}
-
-function addQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return removeQuotes(s, quoteChar)
-    .split('.')
-    .map(function(e) { return quoteChar + String(e) + quoteChar })
-    .join('.')
-}
-
-function pgEscape(val) {
-  if (val === undefined || val === null) {
-    return 'NULL';
-  }
-
-  switch (typeof val) {
-    case 'boolean': return (val) ? 'true' : 'false';
-    case 'number': return val+'';
-  }
-
-  if (val instanceof Date) {
-    val = pgSqlDate(val);
-  }
-
-  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-  val = val.replace(/'/g, "''");
-  return "'"+val+"'";
-}
-
-function pgEscapeAndQuote(val) {
-  return addQuotes(removeQuotes(pgEscape(val), "'"))
-}
-
-function pgEnum(tableName, attr, dataType) {
-  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
-  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
-}
-
-function padInt(i) {
-  return (i < 10) ? '0' + i.toString() : i.toString()
-}
-function pgSqlDate(dt) {
-  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
-  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
-  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
-}
-
-function pgDataTypeMapping(tableName, attr, dataType) {
-  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-    primaryKeys[tableName].push(attr)
-    dataType = dataType.replace(/PRIMARY KEY/, '')
-  }
-
-  if (Utils._.includes(dataType, 'TINYINT(1)')) {
-    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
-  }
-
-  if (Utils._.includes(dataType, 'DATETIME')) {
-    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
-  }
-
-  if (Utils._.includes(dataType, 'SERIAL')) {
-    dataType = dataType.replace(/INTEGER/, '')
-    dataType = dataType.replace(/NOT NULL/, '')
-    tables[tableName][attr] = 'serial'
-  }
-
-  if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
-  }
-
-  return dataType
-}
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-      }, options || {})
-
-      primaryKeys[tableName] = []
-      tables[tableName] = {}
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , attrStr = []
-
-      for (var attr in attributes) {
-        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
-        attrStr.push(addQuotes(attr) + " " + dataType)
-
-        if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr]) + query;
-        }
-      }
-
-      var values  = {
-        table: addQuotes(tableName),
-        attributes: attrStr.join(", "),
-      }
-
-      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
-      if (pks.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pks + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-      return Utils._.template(query)({ table: addQuotes(tableName) })
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
-      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
-    },
-
-    showTablesQuery: function() {
-      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
-    },
-
-    describeTableQuery: function(tableName) {
-      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
-      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
-          attrName: addQuotes(attrName),
-          definition: pgDataTypeMapping(tableName, attrName, definition)
-        }))
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attrName, definition) + query
-        }
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
-        , sql   = []
-
-      for (var attributeName in attributes) {
-        var definition = attributes[attributeName]
-        var attrSql = ''
-
-        if (definition.indexOf('NOT NULL') > 0) {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' SET NOT NULL'
-          })
-          definition = definition.replace('NOT NULL', '').trim()
-        } else {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' DROP NOT NULL'
-          })
-        }
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attributeName, definition) + query
-          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
-        }
-
-        attrSql += Utils._.template(query)({
-          tableName: addQuotes(tableName),
-          query: addQuotes(attributeName) + ' TYPE ' + definition
-        })
-
-        sql.push(attrSql)
-      }
-
-      return sql.join('')
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
-      var attrString = []
-
-      for (var attributeName in attributes) {
-        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
-          before: addQuotes(attrBefore),
-          after: addQuotes(attributeName),
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options = options || {}
-      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr) {
-        if (Array.isArray(attr) && attr.length === 2) {
-          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
-        } else if (attr.indexOf('`') >= 0) {
-          return attr.replace(/`/g, '"')
-        } else {
-          return addQuotes(attr)
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = addQuotes(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
-              query += addQuotes(association.connectorDAO.tableName) + '.'
-              query += addQuotes(foreignIdentifier) + '='
-              query += addQuotes(table) + '.' + addQuotes('id')
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(dao.tableName) + '.'
-              query += addQuotes('id') + '='
-              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += addQuotes(association.identifier) + '='
-              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, addQuotes(attr)].join('.') +
-                  ' AS "' +
-                  removeQuotes([aliasName, attr].join('.')) + '"'
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if(options.where) {
-        options.where = QueryGenerator.getWhereConditions(options.where)
-        query += " WHERE <%= where %>"
-      }
-
-      if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
-        query += " ORDER BY <%= order %>"
-      }
-
-      if(options.group) {
-        options.group = addQuotes(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (!(options.include && (options.limit === 1))) {
-        if (options.limit) {
-          query += " LIMIT <%= limit %>"
-        }
-
-        if (options.offset) {
-          query += " OFFSET <%= offset %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
-        , returning = []
-
-      Utils._.forEach(attrValueHash, function(value, key, hash) {
-        if (tables[tableName] && tables[tableName][key]) {
-          switch (tables[tableName][key]) {
-            case 'serial':
-              delete hash[key]
-              returning.push(key)
-              break
-          }
-        }
-      });
-
-      var replacements  = {
-        table: addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape(value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + pgEscape(value))
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      primaryKeys[tableName] = primaryKeys[tableName] || [];
-
-      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
-
-      var pks;
-      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
-        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
-      } else {
-        pks = addQuotes('id')
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: pgEscape(options.limit),
-        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
-        primaryKeysSelection: pks
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if (typeof attribute === 'string') {
-          return addQuotes(attribute)
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += addQuotes(attribute.attribute)
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === "string") ? attribute : attribute.attribute
-      })
-
-      var indexTable = tableName.split('.')
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
-      return Utils._.template(query)({ tableName: tableName });
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== "string") {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
-    },
-
-    getWhereConditions: function(smth) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        result = QueryGenerator.hashToWhereConditions(smth)
-      }
-      else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + pgEscape(smth)
-      }
-      else if (typeof smth === "string") {
-        result = smth
-      }
-      else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-        //handle qualified key names
-        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return pgEscape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        }
-        else if ((value) && (typeof value === "object")) {
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = pgEscape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(' AND ')
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if(Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.type === "TINYINT(1)") {
-            dataType.type = 'BOOLEAN'
-          }
-
-          if (dataType.type === "DATETIME") {
-            dataType.type = 'TIMESTAMP'
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template +=" SERIAL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = pgEscape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
-
-        if (definition && (definition.indexOf('SERIAL') > -1)) {
-          fields.push(name)
-        }
-      }
-
-      return fields
-    },
-
-    databaseConnectionUri: function(config) {
-      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
-
-      return Utils._.template(template)({
-        user: encodeURIComponent(config.username),
-        password: encodeURIComponent(config.password),
-        database: config.database,
-        host: config.host,
-        port: config.port,
-        protocol: config.protocol
-      })
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/dialects/postgres/query.js.html b/docs/lib/dialects/postgres/query.js.html deleted file mode 100644 index 7cc35de3456d..000000000000 --- a/docs/lib/dialects/postgres/query.js.html +++ /dev/null @@ -1,136 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                                                                                                                                                      Utils

                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                        var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client = client
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var receivedError = false
-      , query         = this.client.query(sql)
-      , rows          = []
-
-    query.on('row', function(row) {
-      rows.push(row)
-    })
-
-    query.on('error', function(err) {
-      receivedError = true
-      this.emit('error', err, this.callee)
-    }.bind(this))
-
-    query.on('end', function() {
-      this.emit('sql', this.sql)
-
-      if (receivedError) {
-        return
-      }
-
-      onSuccess.call(this, rows)
-    }.bind(this))
-
-    return this
-  }
-
-  Query.prototype.getInsertIdField = function() {
-    return 'id'
-  }
-
-  var onSuccess = function(rows) {
-    var results          = []
-      , isTableNameQuery = (this.sql.indexOf('SELECT table_name FROM information_schema.tables') === 0)
-      , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
-
-    if (isTableNameQuery || isRelNameQuery) {
-      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
-    }
-
-    if (this.send('isSelectQuery')) {
-      this.emit('success', this.send('handleSelectQuery', rows))
-    } else if (this.send('isShowOrDescribeQuery')) {
-      this.emit('success', results)
-    } else if (this.send('isInsertQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else if (this.send('isUpdateQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else {
-      this.emit('success', results)
-    }
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/lib/dialects/query-generator.js.html b/docs/lib/dialects/query-generator.js.html deleted file mode 100644 index 5756467cb969..000000000000 --- a/docs/lib/dialects/query-generator.js.html +++ /dev/null @@ -1,92 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                                                                                                                                                          Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                                                                                                          - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                          - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                          Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                          {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                          --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                          - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                          Defaults: { engine: 'InnoDB', charset: null }

                                                                                                                                                                                                                                                                                                                                                                          createTableQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('createTableQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                            Returns a query for dropping a table.

                                                                                                                                                                                                                                                                                                                                                                            dropTableQuery: function(tableName, options) {
-      throwMethodUndefined('dropTableQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                              Returns a rename table query.
                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                              - originalTableName: Name of the table before execution.
                                                                                                                                                                                                                                                                                                                                                                              - futureTableName: Name of the table after execution.

                                                                                                                                                                                                                                                                                                                                                                              renameTableQuery: function(originalTableName, futureTableName) {
-      throwMethodUndefined('renameTableQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                Returns a query, which gets all available table names in the database.

                                                                                                                                                                                                                                                                                                                                                                                showTablesQuery: function() {
-      throwMethodUndefined('showTablesQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                  Returns a query, which adds an attribute to an existing table.
                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                  - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                  - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                  - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                  - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                  - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                  - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                  - allowNull: Boolean

                                                                                                                                                                                                                                                                                                                                                                                  addColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('addColumnQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                    Returns a query, which removes an attribute from an existing table.
                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                    - tableName: Name of the existing table
                                                                                                                                                                                                                                                                                                                                                                                    - attributeName: Name of the obsolete attribute.

                                                                                                                                                                                                                                                                                                                                                                                    removeColumnQuery: function(tableName, attributeName) {
-      throwMethodUndefined('removeColumnQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                      Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                      - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                      - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                      - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                      - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                      - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                      - allowNull: Boolean

                                                                                                                                                                                                                                                                                                                                                                                      changeColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('changeColumnQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                        Returns a query, which renames an existing attribute.
                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                        - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                        - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                                                                                                                                                                                                                                        - attrNameAfter: The name of the attribute, after renaming.

                                                                                                                                                                                                                                                                                                                                                                                        renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
-      throwMethodUndefined('renameColumnQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                          Returns a query for selecting elements in the table .
                                                                                                                                                                                                                                                                                                                                                                                          Options:
                                                                                                                                                                                                                                                                                                                                                                                          - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                                                                                                                                                                                                                                          - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                          OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                          OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                          If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                          - order -> e.g. 'id DESC'
                                                                                                                                                                                                                                                                                                                                                                                          - group
                                                                                                                                                                                                                                                                                                                                                                                          - limit -> The maximum count you want to get.
                                                                                                                                                                                                                                                                                                                                                                                          - offset -> An offset value to start from. Only useable with limit!

                                                                                                                                                                                                                                                                                                                                                                                          selectQuery: function(tableName, options) {
-      throwMethodUndefined('selectQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                            Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.

                                                                                                                                                                                                                                                                                                                                                                                            insertQuery: function(tableName, attrValueHash) {
-      throwMethodUndefined('insertQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                              Returns an update query.
                                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                                              - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                              - values -> A hash with attribute-value-pairs
                                                                                                                                                                                                                                                                                                                                                                                              - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                              OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                              OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                              If you use a string, you have to escape it on your own.

                                                                                                                                                                                                                                                                                                                                                                                              updateQuery: function(tableName, values, where) {
-      throwMethodUndefined('updateQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                Returns a deletion query.
                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                Options:
                                                                                                                                                                                                                                                                                                                                                                                                - limit -> Maximaum count of lines to delete

                                                                                                                                                                                                                                                                                                                                                                                                deleteQuery: function(tableName, where, options) {
-      throwMethodUndefined('deleteQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                  Returns an add index query.
                                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                  - tableName -> Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                  - attributes:
                                                                                                                                                                                                                                                                                                                                                                                                  An array of attributes as string or as hash.
                                                                                                                                                                                                                                                                                                                                                                                                  If the attribute is a hash, it must have the following content:
                                                                                                                                                                                                                                                                                                                                                                                                  - attribute: The name of the attribute/column
                                                                                                                                                                                                                                                                                                                                                                                                  - length: An integer. Optional
                                                                                                                                                                                                                                                                                                                                                                                                  - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                                                                                                                                                                                                                                                  - options:
                                                                                                                                                                                                                                                                                                                                                                                                  - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                                                                                                                                                                                                                                                  - indexName: The name of the index. Default is
                                                                                                                                                                                                                                                                                                                                                                                                  - parser

                                                                                                                                                                                                                                                                                                                                                                                                  addIndexQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('addIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                    Returns an show index query.
                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                    - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                    - options:
                                                                                                                                                                                                                                                                                                                                                                                                    - database: Name of the database.

                                                                                                                                                                                                                                                                                                                                                                                                    showIndexQuery: function(tableName, options) {
-      throwMethodUndefined('showIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                      Returns a remove index query.
                                                                                                                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                      - indexNameOrAttributes: The name of the index as string or an array of attribute names.

                                                                                                                                                                                                                                                                                                                                                                                                      removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      throwMethodUndefined('removeIndexQuery')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                        Takes something and transforms it into values of a where condition.

                                                                                                                                                                                                                                                                                                                                                                                                        getWhereConditions: function(smth) {
-      throwMethodUndefined('getWhereConditions')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                          Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                                                                                                                                                                                                                                          The values are transformed by the relevant datatype.

                                                                                                                                                                                                                                                                                                                                                                                                          hashToWhereConditions: function(hash) {
-      throwMethodUndefined('hashToWhereConditions')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                            This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                                                                                                                                                                                                                                            sql attribute definition.

                                                                                                                                                                                                                                                                                                                                                                                                            attributesToSQL: function(attributes) {
-      throwMethodUndefined('attributesToSQL')
-    },

                                                                                                                                                                                                                                                                                                                                                                                                              Returns all auto increment fields of a factory.

                                                                                                                                                                                                                                                                                                                                                                                                              findAutoIncrementField: function(factory) {
-      throwMethodUndefined('findAutoIncrementField')
-    }
-  }
-
-  var throwMethodUndefined = function(methodName) {
-    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
-  }
-
-  return QueryGenerator
-})()
                                                                                                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/connector-manager.js.html b/docs/lib/dialects/sqlite/connector-manager.js.html deleted file mode 100644 index a9c529724116..000000000000 --- a/docs/lib/dialects/sqlite/connector-manager.js.html +++ /dev/null @@ -1,62 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                              declaration

                                                                                                                                                                                                                                                                                                                                                                                                              Utils

                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                var Utils   = require("../../utils")
-  , sqlite3 = require('sqlite3').verbose()
-  , Query   = require("./query")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize) {
-    this.sequelize = sequelize
-    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    return new Query(this.database, this.sequelize, callee, options).run(sql)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/query-generator.js.html b/docs/lib/dialects/sqlite/query-generator.js.html deleted file mode 100644 index 22fab71dfb54..000000000000 --- a/docs/lib/dialects/sqlite/query-generator.js.html +++ /dev/null @@ -1,240 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                                                                                                                                                                                                Utils

                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils = require("../../utils")
-  , DataTypes = require("../../data-types")
-var MySqlQueryGenerator = Utils._.extend(
-  Utils._.clone(require("../query-generator")),
-  Utils._.clone(require("../mysql/query-generator"))
-)
-
-var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
-
-var escape = function(str) {
-  if (typeof str === 'string') {
-    return "'" + str.replace(/'/g, "''") + "'";
-  } else if (typeof str === 'boolean') {
-    return str ? 1 : 0; // SQLite has no type boolean
-  } else if (str === null || str === undefined) {
-    return 'NULL';
-  } else {
-    return str;
-  }
-};
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = options || {}
-
-      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , primaryKeys = []
-        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
-                    return Utils._.includes(definition, 'PRIMARY KEY')
-                  }).length > 1)
-        , attrStr     = []
-
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    showTablesQuery: function() {
-      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: MySqlQueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: this.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM) {
-	          replacements.type = "INTEGER"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-
-            if (dataType.autoIncrement) {
-              template += ' AUTOINCREMENT'
-            }
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    },
-
-    hashToWhereConditions: function(hash) {
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          var value = hash[key]
-
-          if (typeof value === 'boolean') {
-            value = !!value ? 1 : 0
-          }
-
-          hash[key] = value
-        }
-      }
-
-      return hashToWhereConditions(hash).replace(/\\'/g, "''");
-    }
-  }
-
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/dialects/sqlite/query.js.html b/docs/lib/dialects/sqlite/query.js.html deleted file mode 100644 index 009ae88f2f7f..000000000000 --- a/docs/lib/dialects/sqlite/query.js.html +++ /dev/null @@ -1,160 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                                                                                                                                                                  Utils

                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(database, sequelize, callee, options) {
-    this.database = database
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.getInsertIdField = function() {
-    return 'lastID'
-  }
-
-  Query.prototype.run = function(sql) {
-    var self = this
-
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var columnTypes = {};
-    this.database.serialize(function() {
-      var executeSql = function() {
-        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
-          // allow clients to listen to sql to do their own logging or whatnot
-          self.emit('sql', self.sql)
-          this.columnTypes = columnTypes;
-          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
-        })
-      };
-
-      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
-        var tableName = RegExp.$1;
-
-        if (tableName !== 'sqlite_master') {
-          // get the column types
-          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
-            if (!err) {
-              for (var i=0, l=results.length; i<l; i++) {
-                columnTypes[results[i].name] = results[i].type;
-              }
-            }
-            executeSql();
-          });
-        } else {
-          executeSql();
-        }
-      } else {
-        executeSql();
-      }
-    })
-
-    return this
-  }
-
-  //private
-
-  var getDatabaseMethod = function() {
-    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
-      return 'run'
-    } else {
-      return 'all'
-    }
-  }
-
-  var onSuccess = function(results, metaData) {
-    var result = this.callee
-      , self   = this
-
-    // add the inserted row id to the instance
-    if (this.send('isInsertQuery', results, metaData)) {
-      this.send('handleInsertQuery', results, metaData)
-    }
-
-    if (this.sql.indexOf('sqlite_master') !== -1) {
-      result = results.map(function(resultSet) { return resultSet.name })
-    } else if (this.send('isSelectQuery')) {
-      // we need to convert the timestamps into actual date objects
-
-      if(!this.options.raw) {
-        results = results.map(function(result) {
-          for (var name in result) {
-            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
-              result[name] = new Date(result[name]);
-            }
-          }
-          return result
-        })
-      }
-
-      result = this.send('handleSelectQuery', results)
-    } else if (this.send('isShowOrDescribeQuery')) {
-      result = results
-    }
-
-    this.emit('success', result)
-  }
-
-  var onFailure = function(err) {
-    this.emit('error', err, this.callee)
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/lib/emitters/custom-event-emitter.js.html b/docs/lib/emitters/custom-event-emitter.js.html deleted file mode 100644 index 20612915a3d6..000000000000 --- a/docs/lib/emitters/custom-event-emitter.js.html +++ /dev/null @@ -1,91 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                                                                                                                                                                    util

                                                                                                                                                                                                                                                                                                                                                                                                                    util
                                                                                                                                                                                                                                                                                                                                                                                                                      var util         = require("util")
-  , EventEmitter = require("events").EventEmitter
-
-module.exports = (function() {
-  var CustomEventEmitter = function(fct) {
-    this.fct = fct
-  }
-  util.inherits(CustomEventEmitter, EventEmitter)
-
-  CustomEventEmitter.prototype.run = function() {
-    var self = this
-
-    // delay the function call and return the emitter
-    setTimeout(function(){
-      self.fct.call(self, self)
-    }, 1)
-
-    return this
-  }
-
-  CustomEventEmitter.prototype.success =
-  CustomEventEmitter.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.failure =
-  CustomEventEmitter.prototype.fail =
-  CustomEventEmitter.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.done =
-  CustomEventEmitter.prototype.complete =
-  function(fct) {
-    this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
-    return this
-  }
-
-
-  return CustomEventEmitter
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/lib/migration.js.html b/docs/lib/migration.js.html deleted file mode 100644 index 7e103cf9a4d7..000000000000 --- a/docs/lib/migration.js.html +++ /dev/null @@ -1,177 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                      declaration

                                                                                                                                                                                                                                                                                                                                                                                                                      moment

                                                                                                                                                                                                                                                                                                                                                                                                                      moment
                                                                                                                                                                                                                                                                                                                                                                                                                        var moment         = require("moment")
-  , Utils          = require("./utils")
-  , DataTypes      = require("./data-types")
-  , QueryInterface = require("./query-interface")
-
-module.exports = (function() {
-  var Migration = function(migrator, path) {
-    var split = path.split('/')
-
-    this.migrator       = migrator
-    this.path           = path
-    this.filename       = Utils._.last(this.path.split('/'))
-
-    var parsed          = Migration.parseFilename(this.filename)
-
-    this.migrationId    = parsed.id
-    this.date           = parsed.date;
-    this.queryInterface = this.migrator.queryInterface
-    this.undoneMethods  = 0
-  }
-
-  ///////////////
-  // static /////
-  ///////////////
-
-  Migration.parseFilename = function(s) {
-    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
-
-    if (matches === null) {
-      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
-    }
-
-    return {
-      id: parseInt(matches[1]),
-      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
-    }
-  }
-
-  Migration.migrationHasInterfaceCalls = function(func) {
-    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
-      , hasCalls       = false
-
-    for(var method in QueryInterface.prototype) {
-      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
-      hasCalls = hasCalls || regex.test(functionString)
-    }
-
-    return hasCalls
-  }
-
-  ///////////////
-  // member /////
-  ///////////////
-
-  Object.defineProperty(Migration.prototype, 'migration', {
-    get: function() {
-      return require(this.path)
-    }
-  })
-
-  Migration.prototype.execute = function(options) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      options = Utils._.extend({
-        method: 'up'
-      }, options || {})
-
-      var onSuccess = function() { emitter.emit('success', null) }
-        , func      = self.migration[options.method]
-
-      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
-      func.call(null, self, DataTypes)
-
-      if (!Migration.migrationHasInterfaceCalls(func))
-        onSuccess()
-    }).run()
-  }
-
-  Migration.prototype.isBefore = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date > this.date) : (date >= this.date)
-  }
-
-  Migration.prototype.isAfter = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date < this.date) : (date <= this.date)
-  }
-
-  // extends the Migration prototype with all methods of QueryInterface.prototype
-  // with additional tracking of start and finish. this is done in order to minimize
-  // asynchronous handling in migrations
-  var extendMigrationWithQueryInterfaceMethods = function(callback) {
-    var self = this
-
-    for(var method in QueryInterface.prototype) {
-      (function(_method) {
-        self[_method] = function() {
-          var emitter = self.QueryInterface
-            , args    = Utils._.map(arguments, function(arg, _) { return arg })
-
-          self.undoneMethods++
-
-          // bind listeners to the query interface
-          // the event will have the same name like the method
-          self.queryInterface.on(_method, function(err) {
-            self.undoneMethods--
-            if (err) {
-              throw new Error(err)
-            } else {
-              (self.undoneMethods == 0) && callback && callback()
-            }
-          })
-
-          return self.queryInterface[_method].apply(self.queryInterface, args)
-        }
-      })(method)
-    }
-  }
-
-  return Migration
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/lib/migrator.js.html b/docs/lib/migrator.js.html deleted file mode 100644 index bd080fb8c64e..000000000000 --- a/docs/lib/migrator.js.html +++ /dev/null @@ -1,282 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                          const fs     = require("fs")
-    , path   = require("path")
-    , moment = require("moment")
-
-var Utils          = require("./utils")
-  , Migration      = require("./migration")
-  , DataTypes      = require("./data-types")
-
-module.exports = (function() {
-  var Migrator = function(sequelize, options) {
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      path: __dirname + '/../migrations',
-      from: null,
-      to: null,
-      logging: console.log
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
-
-  Object.defineProperty(Migrator.prototype, "queryInterface", {
-    get: function() {
-      return this.sequelize.getQueryInterface()
-    }
-  })
-
-  Migrator.prototype.migrate = function(options) {
-    var self = this
-
-    options = Utils._.extend({
-      method: 'up'
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.getUndoneMigrations(function(err, migrations) {
-        if (err) {
-          emitter.emit('error', err)
-        } else {
-          var chainer = new Utils.QueryChainer
-            , from    = migrations[0]
-
-          if (options.method === 'down') {
-            from = migrations[0]
-            migrations.reverse()
-          }
-
-          migrations.forEach(function(migration) {
-            chainer.add(migration, 'execute', [options], {
-              before: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executing migration: ' + migration.filename)
-                }
-              },
-              after: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executed migration: ' + migration.filename)
-                }
-              },
-              success: function(migration, callback) {
-                if (options.method === 'down') {
-                  deleteUndoneMigration.call(self, from, migration, callback)
-                } else {
-                  saveSuccessfulMigration.call(self, from, migration, callback)
-                }
-              }
-            })
-          })
-
-          chainer
-            .runSerially({ skipOnError: true })
-            .success(function() { emitter.emit('success', null) })
-            .error(function(err) { emitter.emit('error', err) })
-        }
-      })
-    }).run()
-  }
-
-  Migrator.prototype.getUndoneMigrations = function(callback)  {
-    var self = this
-
-    var filterFrom = function(migrations, from, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
-      callback && callback(null, result)
-    }
-    var filterTo = function(migrations, to, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
-      callback && callback(null, result)
-    }
-
-    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      return /\.js$/.test(file)
-    })
-
-    var migrations = migrationFiles.map(function(file) {
-      return new Migration(self, self.options.path + '/' + file)
-    })
-
-    migrations = migrations.sort(function(a,b){
-      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
-    })
-
-    if (this.options.from) {
-      filterFrom(migrations, this.options.from, function(err, migrations) {
-        if (self.options.to) {
-          filterTo(migrations, self.options.to, callback)
-        } else {
-          callback && callback(null, migrations)
-        }
-      })
-    } else {
-      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
-        if (lastMigrationId) {
-          filterFrom(migrations, lastMigrationId, function(err, migrations) {
-            if (self.options.to) {
-              filterTo(migrations, self.options.to, callback)
-            } else {
-              callback && callback(null, migrations)
-            }
-          }, { withoutEqual: true })
-        } else {
-          if (self.options.to) {
-            filterTo(migrations, self.options.to, callback)
-          } else {
-            callback && callback(null, migrations)
-          }
-        }
-      }).error(function(err) {
-        callback && callback(err, null)
-      })
-    }
-  }
-
-  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
-        , SequelizeMeta = storedDAO
-
-      if (!storedDAO) {
-        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
-          from: DataTypes.STRING,
-          to:   DataTypes.STRING
-        }, {
-          timestamps: false
-        })
-      }
-
-      // force sync when model has newly created or if syncOptions are passed
-      if (!storedDAO || syncOptions) {
-        SequelizeMeta
-          .sync(syncOptions || {})
-          .success(function() { emitter.emit('success', SequelizeMeta) })
-          .error(function(err) { emitter.emit('error', err) })
-      } else {
-        emitter.emit('success', SequelizeMeta)
-      }
-    }).run()
-  }
-
-  // private
-
-  var getLastMigrationFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
-          emitter.emit('success', meta ? meta : null)
-        }).error(function(err) { emitter.emit('error', err) })
-      }).error(function(err) { emitter.emit(err) })
-    }).run()
-  }
-
-  var getLastMigrationIdFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      getLastMigrationFromDatabase.call(self)
-        .success(function(meta) {
-          emitter.emit('success', meta ? meta.to : null)
-        })
-        .error(function(err) {
-          emitter.emit('error', err)
-        })
-    }).run()
-  }
-
-  var getFormattedDateString = function(s) {
-    var result = null
-
-    try {
-      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
-    } catch(e) {
-      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
-    }
-
-    return result
-  }
-
-  var stringToDate = function(s) {
-    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
-  }
-
-  var saveSuccessfulMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .create({ from: from.migrationId, to: to.migrationId })
-        .success(callback)
-    })
-  }
-
-  var deleteUndoneMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
-        .success(function(meta) {
-          meta.destroy().success(callback)
-        })
-    })
-  }
-
-  return Migrator
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/lib/query-chainer.js.html b/docs/lib/query-chainer.js.html deleted file mode 100644 index 2b39bd8beafe..000000000000 --- a/docs/lib/query-chainer.js.html +++ /dev/null @@ -1,188 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                          declaration

                                                                                                                                                                                                                                                                                                                                                                                                                          Utils

                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require("./utils")
-
-module.exports = (function() {
-  var QueryChainer = function(emitters) {
-    var self = this
-
-    this.finishedEmits  = 0
-    this.emitters       = []
-    this.serials        = []
-    this.fails          = []
-    this.serialResults  = []
-    this.emitterResults = []
-    this.finished       = false
-    this.wasRunning     = false
-    this.eventEmitter   = null
-
-    emitters = emitters || []
-    emitters.forEach(function(emitter) {
-      if (Array.isArray(emitter)) {
-        self.add.apply(self, emitter)
-      } else {
-        self.add(emitter)
-      }
-    })
-  }
-
-  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
-    if (!!method) {
-      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
-    } else {
-      observeEmitter.call(this, emitterOrKlass)
-      this.emitters.push(emitterOrKlass)
-    }
-
-    return this
-  }
-
-  QueryChainer.prototype.run = function() {
-    var self = this
-    this.eventEmitter = new Utils.CustomEventEmitter(function() {
-      self.wasRunning = true
-      finish.call(self, 'emitterResults')
-    })
-    return this.eventEmitter.run()
-  }
-
-  QueryChainer.prototype.runSerially = function(options) {
-    var self       = this
-      , serialCopy = Utils._.clone(this.serials)
-
-    options = Utils._.extend({
-      skipOnError: false
-    }, options)
-
-    var exec = function() {
-      var serial = self.serials.pop()
-
-      if (serial) {
-        serial.options = serial.options || {}
-        serial.options.before && serial.options.before(serial.klass)
-
-        var onSuccess = function() {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          exec()
-        }
-
-        var onError = function(err) {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          self.fails.push(err)
-          exec()
-        }
-
-        if (options.skipOnError && (self.fails.length > 0)) {
-          onError('Skipped due to earlier error!')
-        } else {
-          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
-
-          emitter.success(function(result) {
-            self.serialResults[serialCopy.indexOf(serial)] = result
-
-            if (serial.options.success) {
-              serial.options.success(serial.klass, onSuccess)
-            } else {
-              onSuccess()
-            }
-          }).error(onError)
-        }
-      } else {
-        self.wasRunning = true
-        finish.call(self, 'serialResults')
-      }
-    }
-
-    this.serials.reverse()
-    this.eventEmitter = new Utils.CustomEventEmitter(exec)
-    return this.eventEmitter.run()
-  }
-
-  // private
-
-  var observeEmitter = function(emitter) {
-    var self = this
-
-    emitter
-      .success(function(result) {
-        self.emitterResults[self.emitters.indexOf(emitter)] = result
-        self.finishedEmits++
-        finish.call(self, 'emitterResults')
-      })
-      .error(function(err) {
-        self.finishedEmits++
-        self.fails.push(err)
-        finish.call(self, 'emitterResults')
-      })
-      .on('sql', function(sql) {
-        if (self.eventEmitter) {
-          self.eventEmitter.emit('sql', sql)
-        }
-      })
-  }
-
-  var finish = function(resultsName) {
-    this.finished = true
-
-    if (this.emitters.length > 0) {
-      this.finished = (this.finishedEmits == this.emitters.length)
-    }
-    else if (this.serials.length > 0) {
-      this.finished = (this.finishedEmits == this.serials.length)
-    }
-
-    if (this.finished && this.wasRunning) {
-      var status = (this.fails.length == 0 ? 'success' : 'error')
-        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
-
-      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
-    }
-  }
-
-  return QueryChainer
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/lib/query-interface.js.html b/docs/lib/query-interface.js.html deleted file mode 100644 index 950173235ccd..000000000000 --- a/docs/lib/query-interface.js.html +++ /dev/null @@ -1,329 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                            declaration

                                                                                                                                                                                                                                                                                                                                                                                                                            Utils

                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require('./utils')
-  , DataTypes = require('./data-types')
-
-module.exports = (function() {
-  var QueryInterface = function(sequelize) {
-    this.sequelize = sequelize
-    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-   this.QueryGenerator.options = this.sequelize.options;
-  }
-  Utils.addEventEmitter(QueryInterface)
-
-  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
-    var attributeHashes = {}
-
-    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
-      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-        attributeHashes[attributeName] = { type: dataTypeOrOptions }
-      } else {
-        attributeHashes[attributeName] = dataTypeOrOptions
-      }
-    })
-
-    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
-
-    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'createTable')
-  }
-
-  QueryInterface.prototype.dropTable = function(tableName) {
-    var sql = this.QueryGenerator.dropTableQuery(tableName)
-    return queryAndEmit.call(this, sql, 'dropTable')
-  }
-
-  QueryInterface.prototype.dropAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-
-      self.showAllTables().success(function(tableNames) {
-        tableNames.forEach(function(tableName) {
-          chainer.add(self.dropTable(tableName))
-        })
-        chainer
-          .run()
-          .success(function() {
-            self.emit('dropAllTables', null)
-            emitter.emit('success', null)
-          })
-          .error(function(err) {
-            self.emit('dropAllTables', err)
-            emitter.emit('error', err)
-          })
-      }).error(function(err) {
-        self.emit('dropAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.renameTable = function(before, after) {
-    var sql = this.QueryGenerator.renameTableQuery(before, after)
-    return queryAndEmit.call(this, sql, 'renameTable')
-  }
-
-  QueryInterface.prototype.showAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var showTablesSql = self.QueryGenerator.showTablesQuery()
-      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
-        self.emit('showAllTables', null)
-        emitter.emit('success', Utils._.flatten(tableNames))
-      }).error(function(err) {
-        self.emit('showAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.describeTable = function(tableName) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql;
-      if (self.QueryGenerator.describeTableQuery) {
-        sql = self.QueryGenerator.describeTableQuery(tableName)
-      } else {
-        sql = 'DESCRIBE `' + tableName + '`;'
-      }
-      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
-        emitter.emit('success', data)
-      }).error(function(err) {
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'addColumn')
-  }
-
-  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
-    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
-    return queryAndEmit.call(this, sql, 'removeColumn')
-  }
-
-  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'changeColumn')
-  }
-
-  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
-
-        var options =  {}
-
-        options[attrNameAfter] = {
-          type: data.Type,
-          allowNull: data.Null == 'YES',
-          defaultValue: data.Default
-        }
-
-        var sql = self.QueryGenerator.renameColumnQuery(tableName,
-          attrNameBefore,
-          self.QueryGenerator.attributesToSQL(options)
-        )
-
-        self.sequelize.query(sql, null, {}).success(function() {
-          self.emit('renameColumn', null)
-          emitter.emit('success', null)
-        }).error(function(err) {
-          self.emit('renameColumn', err)
-          emitter.emit('error', err)
-        })
-      }).error(function(err) {
-        self.emit('renameColumn', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
-    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'addIndex')
-  }
-
-  QueryInterface.prototype.showIndex = function(tableName, options) {
-    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
-    return queryAndEmit.call(this, sql, 'showIndex')
-  }
-
-  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
-    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
-    return queryAndEmit.call(this, sql, "removeIndex")
-  }
-
-  QueryInterface.prototype.insert = function(dao, tableName, values) {
-    var sql = this.QueryGenerator.insertQuery(tableName, values)
-    return queryAndEmit.call(this, [sql, dao], 'insert', {
-      success: function(obj) { obj.isNewRecord = false }
-    })
-  }
-
-  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
-    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'update')
-  }
-
-  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
-    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'delete')
-  }
-
-  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
-    var sql = this.QueryGenerator.selectQuery(tableName, options)
-    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
-    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
-  }
-
-  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
-    var self = this
-
-    if (attributeSelector === undefined) {
-      throw new Error('Please pass an attribute selector!')
-    }
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, options)
-        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
-
-      qry
-        .success(function(data) {
-          var result = data[attributeSelector]
-
-          if (options && options.parseInt) {
-            result = parseInt(result)
-          }
-
-          self.emit('rawSelect', null)
-          emitter.emit('success', result)
-        })
-        .error(function(err) {
-          self.emit('rawSelect', err)
-          emitter.emit('error', err)
-        })
-        .on('sql', function(sql) {
-          emitter.emit('sql', sql)
-        })
-    }).run()
-  }
-
-  // private
-
-  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
-    var self = this
-
-    options = Utils._.extend({
-      success: function(){},
-      error: function(){}
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var query = null
-
-      if (Array.isArray(sqlOrQueryParams)) {
-        if (sqlOrQueryParams.length === 1) {
-          sqlOrQueryParams.push(null)
-        }
-
-        if (sqlOrQueryParams.length === 2) {
-          sqlOrQueryParams.push({})
-        }
-
-        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
-      } else {
-        query = self.sequelize.query(sqlOrQueryParams, null, {})
-      }
-
-      // append the query for better testing
-      emitter.query = query
-
-      query.success(function(obj) {
-        options.success && options.success(obj)
-        self.emit(methodName, null)
-        emitter.emit('success', obj)
-      }).error(function(err) {
-        options.error && options.error(err)
-        self.emit(methodName, err)
-        emitter.emit('error', err)
-      })
-      query.on('sql', function(sql) {
-        emitter.emit('sql', sql)
-      });
-    }).run()
-  }
-
-  return QueryInterface
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                              \ No newline at end of file diff --git a/docs/lib/sequelize.js.html b/docs/lib/sequelize.js.html deleted file mode 100644 index 44a5a046b894..000000000000 --- a/docs/lib/sequelize.js.html +++ /dev/null @@ -1,210 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                              function

                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize()

                                                                                                                                                                                                                                                                                                                                                                                                                                Main constructor of the project.

                                                                                                                                                                                                                                                                                                                                                                                                                                - -
                                                                                                                                                                                                                                                                                                                                                                                                                                Params:
-
-  - `database`
-  - `username`
-  - `password`, optional, default: null
-  - `options`, optional, default: {}
-
-Examples:
-
-    mymodule.write('foo')
-    mymodule.write('foo', { stream: process.stderr })
-
                                                                                                                                                                                                                                                                                                                                                                                                                                var Sequelize = function(database, username, password, options) {
-    this.options = Utils._.extend({
-      dialect: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      protocol: 'tcp',
-      define: {},
-      query: {},
-      sync: {},
-      logging: console.log,
-      omitNull: false,
-      queue: true,
-      native: false,
-      replication: false,
-      pool: {}
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    this.config = {
-      database: database,
-      username: username,
-      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
-      host    : this.options.host,
-      port    : this.options.port,
-      pool    : this.options.pool,
-      protocol: this.options.protocol,
-      queue   : this.options.queue,
-      native  : this.options.native,
-      replication: this.options.replication,
-      maxConcurrentQueries: this.options.maxConcurrentQueries
-    }
-
-    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
-
-    this.daoFactoryManager = new DAOFactoryManager(this)
-    this.connectorManager  = new ConnectorManager(this, this.config)
-
-    this.importCache = {}
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                property

                                                                                                                                                                                                                                                                                                                                                                                                                                Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize.Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                  Reference to Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize.Utils = Utils
-
-  for (var dataType in DataTypes) {
-    Sequelize[dataType] = DataTypes[dataType]
-  }
-
-  Sequelize.prototype.getQueryInterface = function() {
-    this.queryInterface = this.queryInterface || new QueryInterface(this)
-    return this.queryInterface
-  }
-
-  Sequelize.prototype.getMigrator = function(options, force) {
-    if (force) {
-      this.migrator = new Migrator(this, options)
-    } else {
-      this.migrator = this.migrator || new Migrator(this, options)
-    }
-
-    return this.migrator
-  }
-
-  Sequelize.prototype.define = function(daoName, attributes, options) {
-    options = options || {}
-    var globalOptions = this.options
-
-    if (globalOptions.define) {
-      options = Utils._.extend({}, globalOptions.define, options)
-      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
-        if (globalOptions.define[key]) {
-          options[key] = options[key] || {}
-          Utils._.extend(options[key], globalOptions.define[key])
-        }
-      })
-    }
-    options.omitNull = globalOptions.omitNull
-
-    var factory = new DAOFactory(daoName, attributes, options)
-    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
-    return factory
-  }
-
-  Sequelize.prototype.isDefined = function(daoName) {
-    var daos = this.daoFactoryManager.daos
-    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
-  }
-
-  Sequelize.prototype.import = function(path) {
-    if (!this.importCache[path]) {
-      var defineCall = require(path)
-      this.importCache[path] = defineCall(this, DataTypes)
-    }
-
-    return this.importCache[path]
-  }
-
-  Sequelize.prototype.migrate = function(options) {
-    this.getMigrator().migrate(options)
-  }
-
-  Sequelize.prototype.query = function(sql, callee, options) {
-    if (arguments.length === 3) {
-      options = options
-    } else if (arguments.length === 2) {
-      options = {}
-    } else {
-      options = { raw: true }
-    }
-
-    options = Utils._.extend(Utils._.clone(this.options.query), options)
-    options = Utils._.defaults(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
-      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
-    })
-
-    return this.connectorManager.query(sql, callee, options)
-  }
-
-  Sequelize.prototype.sync = function(options) {
-    options = options || {}
-
-    if (this.options.sync) {
-      options = Utils._.extend({}, this.options.sync, options)
-    }
-
-    var chainer = new Utils.QueryChainer()
-
-    this.daoFactoryManager.daos.forEach(function(dao) {
-      chainer.add(dao.sync(options))
-    })
-
-    return chainer.run()
-  }
-
-  Sequelize.prototype.drop = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer
-
-      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
-
-      chainer
-        .run()
-        .success(function() { emitter.emit('success', null) })
-        .error(function(err) { emitter.emit('error', err) })
-    }).run()
-  }
-
-  return Sequelize
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                  \ No newline at end of file diff --git a/docs/lib/utils.js.html b/docs/lib/utils.js.html deleted file mode 100644 index ea21c0b3a1b8..000000000000 --- a/docs/lib/utils.js.html +++ /dev/null @@ -1,225 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration

                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql

                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                    var mysql      = require("mysql")
-  , connection = mysql.createConnection({})
-  , util       = require("util")
-  , DataTypes  = require("./data-types")
-
-var Utils = module.exports = {
-  _: (function() {
-    var _  = require("underscore")
-      , _s = require('underscore.string')
-
-    _.mixin(_s.exports())
-    _.mixin({
-      includes: _s.include,
-      camelizeIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.camelize(string)
-        }
-
-        return result
-      },
-      underscoredIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.underscored(string)
-        }
-
-        return result
-      }
-    })
-
-    return _
-  })(),
-  addEventEmitter: function(_class) {
-    util.inherits(_class, require('events').EventEmitter)
-  },
-  TICK_CHAR: '`',
-  addTicks: function(s) {
-    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
-  },
-  removeTicks: function(s) {
-    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
-  },
-  escape: function(s) {
-    return connection.escape(s).replace(/\\"/g, '"')
-  },
-  format: function(arr) {
-    return connection.format.apply(connection, [arr.shift(), arr])
-  },
-  isHash: function(obj) {
-    return Utils._.isObject(obj) && !Array.isArray(obj);
-  },
-  toSqlDate: function(date) {
-    return [
-      [
-        date.getFullYear(),
-        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
-        ((date.getDate() < 10 ? '0' : '') + date.getDate())
-      ].join("-"),
-      date.toLocaleTimeString()
-    ].join(" ")
-  },
-  argsArePrimaryKeys: function(args, primaryKeys) {
-    var result = (args.length == Object.keys(primaryKeys).length)
-    if (result) {
-      Utils._.each(args, function(arg) {
-        if (result) {
-          if (['number', 'string'].indexOf(typeof arg) !== -1) {
-            result = true
-          } else {
-            result = (arg instanceof Date)
-          }
-        }
-      })
-    }
-    return result
-  },
-  combineTableNames: function(tableName1, tableName2) {
-    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
-  },
-
-  singularize: function(s) {
-    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
-  },
-
-  pluralize: function(s) {
-    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
-  },
-
-  removeCommentsFromFunctionString: function(s) {
-    s = s.replace(/\s*(\/\/.*)/g, '')
-    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
-
-    return s
-  },
-
-  toDefaultValue: function(value) {
-    return (value == DataTypes.NOW) ? new Date() : value
-  },
-
-  setAttributes: function(hash, identifier, instance, prefix) {
-    prefix = prefix || ''
-    if (this.isHash(identifier)) {
-      this._.each(identifier, function(elem, key) {
-        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
-      })
-    } else {
-      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
-    }
-
-    return hash
-  },
-
-  removeNullValuesFromHash: function(hash, omitNull) {
-    var result = hash
-
-    if (omitNull) {
-      var _hash = {}
-
-      Utils._.each(hash, function(val, key) {
-        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
-          _hash[key] = val;
-        }
-      })
-
-      result = _hash
-    }
-
-    return result
-  },
-
-  prependTableNameToHash: function(tableName, hash) {
-    if (tableName) {
-      var _hash = {}
-
-      for (var key in hash) {
-        if (key.indexOf('.') === -1) {
-          _hash[tableName + '.' + key] = hash[key]
-        } else {
-          _hash[key] = hash[key]
-        }
-      }
-
-      return _hash
-    } else {
-      return hash
-    }
-  },
-
-  firstValueOfHash: function(obj) {
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key))
-        return obj[key]
-    }
-    return null
-  },
-
-  inherit: function(subClass, superClass) {
-    if (superClass.constructor == Function) {
-      // Normal Inheritance
-      subClass.prototype = new superClass();
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass.prototype;
-    } else {
-      // Pure Virtual Inheritance
-      subClass.prototype = superClass;
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass;
-    }
-
-    return subClass;
-  }
-
-}
-
-Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
-Utils.QueryChainer = require("./query-chainer")
-Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                    \ No newline at end of file diff --git a/docs/migration.js.html b/docs/migration.js.html deleted file mode 100644 index 9899fc2e67a5..000000000000 --- a/docs/migration.js.html +++ /dev/null @@ -1,190 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration

                                                                                                                                                                                                                                                                                                                                                                                                                                    moment

                                                                                                                                                                                                                                                                                                                                                                                                                                    moment
                                                                                                                                                                                                                                                                                                                                                                                                                                      var moment         = require("moment")
-  , Utils          = require("./utils")
-  , DataTypes      = require("./data-types")
-  , QueryInterface = require("./query-interface")
-
-module.exports = (function() {
-  var Migration = function(migrator, path) {
-    var split = path.split('/')
-
-    this.migrator       = migrator
-    this.path           = path
-    this.filename       = Utils._.last(this.path.split('/'))
-
-    var parsed          = Migration.parseFilename(this.filename)
-
-    this.migrationId    = parsed.id
-    this.date           = parsed.date;
-    this.queryInterface = this.migrator.queryInterface
-    this.undoneMethods  = 0
-  }
-
-  ///////////////
-  // static /////
-  ///////////////
-
-  Migration.parseFilename = function(s) {
-    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
-
-    if (matches === null) {
-      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
-    }
-
-    return {
-      id: parseInt(matches[1]),
-      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
-    }
-  }
-
-  Migration.migrationHasInterfaceCalls = function(func) {
-    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
-      , hasCalls       = false
-
-    for(var method in QueryInterface.prototype) {
-      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
-      hasCalls = hasCalls || regex.test(functionString)
-    }
-
-    return hasCalls
-  }
-
-  ///////////////
-  // member /////
-  ///////////////
-
-  Object.defineProperty(Migration.prototype, 'migration', {
-    get: function() {
-      return require(this.path)
-    }
-  })
-
-  Migration.prototype.execute = function(options) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      options = Utils._.extend({
-        method: 'up'
-      }, options || {})
-
-      var onSuccess = function() { emitter.emit('success', null) }
-        , func      = self.migration[options.method]
-
-      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
-      func.call(null, self, DataTypes)
-
-      if (!Migration.migrationHasInterfaceCalls(func))
-        onSuccess()
-    }).run()
-  }
-
-  Migration.prototype.isBefore = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date > this.date) : (date >= this.date)
-  }
-
-  Migration.prototype.isAfter = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date < this.date) : (date <= this.date)
-  }
-
-  // extends the Migration prototype with all methods of QueryInterface.prototype
-  // with additional tracking of start and finish. this is done in order to minimize
-  // asynchronous handling in migrations
-  var extendMigrationWithQueryInterfaceMethods = function(callback) {
-    var self = this
-
-    for(var method in QueryInterface.prototype) {
-      (function(_method) {
-        self[_method] = function() {
-          var emitter = self.QueryInterface
-            , args    = Utils._.map(arguments, function(arg, _) { return arg })
-
-          self.undoneMethods++
-
-          // bind listeners to the query interface
-          // the event will have the same name like the method
-          self.queryInterface.on(_method, function(err) {
-            self.undoneMethods--
-            if (err) {
-              throw new Error(err)
-            } else {
-              (self.undoneMethods == 0) && callback && callback()
-            }
-          })
-
-          return self.queryInterface[_method].apply(self.queryInterface, args)
-        }
-      })(method)
-    }
-  }
-
-  return Migration
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                      \ No newline at end of file diff --git a/docs/migrator.js.html b/docs/migrator.js.html deleted file mode 100644 index 02a61c651b3a..000000000000 --- a/docs/migrator.js.html +++ /dev/null @@ -1,295 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                        const fs     = require("fs")
-    , path   = require("path")
-    , moment = require("moment")
-
-var Utils          = require("./utils")
-  , Migration      = require("./migration")
-  , DataTypes      = require("./data-types")
-
-module.exports = (function() {
-  var Migrator = function(sequelize, options) {
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      path: __dirname + '/../migrations',
-      from: null,
-      to: null,
-      logging: console.log
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
-
-  Object.defineProperty(Migrator.prototype, "queryInterface", {
-    get: function() {
-      return this.sequelize.getQueryInterface()
-    }
-  })
-
-  Migrator.prototype.migrate = function(options) {
-    var self = this
-
-    options = Utils._.extend({
-      method: 'up'
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.getUndoneMigrations(function(err, migrations) {
-        if (err) {
-          emitter.emit('error', err)
-        } else {
-          var chainer = new Utils.QueryChainer
-            , from    = migrations[0]
-
-          if (options.method === 'down') {
-            from = migrations[0]
-            migrations.reverse()
-          }
-
-          migrations.forEach(function(migration) {
-            chainer.add(migration, 'execute', [options], {
-              before: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executing migration: ' + migration.filename)
-                }
-              },
-              after: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executed migration: ' + migration.filename)
-                }
-              },
-              success: function(migration, callback) {
-                if (options.method === 'down') {
-                  deleteUndoneMigration.call(self, from, migration, callback)
-                } else {
-                  saveSuccessfulMigration.call(self, from, migration, callback)
-                }
-              }
-            })
-          })
-
-          chainer
-            .runSerially({ skipOnError: true })
-            .success(function() { emitter.emit('success', null) })
-            .error(function(err) { emitter.emit('error', err) })
-        }
-      })
-    }).run()
-  }
-
-  Migrator.prototype.getUndoneMigrations = function(callback)  {
-    var self = this
-
-    var filterFrom = function(migrations, from, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
-      callback && callback(null, result)
-    }
-    var filterTo = function(migrations, to, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
-      callback && callback(null, result)
-    }
-
-    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      return /\.js$/.test(file)
-    })
-
-    var migrations = migrationFiles.map(function(file) {
-      return new Migration(self, self.options.path + '/' + file)
-    })
-
-    migrations = migrations.sort(function(a,b){
-      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
-    })
-
-    if (this.options.from) {
-      filterFrom(migrations, this.options.from, function(err, migrations) {
-        if (self.options.to) {
-          filterTo(migrations, self.options.to, callback)
-        } else {
-          callback && callback(null, migrations)
-        }
-      })
-    } else {
-      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
-        if (lastMigrationId) {
-          filterFrom(migrations, lastMigrationId, function(err, migrations) {
-            if (self.options.to) {
-              filterTo(migrations, self.options.to, callback)
-            } else {
-              callback && callback(null, migrations)
-            }
-          }, { withoutEqual: true })
-        } else {
-          if (self.options.to) {
-            filterTo(migrations, self.options.to, callback)
-          } else {
-            callback && callback(null, migrations)
-          }
-        }
-      }).error(function(err) {
-        callback && callback(err, null)
-      })
-    }
-  }
-
-  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
-        , SequelizeMeta = storedDAO
-
-      if (!storedDAO) {
-        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
-          from: DataTypes.STRING,
-          to:   DataTypes.STRING
-        }, {
-          timestamps: false
-        })
-      }
-
-      // force sync when model has newly created or if syncOptions are passed
-      if (!storedDAO || syncOptions) {
-        SequelizeMeta
-          .sync(syncOptions || {})
-          .success(function() { emitter.emit('success', SequelizeMeta) })
-          .error(function(err) { emitter.emit('error', err) })
-      } else {
-        emitter.emit('success', SequelizeMeta)
-      }
-    }).run()
-  }
-
-  // private
-
-  var getLastMigrationFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
-          emitter.emit('success', meta ? meta : null)
-        }).error(function(err) { emitter.emit('error', err) })
-      }).error(function(err) { emitter.emit(err) })
-    }).run()
-  }
-
-  var getLastMigrationIdFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      getLastMigrationFromDatabase.call(self)
-        .success(function(meta) {
-          emitter.emit('success', meta ? meta.to : null)
-        })
-        .error(function(err) {
-          emitter.emit('error', err)
-        })
-    }).run()
-  }
-
-  var getFormattedDateString = function(s) {
-    var result = null
-
-    try {
-      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
-    } catch(e) {
-      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
-    }
-
-    return result
-  }
-
-  var stringToDate = function(s) {
-    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
-  }
-
-  var saveSuccessfulMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .create({ from: from.migrationId, to: to.migrationId })
-        .success(callback)
-    })
-  }
-
-  var deleteUndoneMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
-        .success(function(meta) {
-          meta.destroy().success(callback)
-        })
-    })
-  }
-
-  return Migrator
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                        \ No newline at end of file diff --git a/docs/query-chainer.js.html b/docs/query-chainer.js.html deleted file mode 100644 index 835eea3a6633..000000000000 --- a/docs/query-chainer.js.html +++ /dev/null @@ -1,201 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration

                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require("./utils")
-
-module.exports = (function() {
-  var QueryChainer = function(emitters) {
-    var self = this
-
-    this.finishedEmits  = 0
-    this.emitters       = []
-    this.serials        = []
-    this.fails          = []
-    this.serialResults  = []
-    this.emitterResults = []
-    this.finished       = false
-    this.wasRunning     = false
-    this.eventEmitter   = null
-
-    emitters = emitters || []
-    emitters.forEach(function(emitter) {
-      if (Array.isArray(emitter)) {
-        self.add.apply(self, emitter)
-      } else {
-        self.add(emitter)
-      }
-    })
-  }
-
-  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
-    if (!!method) {
-      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
-    } else {
-      observeEmitter.call(this, emitterOrKlass)
-      this.emitters.push(emitterOrKlass)
-    }
-
-    return this
-  }
-
-  QueryChainer.prototype.run = function() {
-    var self = this
-    this.eventEmitter = new Utils.CustomEventEmitter(function() {
-      self.wasRunning = true
-      finish.call(self, 'emitterResults')
-    })
-    return this.eventEmitter.run()
-  }
-
-  QueryChainer.prototype.runSerially = function(options) {
-    var self       = this
-      , serialCopy = Utils._.clone(this.serials)
-
-    options = Utils._.extend({
-      skipOnError: false
-    }, options)
-
-    var exec = function() {
-      var serial = self.serials.pop()
-
-      if (serial) {
-        serial.options = serial.options || {}
-        serial.options.before && serial.options.before(serial.klass)
-
-        var onSuccess = function() {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          exec()
-        }
-
-        var onError = function(err) {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          self.fails.push(err)
-          exec()
-        }
-
-        if (options.skipOnError && (self.fails.length > 0)) {
-          onError('Skipped due to earlier error!')
-        } else {
-          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
-
-          emitter.success(function(result) {
-            self.serialResults[serialCopy.indexOf(serial)] = result
-
-            if (serial.options.success) {
-              serial.options.success(serial.klass, onSuccess)
-            } else {
-              onSuccess()
-            }
-          }).error(onError)
-        }
-      } else {
-        self.wasRunning = true
-        finish.call(self, 'serialResults')
-      }
-    }
-
-    this.serials.reverse()
-    this.eventEmitter = new Utils.CustomEventEmitter(exec)
-    return this.eventEmitter.run()
-  }
-
-  // private
-
-  var observeEmitter = function(emitter) {
-    var self = this
-
-    emitter
-      .success(function(result) {
-        self.emitterResults[self.emitters.indexOf(emitter)] = result
-        self.finishedEmits++
-        finish.call(self, 'emitterResults')
-      })
-      .error(function(err) {
-        self.finishedEmits++
-        self.fails.push(err)
-        finish.call(self, 'emitterResults')
-      })
-      .on('sql', function(sql) {
-        if (self.eventEmitter) {
-          self.eventEmitter.emit('sql', sql)
-        }
-      })
-  }
-
-  var finish = function(resultsName) {
-    this.finished = true
-
-    if (this.emitters.length > 0) {
-      this.finished = (this.finishedEmits == this.emitters.length)
-    }
-    else if (this.serials.length > 0) {
-      this.finished = (this.finishedEmits == this.serials.length)
-    }
-
-    if (this.finished && this.wasRunning) {
-      var status = (this.fails.length == 0 ? 'success' : 'error')
-        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
-
-      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
-    }
-  }
-
-  return QueryChainer
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                          \ No newline at end of file diff --git a/docs/query-interface.js.html b/docs/query-interface.js.html deleted file mode 100644 index 63306f65c85c..000000000000 --- a/docs/query-interface.js.html +++ /dev/null @@ -1,342 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration

                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils     = require('./utils')
-  , DataTypes = require('./data-types')
-
-module.exports = (function() {
-  var QueryInterface = function(sequelize) {
-    this.sequelize = sequelize
-    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-   this.QueryGenerator.options = this.sequelize.options;
-  }
-  Utils.addEventEmitter(QueryInterface)
-
-  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
-    var attributeHashes = {}
-
-    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
-      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-        attributeHashes[attributeName] = { type: dataTypeOrOptions }
-      } else {
-        attributeHashes[attributeName] = dataTypeOrOptions
-      }
-    })
-
-    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
-
-    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'createTable')
-  }
-
-  QueryInterface.prototype.dropTable = function(tableName) {
-    var sql = this.QueryGenerator.dropTableQuery(tableName)
-    return queryAndEmit.call(this, sql, 'dropTable')
-  }
-
-  QueryInterface.prototype.dropAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-
-      self.showAllTables().success(function(tableNames) {
-        tableNames.forEach(function(tableName) {
-          chainer.add(self.dropTable(tableName))
-        })
-        chainer
-          .run()
-          .success(function() {
-            self.emit('dropAllTables', null)
-            emitter.emit('success', null)
-          })
-          .error(function(err) {
-            self.emit('dropAllTables', err)
-            emitter.emit('error', err)
-          })
-      }).error(function(err) {
-        self.emit('dropAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.renameTable = function(before, after) {
-    var sql = this.QueryGenerator.renameTableQuery(before, after)
-    return queryAndEmit.call(this, sql, 'renameTable')
-  }
-
-  QueryInterface.prototype.showAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var showTablesSql = self.QueryGenerator.showTablesQuery()
-      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
-        self.emit('showAllTables', null)
-        emitter.emit('success', Utils._.flatten(tableNames))
-      }).error(function(err) {
-        self.emit('showAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.describeTable = function(tableName) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql;
-      if (self.QueryGenerator.describeTableQuery) {
-        sql = self.QueryGenerator.describeTableQuery(tableName)
-      } else {
-        sql = 'DESCRIBE `' + tableName + '`;'
-      }
-      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
-        emitter.emit('success', data)
-      }).error(function(err) {
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'addColumn')
-  }
-
-  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
-    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
-    return queryAndEmit.call(this, sql, 'removeColumn')
-  }
-
-  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'changeColumn')
-  }
-
-  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
-
-        var options =  {}
-
-        options[attrNameAfter] = {
-          type: data.Type,
-          allowNull: data.Null == 'YES',
-          defaultValue: data.Default
-        }
-
-        var sql = self.QueryGenerator.renameColumnQuery(tableName,
-          attrNameBefore,
-          self.QueryGenerator.attributesToSQL(options)
-        )
-
-        self.sequelize.query(sql, null, {}).success(function() {
-          self.emit('renameColumn', null)
-          emitter.emit('success', null)
-        }).error(function(err) {
-          self.emit('renameColumn', err)
-          emitter.emit('error', err)
-        })
-      }).error(function(err) {
-        self.emit('renameColumn', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
-    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'addIndex')
-  }
-
-  QueryInterface.prototype.showIndex = function(tableName, options) {
-    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
-    return queryAndEmit.call(this, sql, 'showIndex')
-  }
-
-  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
-    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
-    return queryAndEmit.call(this, sql, "removeIndex")
-  }
-
-  QueryInterface.prototype.insert = function(dao, tableName, values) {
-    var sql = this.QueryGenerator.insertQuery(tableName, values)
-    return queryAndEmit.call(this, [sql, dao], 'insert', {
-      success: function(obj) { obj.isNewRecord = false }
-    })
-  }
-
-  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
-    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'update')
-  }
-
-  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
-    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'delete')
-  }
-
-  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
-    var sql = this.QueryGenerator.selectQuery(tableName, options)
-    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
-    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
-  }
-
-  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
-    var self = this
-
-    if (attributeSelector === undefined) {
-      throw new Error('Please pass an attribute selector!')
-    }
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, options)
-        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
-
-      qry
-        .success(function(data) {
-          var result = data[attributeSelector]
-
-          if (options && options.parseInt) {
-            result = parseInt(result)
-          }
-
-          self.emit('rawSelect', null)
-          emitter.emit('success', result)
-        })
-        .error(function(err) {
-          self.emit('rawSelect', err)
-          emitter.emit('error', err)
-        })
-        .on('sql', function(sql) {
-          emitter.emit('sql', sql)
-        })
-    }).run()
-  }
-
-  // private
-
-  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
-    var self = this
-
-    options = Utils._.extend({
-      success: function(){},
-      error: function(){}
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var query = null
-
-      if (Array.isArray(sqlOrQueryParams)) {
-        if (sqlOrQueryParams.length === 1) {
-          sqlOrQueryParams.push(null)
-        }
-
-        if (sqlOrQueryParams.length === 2) {
-          sqlOrQueryParams.push({})
-        }
-
-        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
-      } else {
-        query = self.sequelize.query(sqlOrQueryParams, null, {})
-      }
-
-      // append the query for better testing
-      emitter.query = query
-
-      query.success(function(obj) {
-        options.success && options.success(obj)
-        self.emit(methodName, null)
-        emitter.emit('success', obj)
-      }).error(function(err) {
-        options.error && options.error(err)
-        self.emit(methodName, err)
-        emitter.emit('error', err)
-      })
-      query.on('sql', function(sql) {
-        emitter.emit('sql', sql)
-      });
-    }).run()
-  }
-
-  return QueryInterface
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                            \ No newline at end of file diff --git a/docs/sequelize.js.html b/docs/sequelize.js.html deleted file mode 100644 index 962146260313..000000000000 --- a/docs/sequelize.js.html +++ /dev/null @@ -1,223 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                            function

                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize()

                                                                                                                                                                                                                                                                                                                                                                                                                                            Main constructor of the project.

                                                                                                                                                                                                                                                                                                                                                                                                                                            - -
                                                                                                                                                                                                                                                                                                                                                                                                                                            Params:
-
-  - `database`
-  - `username`
-  - `password`, optional, default: null
-  - `options`, optional, default: {}
-
-Examples:
-
-    mymodule.write('foo')
-    mymodule.write('foo', { stream: process.stderr })
-
                                                                                                                                                                                                                                                                                                                                                                                                                                              var Sequelize = function(database, username, password, options) {
-    this.options = Utils._.extend({
-      dialect: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      protocol: 'tcp',
-      define: {},
-      query: {},
-      sync: {},
-      logging: console.log,
-      omitNull: false,
-      queue: true,
-      native: false,
-      replication: false,
-      pool: {}
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    this.config = {
-      database: database,
-      username: username,
-      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
-      host    : this.options.host,
-      port    : this.options.port,
-      pool    : this.options.pool,
-      protocol: this.options.protocol,
-      queue   : this.options.queue,
-      native  : this.options.native,
-      replication: this.options.replication,
-      maxConcurrentQueries: this.options.maxConcurrentQueries
-    }
-
-    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
-
-    this.daoFactoryManager = new DAOFactoryManager(this)
-    this.connectorManager  = new ConnectorManager(this, this.config)
-
-    this.importCache = {}
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                              property

                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize.Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                              Reference to Utils

                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize.Utils = Utils
-
-  for (var dataType in DataTypes) {
-    Sequelize[dataType] = DataTypes[dataType]
-  }
-
-  Sequelize.prototype.getQueryInterface = function() {
-    this.queryInterface = this.queryInterface || new QueryInterface(this)
-    return this.queryInterface
-  }
-
-  Sequelize.prototype.getMigrator = function(options, force) {
-    if (force) {
-      this.migrator = new Migrator(this, options)
-    } else {
-      this.migrator = this.migrator || new Migrator(this, options)
-    }
-
-    return this.migrator
-  }
-
-  Sequelize.prototype.define = function(daoName, attributes, options) {
-    options = options || {}
-    var globalOptions = this.options
-
-    if (globalOptions.define) {
-      options = Utils._.extend({}, globalOptions.define, options)
-      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
-        if (globalOptions.define[key]) {
-          options[key] = options[key] || {}
-          Utils._.extend(options[key], globalOptions.define[key])
-        }
-      })
-    }
-    options.omitNull = globalOptions.omitNull
-
-    var factory = new DAOFactory(daoName, attributes, options)
-    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
-    return factory
-  }
-
-  Sequelize.prototype.isDefined = function(daoName) {
-    var daos = this.daoFactoryManager.daos
-    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
-  }
-
-  Sequelize.prototype.import = function(path) {
-    if (!this.importCache[path]) {
-      var defineCall = require(path)
-      this.importCache[path] = defineCall(this, DataTypes)
-    }
-
-    return this.importCache[path]
-  }
-
-  Sequelize.prototype.migrate = function(options) {
-    this.getMigrator().migrate(options)
-  }
-
-  Sequelize.prototype.query = function(sql, callee, options) {
-    if (arguments.length === 3) {
-      options = options
-    } else if (arguments.length === 2) {
-      options = {}
-    } else {
-      options = { raw: true }
-    }
-
-    options = Utils._.extend(Utils._.clone(this.options.query), options)
-    options = Utils._.defaults(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
-      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
-    })
-
-    return this.connectorManager.query(sql, callee, options)
-  }
-
-  Sequelize.prototype.sync = function(options) {
-    options = options || {}
-
-    if (this.options.sync) {
-      options = Utils._.extend({}, this.options.sync, options)
-    }
-
-    var chainer = new Utils.QueryChainer()
-
-    this.daoFactoryManager.daos.forEach(function(dao) {
-      chainer.add(dao.sync(options))
-    })
-
-    return chainer.run()
-  }
-
-  Sequelize.prototype.drop = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer
-
-      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
-
-      chainer
-        .run()
-        .success(function() { emitter.emit('success', null) })
-        .error(function(err) { emitter.emit('error', err) })
-    }).run()
-  }
-
-  return Sequelize
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                \ No newline at end of file diff --git a/docs/utils.js.html b/docs/utils.js.html deleted file mode 100644 index ebb9bf55ff5c..000000000000 --- a/docs/utils.js.html +++ /dev/null @@ -1,238 +0,0 @@ -Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize

                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration

                                                                                                                                                                                                                                                                                                                                                                                                                                                mysql

                                                                                                                                                                                                                                                                                                                                                                                                                                                mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                  var mysql      = require("mysql")
-  , connection = mysql.createConnection({})
-  , util       = require("util")
-  , DataTypes  = require("./data-types")
-
-var Utils = module.exports = {
-  _: (function() {
-    var _  = require("underscore")
-      , _s = require('underscore.string')
-
-    _.mixin(_s.exports())
-    _.mixin({
-      includes: _s.include,
-      camelizeIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.camelize(string)
-        }
-
-        return result
-      },
-      underscoredIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.underscored(string)
-        }
-
-        return result
-      }
-    })
-
-    return _
-  })(),
-  addEventEmitter: function(_class) {
-    util.inherits(_class, require('events').EventEmitter)
-  },
-  TICK_CHAR: '`',
-  addTicks: function(s) {
-    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
-  },
-  removeTicks: function(s) {
-    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
-  },
-  escape: function(s) {
-    return connection.escape(s).replace(/\\"/g, '"')
-  },
-  format: function(arr) {
-    return connection.format.apply(connection, [arr.shift(), arr])
-  },
-  isHash: function(obj) {
-    return Utils._.isObject(obj) && !Array.isArray(obj);
-  },
-  toSqlDate: function(date) {
-    return [
-      [
-        date.getFullYear(),
-        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
-        ((date.getDate() < 10 ? '0' : '') + date.getDate())
-      ].join("-"),
-      date.toLocaleTimeString()
-    ].join(" ")
-  },
-  argsArePrimaryKeys: function(args, primaryKeys) {
-    var result = (args.length == Object.keys(primaryKeys).length)
-    if (result) {
-      Utils._.each(args, function(arg) {
-        if (result) {
-          if (['number', 'string'].indexOf(typeof arg) !== -1) {
-            result = true
-          } else {
-            result = (arg instanceof Date)
-          }
-        }
-      })
-    }
-    return result
-  },
-  combineTableNames: function(tableName1, tableName2) {
-    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
-  },
-
-  singularize: function(s) {
-    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
-  },
-
-  pluralize: function(s) {
-    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
-  },
-
-  removeCommentsFromFunctionString: function(s) {
-    s = s.replace(/\s*(\/\/.*)/g, '')
-    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
-
-    return s
-  },
-
-  toDefaultValue: function(value) {
-    return (value == DataTypes.NOW) ? new Date() : value
-  },
-
-  setAttributes: function(hash, identifier, instance, prefix) {
-    prefix = prefix || ''
-    if (this.isHash(identifier)) {
-      this._.each(identifier, function(elem, key) {
-        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
-      })
-    } else {
-      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
-    }
-
-    return hash
-  },
-
-  removeNullValuesFromHash: function(hash, omitNull) {
-    var result = hash
-
-    if (omitNull) {
-      var _hash = {}
-
-      Utils._.each(hash, function(val, key) {
-        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
-          _hash[key] = val;
-        }
-      })
-
-      result = _hash
-    }
-
-    return result
-  },
-
-  prependTableNameToHash: function(tableName, hash) {
-    if (tableName) {
-      var _hash = {}
-
-      for (var key in hash) {
-        if (key.indexOf('.') === -1) {
-          _hash[tableName + '.' + key] = hash[key]
-        } else {
-          _hash[key] = hash[key]
-        }
-      }
-
-      return _hash
-    } else {
-      return hash
-    }
-  },
-
-  firstValueOfHash: function(obj) {
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key))
-        return obj[key]
-    }
-    return null
-  },
-
-  inherit: function(subClass, superClass) {
-    if (superClass.constructor == Function) {
-      // Normal Inheritance
-      subClass.prototype = new superClass();
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass.prototype;
-    } else {
-      // Pure Virtual Inheritance
-      subClass.prototype = superClass;
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass;
-    }
-
-    return subClass;
-  }
-
-}
-
-Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
-Utils.QueryChainer = require("./query-chainer")
-Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                  \ No newline at end of file From 156e63a4bce988a88c9f1e5ba404219923401127 Mon Sep 17 00:00:00 2001 From: Sascha Depold Date: Tue, 26 Feb 2013 16:33:19 +0100 Subject: [PATCH 127/360] yuidoc based documentation --- docs/api.js | 17 + docs/assets/css/external-small.png | Bin 0 -> 491 bytes docs/assets/css/logo.png | Bin 0 -> 6308 bytes docs/assets/css/main.css | 782 ++++++++++++++++++ docs/assets/favicon.png | Bin 0 -> 740 bytes docs/assets/img/spinner.gif | Bin 0 -> 2685 bytes docs/assets/index.html | 10 + docs/assets/js/api-filter.js | 52 ++ docs/assets/js/api-list.js | 251 ++++++ docs/assets/js/api-search.js | 98 +++ docs/assets/js/apidocs.js | 370 +++++++++ docs/assets/js/yui-prettify.js | 17 + docs/assets/vendor/prettify/CHANGES.html | 130 +++ docs/assets/vendor/prettify/COPYING | 202 +++++ docs/assets/vendor/prettify/README.html | 203 +++++ docs/assets/vendor/prettify/prettify-min.css | 1 + docs/assets/vendor/prettify/prettify-min.js | 1 + docs/classes/Sequelize.html | 338 ++++++++ docs/classes/index.html | 10 + docs/data.json | 301 +++++++ docs/files/index.html | 10 + docs/files/index.js.html | 115 +++ docs/files/lib_dao-factory.js.html | 523 ++++++++++++ .../files/lib_dialects_abstract_query.js.html | 519 ++++++++++++ docs/files/lib_sequelize.js.html | 303 +++++++ docs/index.html | 183 ++-- docs/modules/index.html | 10 + docs/modules/sequelize.html | 147 ++++ 28 files changed, 4534 insertions(+), 59 deletions(-) create mode 100644 docs/api.js create mode 100644 docs/assets/css/external-small.png create mode 100644 docs/assets/css/logo.png create mode 100644 docs/assets/css/main.css create mode 100644 docs/assets/favicon.png create mode 100644 docs/assets/img/spinner.gif create mode 100644 docs/assets/index.html create mode 100644 docs/assets/js/api-filter.js create mode 100644 docs/assets/js/api-list.js create mode 100644 docs/assets/js/api-search.js create mode 100644 docs/assets/js/apidocs.js create mode 100644 docs/assets/js/yui-prettify.js create mode 100644 docs/assets/vendor/prettify/CHANGES.html create mode 100644 docs/assets/vendor/prettify/COPYING create mode 100644 docs/assets/vendor/prettify/README.html create mode 100644 docs/assets/vendor/prettify/prettify-min.css create mode 100644 docs/assets/vendor/prettify/prettify-min.js create mode 100644 docs/classes/Sequelize.html create mode 100644 docs/classes/index.html create mode 100644 docs/data.json create mode 100644 docs/files/index.html create mode 100644 docs/files/index.js.html create mode 100644 docs/files/lib_dao-factory.js.html create mode 100644 docs/files/lib_dialects_abstract_query.js.html create mode 100644 docs/files/lib_sequelize.js.html create mode 100644 docs/modules/index.html create mode 100644 docs/modules/sequelize.html diff --git a/docs/api.js b/docs/api.js new file mode 100644 index 000000000000..a2be985c6f9b --- /dev/null +++ b/docs/api.js @@ -0,0 +1,17 @@ +YUI.add("yuidoc-meta", function(Y) { + Y.YUIDoc = { meta: { + "classes": [ + "Sequelize" + ], + "modules": [ + "sequelize" + ], + "allModules": [ + { + "displayName": "sequelize", + "name": "sequelize", + "description": "The entry point." + } + ] +} }; +}); \ No newline at end of file diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png new file mode 100644 index 0000000000000000000000000000000000000000..759a1cdcb5b1697e5be290d98b830e279cd71f3c GIT binary patch literal 491 zcmVDs{zR1^XE?tfB*h@ASKHAa7wwn{MEbP z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL z&#-X)Er#`zY#Ce)^8hM>B_8 literal 0 HcmV?d00001 diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..609b336c7cc5ef0c787a0068d221d9b8d69b1241 GIT binary patch literal 6308 zcmV;V7+dFwP)EI3}K zJAc0RviDlMYT7$`hje!Kj@LB3B$v~Qd;9X^3|$AqFu>69Z0KMbrezvAWa@n&$tpT| zTCH{cyjdVi(gp+w@V^dOksB0A>WW6xhIlO6Tv?HM0X_i}I#y60{PpGwx9vPMtFtRN zzNw#+=Tj2u`-uL(#+a*U!Mhu zc*G(+@nj+A1708rA$uKO;<-VVr3MVYxhNW0pGl{-r;6j7{t5L6rgfY5PJ8CL9kUwu zbudgU8eg2Ex&np2&cRTd`wY)J^i1Ra5;fuU*mdm4tUfgDMK5-q{|m=*>K zmt0VX&YeBdQ=)fa$R^1smi%+SgBQrVaGN@ES(A;8iY#qZRr%H8m*V6T)hnK*O z|1pC?@pvK+BT#UNUrSjdWbFT{Dzm@;L_uBh$8ED$ zuiJfPTW9`aY$8*RdjnUUrlU^R+`03|hDm_i5Luwnq7j z3E6ba0VDwiwDHfNDd`afqMg z;ri!g_m!HW5oK|Cwq!YmyzwIm^+yk_|MHs+Eq9xyRnxCJok*4f#gVLpK`K!hOA`m7 zrXArDhy&z@@Nn!4VdiZ&EK2} z!>Wpb{OnM$1DNA}{p_I4v2VIXKZ_VEfRJY;Iuu1&R+5T8o=vA-I4+<*_iE$hMa%1N z?C8v0J+L~7s%)S@Ol>?uPErsk33`wuLuSY*+7vE48>%1a67ze?luG!wOC|%)EeI?C zwx8(O`zi;pKd^^yj)74>4y=|X<3)=q%hS&sGpIj(bkp1oZ|%Pi=bIBl)oF$l5s2@M zMR71BQ;7WmRiZH{$yVb?Qlg!quu66K@%K)LY$gGSZT&zB6I6^-H+0k^z+_eD?rXV0 z5L1qV!A8eorwW24lZ?>%SS-4rYDo5p4;AW7cfWM)yL&qBv%JW5V0Dtllaoax+#e8V zB$k8}28x_x5pbFwuF@G(hQL=Zo$NO}umKO_6oH2kR4wxSrWK}m#G&)Saemf6U$B$# zrk6{FSmir^W1qZLRh7qwRhQrMfkT~l``>=_UTe?oZtBgd(=tsiMRB8Ch$x^WV>B2V z2&ft>#tNPJ}C{6fYwxz@4|uh6E0@Tu_z>Hq6&SP$9h8q(!7amKNbU6FeVQ}e16NTW!wW&xj$800_2i8@Oqgl}( zBSw)>zyh$kWustb6XGlYV~&}Q<#hu4I2f+-v+5yb_Z=xziTz{6OS|eQ&>jY;WnVK< zC-H4sK93taZ#RBkqo1YXxB%3K83r_hfuO2dE_W1xNt zM0PXiOoA)J`RvVj-Ko>7p*$P6lX{8PUSW6R0a&^20BmcNVdIuIyv<@%guE030oxG( zo?N~Tw)_KN*^1o|jTX^uTeiLne_Xi>wrta2?JLbpT^KQ7kpLFMd+=F!t3ij~|9Kbg z?DqNBz4A8v^@Y9gWXeu*Dj4zq2_$oi{Sn_&7~dqZ!8iyBqiKY1-HN?Zbxp z%=7P#eQfF0WjMl}6i_FHX+zXqpqdRdnk@lERXCvF0o8ev8*_ky@1qUVbX2O_VCif! zOA{`dJI)8?n7Q8GJgo=&{!!u@9x-4gSFN;#Wx7XCFDZ2R-^B-`>$|$O;BgpV=&2U} z-Q8pFvun>G@B2G;?!_leayJd!-|j}>eA>jQmQBmt-)qs>p$50j1G}3J?B0K%?el|% zx@g(fW!SGx;?$}8e$6$vE>IHb7L}!O&LszcA`fWZ1BxUClIbB{7o-bn0SpGFZEjhm zo_0zNl$XUR7}31)&e3Uf$=!|^VBqa9R+|tCDKB!$WE+_&GKBtskbs5t>4?=n8%zm6 zT_c8sC>^X}`MkEYvAJbUOKbb5`h`00w$<0;#+>ZJ^wb$URR>Z?Vx4f)LgW^bpmC?862+ zeD`4UR^}Rb;~wIXya zx}t0;$f`{JW*AUX!*zWr@rlJ{c42`nT#(?%bnnhM{!~QV~&KNRZ#a{m5J7Kckw5%_+cXV&s z_uio&gqq*8PN}*Irw$#QI-SpXVs7&`+!!{wYCH6phTRT*q+&i zpen_P7awo-tl@TG#Be~I=>}f$d>RxuQqc6W0UN7Y z2%dwDv>`;fo++^0j!d_f;1u&G`}QAv`A}Qe6b|ZjS4`VDW<>GTE>JzsE0w4>l1e}n zr!I(zZbhK>-4+{Y0{c)>G4k?Ua8+t@zLb8}-E}t5Y-tgkb=pWH1T>gdk z4zzuPOKI+#f8NrHZ0ttjKdCwypmI?Z66I+ds8IkYGYmy7NCzAsGDz@>fAhQV0prFVph_Hz=*3y7?lo;8z0y7vcglvC70- z79pQygD(HHCAbZLffYNMD?Tjw`NcmQT9LTPg-K=-g{6j;4+zvAxsa#nL8@Z7N7Em( zXZa8rmHIGEFL*lVj8TsNl5Q-Ld#=|Q#%%}FJ zRJOwbmnK0dM8uU9fv;gBKDQ*^|7Tj zL+oDe0X2g_b=U0bP*OpBp$v$tn}nHN=Wk{`39L?;S_PHmNk3|Jf+JC}T;mBUMj+;^ zq2Z|=fQjqGT-O64g{DA-{49H`&X0T@Ul@Sx`{m&6L&O&-z=4Q`*WH`LId=}bO8wbX zDlv6Oc zF|f-^0Gr;}1G;fCsH$-9l*<-Fz$V5m`SIaEc4OfiB(Ie4sfB*2uYJSgA}MUn0uJF5E5f`SZN`Q@Aca6eYyMD{kC2-IMJ zD$zJZyTd+E%wI!*LgKd5E$g^gQgQu3i20i%lzrX4Azr%{ZY=-)GG_Pp?wJT@gfTbI92Oa;8JDdj#9Gc;WI2NX9I$xmh(wh8>uPK67)(Jw6zcMYm(2a*x1N5aqpkZI8))7Ks`Ef& zC1s$fMgGoQ!M;GmOP411_he#vy^FI=u>Eig_!n*YV9A#*|J*cq@(-I~*MT@a=ihg> z!}cAxg^dQg$77RbNqC#AdI}XMvNjfrz^&i;3_Sju*I~!*JY8SEy#?yG?ZuxMQJ^^W zrSW(KzVd~WVA6y%KCBsDHgwv+4R|c?dVEV^Im3dGW10NIg5`h(VtG~$t<2nr1EKmO zx=GHZHVZDfcHGGHJk!uRIG|ddQLPT?$`PR|^^5d+fpVb1r8Fl@EO&1ASzi0oo@-go zpbN{3q@7_HP(3sY-@Nh+xbVypNW|Qe<46bxP~MEE@nb6B*6YuPx{-1SQv3hm!^+{N z>rRKyoSlKvlBjbm)dA_uPPF@jo6doA&LU&j4Idt!5^=JhDUxM=JM$U*>oJ}6berXk zA8Jg-V_%$9H)8JL0PQzWBGZC9KKrXxFKv6}!AGC_c1ugo)gsVDX*np7B0nb;Ml<+D z1vb(({RodytZjN-^W=PTYuJpRMa)e|qS|OQ3g?|Q5$2qQ;J_gZE3E^%dUSe>qNoIQ zqtZ|_G>*@e!ySg0L)p)>EZ+o@kBMXgzIf?raPj9%IM8aqtFJYY@Qi-FvLXTF#$@m^ zj(@*Kuf>HUIlt}X>Eqz(KWxKkRvbnSE3w@Nt5oN=dlrc`$Bsq98#*G2{Mf|0kw-M@ z;jjjC|JS1D&V1tOHTQINbHOc-B&*w6MTiu`molOp4j)*Q{iGik72{Q6bry!7Iq=Fd89#@Nf_ zMao|#?58}SLgmQ4Ps$b-OrglYsfhqUZ?FFTsznFe`>qTh&7g-A9D>CL+Z1DeI;kQMSlA}X2`)^_Q>|!@#k7am zF$>th3Ouvk+S*AT?r_d!Ispk2j4>k%+4F!CpxH1aH(=$W@nBGA@go`N`TRRS^tVe= zVhj$J+ZnXK6*pY;Nz!2VR4E-ivgI_5N(FkF)X8|G&RN_)V4 z^8;SC9PEJBHiKUA@M>%sOoNFuc_40YuzXX%6a!2re+-FUo#?{itQUI++@fKWgrp{% za{YYL_>p&i5RY9P5!9DAHBZqrV*+2Ww}R=5DXNn#;@bh!n9&(Vp>AI0r#8qjscvIi zZq7Hzw8yf02CRO5Grn5;WgpY0)X-qZZFN6|KwjX($e)3WJd5BxpydTYY~YI6z{mS- zy+bVDweuVGUc&3TN%pbtIi&fOe4g(2(6d5JH*?bg`^pZNrCl)NzP zqd?lzy!RkHvSbY$?2u?(m{ydWi1Xhsp9wRkW$hFT|3LIL$0hB+3% zlAJISiP2|l=xwp1s6vIAV;uN&MpR{4CR4J!Zp`rG?p;d9!FTw&p&s> z6`4$o1K1x}=DlUX*WZX`JA{s+ycjgcc-a|IlvVLWY}H98j(Z4>k}&_nY<%rV8byJt0*nyoo@3wI~{SwW6$a{pgX^&%sA5cF)n9#9&GxwgR z{Zs0xV^FE`UP%o^P=X8QK;aQ!TAjwSMDZdq=Skc3kWr9qOVj$|TMUy@2RjU7Gg zIrtb)=y-bFI+?cA|6}%{w$5tu%FgzVo|%5E5)Kw8`kl#Syxx^LPA%$(R%SQBCwTgQ a0R{k+kX}`<%LV)Z0000
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +   blocks. */
+pre code, pre kbd, pre samp { font-size: 100%; }
+
+/* Used to denote text that shouldn't be selectable, such as line numbers or
+   shell prompts. Guess which browser this doesn't work in. */
+.noselect {
+    -moz-user-select: -moz-none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
+/* -- Lists ----------------------------------------------------------------- */
+dd { margin: 0.2em 0 0.7em 1em; }
+dl { margin: 1em 0; }
+dt { font-weight: bold; }
+
+/* -- Tables ---------------------------------------------------------------- */
+caption, th { text-align: left; }
+
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+td, th {
+    border: 1px solid #fff;
+    padding: 5px 12px;
+    vertical-align: top;
+}
+
+td { background: #E6E9F5; }
+td dl { margin: 0; }
+td dl dl { margin: 1em 0; }
+td pre:first-child { margin-top: 0; }
+
+th {
+    background: #D2D7E6;/*#97A0BF*/
+    border-bottom: none;
+    border-top: none;
+    color: #000;/*#FFF1D5*/
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight: bold;
+    line-height: 1.3;
+    white-space: nowrap;
+}
+
+
+/* -- Layout and Content ---------------------------------------------------- */
+#doc {
+    margin: auto;
+    min-width: 1024px;
+}
+
+.content { padding: 0 20px 0 25px; }
+
+.sidebar {
+    padding: 0 15px 0 10px;
+}
+#bd {
+    padding: 7px 0 130px;
+    position: relative;
+    width: 99%;
+}
+
+/* -- Table of Contents ----------------------------------------------------- */
+
+/* The #toc id refers to the single global table of contents, while the .toc
+   class refers to generic TOC lists that could be used throughout the page. */
+
+.toc code, .toc kbd, .toc samp { font-size: 100%; }
+.toc li { font-weight: bold; }
+.toc li li { font-weight: normal; }
+
+/* -- Intro and Example Boxes ----------------------------------------------- */
+/*
+.intro, .example { margin-bottom: 2em; }
+.example {
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 0 5px #bfbfbf;
+    -webkit-box-shadow: 0 0 5px #bfbfbf;
+    box-shadow: 0 0 5px #bfbfbf;
+    padding: 1em;
+}
+.intro {
+    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
+}
+*/
+
+/* -- Other Styles ---------------------------------------------------------- */
+
+/* These are probably YUI-specific, and should be moved out of Selleck's default
+   theme. */
+
+.button {
+    border: 1px solid #dadada;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #444;
+    display: inline-block;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 92.308%;
+    font-weight: bold;
+    padding: 4px 13px 3px;
+    -moz-text-shadow: 1px 1px 0 #fff;
+    -webkit-text-shadow: 1px 1px 0 #fff;
+    text-shadow: 1px 1px 0 #fff;
+    white-space: nowrap;
+
+    background: #EFEFEF; /* old browsers */
+    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
+}
+
+.button:hover {
+    border-color: #466899;
+    color: #fff;
+    text-decoration: none;
+    -moz-text-shadow: 1px 1px 0 #222;
+    -webkit-text-shadow: 1px 1px 0 #222;
+    text-shadow: 1px 1px 0 #222;
+
+    background: #6396D8; /* old browsers */
+    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
+}
+
+.newwindow { text-align: center; }
+
+.header .version em {
+    display: block;
+    text-align: right;
+}
+
+
+#classdocs .item {
+    border-bottom: 1px solid #466899;
+    margin: 1em 0;
+    padding: 1.5em;
+}
+
+#classdocs .item .params p,
+    #classdocs .item .returns p,{
+    display: inline;
+}
+
+#classdocs .item em code, #classdocs .item em.comment {
+    color: green;
+}
+
+#classdocs .item em.comment a {
+    color: green;
+    text-decoration: underline;
+}
+
+#classdocs .foundat {
+    font-size: 11px;
+    font-style: normal;
+}
+
+.attrs .emits {
+    margin-left: 2em;
+    padding: .5em;
+    border-left: 1px dashed #ccc;
+}
+
+abbr {
+    border-bottom: 1px dashed #ccc;
+    font-size: 80%;
+    cursor: help;
+}
+
+.prettyprint li.L0, 
+.prettyprint li.L1, 
+.prettyprint li.L2, 
+.prettyprint li.L3, 
+.prettyprint li.L5, 
+.prettyprint li.L6, 
+.prettyprint li.L7, 
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+ul li p {
+    margin-top: 0;
+}
+
+.method .name {
+    font-size: 110%;
+}
+
+.apidocs .methods .extends .method,
+.apidocs .properties .extends .property,
+.apidocs .attrs .extends .attr,
+.apidocs .events .extends .event {
+    font-weight: bold;
+}
+
+.apidocs .methods .extends .inherited,
+.apidocs .properties .extends .inherited,
+.apidocs .attrs .extends .inherited,
+.apidocs .events .extends .inherited {
+    font-weight: normal;
+}
+
+#hd {
+    background: whiteSmoke;
+    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
+    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
+    border-bottom: 1px solid #DFDFDF;
+    padding: 0 15px 1px 20px;
+    margin-bottom: 15px;
+}
+
+#hd img {
+    margin-right: 10px;
+    vertical-align: middle;
+}
+
+
+/* -- API Docs CSS ---------------------------------------------------------- */
+
+/*
+This file is organized so that more generic styles are nearer the top, and more
+specific styles are nearer the bottom of the file. This allows us to take full
+advantage of the cascade to avoid redundant style rules. Please respect this
+convention when making changes.
+*/
+
+/* -- Generic TabView styles ------------------------------------------------ */
+
+/*
+These styles apply to all API doc tabviews. To change styles only for a
+specific tabview, see the other sections below.
+*/
+
+.yui3-js-enabled .apidocs .tabview {
+    visibility: hidden; /* Hide until the TabView finishes rendering. */
+    _visibility: visible;
+}
+
+.apidocs .tabview.yui3-tabview-content { visibility: visible; }
+.apidocs .tabview .yui3-tabview-panel { background: #fff; }
+
+/* -- Generic Content Styles ------------------------------------------------ */
+
+/* Headings */
+h2, h3, h4, h5, h6 {
+    border: none;
+    color: #30418C;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+.link-docs {
+    float: right;
+    font-size: 15px;
+    margin: 4px 4px 6px;
+    padding: 6px 30px 5px;
+}
+
+.apidocs { zoom: 1; }
+
+/* Generic box styles. */
+.apidocs .box {
+    border: 1px solid;
+    border-radius: 3px;
+    margin: 1em 0;
+    padding: 0 1em;
+}
+
+/* A flag is a compact, capsule-like indicator of some kind. It's used to
+   indicate private and protected items, item return types, etc. in an
+   attractive and unobtrusive way. */
+.apidocs .flag {
+    background: #bababa;
+    border-radius: 3px;
+    color: #fff;
+    font-size: 11px;
+    margin: 0 0.5em;
+    padding: 2px 4px 1px;
+}
+
+/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
+.apidocs .meta {
+    background: #f9f9f9;
+    border-color: #efefef;
+    color: #555;
+    font-size: 11px;
+    padding: 3px 6px;
+}
+
+.apidocs .meta p { margin: 0; }
+
+/* Deprecation warning. */
+.apidocs .box.deprecated,
+.apidocs .flag.deprecated {
+    background: #fdac9f;
+    border: 1px solid #fd7775;
+}
+
+.apidocs .box.deprecated p { margin: 0.5em 0; }
+.apidocs .flag.deprecated { color: #333; }
+
+/* Module/Class intro description. */
+.apidocs .intro {
+    background: #f0f1f8;
+    border-color: #d4d8eb;
+}
+
+/* Loading spinners. */
+#bd.loading .apidocs,
+#api-list.loading .yui3-tabview-panel {
+    background: #fff url(../img/spinner.gif) no-repeat center 70px;
+    min-height: 150px;
+}
+
+#bd.loading .apidocs .content,
+#api-list.loading .yui3-tabview-panel .apis {
+    display: none;
+}
+
+.apidocs .no-visible-items { color: #666; }
+
+/* Generic inline list. */
+.apidocs ul.inline {
+    display: inline;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.apidocs ul.inline li { display: inline; }
+
+/* Comma-separated list. */
+.apidocs ul.commas li:after { content: ','; }
+.apidocs ul.commas li:last-child:after { content: ''; }
+
+/* Keyboard shortcuts. */
+kbd .cmd { font-family: Monaco, Helvetica; }
+
+/* -- Generic Access Level styles ------------------------------------------- */
+.apidocs .item.protected,
+.apidocs .item.private,
+.apidocs .index-item.protected,
+.apidocs .index-item.deprecated,
+.apidocs .index-item.private {
+    display: none;
+}
+
+.show-deprecated .item.deprecated,
+.show-deprecated .index-item.deprecated,
+.show-protected .item.protected,
+.show-protected .index-item.protected,
+.show-private .item.private,
+.show-private .index-item.private {
+    display: block;
+}
+
+.hide-inherited .item.inherited,
+.hide-inherited .index-item.inherited {
+    display: none;
+}
+
+/* -- Generic Item Index styles --------------------------------------------- */
+.apidocs .index { margin: 1.5em 0 3em; }
+
+.apidocs .index h3 {
+    border-bottom: 1px solid #efefef;
+    color: #333;
+    font-size: 13px;
+    margin: 2em 0 0.6em;
+    padding-bottom: 2px;
+}
+
+.apidocs .index .no-visible-items { margin-top: 2em; }
+
+.apidocs .index-list {
+    border-color: #efefef;
+    font-size: 12px;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    -moz-column-count: 4;
+    -moz-column-gap: 10px;
+    -moz-column-width: 170px;
+    -ms-column-count: 4;
+    -ms-column-gap: 10px;
+    -ms-column-width: 170px;
+    -o-column-count: 4;
+    -o-column-gap: 10px;
+    -o-column-width: 170px;
+    -webkit-column-count: 4;
+    -webkit-column-gap: 10px;
+    -webkit-column-width: 170px;
+    column-count: 4;
+    column-gap: 10px;
+    column-width: 170px;
+}
+
+.apidocs .no-columns .index-list {
+    -moz-column-count: 1;
+    -ms-column-count: 1;
+    -o-column-count: 1;
+    -webkit-column-count: 1;
+    column-count: 1;
+}
+
+.apidocs .index-item { white-space: nowrap; }
+
+.apidocs .index-item .flag {
+    background: none;
+    border: none;
+    color: #afafaf;
+    display: inline;
+    margin: 0 0 0 0.2em;
+    padding: 0;
+}
+
+/* -- Generic API item styles ----------------------------------------------- */
+.apidocs .args {
+    display: inline;
+    margin: 0 0.5em;
+}
+
+.apidocs .flag.chainable { background: #46ca3b; }
+.apidocs .flag.protected { background: #9b86fc; }
+.apidocs .flag.private { background: #fd6b1b; }
+.apidocs .flag.async { background: #356de4; }
+.apidocs .flag.required { background: #e60923; }
+
+.apidocs .item {
+    border-bottom: 1px solid #efefef;
+    margin: 1.5em 0 2em;
+    padding-bottom: 2em;
+}
+
+.apidocs .item h4,
+.apidocs .item h5,
+.apidocs .item h6 {
+    color: #333;
+    font-family: inherit;
+    font-size: 100%;
+}
+
+.apidocs .item .description p,
+.apidocs .item pre.code {
+    margin: 1em 0 0;
+}
+
+.apidocs .item .meta {
+    background: none;
+    border: none;
+    padding: 0;
+}
+
+.apidocs .item .name {
+    display: inline;
+    font-size: 14px;
+}
+
+.apidocs .item .type,
+.apidocs .item .type a,
+.apidocs .returns-inline {
+    color: #555;
+}
+
+.apidocs .item .type,
+.apidocs .returns-inline {
+    font-size: 11px;
+    margin: 0 0 0 0;
+}
+
+.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
+.apidocs .item .type a:hover { border: none; }
+
+/* -- Item Parameter List --------------------------------------------------- */
+.apidocs .params-list {
+    list-style: square;
+    margin: 1em 0 0 2em;
+    padding: 0;
+}
+
+.apidocs .param { margin-bottom: 1em; }
+
+.apidocs .param .type,
+.apidocs .param .type a {
+    color: #666;
+}
+
+.apidocs .param .type {
+    margin: 0 0 0 0.5em;
+    *margin-left: 0.5em;
+}
+
+.apidocs .param-name { font-weight: bold; }
+
+/* -- Item "Emits" block ---------------------------------------------------- */
+.apidocs .item .emits {
+    background: #f9f9f9;
+    border-color: #eaeaea;
+}
+
+/* -- Item "Returns" block -------------------------------------------------- */
+.apidocs .item .returns .type,
+.apidocs .item .returns .type a {
+    font-size: 100%;
+    margin: 0;
+}
+
+/* -- Class Constructor block ----------------------------------------------- */
+.apidocs .constructor .item {
+    border: none;
+    padding-bottom: 0;
+}
+
+/* -- File Source View ------------------------------------------------------ */
+.apidocs .file pre.code,
+#doc .apidocs .file pre.prettyprint {
+    background: inherit;
+    border: none;
+    overflow: visible;
+    padding: 0;
+}
+
+.apidocs .L0,
+.apidocs .L1,
+.apidocs .L2,
+.apidocs .L3,
+.apidocs .L4,
+.apidocs .L5,
+.apidocs .L6,
+.apidocs .L7,
+.apidocs .L8,
+.apidocs .L9 {
+    background: inherit;
+}
+
+/* -- Submodule List -------------------------------------------------------- */
+.apidocs .module-submodule-description {
+    font-size: 12px;
+    margin: 0.3em 0 1em;
+}
+
+.apidocs .module-submodule-description p:first-child { margin-top: 0; }
+
+/* -- Sidebar TabView ------------------------------------------------------- */
+#api-tabview { margin-top: 0.6em; }
+
+#api-tabview-filter,
+#api-tabview-panel {
+    border: 1px solid #dfdfdf;
+}
+
+#api-tabview-filter {
+    border-bottom: none;
+    border-top: none;
+    padding: 0.6em 10px 0 10px;
+}
+
+#api-tabview-panel { border-top: none; }
+#api-filter { width: 97%; }
+
+/* -- Content TabView ------------------------------------------------------- */
+#classdocs .yui3-tabview-panel { border: none; }
+
+/* -- Source File Contents -------------------------------------------------- */
+.prettyprint li.L0,
+.prettyprint li.L1,
+.prettyprint li.L2,
+.prettyprint li.L3,
+.prettyprint li.L5,
+.prettyprint li.L6,
+.prettyprint li.L7,
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+/* -- API options ----------------------------------------------------------- */
+#api-options {
+    font-size: 11px;
+    margin-top: 2.2em;
+    position: absolute;
+    right: 1.5em;
+}
+
+/*#api-options label { margin-right: 0.6em; }*/
+
+/* -- API list -------------------------------------------------------------- */
+#api-list {
+    margin-top: 1.5em;
+    *zoom: 1;
+}
+
+.apis {
+    font-size: 12px;
+    line-height: 1.4;
+    list-style: none;
+    margin: 0;
+    padding: 0.5em 0 0.5em 0.4em;
+}
+
+.apis a {
+    border: 1px solid transparent;
+    display: block;
+    margin: 0 0 0 -4px;
+    padding: 1px 4px 0;
+    text-decoration: none;
+    _border: none;
+    _display: inline;
+}
+
+.apis a:hover,
+.apis a:focus {
+    background: #E8EDFC;
+    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
+    border-color: #AAC0FA;
+    border-radius: 3px;
+    color: #333;
+    outline: none;
+}
+
+.api-list-item a:hover,
+.api-list-item a:focus {
+    font-weight: bold;
+    text-shadow: 1px 1px 1px #fff;
+}
+
+.apis .message { color: #888; }
+.apis .result a { padding: 3px 5px 2px; }
+
+.apis .result .type {
+    right: 4px;
+    top: 7px;
+}
+
+.api-list-item .yui3-highlight {
+    font-weight: bold;
+}
+
diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a95ddab6ff6735b52596ecea54f2b68298cae91
GIT binary patch
literal 740
zcmV~sYqK3Gcus4xPHVF@NRlx_jU+UHO>DGCVWd%Mvj6}8PiwO?MUOK>
zh#e_-OJS-kK8Z|Xt0XgkGe(eqj=e%xpEO30J581!Eqg~?q%T2?Ek21)YqKpribYwO
zO>DFvE_`l(vNA-DP-?S5PK0`q!bDh@Mq8vgOqNb&rhJXTL|2zvaI{oyv}%RBafiZK
zXPjk$xItE*Ls+3FH-t7xlT2l%b%(okjlX(}z(iM=T5+{UVWUxLu~2HVQ*5(wfwpIY
zx^suTO<$u_Wt}fTi)DPfVSTqxX0Jh2pF>!pWqY$FG=V!yh%`o#I!lpBUZ_i9sy$Mh
zbd0`wjKM-wmsoDGM_{8+Xt7mktWRsRQE9SmezIwQzG;8GYk{~+U!725o-93xU~{x&
zdA3hxu0U0uNL!jG$nRJA=b%wh=O^H2C
zi#SY{S8At7V4_fHuux~PPinJicdKW6vS@y|OI(^NI)+?xw@qZNU~r`!DtSIqoCqvd
zm;e9(D|Av$Qve|DfN(%S$B)~`AYc$64eo$|fIvW?+sFBE5P*O{KtQ1G#~^@FK%hjn
zkdomz0002TNkl`w>G^{kLDnt;%<*|0o$}R6`^xy<@RoEM1
zqurZYT;p`r!P4>0S(y=fId&Oc5+FWDLu^>Hac!Eup}&RRh(iLlN#v|TEqoX
z5F2J5;1i==(bn!4tN;>_E30vHG)PRY)6s2(SgB^~Xzyu~5Z0B?0uj)%)~>X1@wKpO
z<%S6GDhHV+Ih7Q7iNigiX=l`)U1%u_7vT4<*Qrj=V?+3pPb|D3u#*89NQ6#w1ZBuqOP1eV&xzQwK$cK
zkb?<_1QC!z6+{~vj><7mpp+3&q{5Dt1$U9<3{C|V26e`6+}0U?@ONkSN8g|C`^+=f
zec#XX!r`F-fpJ8D2y6j>udlD4pC5oT3UK~dPYWuR4SFpWW~kBI-Ty)
zrAvCf-e52^Ha2#4cJ}o23=R&CjEszqjy`(yXliO|W@ct?Ztm&Rr_Y~1-`w1M{ra`P
zzkftTL}X-Se0+RDLPBO{W_EUVPEL+SqbVvXDlILot*vcoY3b|h8y+6Md-v|chYzQx
zr)Otp7Z(>-R#u)pd$zv5zO}Wry}hkaD7w13`uqDQCnp;k8k(A#mX?;**48#QHr~8>
zlai8BUtizc+}zvSJ3l}F;>C+2M~>XPckkuPmqw%U)vH&B4<82pkB{?j=qTvGeqqR`
z5R2iB1Wl->t8k$(8WzAl-af1_0N4}u*W}bRgf#%9q-JH99w-MtKSV)|0SLen*ai3i
zKwLs*dgT7l1Mh@}LqbZXsptdIrmkC${_G3<>BH|s@jv$AEj=AulRJ-t~vQzbstTBdj1f9x+OI}c{HEGJTIo)-S3
zvXu@V5Ze5s?o^rjP2oAJZBgJ43EeZab1q+7T3AZ*>`$M~Ip=VyAkWdBfV0!N;IWlu
zD(gxt-qC?f-Y0OdwW^d52?XMe&uMsja#IsM*&(x|vpcV`xxBXSr!40`V8IVychwC@
z(!=(Wi*J)OEFo9!i_1H9B3S81`;tp(L9|zFZVRfT#e-Mxsdc=o%{qm6GUnDq8#@+w
z>zp9;^*C*b0a>)OpldGRYLW-}Rgrhi;mT3&%e
zb^^cg9z2rK8N!u+qrAU$JXq=Q$F%*?-T?FD#nCSJ%RJ
zM8EzX-KiKhdEPdX+W9(2!>6Tj7tGHG(@GXIHcI#ZvuG)z`cvk-VdBK*c|$UxeEHgt
zh|eHoo#Hc@pK-so^azG|S%hK;SFlf#7sO=2{OEwvn5bYJuJ)RU!t37+vAHhjqeCDD7^hxtbsYzs?)RgAac-&SQ9q*ejs5N9;>zmK
zPUNUo2`H82%N0r`1gQ%0iFCS%U#Nn#S`7$YER~j(tMN9rtZI;7tOElDR#vuErF^v%
z*JNdL`G(A{(F)h2u*1gkN>^r%0ek*
zgATbqYlGa_bGv|KZA}7qZy-^>7P2IOH6RK_p0{{FP*Z?`0Sgup2zfAw7b+2os*;)q
z+5#lPY#aSu@*Qn1b)Pw6htWZ`zgMBUpw<*kdk!
zI2X()g6*)r9wu>OjUHjg4XG}it7AJ{SYC~${GkN#!Sq}P9oXlOJoAHCyhZJk<7)Dy2%T-Q`9NtoT?
zY$ef_KCTe&F^x^D+|KF=eiSu@+>KzjBXCcw!o>=<#ex+Z!{Kbw1y5|(6?AL-F>Q@`
zuo>r&XN^`QxOtZJWT7R`yM{vkjX0hzY5o_L9GG#?(B^5qQxb*`lhBZP;sO;+aia2c
zCaZudbVWYTsS0qtA`?@uVQ$EHXcr9BK!#y*gOuzZfplYa;d_x0w1J4;p)O;uTj$;O
zv99g_E?%o3GlPCna4l!>3Kn6$TmgB^SaLxzk9U(vpJzOlL7uAtVwlUNiF4YB+lX<^
pE|2Kr%d?-r>ImN9F0EXz^8E;tU2&^Zb%igPc${)^%gY+r_aA#xUsC`8

literal 0
HcmV?d00001

diff --git a/docs/assets/index.html b/docs/assets/index.html
new file mode 100644
index 000000000000..487fe15b2ad0
--- /dev/null
+++ b/docs/assets/index.html
@@ -0,0 +1,10 @@
+
+
+    
+        Redirector
+        
+    
+    
+        Click here to redirect
+    
+
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
new file mode 100644
index 000000000000..37aefbab980b
--- /dev/null
+++ b/docs/assets/js/api-filter.js
@@ -0,0 +1,52 @@
+YUI.add('api-filter', function (Y) {
+
+Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+    getDisplayName: function(name) {
+
+        Y.each(Y.YUIDoc.meta.allModules, function(i) {
+            if (i.name === name && i.displayName) {
+                name = i.displayName;
+            }
+        });
+
+        return name;
+    }
+
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        // May be set to "classes" or "modules".
+        queryType: {
+            value: 'classes'
+        },
+
+        source: {
+            valueFn: function() {
+                var self = this;
+                return function(q) {
+                    var data = Y.YUIDoc.meta[self.get('queryType')],
+                        out = [];
+                    Y.each(data, function(v) {
+                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
+                            out.push(v);
+                        }
+                    });
+                    return out;
+                };
+            }
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
+]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
new file mode 100644
index 000000000000..88905b52ea3d
--- /dev/null
+++ b/docs/assets/js/api-list.js
@@ -0,0 +1,251 @@
+YUI.add('api-list', function (Y) {
+
+var Lang   = Y.Lang,
+    YArray = Y.Array,
+
+    APIList = Y.namespace('APIList'),
+
+    classesNode    = Y.one('#api-classes'),
+    inputNode      = Y.one('#api-filter'),
+    modulesNode    = Y.one('#api-modules'),
+    tabviewNode    = Y.one('#api-tabview'),
+
+    tabs = APIList.tabs = {},
+
+    filter = APIList.filter = new Y.APIFilter({
+        inputNode : inputNode,
+        maxResults: 1000,
+
+        on: {
+            results: onFilterResults
+        }
+    }),
+
+    search = APIList.search = new Y.APISearch({
+        inputNode : inputNode,
+        maxResults: 100,
+
+        on: {
+            clear  : onSearchClear,
+            results: onSearchResults
+        }
+    }),
+
+    tabview = APIList.tabview = new Y.TabView({
+        srcNode  : tabviewNode,
+        panelNode: '#api-tabview-panel',
+        render   : true,
+
+        on: {
+            selectionChange: onTabSelectionChange
+        }
+    }),
+
+    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
+        circular   : true,
+        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
+        keys       : {next: 'down:40', previous: 'down:38'}
+    }).focusManager,
+
+    LIST_ITEM_TEMPLATE =
+        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                • ' +
+            '{displayName}' +
+        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • ';
+
+// -- Init ---------------------------------------------------------------------
+
+// Duckpunch FocusManager's key event handling to prevent it from handling key
+// events when a modifier is pressed.
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusPrevious', focusManager);
+
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusNext', focusManager);
+
+// Create a mapping of tabs in the tabview so we can refer to them easily later.
+tabview.each(function (tab, index) {
+    var name = tab.get('label').toLowerCase();
+
+    tabs[name] = {
+        index: index,
+        name : name,
+        tab  : tab
+    };
+});
+
+// Switch tabs on Ctrl/Cmd-Left/Right arrows.
+tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
+
+// Focus the filter input when the `/` key is pressed.
+Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
+
+// Keep the Focus Manager up to date.
+inputNode.on('focus', function () {
+    focusManager.set('activeDescendant', inputNode);
+});
+
+// Update all tabview links to resolved URLs.
+tabview.get('panelNode').all('a').each(function (link) {
+    link.setAttribute('href', link.get('href'));
+});
+
+// -- Private Functions --------------------------------------------------------
+function getFilterResultNode() {
+    return filter.get('queryType') === 'classes' ? classesNode : modulesNode;
+}
+
+// -- Event Handlers -----------------------------------------------------------
+function onFilterResults(e) {
+    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
+        resultNode   = getFilterResultNode(),
+        typePlural   = filter.get('queryType'),
+        typeSingular = typePlural === 'classes' ? 'class' : 'module';
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
+                rootPath    : APIList.rootPath,
+                displayName : filter.getDisplayName(result.highlighted),
+                name        : result.text,
+                typePlural  : typePlural,
+                typeSingular: typeSingular
+            }));
+        });
+    } else {
+        frag.append(
+            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                • ' +
+                'No ' + typePlural + ' found.' +
+            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • '
+        );
+    }
+
+    resultNode.empty(true);
+    resultNode.append(frag);
+
+    focusManager.refresh();
+}
+
+function onSearchClear(e) {
+
+    focusManager.refresh();
+}
+
+function onSearchKey(e) {
+    var target = e.target;
+
+    if (target.test('input,select,textarea')
+            || target.get('isContentEditable')) {
+        return;
+    }
+
+    e.preventDefault();
+
+    inputNode.focus();
+    focusManager.refresh();
+}
+
+function onSearchResults(e) {
+    var frag = Y.one(Y.config.doc.createDocumentFragment());
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(result.display);
+        });
+    } else {
+        frag.append(
+            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                • ' +
+                'No results found. Maybe you\'ll have better luck with a ' +
+                'different query?' +
+            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • '
+        );
+    }
+
+
+    focusManager.refresh();
+}
+
+function onTabSelectionChange(e) {
+    var tab  = e.newVal,
+        name = tab.get('label').toLowerCase();
+
+    tabs.selected = {
+        index: tab.get('index'),
+        name : name,
+        tab  : tab
+    };
+
+    switch (name) {
+    case 'classes': // fallthru
+    case 'modules':
+        filter.setAttrs({
+            minQueryLength: 0,
+            queryType     : name
+        });
+
+        search.set('minQueryLength', -1);
+
+        // Only send a request if this isn't the initially-selected tab.
+        if (e.prevVal) {
+            filter.sendRequest(filter.get('value'));
+        }
+        break;
+
+    case 'everything':
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', 1);
+
+        if (search.get('value')) {
+            search.sendRequest(search.get('value'));
+        } else {
+            inputNode.focus();
+        }
+        break;
+
+    default:
+        // WTF? We shouldn't be here!
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', -1);
+    }
+
+    if (focusManager) {
+        setTimeout(function () {
+            focusManager.refresh();
+        }, 1);
+    }
+}
+
+function onTabSwitchKey(e) {
+    var currentTabIndex = tabs.selected.index;
+
+    if (!(e.ctrlKey || e.metaKey)) {
+        return;
+    }
+
+    e.preventDefault();
+
+    switch (e.keyCode) {
+    case 37: // left arrow
+        if (currentTabIndex > 0) {
+            tabview.selectChild(currentTabIndex - 1);
+            inputNode.focus();
+        }
+        break;
+
+    case 39: // right arrow
+        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
+            tabview.selectChild(currentTabIndex + 1);
+            inputNode.focus();
+        }
+        break;
+    }
+}
+
+}, '3.4.0', {requires: [
+    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
+]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
new file mode 100644
index 000000000000..175f6a61791f
--- /dev/null
+++ b/docs/assets/js/api-search.js
@@ -0,0 +1,98 @@
+YUI.add('api-search', function (Y) {
+
+var Lang   = Y.Lang,
+    Node   = Y.Node,
+    YArray = Y.Array;
+
+Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
+    // -- Public Properties ----------------------------------------------------
+    RESULT_TEMPLATE:
+        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                • ' +
+            '' +
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  {name}
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                '{resultType}' +
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  {description}
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                '{class}' +
+            '                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • ',
+
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+
+    // -- Protected Methods ----------------------------------------------------
+    _apiResultFilter: function (query, results) {
+        // Filter components out of the results.
+        return YArray.filter(results, function (result) {
+            return result.raw.resultType === 'component' ? false : result;
+        });
+    },
+
+    _apiResultFormatter: function (query, results) {
+        return YArray.map(results, function (result) {
+            var raw  = Y.merge(result.raw), // create a copy
+                desc = raw.description || '';
+
+            // Convert description to text and truncate it if necessary.
+            desc = Node.create('
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' + desc + '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ').get('text');
+
+            if (desc.length > 65) {
+                desc = Y.Escape.html(desc.substr(0, 65)) + ' …';
+            } else {
+                desc = Y.Escape.html(desc);
+            }
+
+            raw['class'] || (raw['class'] = '');
+            raw.description = desc;
+
+            // Use the highlighted result name.
+            raw.name = result.highlighted;
+
+            return Lang.sub(this.RESULT_TEMPLATE, raw);
+        }, this);
+    },
+
+    _apiTextLocator: function (result) {
+        return result.displayName || result.name;
+    }
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultFormatter: {
+            valueFn: function () {
+                return this._apiResultFormatter;
+            }
+        },
+
+        resultFilters: {
+            valueFn: function () {
+                return this._apiResultFilter;
+            }
+        },
+
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        resultListLocator: {
+            value: 'data.results'
+        },
+
+        resultTextLocator: {
+            valueFn: function () {
+                return this._apiTextLocator;
+            }
+        },
+
+        source: {
+            value: '/api/v1/search?q={query}&count={maxResults}'
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
+    'escape'
+]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
new file mode 100644
index 000000000000..c64bb46326fb
--- /dev/null
+++ b/docs/assets/js/apidocs.js
@@ -0,0 +1,370 @@
+YUI().use(
+    'yuidoc-meta',
+    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
+function (Y) {
+
+var win          = Y.config.win,
+    localStorage = win.localStorage,
+
+    bdNode = Y.one('#bd'),
+
+    pjax,
+    defaultRoute,
+
+    classTabView,
+    selectedTab;
+
+// Kill pjax functionality unless serving over HTTP.
+if (!Y.getLocation().protocol.match(/^https?\:/)) {
+    Y.Router.html5 = false;
+}
+
+// Create the default route with middleware which enables syntax highlighting
+// on the loaded content.
+defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
+    prettyPrint();
+    bdNode.removeClass('loading');
+
+    next();
+});
+
+pjax = new Y.Pjax({
+    container      : '#docs-main',
+    contentSelector: '#docs-main > .content',
+    linkSelector   : '#bd a',
+    titleSelector  : '#xhr-title',
+
+    navigateOnHash: true,
+    root          : '/',
+    routes        : [
+        // -- / ----------------------------------------------------------------
+        {
+            path     : '/(index.html)?',
+            callbacks: defaultRoute
+        },
+
+        // -- /classes/* -------------------------------------------------------
+        {
+            path     : '/classes/:class.html*',
+            callbacks: [defaultRoute, 'handleClasses']
+        },
+
+        // -- /files/* ---------------------------------------------------------
+        {
+            path     : '/files/*file',
+            callbacks: [defaultRoute, 'handleFiles']
+        },
+
+        // -- /modules/* -------------------------------------------------------
+        {
+            path     : '/modules/:module.html*',
+            callbacks: defaultRoute
+        }
+    ]
+});
+
+// -- Utility Functions --------------------------------------------------------
+
+pjax.checkVisibility = function (tab) {
+    tab || (tab = selectedTab);
+
+    if (!tab) { return; }
+
+    var panelNode = tab.get('panelNode'),
+        visibleItems;
+
+    // If no items are visible in the tab panel due to the current visibility
+    // settings, display a message to that effect.
+    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
+        if (itemNode.getComputedStyle('display') !== 'none') {
+            return true;
+        }
+    });
+
+    panelNode.all('.no-visible-items').remove();
+
+    if (!visibleItems) {
+        if (Y.one('#index .index-item')) {
+            panelNode.append(
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                    'Some items are not shown due to the current visibility ' +
+                    'settings. Use the checkboxes at the upper right of this ' +
+                    'page to change the visibility settings.' +
+                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  '
+            );
+        } else {
+            panelNode.append(
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                    'This class doesn\'t provide any methods, properties, ' +
+                    'attributes, or events.' +
+                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  ' +
+                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                  '
+            );
+        }
+    }
+
+    // Hide index sections without any visible items.
+    Y.all('.index-section').each(function (section) {
+        var items        = 0,
+            visibleItems = 0;
+
+        section.all('.index-item').each(function (itemNode) {
+            items += 1;
+
+            if (itemNode.getComputedStyle('display') !== 'none') {
+                visibleItems += 1;
+            }
+        });
+
+        section.toggleClass('hidden', !visibleItems);
+        section.toggleClass('no-columns', visibleItems < 4);
+    });
+};
+
+pjax.initClassTabView = function () {
+    if (!Y.all('#classdocs .api-class-tab').size()) {
+        return;
+    }
+
+    if (classTabView) {
+        classTabView.destroy();
+        selectedTab = null;
+    }
+
+    classTabView = new Y.TabView({
+        srcNode: '#classdocs',
+
+        on: {
+            selectionChange: pjax.onTabSelectionChange
+        }
+    });
+
+    pjax.updateTabState();
+    classTabView.render();
+};
+
+pjax.initLineNumbers = function () {
+    var hash      = win.location.hash.substring(1),
+        container = pjax.get('container'),
+        hasLines, node;
+
+    // Add ids for each line number in the file source view.
+    container.all('.linenums>li').each(function (lineNode, index) {
+        lineNode.set('id', 'l' + (index + 1));
+        lineNode.addClass('file-line');
+        hasLines = true;
+    });
+
+    // Scroll to the desired line.
+    if (hasLines && /^l\d+$/.test(hash)) {
+        if ((node = container.getById(hash))) {
+            win.scroll(0, node.getY());
+        }
+    }
+};
+
+pjax.initRoot = function () {
+    var terminators = /^(?:classes|files|modules)$/,
+        parts       = pjax._getPathRoot().split('/'),
+        root        = [],
+        i, len, part;
+
+    for (i = 0, len = parts.length; i < len; i += 1) {
+        part = parts[i];
+
+        if (part.match(terminators)) {
+            // Makes sure the path will end with a "/".
+            root.push('');
+            break;
+        }
+
+        root.push(part);
+    }
+
+    pjax.set('root', root.join('/'));
+};
+
+pjax.updateTabState = function (src) {
+    var hash = win.location.hash.substring(1),
+        defaultTab, node, tab, tabPanel;
+
+    function scrollToNode() {
+        if (node.hasClass('protected')) {
+            Y.one('#api-show-protected').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        if (node.hasClass('private')) {
+            Y.one('#api-show-private').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        setTimeout(function () {
+            // For some reason, unless we re-get the node instance here,
+            // getY() always returns 0.
+            var node = Y.one('#classdocs').getById(hash);
+            win.scrollTo(0, node.getY() - 70);
+        }, 1);
+    }
+
+    if (!classTabView) {
+        return;
+    }
+
+    if (src === 'hashchange' && !hash) {
+        defaultTab = 'index';
+    } else {
+        if (localStorage) {
+            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
+                'index';
+        } else {
+            defaultTab = 'index';
+        }
+    }
+
+    if (hash && (node = Y.one('#classdocs').getById(hash))) {
+        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
+            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
+                if (classTabView.get('rendered')) {
+                    Y.Widget.getByNode(tab).set('selected', 1);
+                } else {
+                    tab.addClass('yui3-tab-selected');
+                }
+            }
+        }
+
+        // Scroll to the desired element if this is a hash URL.
+        if (node) {
+            if (classTabView.get('rendered')) {
+                scrollToNode();
+            } else {
+                classTabView.once('renderedChange', scrollToNode);
+            }
+        }
+    } else {
+        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
+
+        // When the `defaultTab` node isn't found, `localStorage` is stale.
+        if (!tab && defaultTab !== 'index') {
+            tab = Y.one('#classdocs .api-class-tab.index');
+        }
+
+        if (classTabView.get('rendered')) {
+            Y.Widget.getByNode(tab).set('selected', 1);
+        } else {
+            tab.addClass('yui3-tab-selected');
+        }
+    }
+};
+
+pjax.updateVisibility = function () {
+    var container = pjax.get('container');
+
+    container.toggleClass('hide-inherited',
+            !Y.one('#api-show-inherited').get('checked'));
+
+    container.toggleClass('show-deprecated',
+            Y.one('#api-show-deprecated').get('checked'));
+
+    container.toggleClass('show-protected',
+            Y.one('#api-show-protected').get('checked'));
+
+    container.toggleClass('show-private',
+            Y.one('#api-show-private').get('checked'));
+
+    pjax.checkVisibility();
+};
+
+// -- Route Handlers -----------------------------------------------------------
+
+pjax.handleClasses = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    // Handles success and local filesystem XHRs.
+    if (!status || (status >= 200 && status < 300)) {
+        pjax.initClassTabView();
+    }
+
+    next();
+};
+
+pjax.handleFiles = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    // Handles success and local filesystem XHRs.
+    if (!status || (status >= 200 && status < 300)) {
+        pjax.initLineNumbers();
+    }
+
+    next();
+};
+
+// -- Event Handlers -----------------------------------------------------------
+
+pjax.onNavigate = function (e) {
+    var hash         = e.hash,
+        originTarget = e.originEvent && e.originEvent.target,
+        tab;
+
+    if (hash) {
+        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
+
+        if (hash === win.location.hash) {
+            pjax.updateTabState('hashchange');
+        } else if (!tab) {
+            win.location.hash = hash;
+        }
+
+        e.preventDefault();
+        return;
+    }
+
+    // Only scroll to the top of the page when the URL doesn't have a hash.
+    this.set('scrollToTop', !e.url.match(/#.+$/));
+
+    bdNode.addClass('loading');
+};
+
+pjax.onOptionClick = function (e) {
+    pjax.updateVisibility();
+};
+
+pjax.onTabSelectionChange = function (e) {
+    var tab   = e.newVal,
+        tabId = tab.get('contentBox').getAttribute('href').substring(1);
+
+    selectedTab = tab;
+
+    // If switching from a previous tab (i.e., this is not the default tab),
+    // replace the history entry with a hash URL that will cause this tab to
+    // be selected if the user navigates away and then returns using the back
+    // or forward buttons.
+    if (e.prevVal && localStorage) {
+        localStorage.setItem('tab_' + pjax.getPath(), tabId);
+    }
+
+    pjax.checkVisibility(tab);
+};
+
+// -- Init ---------------------------------------------------------------------
+
+pjax.on('navigate', pjax.onNavigate);
+
+pjax.initRoot();
+pjax.upgrade();
+pjax.initClassTabView();
+pjax.initLineNumbers();
+pjax.updateVisibility();
+
+Y.APIList.rootPath = pjax.get('root');
+
+Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
+
+Y.on('hashchange', function (e) {
+    pjax.updateTabState('hashchange');
+}, win);
+
+});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
new file mode 100644
index 000000000000..18de8649532c
--- /dev/null
+++ b/docs/assets/js/yui-prettify.js
@@ -0,0 +1,17 @@
+YUI().use('node', function(Y) {
+    var code = Y.all('.prettyprint.linenums');
+    if (code.size()) {
+        code.each(function(c) {
+            var lis = c.all('ol li'),
+                l = 1;
+            lis.each(function(n) {
+                n.prepend('');
+                l++;
+            });
+        });
+        var h = location.hash;
+        location.hash = '';
+        h = h.replace('LINE_', 'LINENUM_');
+        location.hash = h;
+    }
+});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
new file mode 100644
index 000000000000..b50b841499e7
--- /dev/null
+++ b/docs/assets/vendor/prettify/CHANGES.html
@@ -0,0 +1,130 @@
+
+  
+    
+    Change Log
+  
+  
+    README
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Known Issues
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Perl formatting is really crappy.  Partly because the author is lazy and
+      partly because Perl is
+      hard to parse.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • On some browsers, <code> elements with newlines in the text
+      which use CSS to specify white-space:pre will have the newlines
+      improperly stripped if the element is not attached to the document at the time
+      the stripping is done.  Also, on IE 6, all newlines will be stripped from
+      <code> elements because of the way IE6 produces
+      innerHTML.  Workaround: use <pre> for code with
+      newlines.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Change Log
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  29 March 2007
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added tests for PHP support
+        to address 
+      issue 3.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed
+      bug: prettyPrintOne was not halting.  This was not
+        reachable through the normal entry point.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed
+      bug: recursing into a script block or PHP tag that was not properly
+        closed would not silently drop the content.
+        (test)
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed
+      bug: was eating tabs
+        (test)
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed entity handling so that the caveat
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+          
                                                                                                                                                                                                                                                                                                                                                                                                                                                    Caveats: please properly escape less-thans.  x&lt;y
+          instead of x<y, and use " instead of 
+          &quot; for string delimiters.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        is no longer applicable.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added noisefree's C#
+      patch
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added a distribution that has comments and
+        whitespace removed to reduce download size from 45.5kB to 12.8kB.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  4 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added language specific formatters that are triggered by the presence
+      of a lang-<language-file-extension>
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed bug: python handling of '''string'''
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed bug: / in regex [charsets] should not end regex
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  5 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Defined language extensions for Lisp and Lua
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  14 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Language handlers for F#, OCAML, SQL
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Support for nocode spans to allow embedding of line
+      numbers and code annotations which should not be styled or otherwise
+      affect the tokenization of prettified code.
+      See the issue 22
+      testcase.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  6 Jan 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Language handlers for Visual Basic, Haskell, CSS, and WikiText
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added .mxml extension to the markup style handler for
+        Flex MXML files.  See
+        issue 37.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added .m extension to the C style handler so that Objective
+        C source files properly highlight.  See
+        issue 58.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Changed HTML lexer to use the same embedded source mechanism as the
+        wiki language handler, and changed to use the registered
+        CSS handler for STYLE element content.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  21 May 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Rewrote to improve performance on large files.
+        See benchmarks.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed bugs with highlighting of Haskell line comments, Lisp
+        number literals, Lua strings, C preprocessor directives,
+        newlines in Wiki code on Windows, and newlines in IE6.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  14 August 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed prettifying of <code> blocks with embedded newlines.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  3 October 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed prettifying of XML/HTML tags that contain uppercase letters.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  19 July 2010
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added support for line numbers.  Bug
+        22
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added YAML support.  Bug
+        123
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Added VHDL support courtesy Le Poussin.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • IE performance improvements.  Bug
+        102 courtesy jacobly.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • A variety of markup formatting fixes courtesy smain and thezbyg.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Fixed copy and paste in IE[678].
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Changed output to use &#160; instead of
+        &nbsp; so that the output works when embedded in XML.
+        Bug
+        108.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+  
+
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/docs/assets/vendor/prettify/COPYING
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
new file mode 100644
index 000000000000..c6fe1a32c38f
--- /dev/null
+++ b/docs/assets/vendor/prettify/README.html
@@ -0,0 +1,203 @@
+
+
+
+  
+    Javascript code prettifier
+
+    
+
+    
+
+    
+  
+
+  
+    Languages : CH
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Javascript code prettifier
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Setup
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  1. Download a distribution
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  2. Include the script and stylesheets in your document
+        (you will need to make sure the css and js file are on your server, and
+         adjust the paths in the script and link tag)
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    +<link href="prettify.css" type="text/css" rel="stylesheet" />
+<script type="text/javascript" src="prettify.js"></script>
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  3. Add onload="prettyPrint()" to your
+      document's body tag.
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  4. Modify the stylesheet to get the coloring you prefer
                                                                                                                                                                                                                                                                                                                                                                                                                                                    5. 
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Usage
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Put code snippets in
+    <pre class="prettyprint">...</pre>
+    or <code class="prettyprint">...</code>
+    and it will automatically be pretty printed.
+
+    
+      
+        
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  The original
+        Prettier
+      
                                                                                                                                                                                                                                                                                                                                                                                                                                                  class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded tags.
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded tags.
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  FAQ
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Which languages does it work for?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  The comments in prettify.js are authoritative but the lexer
+    should work on a number of languages including C and friends,
+    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
+    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
+    and Ruby, but, because of commenting conventions, doesn't work on
+    Smalltalk, or CAML-like languages.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  LISPy languages are supported via an extension:
+    lang-lisp.js.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  And similarly for
+    CSS,
+    Haskell,
+    Lua,
+    OCAML, SML, F#,
+    Visual Basic,
+    SQL,
+    Protocol Buffers, and
+    WikiText..
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  If you'd like to add an extension for your favorite language, please
+    look at src/lang-lisp.js and file an
+    issue including your language extension, and a testcase.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  How do I specify which language my code is in?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  You don't need to specify the language since prettyprint()
+    will guess.  You can specify a language by specifying the language extension
+    along with the prettyprint class like so:
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  <pre class="prettyprint lang-html">
+  The lang-* class specifies the language file extensions.
+  File extensions supported by default include
+    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
+    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
+    "xhtml", "xml", "xsl".
+</pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  It doesn't work on <obfuscated code sample>?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Yes.  Prettifying obfuscated code is like putting lipstick on a pig
+    — i.e. outside the scope of this tool.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Which browsers does it work with?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  It's been tested with IE 6, Firefox 1.5 & 2, and Safari 2.0.4.
+    Look at the test page to see if it
+    works in your browser.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  What's changed?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  See the change log
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Why doesn't Prettyprinting of strings work on WordPress?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Apparently wordpress does "smart quoting" which changes close quotes.
+    This causes end quotes to not match up with open quotes.
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  This breaks prettifying as well as copying and pasting of code samples.
+    See
+    WordPress's help center for info on how to stop smart quoting of code
+    snippets.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  How do I put line numbers in my code?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  You can use the linenums class to turn on line
+    numbering.  If your code doesn't start at line number 1, you can
+    add a colon and a line number to the end of that class as in
+    linenums:52.
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  For example
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  <pre class="prettyprint linenums:4"
+>// This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+<pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    produces
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  // This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  How do I prevent a portion of markup from being marked as code?
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  You can use the nocode class to identify a span of markup
+    that is not code.
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  <pre class=prettyprint>
+int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
+  Continuation of comment */
+int y = bar();
+</pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+produces
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +int x = foo();  /* This is a comment  This is not code
+  Continuation of comment */
+int y = bar();
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  For a more complete example see the issue22
+    testcase.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  I get an error message "a is not a function" or "opt_whenDone is not a function"
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  If you are calling prettyPrint via an event handler, wrap it in a function.
+    Instead of doing
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+      addEventListener('load', prettyPrint, false);
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    wrap it in a closure like
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+      addEventListener('load', function (event) { prettyPrint() }, false);
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    so that the browser does not pass an event object to prettyPrint which
+    will confuse it.
+
+    


                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+Last modified: Wed Jul 19 13:56:00 PST 2010
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+  
+
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
new file mode 100644
index 000000000000..d44b3a2282ad
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.css
@@ -0,0 +1 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
new file mode 100644
index 000000000000..4845d05d4b5e
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.js
@@ -0,0 +1 @@
+window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;atau[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Sequelize.html b/docs/classes/Sequelize.html
new file mode 100644
index 000000000000..c63d55e893a8
--- /dev/null
+++ b/docs/classes/Sequelize.html
@@ -0,0 +1,338 @@
+
+
+
+    
+    Sequelize
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize Class
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            Defined in: lib/sequelize.js:12
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+        
+            Module: sequelize
+        
+    
+
+    
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Main class of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Constructor
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            (
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        database
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        username
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        [password]
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        [options]
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  )
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
+            
+                
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
+                Defined in
+                
+            
+        
+        
+        lib/sequelize.js:12
+        
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+        
+
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        database
+                        String
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    The name of the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        username
+                        String
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    The username which is used to authenticate against the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        [password]
+                        String
+                        optional
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    The password which is used to authenticate against the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • 
+                    
+                        [options]
+                        Object
+                        optional
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                    An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example:
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  // without password and options
+var sequelize = new Sequelize('database', 'username')
+
+// without options
+var sequelize = new Sequelize('database', 'username', 'password')
+
+// without password / with blank password
+var sequelize = new Sequelize('database', 'username', null, {})
+
+// with password and options
+var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Item Index
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
+
+            
+
+            
+
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
+
+        
+
+        
+
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/classes/index.html b/docs/classes/index.html
new file mode 100644
index 000000000000..487fe15b2ad0
--- /dev/null
+++ b/docs/classes/index.html
@@ -0,0 +1,10 @@
+
+
+    
+        Redirector
+        
+    
+    
+        Click here to redirect
+    
+
diff --git a/docs/data.json b/docs/data.json
new file mode 100644
index 000000000000..f9c0be7f7777
--- /dev/null
+++ b/docs/data.json
@@ -0,0 +1,301 @@
+{
+    "project": {},
+    "files": {
+        "lib/dialects/abstract/query.js": {
+            "name": "lib/dialects/abstract/query.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "lib/dao-factory.js": {
+            "name": "lib/dao-factory.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "lib/sequelize.js": {
+            "name": "lib/sequelize.js",
+            "modules": {},
+            "classes": {
+                "Sequelize": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "index.js": {
+            "name": "index.js",
+            "modules": {
+                "sequelize": 1
+            },
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        }
+    },
+    "modules": {
+        "sequelize": {
+            "name": "sequelize",
+            "submodules": {},
+            "classes": {
+                "Sequelize": 1
+            },
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "lib/sequelize.js",
+            "line": 12,
+            "description": "The entry point."
+        }
+    },
+    "classes": {
+        "Sequelize": {
+            "name": "Sequelize",
+            "shortname": "Sequelize",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "sequelize",
+            "file": "lib/sequelize.js",
+            "line": 12,
+            "description": "Main class of the project.",
+            "params": [
+                {
+                    "name": "database",
+                    "description": "The name of the database.",
+                    "type": "String"
+                },
+                {
+                    "name": "username",
+                    "description": "The username which is used to authenticate against the database.",
+                    "type": "String"
+                },
+                {
+                    "name": "password",
+                    "description": "The password which is used to authenticate against the database.",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "options",
+                    "description": "An object with options.",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "example": [
+                "\n    // without password and options\n    var sequelize = new Sequelize('database', 'username')\n\n    // without options\n    var sequelize = new Sequelize('database', 'username', 'password')\n\n    // without password / with blank password\n    var sequelize = new Sequelize('database', 'username', null, {})\n\n    // with password and options\n    var sequelize = new Sequelize('my_database', 'john', 'doe', {})"
+            ],
+            "is_constructor": 1
+        }
+    },
+    "classitems": [
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 7,
+            "description": "Inherit from CustomEventEmitter",
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 12,
+            "description": "Execute the passed sql query.\n\nExamples:\n\n    query.run('SELECT 1')",
+            "params": [
+                {
+                    "name": "sql",
+                    "description": "- The SQL query which should be executed.",
+                    "type": "String"
+                }
+            ],
+            "api": "public",
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 26,
+            "description": "Check the logging option of the instance and print deprecation warnings.",
+            "return": {
+                "description": "",
+                "type": "Void"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 43,
+            "description": "High level function that handles the results of a query execution.\n\n\nExample:\n query.formatResults([\n   {\n     id: 1,              // this is from the main table\n     attr2: 'snafu',     // this is from the main table\n     Tasks.id: 1,        // this is from the associated table\n     Tasks.title: 'task' // this is from the associated table\n   }\n ])",
+            "params": [
+                {
+                    "name": "data",
+                    "description": "- The result of the query execution.",
+                    "type": "Array"
+                }
+            ],
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 79,
+            "description": "Shortcut methods (success, ok) for listening for success events.\n\nParams:\n  - fct: A function that gets executed once the *success* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 95,
+            "description": "Shortcut methods (failure, fail, error) for listening for error events.\n\nParams:\n  - fct: A function that gets executed once the *error* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 112,
+            "description": "This function is a wrapper for private methods.",
+            "params": [
+                {
+                    "name": "fctName",
+                    "description": "The name of the private method.",
+                    "type": "String"
+                }
+            ],
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 123,
+            "description": "Get the attributes of an insert query, which contains the just inserted id.",
+            "return": {
+                "description": "The field name.",
+                "type": "String"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 136,
+            "description": "Iterate over all known tables and search their names inside the sql query.\nThis method will also check association aliases ('as' option).",
+            "params": [
+                {
+                    "name": "attribute",
+                    "description": "An attribute of a SQL query. (?)",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "The found tableName / alias.",
+                "type": "String"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 318,
+            "description": "The function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dialects/abstract/query.js",
+            "line": 378,
+            "description": "This function will prepare the result of select queries with joins.",
+            "params": [
+                {
+                    "name": "data",
+                    "description": "This array contains objects.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "The array will have the needed format for groupDataByCalleeFactory.",
+                "type": "Array"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/dao-factory.js",
+            "line": 178,
+            "description": "Search for an instance.",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "Options to describe the scope of the search.",
+                    "type": "Object"
+                },
+                {
+                    "name": "include",
+                    "description": "A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "A promise which fires `success`, `error`, `complete` and `sql`.",
+                "type": "Object"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/sequelize.js",
+            "line": 80,
+            "description": "Reference to Utils",
+            "class": "Sequelize"
+        }
+    ],
+    "warnings": [
+        {
+            "message": "unknown tag: api",
+            "line": " lib/dialects/abstract/query.js:12"
+        },
+        {
+            "message": "Missing item type\nInherit from CustomEventEmitter",
+            "line": " lib/dialects/abstract/query.js:7"
+        },
+        {
+            "message": "Missing item type\nExecute the passed sql query.\n\nExamples:\n\n    query.run('SELECT 1')",
+            "line": " lib/dialects/abstract/query.js:12"
+        },
+        {
+            "message": "Missing item type\nCheck the logging option of the instance and print deprecation warnings.",
+            "line": " lib/dialects/abstract/query.js:26"
+        },
+        {
+            "message": "Missing item type\nHigh level function that handles the results of a query execution.\n\n\nExample:\n query.formatResults([\n   {\n     id: 1,              // this is from the main table\n     attr2: 'snafu',     // this is from the main table\n     Tasks.id: 1,        // this is from the associated table\n     Tasks.title: 'task' // this is from the associated table\n   }\n ])",
+            "line": " lib/dialects/abstract/query.js:43"
+        },
+        {
+            "message": "Missing item type\nShortcut methods (success, ok) for listening for success events.\n\nParams:\n  - fct: A function that gets executed once the *success* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
+            "line": " lib/dialects/abstract/query.js:79"
+        },
+        {
+            "message": "Missing item type\nShortcut methods (failure, fail, error) for listening for error events.\n\nParams:\n  - fct: A function that gets executed once the *error* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
+            "line": " lib/dialects/abstract/query.js:95"
+        },
+        {
+            "message": "Missing item type\nThis function is a wrapper for private methods.",
+            "line": " lib/dialects/abstract/query.js:112"
+        },
+        {
+            "message": "Missing item type\nGet the attributes of an insert query, which contains the just inserted id.",
+            "line": " lib/dialects/abstract/query.js:123"
+        },
+        {
+            "message": "Missing item type\nIterate over all known tables and search their names inside the sql query.\nThis method will also check association aliases ('as' option).",
+            "line": " lib/dialects/abstract/query.js:136"
+        },
+        {
+            "message": "Missing item type\nThe function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
+            "line": " lib/dialects/abstract/query.js:318"
+        },
+        {
+            "message": "Missing item type\nThis function will prepare the result of select queries with joins.",
+            "line": " lib/dialects/abstract/query.js:378"
+        },
+        {
+            "message": "Missing item type\nSearch for an instance.",
+            "line": " lib/dao-factory.js:178"
+        },
+        {
+            "message": "Missing item type\nReference to Utils",
+            "line": " lib/sequelize.js:80"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/docs/files/index.html b/docs/files/index.html
new file mode 100644
index 000000000000..487fe15b2ad0
--- /dev/null
+++ b/docs/files/index.html
@@ -0,0 +1,10 @@
+
+
+    
+        Redirector
+        
+    
+    
+        Click here to redirect
+    
+
diff --git a/docs/files/index.js.html b/docs/files/index.js.html
new file mode 100644
index 000000000000..c118a62cdff8
--- /dev/null
+++ b/docs/files/index.js.html
@@ -0,0 +1,115 @@
+
+
+
+    
+    index.js
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  File: index.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +/**
+  The entry point.
+  @module sequelize
+**/
+module.exports = require("./lib/sequelize")
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/files/lib_dao-factory.js.html b/docs/files/lib_dao-factory.js.html
new file mode 100644
index 000000000000..dd99a8912239
--- /dev/null
+++ b/docs/files/lib_dao-factory.js.html
@@ -0,0 +1,523 @@
+
+
+
+    
+    lib/dao-factory.js
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  File: lib/dao-factory.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +var Utils     = require("./utils")
+  , DAO       = require("./dao")
+  , DataTypes = require("./data-types")
+  , Util      = require('util')
+
+module.exports = (function() {
+  var DAOFactory = function(name, attributes, options) {
+    var self = this
+
+    this.options = Utils._.extend({
+      timestamps: true,
+      instanceMethods: {},
+      classMethods: {},
+      validate: {},
+      freezeTableName: false,
+      underscored: false,
+      syncOnAssociation: true,
+      paranoid: false,
+      whereCollection: null
+    }, options || {})
+
+    this.name = name
+    if (!this.options.tableName) {
+      this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name)
+    } else {
+      this.tableName = this.options.tableName
+    }
+    this.rawAttributes = attributes
+    this.daoFactoryManager = null // defined in init function
+    this.associations = {}
+
+    // extract validation
+    this.validate = this.options.validate || {}
+  }
+
+  Object.defineProperty(DAOFactory.prototype, 'attributes', {
+    get: function() {
+      return this.QueryGenerator.attributesToSQL(this.rawAttributes)
+    }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'QueryInterface', {
+    get: function() { return this.daoFactoryManager.sequelize.getQueryInterface() }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'QueryGenerator', {
+    get: function() { return this.QueryInterface.QueryGenerator }
+  })
+
+  DAOFactory.prototype.init = function(daoFactoryManager) {
+    var self = this;
+
+    this.daoFactoryManager = daoFactoryManager
+
+    this.primaryKeys = {};
+    Utils._.each(this.attributes, function(dataTypeString, attributeName) {
+      // If you don't specify a valid data type lets help you debug it
+      if (dataTypeString === undefined) {
+        throw new Error("Unrecognized data type for field " + attributeName );
+      }
+
+      if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) {
+        self.primaryKeys[attributeName] = dataTypeString
+      }
+    })
+
+    this.primaryKeyCount = Object.keys(this.primaryKeys).length;
+    this.options.hasPrimaryKeys = this.hasPrimaryKeys = this.primaryKeyCount > 0;
+
+    addDefaultAttributes.call(this)
+    addOptionalClassMethods.call(this)
+    findAutoIncrementField.call(this)
+
+    // DAO prototype
+    this.DAO = function() {
+      DAO.apply(this, arguments);
+    };
+    Util.inherits(this.DAO, DAO);
+
+    this.DAO.prototype.rawAttributes = this.rawAttributes;
+    if (this.options.instanceMethods) {
+      Utils._.each(this.options.instanceMethods, function(fct, name) {
+        self.DAO.prototype[name] = fct
+      })
+    }
+    this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes);
+
+    this.DAO.prototype.booleanValues = [];
+    this.DAO.prototype.defaultValues = {};
+    this.DAO.prototype.validators = {};
+    Utils._.each(this.rawAttributes, function (definition, name) {
+      if (((definition === DataTypes.BOOLEAN) || (definition.type === DataTypes.BOOLEAN))) {
+        self.DAO.prototype.booleanValues.push(name);
+      }
+      if (definition.hasOwnProperty('defaultValue')) {
+        self.DAO.prototype.defaultValues[name] = function() {
+          return Utils.toDefaultValue(definition.defaultValue);
+        }
+      }
+
+      if (definition.hasOwnProperty('validate')) {
+        self.DAO.prototype.validators[name] = definition.validate;
+      }
+    });
+
+    this.DAO.prototype.__factory = this;
+    this.DAO.prototype.hasDefaultValues = !Utils._.isEmpty(this.DAO.prototype.defaultValues);
+
+    return this
+  }
+
+  DAOFactory.prototype.sync = function(options) {
+    options = Utils._.extend({}, this.options, options || {})
+
+    var self = this
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var doQuery = function() {
+        self.QueryInterface
+          .createTable(self.tableName, self.attributes, options)
+          .success(function() { emitter.emit('success', self) })
+          .error(function(err) { emitter.emit('error', err) })
+          .on('sql', function(sql) { emitter.emit('sql', sql) })
+      }
+
+      if (options.force) {
+        self.drop().success(doQuery).error(function(err) { emitter.emit('error', err) })
+      } else {
+        doQuery()
+      }
+    }).run()
+  }
+
+  DAOFactory.prototype.drop = function() {
+    return this.QueryInterface.dropTable(this.tableName)
+  }
+
+  // alias for findAll
+  DAOFactory.prototype.all = function(options) {
+    return this.findAll(options)
+  }
+
+  DAOFactory.prototype.findAll = function(options) {
+    var hasJoin = false
+    var options = Utils._.clone(options)
+
+    if (typeof options === 'object') {
+      hasJoin = true
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          return validateIncludedElement.call(this, include)
+        }.bind(this))
+      }
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      type:    'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  //right now, the caller (has-many-double-linked) is in charge of the where clause
+  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
+    var optcpy = Utils._.clone(options)
+    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
+
+    // whereCollection is used for non-primary key updates
+    this.options.whereCollection = optcpy.where || null;
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+  }
+
+ /**
+  * Search for an instance.
+  *
+  * @param  {Object} options Options to describe the scope of the search.
+  *   @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
+  * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
+  */
+  DAOFactory.prototype.find = function(options) {
+    var hasJoin = false
+
+    // no options defined?
+    // return an emitter which emits null
+    if ([null, undefined].indexOf(options) !== -1) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        setTimeout(function() { emitter.emit('success', null) }, 10)
+      }).run()
+    }
+
+    var primaryKeys = this.primaryKeys
+
+    // options is not a hash but an id
+    if (typeof options === 'number') {
+      options = { where: options }
+    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
+      var where = {}
+        , self  = this
+        , keys = Object.keys(primaryKeys)
+
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
+
+      options = { where: where }
+    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
+      var parsedId = parseInt(options, 10)
+
+      if (!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
+
+      options = { where: parsedId }
+    } else if (typeof options === 'object') {
+      options = Utils._.clone(options)
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          return validateIncludedElement.call(this, include)
+        }.bind(this))
+      }
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    options.limit = 1
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      plain: true,
+      type: 'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  DAOFactory.prototype.count = function(options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['count(*)', 'count'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
+  }
+
+  DAOFactory.prototype.max = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['max(' + field + ')', 'max'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
+  }
+  DAOFactory.prototype.min = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['min(' + field + ')', 'min'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
+  }
+
+  DAOFactory.prototype.build = function(values, options) {
+    options = options || { isNewRecord: true }
+
+    var self     = this
+      , instance = new this.DAO(values, this.options, options.isNewRecord)
+
+    instance.isNewRecord = options.isNewRecord
+
+    return instance
+  }
+
+  DAOFactory.prototype.create = function(values, fields) {
+    return this.build(values).save(fields)
+  }
+
+  DAOFactory.prototype.findOrCreate = function (params, defaults) {
+    var self = this;
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          for (var attrname in defaults) {
+            params[attrname] = defaults[attrname]
+          }
+
+          self.create(params)
+            .success(function (instance) {
+              emitter.emit('success', instance)
+            })
+            .error( function (error) {
+              emitter.emit('error', error)
+            })
+        } else {
+          emitter.emit('success', instance)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      });
+    }).run()
+  }
+
+  // private
+
+  var query = function() {
+    var args      = Utils._.map(arguments, function(arg, _) { return arg })
+      , sequelize = this.daoFactoryManager.sequelize
+
+    // add this as the second argument
+    if (arguments.length === 1) {
+      args.push(this)
+    }
+
+    // add {} as options
+    if (args.length === 2) {
+      args.push({})
+    }
+
+    return sequelize.query.apply(sequelize, args)
+  }
+
+  var addOptionalClassMethods = function() {
+    var self = this
+    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
+  }
+
+  var addDefaultAttributes = function() {
+    var self              = this
+      , defaultAttributes = {
+        id: {
+          type: DataTypes.INTEGER,
+          allowNull: false,
+          primaryKey: true,
+          autoIncrement: true
+        }
+      }
+
+    if (this.hasPrimaryKeys) {
+      defaultAttributes = {}
+    }
+
+    if (this.options.timestamps) {
+      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+
+      if (this.options.paranoid)
+        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
+    }
+
+    Utils._.each(defaultAttributes, function(value, attr) {
+      self.rawAttributes[attr] = value
+    })
+  }
+
+  var findAutoIncrementField = function() {
+    var fields = this.QueryGenerator.findAutoIncrementField(this)
+
+    this.autoIncrementField = null
+
+    fields.forEach(function(field) {
+      if (this.autoIncrementField) {
+        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
+      } else {
+        this.autoIncrementField = field
+      }
+    }.bind(this))
+  }
+
+  var validateIncludedElement = function(include) {
+    if (include instanceof DAOFactory) {
+      include = { daoFactory: include, as: include.tableName }
+    }
+
+    if (typeof include === 'object') {
+      if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
+        var usesAlias   = (include.as !== include.daoFactory.tableName)
+          , association = (usesAlias ? this.getAssociationByAlias(include.as) : this.getAssociation(include.daoFactory))
+
+        // check if the current daoFactory is actually associated with the passed daoFactory
+        if (!!association && (!association.options.as || (association.options.as === include.as))) {
+          include.association = association
+
+          return include
+        } else {
+          var msg = include.daoFactory.name
+
+          if (usesAlias) {
+            msg += " (" + include.as + ")"
+          }
+
+          msg += " is not associated to " + this.name + "!"
+
+          throw new Error(msg)
+        }
+      } else {
+        throw new Error('Include malformed. Expected attributes: daoFactory, as!')
+      }
+    } else {
+      throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
+    }
+  }
+
+  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
+
+  return DAOFactory
+})()
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/files/lib_dialects_abstract_query.js.html b/docs/files/lib_dialects_abstract_query.js.html
new file mode 100644
index 000000000000..06875686355d
--- /dev/null
+++ b/docs/files/lib_dialects_abstract_query.js.html
@@ -0,0 +1,519 @@
+
+
+
+    
+    lib/dialects/abstract/query.js
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  File: lib/dialects/abstract/query.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +var Utils              = require('../../utils')
+  , CustomEventEmitter = require("../../emitters/custom-event-emitter")
+
+module.exports = (function() {
+  var AbstractQuery = function(database, sequelize, callee, options) {}
+
+  /**
+    Inherit from CustomEventEmitter
+  */
+  Utils.inherit(AbstractQuery, CustomEventEmitter)
+
+  /**
+   * Execute the passed sql query.
+   *
+   * Examples:
+   *
+   *     query.run('SELECT 1')
+   *
+   * @param {String} sql - The SQL query which should be executed.
+   * @api public
+   */
+  AbstractQuery.prototype.run = function(sql) {
+    throw new Error("The run method wasn't overwritten!")
+  }
+
+  /**
+   * Check the logging option of the instance and print deprecation warnings.
+   *
+   * @return {void}
+   */
+  AbstractQuery.prototype.checkLoggingOption = function() {
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging === console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+
+  /**
+   * High level function that handles the results of a query execution.
+   *
+   *
+   * Example:
+   *  query.formatResults([
+   *    {
+   *      id: 1,              // this is from the main table
+   *      attr2: 'snafu',     // this is from the main table
+   *      Tasks.id: 1,        // this is from the associated table
+   *      Tasks.title: 'task' // this is from the associated table
+   *    }
+   *  ])
+   *
+   * @param {Array} data - The result of the query execution.
+   */
+  AbstractQuery.prototype.formatResults = function(data) {
+    var result  = this.callee
+
+    if (isInsertQuery.call(this, data)) {
+      handleInsertQuery.call(this, data)
+    }
+
+    if (isSelectQuery.call(this)) {
+      result = handleSelectQuery.call(this, data)
+    } else if (isShowTableQuery.call(this)) {
+      result = handleShowTableQuery.call(this, data)
+    } else if (isShowOrDescribeQuery.call(this)) {
+      result = data
+    } else if (isCallQuery.call(this)) {
+      result = data[0]
+    }
+
+    return result
+  }
+
+  /**
+    Shortcut methods (success, ok) for listening for success events.
+
+    Params:
+      - fct: A function that gets executed once the *success* event was triggered.
+
+    Result:
+      The function returns the instance of the query.
+  */
+  AbstractQuery.prototype.success =
+  AbstractQuery.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
+
+  /**
+    Shortcut methods (failure, fail, error) for listening for error events.
+
+    Params:
+      - fct: A function that gets executed once the *error* event was triggered.
+
+    Result:
+      The function returns the instance of the query.
+  */
+  AbstractQuery.prototype.failure =
+  AbstractQuery.prototype.fail =
+  AbstractQuery.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  /**
+   * This function is a wrapper for private methods.
+   *
+   * @param {String} fctName The name of the private method.
+   *
+   */
+  AbstractQuery.prototype.send = function(fctName/*, arg1, arg2, arg3, ...*/) {
+    var args = Array.prototype.slice.call(arguments).slice(1)
+    return eval(fctName).apply(this, args)
+  }
+
+  /**
+   * Get the attributes of an insert query, which contains the just inserted id.
+   *
+   * @return {String} The field name.
+   */
+  AbstractQuery.prototype.getInsertIdField = function() {
+    return 'insertId'
+  }
+
+  /////////////
+  // private //
+  /////////////
+
+  /**
+   * Iterate over all known tables and search their names inside the sql query.
+   * This method will also check association aliases ('as' option).
+   *
+   * @param  {String} attribute An attribute of a SQL query. (?)
+   * @return {String}           The found tableName / alias.
+   */
+  var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
+        tableName = daoFactory.tableName
+      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
+        tableName = Utils.singularize(daoFactory.tableName)
+      } else {
+        for (var associationName in daoFactory.associations) {
+          if (daoFactory.associations.hasOwnProperty(associationName)) {
+            var association = daoFactory.associations[associationName]
+
+            if (attribute.indexOf(association.options.as + ".") === 0) {
+              tableName = association.options.as
+            }
+          }
+        }
+      }
+    })
+
+    return tableName
+  }
+
+  var queryResultHasJoin = function(results) {
+    if (!!results[0]) {
+      var keys = Object.keys(results[0])
+
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
+
+    return false
+  }
+
+  var isInsertQuery = function(results, metaData) {
+    var result = true
+
+    // is insert query if sql contains insert into
+    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
+
+    // is insert query if no results are passed or if the result has the inserted id
+    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
+
+    // is insert query if no metadata are passed or if the metadata has the inserted id
+    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
+
+    return result
+  }
+
+  var handleInsertQuery = function(results, metaData) {
+    if (this.callee) {
+      // add the inserted row id to the instance
+      var autoIncrementField = this.callee.__factory.autoIncrementField
+        , id                 = null
+
+      id = id || (results && results[this.getInsertIdField()])
+      id = id || (metaData && metaData[this.getInsertIdField()])
+
+      this.callee[autoIncrementField] = id
+    }
+  }
+
+  var isShowTableQuery = function() {
+    return (this.sql.toLowerCase().indexOf('show tables') === 0)
+  }
+
+  var handleShowTableQuery = function(results) {
+    return Utils._.flatten(results.map(function(resultSet) {
+      return Utils._.values(resultSet)
+    }))
+  }
+
+  var isSelectQuery = function() {
+    return this.options.type === 'SELECT';
+  }
+
+  var isUpdateQuery = function() {
+    return (this.sql.toLowerCase().indexOf('update') === 0)
+  }
+
+  var handleSelectQuery = function(results) {
+    var result = null, self = this;
+
+    if (this.options.raw) {
+      result = results
+    } else if (this.options.hasJoin === true) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+        // let's build the actual dao instance first...
+        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+        // ... and afterwards the prefetched associations
+        for (var tableName in result) {
+          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+          }
+        }
+
+        return dao
+      }.bind(this))
+    } else {
+      result = results.map(function(result) {
+        return this.callee.build(result, { isNewRecord: false })
+      }.bind(this))
+    }
+
+    // return the first real model instance if options.plain is set (e.g. Model.find)
+    if (this.options.plain) {
+      result = (result.length === 0) ? null : result[0]
+    }
+
+    return result
+  }
+
+  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
+    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association          = null
+
+    if (!!associatedDaoFactory) {
+      association = this.callee.getAssociation(associatedDaoFactory)
+    } else {
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+
+      if (!!associatedDaoFactory) {
+        association = this.callee.getAssociation(associatedDaoFactory)
+      } else {
+        association          = this.callee.getAssociationByAlias(tableName)
+        associatedDaoFactory = association.target
+      }
+    }
+
+    var accessor = Utils._.camelize(tableName)
+
+    // downcase the first char
+    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
+
+    associationData.forEach(function(data) {
+      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+
+      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
+        accessor = Utils.singularize(accessor)
+        dao[accessor] = isEmpty ? null : daoInstance
+      } else {
+        dao[accessor] = dao[accessor] || []
+        if (! isEmpty)
+          dao[accessor].push(daoInstance)
+      }
+    })
+  }
+
+  var isShowOrDescribeQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
+    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
+
+    return  result
+  }
+
+  var isCallQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
+
+    return result
+  }
+
+
+  /**
+    The function takes the result of the query execution and groups
+    the associated data by the callee.
+
+    Example:
+      groupDataByCalleeFactory([
+        {
+          callee: { some: 'data', id: 1 },
+          association: { foo: 'bar', id: 1 }
+        }, {
+          callee: { some: 'data', id: 1 },
+          association: { foo: 'bar', id: 2 }
+        }, {
+          callee: { some: 'data', id: 1 },
+          association: { foo: 'bar', id: 3 }
+        }
+      ])
+
+    Result:
+      Something like this:
+
+      [
+        {
+          callee:  { some: 'data', id: 1 },
+          association: [
+            { foo: 'bar', id: 1 },
+            { foo: 'bar', id: 2 },
+            { foo: 'bar', id: 3 }
+          ]
+        }
+      ]
+  */
+  var groupDataByCalleeFactory = function(data) {
+    var result          = []
+      , calleeTableName = this.callee.tableName
+
+    data.forEach(function(row) {
+      var calleeData    = row[calleeTableName]
+        , existingEntry = result.filter(function(groupedRow) {
+            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
+          })[0]
+
+      if (!existingEntry) {
+        existingEntry = {}
+        result.push(existingEntry)
+        existingEntry[calleeTableName] = calleeData
+      }
+
+      for (var attrName in row) {
+        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
+          existingEntry[attrName] = existingEntry[attrName] || []
+          existingEntry[attrName].push(row[attrName])
+        }
+      }
+    })
+
+    return result
+  }
+
+
+  /**
+   * This function will prepare the result of select queries with joins.
+   *
+   * @param  {Array} data This array contains objects.
+   * @return {Array}      The array will have the needed format for groupDataByCalleeFactory.
+   */
+  var prepareJoinData = function(data) {
+    var result = data.map(function(row) {
+      var nestedRow = {}
+
+      for (var key in row) {
+        if (row.hasOwnProperty(key)) {
+          var tableName = findTableNameInAttribute.call(this, key)
+
+          if (!!tableName) {
+            nestedRow[tableName] = nestedRow[tableName] || {}
+            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
+          } else {
+            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
+            nestedRow[this.callee.tableName][key] = row[key]
+          }
+        }
+      }
+
+      return nestedRow
+    }.bind(this))
+
+    return result
+  }
+
+  return AbstractQuery
+})()
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/files/lib_sequelize.js.html b/docs/files/lib_sequelize.js.html
new file mode 100644
index 000000000000..b146d5bd589d
--- /dev/null
+++ b/docs/files/lib_sequelize.js.html
@@ -0,0 +1,303 @@
+
+
+
+    
+    lib/sequelize.js
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  File: lib/sequelize.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  +var Utils             = require("./utils")
+  , DAOFactory        = require("./dao-factory")
+  , DataTypes         = require('./data-types')
+  , DAOFactoryManager = require("./dao-factory-manager")
+  , QueryInterface    = require("./query-interface")
+
+if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')) < 0.6) {
+  console.log("DEPRECATION WARNING: Support for Node.JS < v0.6 will be canceled in the next minor release.")
+}
+
+module.exports = (function() {
+  /**
+    Main class of the project.
+
+    @param {String} database The name of the database.
+    @param {String} username The username which is used to authenticate against the database.
+    @param {String} [password] The password which is used to authenticate against the database.
+    @param {Object} [options] An object with options.
+
+    @example
+        // without password and options
+        var sequelize = new Sequelize('database', 'username')
+
+        // without options
+        var sequelize = new Sequelize('database', 'username', 'password')
+
+        // without password / with blank password
+        var sequelize = new Sequelize('database', 'username', null, {})
+
+        // with password and options
+        var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+
+    @class Sequelize
+    @constructor
+  */
+  var Sequelize = function(database, username, password, options) {
+    this.options = Utils._.extend({
+      dialect: 'mysql',
+      host: 'localhost',
+      port: 3306,
+      protocol: 'tcp',
+      define: {},
+      query: {},
+      sync: {},
+      logging: console.log,
+      omitNull: false,
+      queue: true,
+      native: false,
+      replication: false,
+      pool: {}
+    }, options || {})
+
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    this.config = {
+      database: database,
+      username: username,
+      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
+      host    : this.options.host,
+      port    : this.options.port,
+      pool    : this.options.pool,
+      protocol: this.options.protocol,
+      queue   : this.options.queue,
+      native  : this.options.native,
+      replication: this.options.replication,
+      maxConcurrentQueries: this.options.maxConcurrentQueries
+    }
+
+    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
+
+    this.daoFactoryManager = new DAOFactoryManager(this)
+    this.connectorManager  = new ConnectorManager(this, this.config)
+
+    this.importCache = {}
+  }
+
+  /**
+    Reference to Utils
+  */
+  Sequelize.Utils = Utils
+
+  for (var dataType in DataTypes) {
+    Sequelize[dataType] = DataTypes[dataType]
+  }
+
+  Sequelize.prototype.getQueryInterface = function() {
+    this.queryInterface = this.queryInterface || new QueryInterface(this)
+    return this.queryInterface
+  }
+
+  Sequelize.prototype.getMigrator = function(options, force) {
+    var Migrator = require("./migrator")
+    if (force) {
+      this.migrator = new Migrator(this, options)
+    } else {
+      this.migrator = this.migrator || new Migrator(this, options)
+    }
+
+    return this.migrator
+  }
+
+  Sequelize.prototype.define = function(daoName, attributes, options) {
+    options = options || {}
+    var globalOptions = this.options
+
+    if (globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if (globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
+    }
+    options.omitNull = globalOptions.omitNull
+
+    var factory = new DAOFactory(daoName, attributes, options)
+    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
+    return factory
+  }
+
+  Sequelize.prototype.isDefined = function(daoName) {
+    var daos = this.daoFactoryManager.daos
+    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
+  }
+
+  Sequelize.prototype.import = function(path) {
+    if (!this.importCache[path]) {
+      var defineCall = require(path)
+      this.importCache[path] = defineCall(this, DataTypes)
+    }
+
+    return this.importCache[path]
+  }
+
+  Sequelize.prototype.migrate = function(options) {
+    this.getMigrator().migrate(options)
+  }
+
+  Sequelize.prototype.query = function(sql, callee, options) {
+    if (arguments.length === 3) {
+      options = options
+    } else if (arguments.length === 2) {
+      options = {}
+    } else {
+      options = { raw: true }
+    }
+
+    options = Utils._.extend(Utils._.clone(this.options.query), options)
+    options = Utils._.defaults(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
+      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
+    })
+
+    return this.connectorManager.query(sql, callee, options)
+  }
+
+  Sequelize.prototype.sync = function(options) {
+    options = options || {}
+
+    if (this.options.sync) {
+      options = Utils._.extend({}, this.options.sync, options)
+    }
+
+    var chainer = new Utils.QueryChainer()
+
+    this.daoFactoryManager.daos.forEach(function(dao) {
+      chainer.add(dao.sync(options))
+    })
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.drop = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer
+
+      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
+
+      chainer
+        .run()
+        .success(function() { emitter.emit('success', null) })
+        .error(function(err) { emitter.emit('error', err) })
+    }).run()
+  }
+
+  return Sequelize
+})()
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/index.html b/docs/index.html
index 58c3518aea0b..469a8b574ddc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,59 +1,124 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
+
+
+
+    
+    
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            Browse to a module or class using the sidebar to view its API documentation.
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Keyboard Shortcuts
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Press s to focus the API search box.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Use Up and Down to select classes, modules, and search results.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • With the API search box or sidebar focused, use ⌘-Left or ⌘-Right to switch sidebar tabs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  • With the API search box or sidebar focused, use Ctrl+Left and Ctrl+Right to switch sidebar tabs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/modules/index.html b/docs/modules/index.html
new file mode 100644
index 000000000000..487fe15b2ad0
--- /dev/null
+++ b/docs/modules/index.html
@@ -0,0 +1,10 @@
+
+
+    
+        Redirector
+        
+    
+    
+        Click here to redirect
+    
+
diff --git a/docs/modules/sequelize.html b/docs/modules/sequelize.html
new file mode 100644
index 000000000000..e0d3e122fdbd
--- /dev/null
+++ b/docs/modules/sequelize.html
@@ -0,0 +1,147 @@
+
+
+
+    
+    sequelize
+    
+    
+    
+    
+    
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            API Docs for: 
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        Show:
+        
+
+        
+
+        
+        
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  sequelize Module
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            Defined in: lib/sequelize.js:12
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+
+    
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  The entry point.
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  This module provides the following classes:
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+            
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
+
+
+
+
+
+
+
+

From f096d9bee3c1cf4b5265508ead1e9407bf8bcc02 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:14:32 +0100
Subject: [PATCH 128/360] support model instead of daoFactory

---
 lib/dao-factory.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 04202ecfe85e..47f9547ab469 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -379,6 +379,11 @@ module.exports = (function() {
     }
 
     if (typeof include === 'object') {
+      if (include.hasOwnProperty('model')) {
+        include.daoFactory = include.model
+        delete include.model
+      }
+
       if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
         var usesAlias   = (include.as !== include.daoFactory.tableName)
           , association = (usesAlias ? this.getAssociationByAlias(include.as) : this.getAssociation(include.daoFactory))

From be10f0bc737255814ba4906e3a23d2cf25fdb7ad Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:15:01 +0100
Subject: [PATCH 129/360] pg support for eager loading

---
 lib/dialects/postgres/connector-manager.js |   2 +
 lib/dialects/postgres/query-generator.js   |  64 +-
 spec/dao-factory.spec.js                   | 824 ++-------------------
 spec/dao.spec.js                           |   2 +-
 4 files changed, 74 insertions(+), 818 deletions(-)

diff --git a/lib/dialects/postgres/connector-manager.js b/lib/dialects/postgres/connector-manager.js
index 478536045555..1037c05da610 100644
--- a/lib/dialects/postgres/connector-manager.js
+++ b/lib/dialects/postgres/connector-manager.js
@@ -31,7 +31,9 @@ module.exports = (function() {
     }
 
     var query = new Query(this.client, this.sequelize, callee, options || {})
+
     self.pendingQueries += 1
+
     return query.run(sql)
       .success(function() { self.endQuery.call(self) })
       .error(function() { self.endQuery.call(self) })
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 09ec178dbb99..fc0fff8fd0bc 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -233,49 +233,27 @@ module.exports = (function() {
       if (options.include) {
         var optAttributes = [options.table + '.*']
 
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = addQuotes(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
-              query += addQuotes(association.connectorDAO.tableName) + '.'
-              query += addQuotes(foreignIdentifier) + '='
-              query += addQuotes(table) + '.' + addQuotes('id')
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(dao.tableName) + '.'
-              query += addQuotes('id') + '='
-              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += addQuotes(association.identifier) + '='
-              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, addQuotes(attr)].join('.') +
-                  ' AS "' +
-                  removeQuotes([aliasName, attr].join('.')) + '"'
-              })
-            )
-          }
-        }
+        options.include.forEach(function(include) {
+          var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
+            var template = Utils._.template('"<%= table %>"."<%= attr %>" AS "<%= as %>.<%= attr %>"')
+            return template({
+              table: include.daoFactory.tableName,
+              as:    include.as,
+              attr:  attr
+            })
+          })
+
+          optAttributes = optAttributes.concat(attributes)
+
+          var joinQuery = ' LEFT OUTER JOIN "<%= table %>" ON "<%= tableLeft %>"."<%= attrLeft %>" = "<%= tableRight %>"."<%= attrRight %>"'
+          query += Utils._.template(joinQuery)({
+            table:      include.daoFactory.tableName,
+            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.daoFactory.tableName : tableName),
+            attrLeft:   'id',
+            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.daoFactory.tableName),
+            attrRight:  include.association.identifier
+          })
+        })
 
         options.attributes = optAttributes.join(', ')
       }
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 247040609fc6..ff1123398cd8 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -508,7 +508,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated worker via task.worker', function(done) {
           this.Task.find({
-            where:   { id: this.task.id },
+            where:   { title: 'homework' },
             include: [ this.Worker ]
           }).complete(function(err, task) {
             expect(err).toBeNull()
@@ -544,7 +544,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.find({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ this.Task ]
           }).complete(function(err, worker) {
             expect(err).toBeNull()
@@ -586,7 +586,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.find({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ { daoFactory: this.Task, as: 'ToDo' } ]
           }).complete(function(err, worker) {
             expect(err).toBeNull()
@@ -596,6 +596,16 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             done()
           }.bind(this))
         })
+
+        it('returns the associated task via worker.task when daoFactory is aliased with model', function(done) {
+          this.Worker.find({
+            where:   { name: 'worker' },
+            include: [ { model: this.Task, as: 'ToDo' } ]
+          }).complete(function(err, worker) {
+            expect(worker.toDo.title).toEqual('homework')
+            done()
+          }.bind(this))
+        })
       })
 
       describe('hasMany', function() {
@@ -622,7 +632,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated tasks via worker.tasks', function(done) {
           this.Worker.find({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ this.Task ]
           }).complete(function(err, worker) {
             expect(err).toBeNull()
@@ -664,7 +674,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.find({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ { daoFactory: this.Task, as: 'ToDos' } ]
           }).complete(function(err, worker) {
             expect(err).toBeNull()
@@ -674,420 +684,18 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             done()
           }.bind(this))
         })
+
+        it('returns the associated task via worker.task when daoFactory is aliased with model', function(done) {
+          this.Worker.find({
+            where:   { name: 'worker' },
+            include: [ { model: this.Task, as: 'ToDos' } ]
+          }).complete(function(err, worker) {
+            expect(worker.toDos[0].title).toEqual('homework')
+            done()
+          }.bind(this))
+        })
       })
     })
-
-    // describe('association fetching', function() {
-    //   before(function() {
-    //     this.Task = this.sequelize.define('Task', {
-    //       title: Sequelize.STRING
-    //     })
-
-    //     this.User = this.sequelize.define('UserWithName', {
-    //       name: Sequelize.STRING
-    //     })
-    //   })
-
-    //   describe('1:1 associations', function() {
-    //     it('fetches associated objects (1st direction)', function(done) {
-    //       this.User.hasOne(this.Task)
-    //       this.Task.belongsTo(this.User)
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.Task.create({ title: 'task' }).success(function(task) {
-    //             user.setTask(task).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Task' ]
-    //               }).success(function(user) {
-    //                 expect(user.task).toBeDefined()
-    //                 expect(user.task.id).toEqual(task.id)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-
-    //     it('fetches no associated object if none is set (1st direction)', function(done) {
-    //       this.User.hasOne(this.Task)
-    //       this.Task.belongsTo(this.User)
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.Task.create({ title: 'task' }).success(function(task) {
-    //             this.User.find({
-    //               where: { 'UserWithNames.id': 1 },
-    //               include: [ 'Task' ]
-    //             }).success(function(user) {
-    //               expect(user.task).toEqual(null)
-    //               done()
-    //             })
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-
-    //     it('fetches associated objects via "as" param (1st direction)', function(done) {
-    //       this.User.hasOne(this.Task, { as: 'Homework' })
-    //       this.Task.belongsTo(this.User)
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.Task.create({ title: 'task' }).success(function(task) {
-    //             user.setHomework(task).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Homework' ]
-    //               }).success(function(user) {
-    //                 expect(user.homework).toBeDefined()
-    //                 expect(user.homework.id).toEqual(task.id)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-
-    //     it('fetches associated object (2nd direction)', function(done) {
-    //       this.User.hasOne(this.Task)
-    //       this.Task.belongsTo(this.User)
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.User.create({ name: 'another user' }).success(function(another_user) {
-    //             this.Task.create({ title: 'task' }).success(function(task) {
-    //               user.setTask(task).success(function() {
-    //                 this.Task.find({
-    //                   where: { 'Tasks.id': 1 },
-    //                   include: [ 'UserWithName' ]
-    //                 }).success(function(task) {
-    //                   expect(task.userWithName).toBeDefined()
-    //                   expect(task.userWithName.id).toEqual(user.id)
-    //                   done()
-    //                 })
-    //               }.bind(this)) //- setTask
-    //             }.bind(this)) //- Task.create
-    //           }.bind(this)) //- User.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-
-    //     it('fetches no associated object if none is set (2nd direction)', function(done) {
-    //       this.User.hasOne(this.Task)
-    //       this.Task.belongsTo(this.User)
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.User.create({ name: 'another user' }).success(function(another_user) {
-    //             this.Task.create({ title: 'task' }).success(function(task) {
-    //               this.Task.find({
-    //                 where: { 'Tasks.id': 1 },
-    //                 include: [ 'UserWithName' ]
-    //               }).success(function(task) {
-    //                 expect(task.userWithName).toEqual(null)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- Task.create
-    //           }.bind(this)) //- User.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-
-    //     it('fetches associated object via "as" param (2nd direction)', function(done) {
-    //       this.User.hasOne(this.Task)
-    //       this.Task.belongsTo(this.User, { as: 'Owner' })
-
-    //       this.sequelize.sync({ force: true }).success(function() {
-    //         this.User.create({ name: 'barfooz' }).success(function(user) {
-    //           this.User.create({ name: 'another user' }).success(function(another_user) {
-    //             this.Task.create({ title: 'task' }).success(function(task) {
-    //               user.setTask(task).success(function() {
-    //                 this.Task.find({
-    //                   where: { 'Tasks.id': 1 },
-    //                   include: [ 'Owner' ]
-    //                 }).success(function(task) {
-    //                   expect(task.owner).toBeDefined()
-    //                   expect(task.owner.id).toEqual(user.id)
-    //                   done()
-    //                 })
-    //               }.bind(this)) //- setTask
-    //             }.bind(this)) //- Task.create
-    //           }.bind(this)) //- User.create
-    //         }.bind(this)) //- User.create
-    //       }.bind(this)) //- sequelize.sync
-    //     })
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Task' ]
-    //               }).success(function(user) {
-    //                 expect(user.tasks).toBeDefined()
-    //                 expect(
-    //                   user.tasks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects via "as" param for 1:N associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task, { as: 'Homeworks' })
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setHomeworks([task1, task2]).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Homeworks' ]
-    //               }).success(function(user) {
-    //                 expect(user.homeworks).toBeDefined()
-    //                 expect(
-    //                   user.homeworks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches no associated objects for 1:N associations if none are set (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.User.find({
-    //             where: { 'UserWithNames.id': 1 },
-    //             include: [ 'Task' ]
-    //           }).success(function(user) {
-    //             expect(user.tasks.length).toEqual(0)
-    //             done()
-    //           })
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.Task.find({
-    //                 where: { 'Tasks.id': 1 },
-    //                 include: [ 'UserWithName' ]
-    //               }).success(function(task) {
-    //                 expect(task.userWithName).toBeDefined()
-    //                 expect(task.userWithName.name).toEqual(user.name)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects via "as" param for 1:N associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User, { as: 'Owner'})
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.Task.find({
-    //                 where: { 'Tasks.id': 1 },
-    //                 include: [ 'Owner' ]
-    //               }).success(function(task) {
-    //                 expect(task.owner).toBeDefined()
-    //                 expect(task.owner.name).toEqual(user.name)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setTasks([task1, task2]).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': user1.id },
-    //                 include: [ 'Task' ]
-    //               }).success(function(user) {
-    //                 expect(user.tasks).toBeDefined()
-    //                 expect(
-    //                   user.tasks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches no associated objects for N:M associations if none are set (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             this.User.find({
-    //               where: { 'UserWithNames.id': user1.id },
-    //               include: [ 'Task' ]
-    //             }).success(function(user) {
-    //               expect(user.tasks.length).toEqual(0)
-    //               done()
-    //             })
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects via "as" param for N:M associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task, { as: 'Homeworks' })
-    //     this.Task.hasMany(this.User, { as: 'Owners' })
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setHomeworks([task1, task2]).success(function() {
-    //               this.User.find({
-    //                 where: { 'UserWithNames.id': user1.id },
-    //                 include: [ 'Homeworks' ]
-    //               }).success(function(user) {
-    //                 expect(user.homeworks).toBeDefined()
-    //                 expect(
-    //                   user.homeworks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setTasks([task1, task2]).success(function() {
-    //               this.Task.find({
-    //                 where: { 'Tasks.id': task1.id },
-    //                 include: [ 'UserWithName' ]
-    //               }).success(function(task) {
-    //                 expect(task.userWithNames).toBeDefined()
-    //                 expect(
-    //                   task.userWithNames.map(function(u) { return u.id })
-    //                 ).toEqual(
-    //                   [ user1.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects via "as" param for N:M associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task, { as: 'Homeworks' })
-    //     this.Task.hasMany(this.User, { as: 'Owners' })
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setHomeworks([task1, task2]).success(function() {
-    //               this.Task.find({
-    //                 where: { 'Tasks.id': task1.id },
-    //                 include: [ 'Owners' ]
-    //               }).success(function(task) {
-    //                 expect(task.owners).toBeDefined()
-    //                 expect(
-    //                   task.owners.map(function(u) { return u.id })
-    //                 ).toEqual(
-    //                   [ user1.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-    // })
   }) //- describe: find
 
   describe('findAll', function findAll() {
@@ -1133,7 +741,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated worker via task.worker', function(done) {
           this.Task.findAll({
-            where:   { id: this.task.id },
+            where:   { title: 'homework' },
             include: [ this.Worker ]
           }).complete(function(err, tasks) {
             expect(err).toBeNull()
@@ -1169,7 +777,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.findAll({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ this.Task ]
           }).complete(function(err, workers) {
             expect(err).toBeNull()
@@ -1211,7 +819,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.findAll({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ { daoFactory: this.Task, as: 'ToDo' } ]
           }).complete(function(err, workers) {
             expect(err).toBeNull()
@@ -1221,6 +829,16 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             done()
           }.bind(this))
         })
+
+        it('returns the associated task via worker.task when daoFactory is aliased with model', function(done) {
+          this.Worker.findAll({
+            where:   { name: 'worker' },
+            include: [ { model: this.Task, as: 'ToDo' } ]
+          }).complete(function(err, workers) {
+            expect(workers[0].toDo.title).toEqual('homework')
+            done()
+          }.bind(this))
+        })
       })
 
       describe('hasMany', function() {
@@ -1247,7 +865,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated tasks via worker.tasks', function(done) {
           this.Worker.findAll({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ this.Task ]
           }).complete(function(err, workers) {
             expect(err).toBeNull()
@@ -1289,7 +907,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         it('returns the associated task via worker.task', function(done) {
           this.Worker.findAll({
-            where:   { id: this.worker.id },
+            where:   { name: 'worker' },
             include: [ { daoFactory: this.Task, as: 'ToDos' } ]
           }).complete(function(err, workers) {
             expect(err).toBeNull()
@@ -1299,360 +917,18 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             done()
           }.bind(this))
         })
+
+        it('returns the associated task via worker.task when daoFactory is aliased with model', function(done) {
+          this.Worker.findAll({
+            where:   { name: 'worker' },
+            include: [ { daoFactory: this.Task, as: 'ToDos' } ]
+          }).complete(function(err, workers) {
+            expect(workers[0].toDos[0].title).toEqual('homework')
+            done()
+          }.bind(this))
+        })
       })
     })
-
-    // describe('include', function() {
-    //   before(function() {
-    //     this.Task = this.sequelize.define('Task', {
-    //       title: Sequelize.STRING
-    //     })
-
-    //     this.User = this.sequelize.define('UserWithName', {
-    //       name: Sequelize.STRING
-    //     })
-    //   })
-
-    //   it('fetches data only for the relevant where clause', function(done) {
-    //     this.User.hasOne(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-    //         this.User.create({ name: 'barfooz' }).success(function(user2) {
-    //           this.Task.create({ title: 'task' }).success(function(task) {
-    //             var where = [Sequelize.Utils.addTicks(this.User.tableName) + ".`id`=?", user1.id]
-
-    //             if (dialect === 'postgres') {
-    //               where = ['"' + this.User.tableName + '"."id"=?', user1.id]
-    //             }
-
-    //             this.User.findAll({
-    //               where: where,
-    //               include: [ 'Task' ]
-    //             }).success(function(users){
-    //               expect(users.length).toEqual(1)
-    //               // console.log(users[0])
-    //               done()
-    //             }.bind(this))
-    //           }.bind(this))
-    //         }.bind(this))
-    //       }.bind(this))
-    //     }.bind(this))
-    //   })
-
-    //   it('fetches associated objects for 1:1 associations (1st direction)', function(done) {
-    //     this.User.hasOne(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task' }).success(function(task) {
-    //           user.setTask(task).success(function() {
-    //             this.User.findAll({
-    //               where: { 'UserWithNames.id': 1 },
-    //               include: [ 'Task' ]
-    //             }).success(function(users) {
-    //               expect(users[0].task).toBeDefined()
-    //               expect(users[0].task.id).toEqual(task.id)
-    //               done()
-    //             })
-    //           }.bind(this)) //- setTask
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects via "as" param for 1:1 associations (1st direction)', function(done) {
-    //     this.User.hasOne(this.Task, { as: 'Homework' })
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task' }).success(function(task) {
-    //           user.setHomework(task).success(function() {
-    //             this.User.findAll({
-    //               where: { 'UserWithNames.id': 1 },
-    //               include: [ 'Homework' ]
-    //             }).success(function(users) {
-    //               expect(users[0].homework).toBeDefined()
-    //               expect(users[0].homework.id).toEqual(task.id)
-    //               done()
-    //             })
-    //           }.bind(this)) //- setTask
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:1 associations (2nd direction)', function(done) {
-    //     this.User.hasOne(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task' }).success(function(task) {
-    //           user.setTask(task).success(function() {
-    //             this.Task.findAll({
-    //               where: { 'Tasks.id': 1 },
-    //               include: [ 'UserWithName' ]
-    //             }).success(function(tasks) {
-    //               expect(tasks[0].userWithName).toBeDefined()
-    //               expect(tasks[0].userWithName.id).toEqual(user.id)
-    //               done()
-    //             })
-    //           }.bind(this)) //- setTask
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:1 associations (2nd direction)', function(done) {
-    //     this.User.hasOne(this.Task)
-    //     this.Task.belongsTo(this.User, { as: 'Owner' })
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task' }).success(function(task) {
-    //           user.setTask(task).success(function() {
-    //             this.Task.findAll({
-    //               where: { 'Tasks.id': 1 },
-    //               include: [ 'Owner' ]
-    //             }).success(function(tasks) {
-    //               expect(tasks[0].owner).toBeDefined()
-    //               expect(tasks[0].owner.id).toEqual(user.id)
-    //               done()
-    //             })
-    //           }.bind(this)) //- setTask
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.User.findAll({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Task' ]
-    //               }).success(function(users) {
-    //                 expect(users[0].tasks).toBeDefined()
-    //                 expect(
-    //                   users[0].tasks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task, { as: 'Homeworks' })
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setHomeworks([task1, task2]).success(function() {
-    //               this.User.findAll({
-    //                 where: { 'UserWithNames.id': 1 },
-    //                 include: [ 'Homeworks' ]
-    //               }).success(function(users) {
-    //                 expect(users[0].homeworks).toBeDefined()
-    //                 expect(
-    //                   users[0].homeworks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.Task.findAll({
-    //                 where: { 'Tasks.id': 1 },
-    //                 include: [ 'UserWithName' ]
-    //               }).success(function(tasks) {
-    //                 expect(tasks[0].userWithName).toBeDefined()
-    //                 expect(tasks[0].userWithName.name).toEqual(user.name)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for 1:N associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.belongsTo(this.User, { as: 'Owner' })
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user) {
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user.setTasks([task1, task2]).success(function() {
-    //               this.Task.findAll({
-    //                 where: { 'Tasks.id': 1 },
-    //                 include: [ 'Owner' ]
-    //               }).success(function(tasks) {
-    //                 expect(tasks[0].owner).toBeDefined()
-    //                 expect(tasks[0].owner.name).toEqual(user.name)
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setTasks([task1, task2]).success(function() {
-    //               this.User.findAll({
-    //                 where: { 'UserWithNames.id': user1.id },
-    //                 include: [ 'Task' ]
-    //               }).success(function(users) {
-    //                 expect(users[0].tasks).toBeDefined()
-    //                 expect(
-    //                   users[0].tasks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (1st direction)', function(done) {
-    //     this.User.hasMany(this.Task, { as: 'Homeworks' })
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setHomeworks([task1, task2]).success(function() {
-    //               this.User.findAll({
-    //                 where: { 'UserWithNames.id': user1.id },
-    //                 include: [ 'Homeworks' ]
-    //               }).success(function(users) {
-    //                 expect(users[0].homeworks).toBeDefined()
-    //                 expect(
-    //                   users[0].homeworks.map(function(t) { return t.id })
-    //                 ).toEqual(
-    //                   [ task1.id, task2.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User)
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setTasks([task1, task2]).success(function() {
-    //               this.Task.findAll({
-    //                 where: { 'Tasks.id': task1.id },
-    //                 include: [ 'UserWithName' ]
-    //               }).success(function(tasks) {
-    //                 expect(tasks[0].userWithNames).toBeDefined()
-    //                 expect(
-    //                   tasks[0].userWithNames.map(function(u) { return u.id })
-    //                 ).toEqual(
-    //                   [ user1.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-
-    //   it('fetches associated objects for N:M associations (2nd direction)', function(done) {
-    //     this.User.hasMany(this.Task)
-    //     this.Task.hasMany(this.User, { as: 'Owners' })
-
-    //     this.sequelize.sync({ force: true }).success(function() {
-    //       this.User.create({ name: 'barfooz' }).success(function(user1) {
-
-    //         this.Task.create({ title: 'task1' }).success(function(task1) {
-    //           this.Task.create({ title: 'task2' }).success(function(task2) {
-    //             user1.setTasks([task1, task2]).success(function() {
-    //               this.Task.findAll({
-    //                 where: { 'Tasks.id': task1.id },
-    //                 include: [ 'Owners' ]
-    //               }).success(function(tasks) {
-    //                 expect(tasks[0].owners).toBeDefined()
-    //                 expect(
-    //                   tasks[0].owners.map(function(u) { return u.id })
-    //                 ).toEqual(
-    //                   [ user1.id ]
-    //                 )
-    //                 done()
-    //               })
-    //             }.bind(this)) //- setTask
-    //           }.bind(this)) //- Task.create
-    //         }.bind(this)) //- Task.create
-
-    //       }.bind(this)) //- User.create
-    //     }.bind(this)) //- sequelize.sync
-    //   })
-    // })
   }) //- describe: findAll
 
   describe('min', function() {
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index baf83837d013..9524204de87f 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -1,4 +1,4 @@
-if(typeof require === 'function') {
+if (typeof require === 'function') {
   const buster  = require("buster")
       , Helpers = require('./buster-helpers')
       , dialect = Helpers.getTestDialect()

From 6cadd2e7c1a22f49774d21a43d07f0ee08bc72d8 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:15:12 +0100
Subject: [PATCH 130/360] adjustments for yuidoc

---
 index.js         |  4 ++++
 lib/sequelize.js | 26 +++++++++++++++++---------
 package.json     |  6 +++---
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/index.js b/index.js
index 753b8bad11f2..ed4fb1bfddce 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,5 @@
+/**
+  The entry point.
+  @module sequelize
+**/
 module.exports = require("./lib/sequelize")
diff --git a/lib/sequelize.js b/lib/sequelize.js
index b7b355925025..f12d251eb0b1 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -10,20 +10,28 @@ if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')
 
 module.exports = (function() {
   /**
-    Main constructor of the project.
+    Main class of the project.
 
-    Params:
+    @param {String} database The name of the database.
+    @param {String} username The username which is used to authenticate against the database.
+    @param {String} [password] The password which is used to authenticate against the database.
+    @param {Object} [options] An object with options.
 
-      - `database`
-      - `username`
-      - `password`, optional, default: null
-      - `options`, optional, default: {}
+    @example
+        // without password and options
+        var sequelize = new Sequelize('database', 'username')
 
-    Examples:
+        // without options
+        var sequelize = new Sequelize('database', 'username', 'password')
 
-        mymodule.write('foo')
-        mymodule.write('foo', { stream: process.stderr })
+        // without password / with blank password
+        var sequelize = new Sequelize('database', 'username', null, {})
 
+        // with password and options
+        var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+
+    @class Sequelize
+    @constructor
   */
   var Sequelize = function(database, username, password, options) {
     this.options = Utils._.extend({
diff --git a/package.json b/package.json
index b501b7b64ad5..fe4bd4825c0f 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "mysql": "~2.0.0-alpha3",
     "pg": "~0.10.2",
     "buster": "~0.6.0",
-    "dox-foundation": "~0.3.0",
-    "watchr": "~2.2.0"
+    "watchr": "~2.2.0",
+    "yuidocjs": "~0.3.36"
   },
   "keywords": [
     "mysql",
@@ -55,7 +55,7 @@
     "test-buster-postgres": "DIALECT=postgres ./node_modules/.bin/buster-test",
     "test-buster-postgres-native": "DIALECT=postgres-native ./node_modules/.bin/buster-test",
     "test-buster-sqlite": "DIALECT=sqlite ./node_modules/.bin/buster-test",
-    "generate-docs": "node_modules/.bin/dox-foundation --source ./lib --target ./docs --title Sequelize"
+    "docs": "node_modules/.bin/yuidoc . -o docs"
   },
   "bin": {
     "sequelize": "bin/sequelize"

From 41750274dd1df64defa742b20e3c8e4903975d63 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:21:31 +0100
Subject: [PATCH 131/360] don't commit the docs change in this PR

---
 docs/associations/belongs-to.js.html          | 188 ++++++
 .../has-many-double-linked.js.html            | 250 ++++++++
 .../has-many-single-linked.js.html            | 172 ++++++
 docs/associations/has-many.js.html            | 316 ++++++++++
 docs/associations/has-one.js.html             | 211 +++++++
 docs/associations/mixin.js.html               | 166 +++++
 docs/dao-factory-manager.js.html              | 165 +++++
 docs/dao-factory.js.html                      | 409 +++++++++++++
 docs/dao.js.html                              | 294 +++++++++
 docs/data-types.js.html                       | 139 +++++
 docs/dialects/abstract/query.js.html          | 336 ++++++++++
 docs/dialects/connector-manager.js.html       | 154 +++++
 docs/dialects/mysql/connector-manager.js.html | 343 +++++++++++
 docs/dialects/mysql/query-generator.js.html   | 512 ++++++++++++++++
 docs/dialects/mysql/query.js.html             | 212 +++++++
 .../postgres/connector-manager.js.html        | 219 +++++++
 .../dialects/postgres/query-generator.js.html | 576 ++++++++++++++++++
 docs/dialects/postgres/query.js.html          | 227 +++++++
 docs/dialects/query-generator.js.html         | 177 ++++++
 docs/dialects/query.js.html                   | 216 +++++++
 .../dialects/sqlite/connector-manager.js.html | 147 +++++
 docs/dialects/sqlite/query-generator.js.html  | 279 +++++++++
 docs/dialects/sqlite/query.js.html            | 248 ++++++++
 docs/emitters/custom-event-emitter.js.html    | 176 ++++++
 docs/index.html                               | 317 ++++++----
 docs/migration.js.html                        | 261 ++++++++
 docs/migrator.js.html                         | 359 +++++++++++
 docs/query-chainer.js.html                    | 272 +++++++++
 docs/query-interface.js.html                  | 402 ++++++++++++
 docs/sequelize.js.html                        | 270 ++++++++
 docs/utils.js.html                            | 309 ++++++++++
 31 files changed, 8198 insertions(+), 124 deletions(-)
 create mode 100644 docs/associations/belongs-to.js.html
 create mode 100644 docs/associations/has-many-double-linked.js.html
 create mode 100644 docs/associations/has-many-single-linked.js.html
 create mode 100644 docs/associations/has-many.js.html
 create mode 100644 docs/associations/has-one.js.html
 create mode 100644 docs/associations/mixin.js.html
 create mode 100644 docs/dao-factory-manager.js.html
 create mode 100644 docs/dao-factory.js.html
 create mode 100644 docs/dao.js.html
 create mode 100644 docs/data-types.js.html
 create mode 100644 docs/dialects/abstract/query.js.html
 create mode 100644 docs/dialects/connector-manager.js.html
 create mode 100644 docs/dialects/mysql/connector-manager.js.html
 create mode 100644 docs/dialects/mysql/query-generator.js.html
 create mode 100644 docs/dialects/mysql/query.js.html
 create mode 100644 docs/dialects/postgres/connector-manager.js.html
 create mode 100644 docs/dialects/postgres/query-generator.js.html
 create mode 100644 docs/dialects/postgres/query.js.html
 create mode 100644 docs/dialects/query-generator.js.html
 create mode 100644 docs/dialects/query.js.html
 create mode 100644 docs/dialects/sqlite/connector-manager.js.html
 create mode 100644 docs/dialects/sqlite/query-generator.js.html
 create mode 100644 docs/dialects/sqlite/query.js.html
 create mode 100644 docs/emitters/custom-event-emitter.js.html
 create mode 100644 docs/migration.js.html
 create mode 100644 docs/migrator.js.html
 create mode 100644 docs/query-chainer.js.html
 create mode 100644 docs/query-interface.js.html
 create mode 100644 docs/sequelize.js.html
 create mode 100644 docs/utils.js.html

diff --git a/docs/associations/belongs-to.js.html b/docs/associations/belongs-to.js.html
new file mode 100644
index 000000000000..c30aa52eefec
--- /dev/null
+++ b/docs/associations/belongs-to.js.html
@@ -0,0 +1,188 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var BelongsTo = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'BelongsTo'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+  }
+
+  // the id is in the source table
+  BelongsTo.prototype.injectAttributes = function() {
+    var newAttributes  = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.extend(this.source.rawAttributes, newAttributes)
+    return this
+  }
+
+  BelongsTo.prototype.injectGetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function() {
+      var id = obj[self.identifier]
+      return self.target.find(id)
+    }
+
+    return this
+  }
+
+  BelongsTo.prototype.injectSetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function(associatedObject) {
+      obj[self.identifier] = associatedObject ? associatedObject.id : null
+
+      // passes the changed field to save, so only that field get updated.
+      return obj.save([ self.identifier ])
+    }
+
+    return this
+  }
+
+  return BelongsTo
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/associations/has-many-double-linked.js.html b/docs/associations/has-many-double-linked.js.html
new file mode 100644
index 000000000000..7e0c03241b5e
--- /dev/null
+++ b/docs/associations/has-many-double-linked.js.html
@@ -0,0 +1,250 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManyDoubleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManyDoubleLinked.prototype.injectGetter = function(options) {
+    var self = this, _options = options
+
+    var customEventEmitter = new Utils.CustomEventEmitter(function() {
+      var where = {}, options = _options || {};
+
+      //fully qualify
+      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
+
+      var primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+
+      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
+
+      if (options.where) {
+        Utils._.each(options.where, function(value, index) {
+          delete options.where[index];
+          options.where[self.__factory.target.tableName+"."+index] = value;
+        });
+
+        options.where = options.where ? Utils.merge(options.where, where) : where
+      } else {
+        options.where = where;
+      }
+
+      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
+        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
+        .on('error', function(err){ customEventEmitter.emit('error', err) })
+        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
+    })
+
+    return customEventEmitter.run()
+  }
+
+  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
+    var self = this
+
+    destroyObsoleteAssociations
+      .call(this, oldAssociations, newAssociations)
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .success(function() {
+        var chainer             = new Utils.QueryChainer
+          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
+          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+          , unassociatedObjects = newAssociations.filter(function(obj) { return !obj.equalsOneOf(oldAssociations) })
+
+        unassociatedObjects.forEach(function(unassociatedObject) {
+          var attributes = {}
+          attributes[self.__factory.identifier] = self.instance.id
+          attributes[foreignIdentifier] = unassociatedObject.id
+
+          chainer.add(self.__factory.connectorDAO.create(attributes))
+        })
+
+        chainer
+          .run()
+          .success(function() { emitterProxy.emit('success', newAssociations) })
+          .error(function(err) { emitterProxy.emit('error', err) })
+          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      })
+  }
+
+  // private
+
+  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
+      var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) })
+
+      if(obsoleteAssociations.length === 0) {
+        return emitter.emit('success', null)
+      }
+
+      obsoleteAssociations.forEach(function(associatedObject) {
+        var where            = {}
+          , primaryKeys      = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+          , notFoundEmitters = []
+
+        where[self.__factory.identifier] = self.instance.id
+        where[foreignKey] = associatedObject.id
+
+        self.__factory.connectorDAO
+          .find({ where: where })
+          .success(function(connector) {
+            if(connector === null) {
+              notFoundEmitters.push(null)
+            } else {
+              chainer.add(connector.destroy())
+            }
+
+            if((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+              // found all obsolete connectors and will delete them now
+              chainer
+                .run()
+                .success(function() { emitter.emit('success', null) })
+                .error(function(err) { emitter.emit('error', err) })
+                .on('sql', function(sql) { emitter.emit('sql', sql) })
+            }
+          })
+          .error(function(err) { emitter.emit('error', err) })
+          .on('sql', function(sql) { emitter.emit('sql', sql) })
+      })
+    }).run()
+  }
+
+  return HasManyDoubleLinked
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/associations/has-many-single-linked.js.html b/docs/associations/has-many-single-linked.js.html
new file mode 100644
index 000000000000..c8cf86b9f97e
--- /dev/null
+++ b/docs/associations/has-many-single-linked.js.html
@@ -0,0 +1,172 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManySingleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManySingleLinked.prototype.injectGetter = function(options) {
+    var where = {}, options = options || {}
+
+    where[this.__factory.identifier] = this.instance.id
+
+    options.where = options.where ? Utils.merge(options.where, where) : where
+    return this.__factory.target.findAll(options)
+  }
+
+  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
+    var self    = this
+      , options = this.__factory.options
+      , chainer = new Utils.QueryChainer()
+
+    // clear the old associations
+    oldAssociations.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = null
+      chainer.add(associatedObject.save())
+    })
+
+    // set the new associations
+    newAssociations.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = self.instance.id
+      chainer.add(associatedObject.save())
+    })
+
+    chainer
+      .run()
+      .success(function() { emitter.emit('success', newAssociations) })
+      .error(function(err) { emitter.emit('error', err) })
+  }
+
+  return HasManySingleLinked
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/associations/has-many.js.html b/docs/associations/has-many.js.html
new file mode 100644
index 000000000000..cfc43bd7b913
--- /dev/null
+++ b/docs/associations/has-many.js.html
@@ -0,0 +1,316 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+var HasManySingleLinked = require("./has-many-single-linked")
+  , HasManyMultiLinked  = require("./has-many-double-linked")
+
+module.exports = (function() {
+  var HasMany = function(srcDAO, targetDAO, options) {
+    this.source = srcDAO
+    this.target = targetDAO
+    this.options = options
+    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
+    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
+
+    var combinedTableName = Utils.combineTableNames(
+      this.source.tableName,
+      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
+    )
+    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
+
+    var as = (this.options.as || Utils.pluralize(this.target.tableName))
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + as),
+      set: Utils._.camelize('set_' + as),
+      add: Utils._.camelize(Utils.singularize('add_' + as)),
+      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
+      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
+      hasAll: Utils._.camelize('has_' + as)
+    }
+  }
+
+  // the id is in the target table
+  // or in an extra table which connects two tables
+  HasMany.prototype.injectAttributes = function() {
+    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+
+    // is there already a single sided association between the source and the target?
+    // or is the association on the model itself?
+    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
+      // remove the obsolete association identifier from the source
+      if(this.isSelfAssociation) {
+        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
+      } else {
+        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
+        delete this.source.rawAttributes[this.foreignIdentifier]
+      }
+
+      // define a new model, which connects the models
+      var combinedTableAttributes = {}
+      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
+
+      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
+      if(!this.isSelfAssociation) {
+        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
+      }
+
+      if(this.options.syncOnAssociation) {
+        this.connectorDAO.sync()
+      }
+    } else {
+      var newAttributes = {}
+      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      Utils._.extend(this.target.rawAttributes, newAttributes)
+    }
+
+    return this
+  }
+
+  HasMany.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function(options) {
+      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+      return new Class(self, this).injectGetter(options)
+    }
+
+   obj[this.accessors.hasAll] = function(objects) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.all(objects, function(o) {
+              return Utils._.any(associatedObjects, function(associatedObject) {
+                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                  return o[identifier] == associatedObject[identifier];
+                });
+              })
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    obj[this.accessors.hasSingle] = function(o) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.any(associatedObjects, function(associatedObject) {
+              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                return o[identifier] == associatedObject[identifier];
+              });
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+    return this
+  }
+
+  HasMany.prototype.injectSetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.set] = function(newAssociatedObjects) {
+      if(newAssociatedObjects === null) {
+        newAssociatedObjects = []
+      }
+
+      var instance = this
+
+      // define the returned customEventEmitter, which will emit the success event once everything is done
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]()
+          .success(function(oldAssociatedObjects) {
+            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
+          })
+          .error(function(err) {
+            emitter.emit('error', err)
+          })
+          .on('sql', function(sql) {
+            emitter.emit('sql', sql)
+          })
+      }).run()
+    }
+
+    obj[this.accessors.add] = function(newAssociatedObject) {
+      var instance = this
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+          .error(function(err){ customEventEmitter.emit('error', err)})
+          .success(function(currentAssociatedObjects) {
+            if(!newAssociatedObject.equalsOneOf(currentAssociatedObjects))
+              currentAssociatedObjects.push(newAssociatedObject)
+
+            instance[self.accessors.set](currentAssociatedObjects)
+              .success(function(instances) { customEventEmitter.emit('success', instances) })
+              .error(function(err) { customEventEmitter.emit('error', err) })
+          })
+      })
+      return customEventEmitter.run()
+    }
+
+    obj[this.accessors.remove] = function(oldAssociatedObject) {
+      var instance = this
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
+          var newAssociations = []
+
+          currentAssociatedObjects.forEach(function(association) {
+            if(!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+              newAssociations.push(association)
+          })
+
+          instance[self.accessors.set](newAssociations)
+            .success(function() { customEventEmitter.emit('success', null) })
+            .error(function(err) { customEventEmitter.emit('error', err) })
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    return this
+  }
+
+  return HasMany
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/associations/has-one.js.html b/docs/associations/has-one.js.html
new file mode 100644
index 000000000000..ae62c0c64278
--- /dev/null
+++ b/docs/associations/has-one.js.html
@@ -0,0 +1,211 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var HasOne = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'HasOne'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
+      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+    }
+  }
+
+  // the id is in the target table
+  HasOne.prototype.injectAttributes = function() {
+    var newAttributes = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.extend(this.target.rawAttributes, newAttributes)
+
+    return this
+  }
+
+  HasOne.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function() {
+      var id    = obj.id
+        , where = {}
+
+      where[self.identifier] = id
+      return self.target.find({where: where})
+    }
+
+    return this
+  }
+
+  HasOne.prototype.injectSetter = function(obj) {
+    var self    = this
+      , options = self.options || {}
+
+    obj[this.accessors.set] = function(associatedObject) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        obj[self.accessors.get]().success(function(oldObj) {
+          if(oldObj) {
+            oldObj[self.identifier] = null
+            oldObj.save()
+          }
+
+          if(associatedObject) {
+            associatedObject[self.identifier] = obj.id
+            associatedObject
+              .save()
+              .success(function() { emitter.emit('success', associatedObject) })
+              .error(function(err) { emitter.emit('error', err) })
+          } else {
+            emitter.emit('success', null)
+          }
+
+        })
+      }).run()
+    }
+
+    return this
+  }
+
+  return HasOne
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/associations/mixin.js.html b/docs/associations/mixin.js.html
new file mode 100644
index 000000000000..ed4a931aba33
--- /dev/null
+++ b/docs/associations/mixin.js.html
@@ -0,0 +1,166 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                            Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                            Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                            Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Mixin = module.exports = function(){}
+
+Mixin.hasOne = function(associatedDAO, options) {
+  // the id is in the foreign table
+  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+  return this
+}
+
+Mixin.belongsTo = function(associatedDAO, options) {
+  // the id is in this table
+  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+  return this
+}
+
+Mixin.hasMany = function(associatedDAO, options) {
+  // the id is in the foreign table or in a connecting table
+  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+  return this
+}
+
+Mixin.getAssociation = function(target, options) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    var association = this.associations[associationName]
+
+    if (!result && (association.target === target)) {
+      result = association
+    }
+  }
+
+  return result
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                              example for instance methods:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  console.log('asd')
                                                                                                                                                                                                                                                                                                                                                                                                                                                                }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/dao-factory-manager.js.html b/docs/dao-factory-manager.js.html
new file mode 100644
index 000000000000..1c8bb2cedf87
--- /dev/null
+++ b/docs/dao-factory-manager.js.html
@@ -0,0 +1,165 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  module.exports = (function() {
+  var DAOFactoryManager = function(sequelize) {
+    this.daos = []
+    this.sequelize = sequelize
+  }
+
+  DAOFactoryManager.prototype.addDAO = function(dao) {
+    this.daos.push(dao)
+
+    return dao
+  }
+
+  DAOFactoryManager.prototype.removeDAO = function(dao) {
+    this.daos = this.daos.filter(function(_dao) {
+      return _dao.name != dao.name
+    })
+  }
+
+  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
+    options = options || {}
+    options.attribute = options.attribute || 'name'
+
+    var dao = this.daos.filter(function(dao) {
+      return dao[options.attribute] === daoName
+    })
+
+    return !!dao ? dao[0] : null
+  }
+
+  DAOFactoryManager.prototype.__defineGetter__('all', function() {
+    return this.daos
+  })
+
+  return DAOFactoryManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/dao-factory.js.html b/docs/dao-factory.js.html
new file mode 100644
index 000000000000..d00c3550494f
--- /dev/null
+++ b/docs/dao-factory.js.html
@@ -0,0 +1,409 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./utils")
+  , DAO       = require("./dao")
+  , DataTypes = require("./data-types")
+
+module.exports = (function() {
+  var DAOFactory = function(name, attributes, options) {
+    var self = this
+
+    this.options = Utils._.extend({
+      timestamps: true,
+      instanceMethods: {},
+      classMethods: {},
+      validate: {},
+      freezeTableName: false,
+      underscored: false,
+      syncOnAssociation: true,
+      paranoid: false
+    }, options || {})
+
+    this.name = name
+    this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name)
+    this.rawAttributes = attributes
+    this.daoFactoryManager = null // defined in init function
+    this.associations = {}
+
+    // extract validation
+    this.validate = this.options.validate || {}
+  }
+
+  Object.defineProperty(DAOFactory.prototype, 'attributes', {
+    get: function() {
+      return this.QueryGenerator.attributesToSQL(this.rawAttributes)
+    }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'QueryInterface', {
+    get: function() { return this.daoFactoryManager.sequelize.getQueryInterface() }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'QueryGenerator', {
+    get: function() { return this.QueryInterface.QueryGenerator }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'primaryKeyCount', {
+    get: function() { return Utils._.keys(this.primaryKeys).length }
+  })
+
+  Object.defineProperty(DAOFactory.prototype, 'hasPrimaryKeys', {
+    get: function() { return this.primaryKeyCount > 0 }
+  })
+
+  DAOFactory.prototype.init = function(daoFactoryManager) {
+    this.daoFactoryManager = daoFactoryManager
+
+    addDefaultAttributes.call(this)
+    addOptionalClassMethods.call(this)
+    findAutoIncrementField.call(this)
+
+    return this
+  }
+
+  DAOFactory.prototype.sync = function(options) {
+    options = Utils.merge(options || {}, this.options)
+
+    var self = this
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var doQuery = function() {
+        self.QueryInterface
+          .createTable(self.tableName, self.attributes, options)
+          .success(function() { emitter.emit('success', self) })
+          .error(function(err) { emitter.emit('error', err) })
+          .on('sql', function(sql) { emitter.emit('sql', sql) })
+      }
+
+      if(options.force)
+        self.drop().success(doQuery).error(function(err) { emitter.emit('error', err) })
+      else
+        doQuery()
+
+    }).run()
+  }
+
+  DAOFactory.prototype.drop = function() {
+    return this.QueryInterface.dropTable(this.tableName)
+  }
+
+  // alias for findAll
+  DAOFactory.prototype.all = function(options) {
+    return this.findAll(options)
+  }
+
+  DAOFactory.prototype.findAll = function(options) {
+    return this.QueryInterface.select(this, this.tableName, options)
+  }
+
+  //right now, the caller (has-many-double-linked) is in charge of the where clause
+  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
+    var optcpy = Utils._.clone(options)
+    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy)
+  }
+
+  DAOFactory.prototype.find = function(options) {
+    // no options defined?
+    // return an emitter which emits null
+    if([null, undefined].indexOf(options) > -1) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        setTimeout(function() { emitter.emit('success', null) }, 10)
+      }).run()
+    }
+
+    // options is not a hash but an id
+    if(typeof options === 'number') {
+      options = { where: options }
+    } else if (Utils.argsArePrimaryKeys(arguments, this.primaryKeys)) {
+        var where = {}
+          , self  = this
+
+        Utils._.each(arguments, function(arg, i) {
+          var key = Utils._.keys(self.primaryKeys)[i]
+          where[key] = arg
+        })
+
+        options = { where: where }
+    } else if((typeof options === 'object') && (options.hasOwnProperty('include'))) {
+      var includes = options.include
+
+      options.include = {}
+
+      includes.forEach(function(daoName) {
+        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+      }.bind(this))
+    }
+
+    options.limit = 1
+
+    return this.QueryInterface.select(this, this.tableName, options, { plain: true })
+  }
+
+  DAOFactory.prototype.count = function(options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['count(*)', 'count'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
+  }
+
+  DAOFactory.prototype.max = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['max(' + field + ')', 'max'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
+  }
+  DAOFactory.prototype.min = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['min(' + field + ')', 'min'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
+  }
+
+  DAOFactory.prototype.build = function(values, options) {
+    var instance = new DAO(values, Utils._.extend(this.options, this.attributes, { hasPrimaryKeys: this.hasPrimaryKeys }))
+      , self     = this
+
+    options = options || {}
+    instance.__factory = this
+
+    Utils._.each(this.attributes, function(definition, name) {
+      //transform integer 0,1 into boolean
+      if((definition.indexOf(DataTypes.BOOLEAN) !== -1) && (typeof instance[name] === "number")) {
+        instance[name] = (instance[name] !== 0)
+      }
+
+      //add default attributes
+      if(typeof instance[name] === 'undefined') {
+        var value = null
+
+        if(self.rawAttributes.hasOwnProperty(name) && self.rawAttributes[name].hasOwnProperty('defaultValue')) {
+          value = Utils.toDefaultValue(self.rawAttributes[name].defaultValue)
+        }
+
+        instance[name] = value
+        instance.addAttribute(name, value)
+      }
+
+      // add validation
+      if (self.rawAttributes.hasOwnProperty(name) && self.rawAttributes[name].hasOwnProperty('validate')) {
+        instance.setValidators(name, self.rawAttributes[name].validate)
+      }
+    })
+
+    Utils._.each(this.options.instanceMethods || {}, function(fct, name) { instance[name] = fct })
+    Utils._.each(this.associations, function(association, associationName) {
+      association.injectGetter(instance)
+      association.injectSetter(instance)
+    })
+
+    instance.isNewRecord = options.hasOwnProperty('isNewRecord') ? options.isNewRecord : true
+
+    return instance
+  }
+
+  DAOFactory.prototype.create = function(values, fields) {
+    return this.build(values).save(fields)
+  }
+
+  DAOFactory.prototype.__defineGetter__('primaryKeys', function() {
+    var result = {}
+    Utils._.each(this.attributes, function(dataTypeString, attributeName) {
+      if((attributeName != 'id') && (dataTypeString.indexOf('PRIMARY KEY') > -1))
+        result[attributeName] = dataTypeString
+    })
+
+    return result
+  })
+
+  // private
+
+  var query = function() {
+    var args = Utils._.map(arguments, function(arg, _) { return arg })
+      , s    = this.daoFactoryManager.sequelize
+
+    // add this as the second argument
+    if(arguments.length == 1) args.push(this)
+    return s.query.apply(s, args)
+  }
+
+  var addOptionalClassMethods = function() {
+    var self = this
+    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
+  }
+
+  var addDefaultAttributes = function() {
+    var self              = this
+      , defaultAttributes = {
+        id: {
+          type: DataTypes.INTEGER,
+          allowNull: false,
+          primaryKey: true,
+          autoIncrement: true
+        }
+      }
+
+    if(this.hasPrimaryKeys) defaultAttributes = {}
+
+    if(this.options.timestamps) {
+      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+
+      if(this.options.paranoid)
+        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
+    }
+
+    Utils._.each(defaultAttributes, function(value, attr) {
+      self.rawAttributes[attr] = value
+    })
+  }
+
+  var findAutoIncrementField = function() {
+    var self   = this
+      , fields = this.QueryGenerator.findAutoIncrementField(this)
+
+    this.autoIncrementField = null
+
+    fields.forEach(function(field) {
+      if(self.autoIncrementField)
+        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
+      else
+        self.autoIncrementField = field
+    })
+  }
+
+  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
+
+  return DAOFactory
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/dao.js.html b/docs/dao.js.html
new file mode 100644
index 000000000000..8f250b63ece6
--- /dev/null
+++ b/docs/dao.js.html
@@ -0,0 +1,294 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    DAO.prototype.validate = function() {
+    var self = this
+    var failures = {}
+
+    // for each field and value
+    Utils._.each(self.values, function(value, field) {
+
+      // if field has validators
+      if (self.validators.hasOwnProperty(field)) {
+        // for each validator
+        Utils._.each(self.validators[field], function(details, validatorType) {
+
+          var is_custom_fn = false  // if true then it's a custom validation method
+          var fn_method = null      // the validation function to call
+          var fn_args = []          // extra arguments to pass to validation function
+          var fn_msg = ""           // the error message to return if validation fails
+
+          // is it a custom validator function?
+          if (Utils._.isFunction(details)) {
+            is_custom_fn = true
+            fn_method = Utils._.bind(details, self, value)
+          }
+          // is it a validator module function?
+          else {
+            // extra args
+            fn_args = details.hasOwnProperty("args") ? details.args : []
+            if (!Utils._.isArray(fn_args))
+              fn_args = [fn_args]
+            // error msg
+            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
+            // check method exists
+            var v = Validator.check(value, fn_msg)
+            if (!Utils._.isFunction(v[validatorType]))
+              throw new Error("Invalid validator function: " + validatorType)
+            // bind to validator obj
+            fn_method = Utils._.bind(v[validatorType], v)
+          }
+
+          try {
+            fn_method.apply(null, fn_args)
+          } catch (err) {
+            err = err.message
+            // if we didn't provide a custom error message then augment the default one returned by the validator
+            if (!fn_msg && !is_custom_fn)
+              err += ": " + field
+            // each field can have multiple validation failures stored against it
+            if (failures.hasOwnProperty(field)) {
+              failures[field].push(err)
+            } else {
+              failures[field] = [err]
+            }
+          }
+
+        }) // for each validator for this field
+      } // if field has validator set
+    }) // for each field
+
+    return (Utils._.isEmpty(failures) ? null : failures)
+  }
+
+
+  DAO.prototype.updateAttributes = function(updates) {
+    this.setAttributes(updates)
+    return this.save()
+  }
+
+  DAO.prototype.setAttributes = function(updates) {
+    var self = this
+
+    var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys)
+
+    readOnlyAttributes.push('id')
+    readOnlyAttributes.push('createdAt')
+    readOnlyAttributes.push('updatedAt')
+    readOnlyAttributes.push('deletedAt')
+
+    Utils._.each(updates, function(value, attr) {
+      var updateAllowed = (
+        (readOnlyAttributes.indexOf(attr) == -1) &&
+        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
+        (self.attributes.indexOf(attr) > -1)
+      )
+      updateAllowed && (self[attr] = value)
+    })
+  }
+
+  DAO.prototype.destroy = function() {
+    if(this.__options.timestamps && this.__options.paranoid) {
+      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
+      this[attr] = new Date()
+      return this.save()
+    } else {
+      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
+      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
+    }
+  }
+
+  DAO.prototype.equals = function(other) {
+    var result = true
+      , self   = this
+
+    Utils._.each(this.values, function(value, key) {
+      result = result && (value == other[key])
+    })
+
+    return result
+  }
+
+  DAO.prototype.equalsOneOf = function(others) {
+    var result = false
+      , self   = this
+
+    others.forEach(function(other) { result = result || self.equals(other) })
+
+    return result
+  }
+
+  DAO.prototype.addAttribute = function(attribute, value) {
+    this[attribute] = value
+    this.attributes.push(attribute)
+  }
+
+  DAO.prototype.setValidators = function(attribute, validators) {
+    this.validators[attribute] = validators
+  }
+
+  DAO.prototype.toJSON = function() {
+    return this.values;
+  }
+
+  // private
+
+  var initAttributes = function(values) {
+    // add all passed values to the dao and store the attribute names in this.attributes
+    for (var key in values) {
+      if (values.hasOwnProperty(key)) {
+        this.addAttribute(key, values[key])
+      }
+    }
+
+    // set id to null if not passed as value
+    // a newly created dao has no id
+    var defaults = this.__options.hasPrimaryKeys ? {} : { id: null }
+
+    if(this.__options.timestamps) {
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+
+      if(this.__options.paranoid) {
+        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
+      }
+    }
+
+    for (var attr in defaults) {
+      var value = defaults[attr]
+
+      if(!this.hasOwnProperty(attr)) {
+        this.addAttribute(attr, Utils.toDefaultValue(value))
+      }
+    }
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Add the instance methods to DAO
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils._.extend(DAO.prototype, Mixin.prototype)
+
+  return DAO
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/data-types.js.html b/docs/data-types.js.html
new file mode 100644
index 000000000000..431695e88487
--- /dev/null
+++ b/docs/data-types.js.html
@@ -0,0 +1,139 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                      module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports = {
+  STRING: 'VARCHAR(255)',
+  TEXT: 'TEXT',
+  INTEGER: 'INTEGER',
+  DATE: 'DATETIME',
+  BOOLEAN: 'TINYINT(1)',
+  FLOAT: 'FLOAT',
+  NOW: 'NOW'
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/dialects/abstract/query.js.html b/docs/dialects/abstract/query.js.html
new file mode 100644
index 000000000000..13d6c3a60671
--- /dev/null
+++ b/docs/dialects/abstract/query.js.html
@@ -0,0 +1,336 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Examples
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          query.run('SELECT 1')
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @param:  {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.run = function(sql) {
+    throw new Error("The run method wasn't overwritten!")
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          formatResults
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          High level function that handles the results of a query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                             {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                               UserWithNames: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 name: 'barfooz',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                               },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Tasks: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 title: 'task',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 UserWithNameId: 1
                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                             }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.formatResults = function(data) {
+    var result  = this.callee
+
+    if (isInsertQuery.call(this, data)) {
+      handleInsertQuery.call(this, data)
+    }
+
+    if (isSelectQuery.call(this)) {
+      result = handleSelectQuery.call(this, data)
+    } else if (isShowTableQuery.call(this)) {
+      result = handleShowTableQuery.call(this, data)
+    } else if (isShowOrDescribeQuery.call(this)) {
+      result = data
+    }
+
+    return result
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Shortcut methods (success, ok) for listening for success events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Params:
+  - fct: A function that gets executed once the *success* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                            AbstractQuery.prototype.success =
+  AbstractQuery.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Shortcut methods (failure, fail, error) for listening for error events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Params:
+  - fct: A function that gets executed once the *error* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              AbstractQuery.prototype.failure =
+  AbstractQuery.prototype.fail =
+  AbstractQuery.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  var queryResultHasJoin = function(results) {
+    var hasJoin = !!results[0]
+
+    hasJoin = hasJoin && (Utils._.keys(results[0]).length > 1)
+    hasJoin = hasJoin && (Utils.isHash(results[0][Utils._.keys(results[0])[0]]))
+
+    return hasJoin
+  }
+
+  var isInsertQuery = function(results) {
+    var result = !!this.callee
+
+    result = result && (this.sql.indexOf('INSERT INTO') === 0)
+    result = result && results.hasOwnProperty('insertId')
+
+    return result
+  }
+
+  var handleInsertQuery = function(results) {
+    // add the inserted row id to the instance
+    var autoIncrementField = this.callee.__factory.autoIncrementField
+    this.callee[autoIncrementField] = results.insertId
+  }
+
+  var isShowTableQuery = function() {
+    return (this.sql.indexOf('SHOW TABLES') === 0)
+  }
+
+  var handleShowTableQuery = function(results) {
+    return Utils._.flatten(results.map(function(resultSet) {
+      return Utils._.values(resultSet)
+    }))
+  }
+
+  var isSelectQuery = function() {
+    return (this.sql.indexOf('SELECT') === 0)
+  }
+
+  var handleSelectQuery = function(results) {
+    var result = null
+
+    if (this.options.raw) {
+      result = results
+    } else if (queryResultHasJoin(results)) {
+      result = groupDataByCalleeFactory.call(this, results).map(function(result) {
+        // let's build the actual dao instance first...
+        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+        // ... and afterwards the prefetched associations
+        for (var tableName in result) {
+          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+          }
+        }
+
+        return dao
+      }.bind(this))
+    } else {
+      result = results.map(function(result) {
+        return this.callee.build(result, { isNewRecord: false })
+      }.bind(this))
+    }
+
+    // return the first real model instance if options.plain is set (e.g. Model.find)
+    if(this.options.plain) {
+      result = (result.length === 0) ? null : result[0]
+    }
+
+    return result
+  }
+
+  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
+    var associatedDao = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association   = this.callee.getAssociation(associatedDao)
+      , accessor      = Utils._.camelize(associatedDao.tableName)
+
+    // downcase the first char
+    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
+
+    associationData.forEach(function(data) {
+      var daoInstance = associatedDao.build(data, { isNewRecord: false })
+
+      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
+        accessor = Utils.singularize(accessor)
+        dao[accessor] = daoInstance
+      } else {
+        dao[accessor] = dao[accessor] || []
+        dao[accessor].push(daoInstance)
+      }
+    })
+  }
+
+  var isShowOrDescribeQuery = function() {
+    return (this.sql.indexOf('SHOW') === 0) || (this.sql.indexOf('DESCRIBE') === 0)
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              groupDataByCalleeFactory
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              groupDataByCalleeFactory()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  the associated data by the callee.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Example:
+  groupDataByCalleeFactory([
+    {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 1 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 2 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 3 }
+    }
+  ])
+
+Result:
+  Something like this:
+
+  [
+    {
+      callee:  { some: 'data', id: 1 },
+      association: [
+        { foo: 'bar', id: 1 },
+        { foo: 'bar', id: 2 },
+        { foo: 'bar', id: 3 }
+      ]
+    }
+  ]
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var groupDataByCalleeFactory = function(data) {
+    var result          = []
+      , calleeTableName = this.callee.tableName
+
+    data.forEach(function(row) {
+      var calleeData    = row[calleeTableName]
+        , existingEntry = result.filter(function(groupedRow) {
+            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
+          })[0]
+
+      if (!existingEntry) {
+        existingEntry = {}
+        result.push(existingEntry)
+        existingEntry[calleeTableName] = calleeData
+      }
+
+      for (var attrName in row) {
+        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
+          existingEntry[attrName] = existingEntry[attrName] || []
+          existingEntry[attrName].push(row[attrName])
+        }
+      }
+    })
+
+    return result
+  }
+
+  return AbstractQuery
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/dialects/connector-manager.js.html b/docs/dialects/connector-manager.js.html
new file mode 100644
index 000000000000..fd7f8f0f017c
--- /dev/null
+++ b/docs/dialects/connector-manager.js.html
@@ -0,0 +1,154 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  module.exports = (function(){
+  var ConnectorManager = function(sequelize, config) {
+    throw new Error('Define the constructor!')
+  }
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    throw new Error('Define the query method!')
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    throw new Error('Define the connect method!')
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    throw new Error('Define the disconnect method!')
+  }
+
+  ConnectorManager.prototype.reconnect = function() {
+    this.disconnect()
+    this.connect()
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/dialects/mysql/connector-manager.js.html b/docs/dialects/mysql/connector-manager.js.html
new file mode 100644
index 000000000000..310eb1585663
--- /dev/null
+++ b/docs/dialects/mysql/connector-manager.js.html
@@ -0,0 +1,343 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var mysql   = require("mysql")
+  , Pooling = require('generic-pool')
+  , Query   = require("./query")
+  , Utils   = require("../../utils")
+  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client = null
+    this.config = config || {}
+    this.disconnectTimeoutId = null
+    this.queue = []
+    this.activeQueue = []
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+    this.poolCfg = this.config.pool
+
+    var self = this
+
+    if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
+      if (!this.poolCfg.maxConnections) {
+        this.poolCfg.maxConnections = 10
+      }
+      this.pool = Pooling.Pool({
+        name: 'sequelize-mysql',
+        create: function (done) {
+            connect.call(self, done)
+        },
+        destroy: function(client) {
+            disconnect.call(self, client)
+        },
+        max: self.poolCfg.maxConnections,
+        idleTimeoutMillis: self.poolCfg.maxIdleTime
+      })
+    }
+
+    process.on('exit', function () {
+      //be nice & close our connections on exit
+      if (self.pool) {
+        self.pool.drain()
+      } else if (self.client) {
+        disconnect(self.client)
+      }
+
+      return
+    })
+  }
+
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  var isConnecting = false
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    if(!this.isConnected && !this.pool) this.connect()
+
+    var queueItem = {
+      query: new Query(this.client, this.sequelize, callee, options || {}),
+      sql: sql
+    }
+
+    enqueue.call(this, queueItem)
+
+    return queueItem.query
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting || this.pool) {
+      return
+    }
+    connect.call(self, function(err, client) {
+      self.client = client
+      return
+    })
+    return
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    if (this.client)
+      disconnect.call(this, this.client)
+    return
+  }
+
+
+  // private
+
+  var disconnect = function(client) {
+    var self = this
+    client.end(function() {
+      var intervalObj = null
+      var cleanup = function () {
+        var retryCt = 0
+        // make sure to let client finish before calling destroy
+        if (self && self.hasQueuedItems) {
+          return
+        }
+        // needed to prevent mysql connection leak
+        client.destroy()
+        if (self && self.client) {
+          self.client = null
+        }
+        clearInterval(intervalObj)
+      }
+      intervalObj = setInterval(cleanup, 10)
+      cleanup()
+      return
+    })
+  }
+
+  var connect = function(done) {
+    var connection = mysql.createConnection({
+      host: this.config.host,
+      port: this.config.port,
+      user: this.config.username,
+      password: this.config.password,
+      database: this.config.database
+    })
+    // client.setMaxListeners(self.maxConcurrentQueries)
+    this.isConnecting = false
+
+    done(null, connection)
+  }
+
+  var enqueue = function(queueItem) {
+    if(this.activeQueue.length < this.maxConcurrentQueries) {
+      this.activeQueue.push(queueItem)
+      if (this.pool) {
+        var self = this
+        this.pool.acquire(function(err, client) {
+          if (err) {
+            queueItem.query.emit('error', err)
+            return
+          }
+          //we set the client here, asynchronously, when getting a pooled connection
+          //allowing the ConnectorManager.query method to remain synchronous
+          queueItem.query.client = client
+          queueItem.client = client
+          execQueueItem.call(self, queueItem)
+          return
+        })
+      }
+      else
+      {
+        execQueueItem.call(this, queueItem)
+      }
+    } else {
+      this.queue.push(queueItem)
+    }
+  }
+
+  var dequeue = function(queueItem) {
+    //return the item's connection to the pool
+    if (this.pool) {
+      this.pool.release(queueItem.client)
+    }
+    this.activeQueue = without(this.activeQueue, queueItem)
+  }
+
+  var transferQueuedItems = function(count) {
+    for(var i = 0; i < count; i++) {
+      var queueItem = this.queue[0]
+      if(queueItem) {
+        enqueue.call(this, queueItem)
+        this.queue = without(this.queue, queueItem)
+      }
+    }
+  }
+
+  var afterQuery = function(queueItem) {
+    var self = this
+
+    dequeue.call(this, queueItem)
+    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
+    disconnectIfNoConnections.call(this)
+  }
+
+
+  var execQueueItem = function(queueItem) {
+    var self = this
+
+    queueItem.query
+      .success(function(){ afterQuery.call(self, queueItem) })
+      .error(function(){ afterQuery.call(self, queueItem) })
+
+    queueItem.query.run(queueItem.sql, queueItem.client)
+  }
+
+  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
+    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
+  })
+
+  // legacy
+  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
+    return !this.hasQueuedItems
+  })
+
+  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
+    return this.client != null
+  })
+
+  var disconnectIfNoConnections = function() {
+    var self = this
+
+    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
+    this.disconnectTimeoutId = setTimeout(function() {
+      self.isConnected && !self.hasQueuedItems && self.disconnect()
+    }, 100)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/dialects/mysql/query-generator.js.html b/docs/dialects/mysql/query-generator.js.html
new file mode 100644
index 000000000000..22b4185358ce
--- /dev/null
+++ b/docs/dialects/mysql/query-generator.js.html
@@ -0,0 +1,512 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require("../../utils")
+  , DataTypes = require("../../data-types")
+  , util      = require("util")
+
+module.exports = (function() {
+  var QueryGenerator = {
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+        engine: 'InnoDB',
+        charset: null
+      }, options || {})
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
+        , primaryKeys = []
+        , attrStr = []
+
+      for (var attr in attributes) {
+        var dataType = attributes[attr]
+
+        if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+          primaryKeys.push(attr)
+          attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+        } else {
+          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        engine: options.engine,
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if(pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+
+      return Utils._.template(query)({table: Utils.addTicks(tableName)})
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
+      return Utils._.template(query)({ before: before, after: after })
+    },
+
+    showTablesQuery: function() {
+      return 'SHOW TABLES;'
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
+      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
+          before: attrBefore,
+          after: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+
+      options = options || {}
+      options.table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr){
+        if(Array.isArray(attr) && attr.length == 2) {
+          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
+        } else {
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var tableNames = []
+
+        for (var daoName in options.include) {
+          tableNames.push(Utils.addTicks(options.include[daoName].tableName))
+        }
+
+        options.table = [options.table].concat(tableNames).join(', ')
+      }
+
+      if(options.where) {
+        options.where = QueryGenerator.getWhereConditions(options.where, tableName)
+        query += " WHERE <%= where %>"
+      }
+
+      if(options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+      if(options.group) {
+        options.group = Utils.addTicks(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+
+      if(options.limit && !(options.include && (options.limit === 1))) {
+        if(options.offset) {
+          query += " LIMIT <%= offset %>, <%= limit %>"
+        } else {
+          query += " LIMIT <%= limit %>"
+        }
+      }
+
+      query += ";"
+
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value  = attrValueHash[key]
+          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+
+        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if(typeof attribute == 'string')
+          return attribute
+        else {
+          var result = ""
+
+          if(!attribute.attribute)
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+
+          result += attribute.attribute
+
+          if(attribute.length)
+            result += '(' + attribute.length + ')'
+
+          if(attribute.order)
+            result += ' ' + attribute.order
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute == 'string') ? attribute : attribute.attribute
+      })
+
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", options.indexName,
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
+        (options.parser ? "WITH PARSER " + options.parser : undefined)
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
+      return Utils._.template(sql)({
+        tableName: tableName,
+        options: (options || {}).database ? ' FROM ' + options.database : ''
+      })
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
+        , indexName = indexNameOrAttributes
+
+      if(typeof indexName != 'string')
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+
+      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
+    },
+
+    getWhereConditions: function(smth, tableName) {
+      var result = null
+
+      if(Utils.isHash(smth)) {
+        smth   = Utils.prependTableNameToHash(tableName, smth)
+        result = QueryGenerator.hashToWhereConditions(smth)
+      } else if (typeof smth === 'number') {
+        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
+        result = QueryGenerator.hashToWhereConditions(smth)
+      } else if (typeof smth === "string") {
+        result = smth
+      } else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+         //handle qualified key names
+        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
+          , _value = null
+
+        if (Array.isArray(value)) {
+          // is value an array?
+
+          _value = "(" + value.map(function(subValue) {
+            return Utils.escape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        } else if ((value) && (typeof value == 'object')) {
+          // is value an object?
+
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = Utils.escape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(" AND ")
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if(Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if(dataType.autoIncrement) {
+            template +=" auto_increment"
+          }
+
+          if((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if(dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if(dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        var definition = factory.attributes[name]
+
+        if (definition && (definition.indexOf('auto_increment') > -1)) {
+          fields.push(name)
+        }
+      }
+
+      return fields
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/dialects/mysql/query.js.html b/docs/dialects/mysql/query.js.html
new file mode 100644
index 000000000000..c7cc42b26c67
--- /dev/null
+++ b/docs/dialects/mysql/query.js.html
@@ -0,0 +1,212 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    var self = this
+
+    this.client    = client
+    this.callee    = callee
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    if(this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if(this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+
+    this.bindClientFunction = function(err) { onFailure.call(self, err) }
+  }
+
+  Utils.inherit(Query, require('../abstract/query'))
+
+  Query.prototype.run = function(sql) {
+    var self = this
+
+    this.sql = sql
+
+    bindClient.call(this)
+
+    if(this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    this.client.query({ sql: this.sql, nestTables: true }, function(err, results, fields) {
+      self.emit('sql', self.sql)
+
+      if (err) {
+        onFailure.call(self, err)
+      } else {
+        if (Array.isArray(results) && !!results[0] && Utils._.keys(results[0]).length === 1) {
+          results = results.map(function(result){ return Utils._.values(result)[0] })
+        }
+
+        onSuccess.call(self, results, fields)
+      }
+    }).setMaxListeners(100)
+
+    return this
+  }
+
+  //private
+
+  var bindClient = function() {
+    this.client.on('error', this.bindClientFunction)
+  }
+
+  var unbindClient = function() {
+    this.client.removeListener('error', this.bindClientFunction)
+  }
+
+  var onSuccess = function(results, fields) {
+    unbindClient.call(this)
+    this.emit('success', this.formatResults(results))
+
+  }
+
+  var onFailure = function(err) {
+    unbindClient.call(this)
+    this.emit('error', err, this.callee)
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/dialects/postgres/connector-manager.js.html b/docs/dialects/postgres/connector-manager.js.html
new file mode 100644
index 000000000000..61a3be2c6c41
--- /dev/null
+++ b/docs/dialects/postgres/connector-manager.js.html
@@ -0,0 +1,219 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Query   = require("./query")
+  , Utils   = require("../../utils")
+  , pg  = require("pg")
+  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client = null
+    this.config = config || {}
+    this.pooling = (this.config.poolCfg != null && this.config.poolCfg.maxConnections > 0)
+    // set pooling parameters if specified
+    if (this.pooling) {
+      pg.defaults.poolSize = this.config.poolCfg.maxConnections
+      pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
+    }
+    this.disconnectTimeoutId = null
+    this.pendingQueries = 0
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  var isConnecting = false
+  var isConnected  = false
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    var self = this
+    if (this.client == null) this.connect()
+    var query = new Query(this.client, this.sequelize, callee, options || {})
+    self.pendingQueries += 1
+    return query.run(sql)
+      .success(function() { self.endQuery.call(self) })
+      .error(function() { self.endQuery.call(self) })
+  }
+
+  ConnectorManager.prototype.endQuery = function() {
+    var self = this
+    self.pendingQueries -= 1
+    if (self.pendingQueries == 0) {
+      setTimeout(function() {
+        self.pendingQueries == 0 && self.disconnect.call(self)
+      }, 100)
+    }
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this
+
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting) return
+    this.isConnecting = true
+    this.isConnected  = false
+
+    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
+
+    var connectCallback = function(err, client) {
+      self.isConnecting = false
+      if (!err && client) {
+        client.query("SET TIME ZONE 'UTC'")
+          .on('end', function() {
+            self.isConnected = true
+            this.client = client
+          });
+      } else {
+        this.client = null
+      }
+    }
+
+    if (this.pooling) {
+      // acquire client from pool
+      pg.connect(uri, connectCallback)
+
+    } else {
+      //create one-off client
+      this.client = new pg.Client(uri)
+      this.client.connect(connectCallback)
+    }
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    var self = this
+    if (this.client) this.client.end()
+    this.client = null
+    this.isConnecting = false
+    this.isConnected  = false
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/dialects/postgres/query-generator.js.html b/docs/dialects/postgres/query-generator.js.html
new file mode 100644
index 000000000000..95a3629eb026
--- /dev/null
+++ b/docs/dialects/postgres/query-generator.js.html
@@ -0,0 +1,576 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require("../../utils")
+  , util  = require("util")
+  , tables = {}
+  , primaryKeys = {};
+
+function removeQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return s.replace(new RegExp(quoteChar, 'g'), '')
+}
+
+function addQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return quoteChar + removeQuotes(s) + quoteChar
+}
+
+function pgEscape(s) {
+  s = Utils.escape(s)
+
+  if (typeof s == 'string') {
+    // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+    s = s.replace(/\\'/g, "''")
+  }
+
+  return s
+}
+
+function padInt(i) {
+  return (i < 10) ? '0' + i.toString() : i.toString()
+}
+function pgSqlDate(dt) {
+  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
+  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
+  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
+}
+
+function pgDataTypeMapping(tableName, attr, dataType) {
+  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+    primaryKeys[tableName].push(attr)
+    dataType = dataType.replace(/PRIMARY KEY/, '')
+  }
+
+  if (Utils._.includes(dataType, 'TINYINT(1)')) {
+    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
+  }
+
+  if (Utils._.includes(dataType, 'DATETIME')) {
+    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
+  }
+
+  if (Utils._.includes(dataType, 'SERIAL')) {
+    dataType = dataType.replace(/INTEGER/, '')
+    dataType = dataType.replace(/NOT NULL/, '')
+    tables[tableName][attr] = 'serial'
+  }
+
+  return dataType
+}
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+      }, options || {})
+
+      primaryKeys[tableName] = []
+      tables[tableName] = {}
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , attrStr = []
+
+      for (var attr in attributes) {
+        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
+        attrStr.push(addQuotes(attr) + " " + dataType)
+      }
+
+      var values  = {
+        table: addQuotes(tableName),
+        attributes: attrStr.join(", "),
+      }
+
+      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
+      if (pks.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pks + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+      return Utils._.template(query)({table: addQuotes(tableName)})
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
+      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
+    },
+
+    showTablesQuery: function() {
+      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
+    },
+
+    describeTableQuery: function(tableName) {
+      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
+      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
+          attrName: addQuotes(attrName),
+          definition: pgDataTypeMapping(tableName, attrName, definition)
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
+        , sql   = []
+
+      for (var attributeName in attributes) {
+        var attrSql = ''
+
+        if (definition.indexOf('NOT NULL') > 0) {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' SET NOT NULL'
+          })
+          definition = definition.replace('NOT NULL', '').trim()
+        } else {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' DROP NOT NULL'
+          })
+        }
+
+        attrSql += Utils._.template(query)({
+          tableName: addQuotes(tableName),
+          query: addQuotes(attributeName) + ' TYPE ' + definition
+        })
+
+        sql.push(attrSql)
+      }
+
+      return sql.join('')
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
+      var attrString = []
+
+      for (var attributeName in attributes) {
+        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
+          before: addQuotes(attrBefore),
+          after: addQuotes(attributeName),
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      options = options || {}
+      options.table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr){
+        if(Array.isArray(attr) && attr.length == 2) {
+          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
+        } else if (attr.indexOf('`') >= 0) {
+          return attr.replace(/`/g, '"')
+        } else {
+          return addQuotes(attr)
+        }
+      }).join(", ")
+
+      options.attributes = options.attributes || '*'
+
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+
+      if(options.where) {
+        options.where = QueryGenerator.getWhereConditions(options.where)
+        query += " WHERE <%= where %>"
+      }
+      if(options.order) {
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
+        query += " ORDER BY <%= order %>"
+      }
+      if(options.group) {
+        options.group = addQuotes(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+      if(options.limit) query += " LIMIT <%= limit %>"
+      if(options.offset) query += " OFFSET <%= offset %>"
+
+      query += ";"
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
+        , returning = []
+
+      Utils._.forEach(attrValueHash, function(value, key, hash) {
+        if (tables[tableName] && tables[tableName][key]) {
+          switch (tables[tableName][key]) {
+            case 'serial':
+              delete hash[key]
+              returning.push(key)
+              break
+          }
+        }
+      });
+
+      var replacements  = {
+        table: addQuotes(tableName),
+        attributes: Utils._.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return pgEscape((value instanceof Date) ? pgSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(addQuotes(key) + "=" + pgEscape((value instanceof Date) ? pgSqlDate(value) : value))
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      primaryKeys[tableName] = primaryKeys[tableName] || [];
+
+      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
+
+      var pks;
+      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
+        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
+      } else {
+        pks = addQuotes('id')
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: pgEscape(options.limit),
+        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
+        primaryKeysSelection: pks
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if(typeof attribute == 'string')
+          return addQuotes(attribute)
+        else {
+          var result = ""
+
+          if(!attribute.attribute)
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+
+          result += addQuotes(attribute.attribute)
+
+          if(attribute.length)
+            result += '(' + attribute.length + ')'
+
+          if(attribute.order)
+            result += ' ' + attribute.order
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute == 'string') ? attribute : attribute.attribute
+      })
+
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
+      return Utils._.template(query)({ tableName: tableName });
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
+        , indexName = indexNameOrAttributes
+
+      if(typeof indexName != 'string')
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+
+      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
+    },
+
+    getWhereConditions: function(smth) {
+      var result = null
+
+      if(Utils.isHash(smth))
+        result = QueryGenerator.hashToWhereConditions(smth)
+      else if(typeof smth == 'number')
+        result = '\"id\"' + "=" + pgEscape(smth)
+      else if(typeof smth == "string")
+        result = smth
+      else if(Array.isArray(smth))
+        result = Utils.format(smth)
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+        //handle qualified key names
+        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
+          , _value = null
+
+        if(Array.isArray(value)) {
+          _value = "(" + value.map(function(subValue) {
+            return pgEscape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        }
+        else if ((value) && (typeof value == 'object')) {
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = pgEscape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(' AND ')
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if(Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if(dataType.type == 'TINYINT(1)') dataType.type = 'BOOLEAN'
+          if(dataType.type == 'DATETIME') dataType.type = 'TIMESTAMP'
+
+          if(dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) template += " NOT NULL"
+          if(dataType.autoIncrement) template +=" SERIAL"
+          if(dataType.defaultValue != undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = pgEscape(dataType.defaultValue)
+          }
+          if(dataType.unique) template += " UNIQUE"
+          if(dataType.primaryKey) template += " PRIMARY KEY"
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        var definition = factory.attributes[name]
+
+        if (definition && (definition.indexOf('SERIAL') > -1)) {
+          fields.push(name)
+        }
+      }
+
+      return fields
+    },
+
+    databaseConnectionUri: function(config) {
+      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
+
+      return Utils._.template(template)({
+        user: config.username,
+        password: config.password,
+        database: config.database,
+        host: config.host,
+        port: config.port,
+        protocol: config.protocol
+      })
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/dialects/postgres/query.js.html b/docs/dialects/postgres/query.js.html
new file mode 100644
index 000000000000..91f09e1b2464
--- /dev/null
+++ b/docs/dialects/postgres/query.js.html
@@ -0,0 +1,227 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    var self = this
+
+    this.client = client
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    if(this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if(this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.run = function(sql) {
+    var self = this
+
+    this.sql = sql
+
+    if(this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var results = [];
+    var receivedError = false;
+
+    var query = this.client.query(sql)
+    query.on('row', function(row) {
+      if (self.callee && (self.sql.indexOf('INSERT INTO') == 0 || self.sql.indexOf('UPDATE') == 0)) {
+        Utils._.forEach(row, function(value, key) {
+          self.callee[key] = value
+        })
+        results.push(self.callee)
+      }
+
+      if (self.sql.indexOf('SELECT table_name FROM information_schema.tables') == 0) {
+        results.push(Utils._.values(row))
+      } else if (self.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') == 0) {
+        results.push(Utils._.values(row))
+      } else if (self.sql.indexOf('SELECT') == 0) {
+        // transform results into real model instances
+        // return the first real model instance if options.plain is set (e.g. Model.find)
+        if (self.options.raw) {
+          results.push(row);
+        } else {
+          results.push(self.callee.build(row, { isNewRecord: false }))
+        }
+      } else if((self.sql.indexOf('SHOW') == 0) || (self.sql.indexOf('DESCRIBE') == 0)) {
+        results.push(row)
+      }
+    });
+
+    query.on('end', function() {
+      self.emit('sql', self.sql)
+      if (receivedError) return;
+
+      if (self.sql.indexOf('SELECT') == 0) {
+        if (self.options.plain) {
+          self.emit('success', (results.length == 0) ? null : results[0])
+        } else {
+          self.emit('success', results)
+        }
+      } else if((self.sql.indexOf('SHOW') == 0) || (self.sql.indexOf('DESCRIBE') == 0)) {
+        self.emit('success', results)
+      } else if (self.sql.indexOf('INSERT INTO') == 0) {
+        self.emit('success', results[0])
+      } else if (self.sql.indexOf('UPDATE') == 0) {
+        self.emit('success', self.callee)
+      } else {
+        self.emit('success', results)
+      }
+    });
+
+    query.on('error', function(err) {
+      receivedError = true
+      self.emit('error', err, self.callee)
+    });
+
+    return this
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/dialects/query-generator.js.html b/docs/dialects/query-generator.js.html
new file mode 100644
index 000000000000..3ebd02f14d9b
--- /dev/null
+++ b/docs/dialects/query-generator.js.html
@@ -0,0 +1,177 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                createTableQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('createTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns a query for dropping a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  dropTableQuery: function(tableName, options) {
+      throwMethodUndefined('dropTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a rename table query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - originalTableName: Name of the table before execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - futureTableName: Name of the table after execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    renameTableQuery: function(originalTableName, futureTableName) {
+      throwMethodUndefined('renameTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns a query, which gets all available table names in the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      showTablesQuery: function() {
+      throwMethodUndefined('showTablesQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns a query, which adds an attribute to an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        addColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('addColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Returns a query, which removes an attribute from an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - tableName: Name of the existing table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - attributeName: Name of the obsolete attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          removeColumnQuery: function(tableName, attributeName) {
+      throwMethodUndefined('removeColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            changeColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('changeColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Returns a query, which renames an existing attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - attrNameAfter: The name of the attribute, after renaming.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
+      throwMethodUndefined('renameColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a query for selecting elements in the table .
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - order -> e.g. 'id DESC'
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - group
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - limit -> The maximum count you want to get.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - offset -> An offset value to start from. Only useable with limit!
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                selectQuery: function(tableName, options) {
+      throwMethodUndefined('selectQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  insertQuery: function(tableName, attrValueHash) {
+      throwMethodUndefined('insertQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns an update query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - values -> A hash with attribute-value-pairs
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    updateQuery: function(tableName, values, where) {
+      throwMethodUndefined('updateQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns a deletion query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - limit -> Maximaum count of lines to delete
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      deleteQuery: function(tableName, where, options) {
+      throwMethodUndefined('deleteQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns an add index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - tableName -> Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - attributes:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  An array of attributes as string or as hash.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  If the attribute is a hash, it must have the following content:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - attribute: The name of the attribute/column
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - length: An integer. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - indexName: The name of the index. Default is 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - parser
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        addIndexQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('addIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Returns an show index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - database: Name of the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          showIndexQuery: function(tableName, options) {
+      throwMethodUndefined('showIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns a remove index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - indexNameOrAttributes: The name of the index as string or an array of attribute names.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      throwMethodUndefined('removeIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Takes something and transforms it into values of a where condition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              getWhereConditions: function(smth) {
+      throwMethodUndefined('getWhereConditions')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    The values are transformed by the relevant datatype.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                hashToWhereConditions: function(hash) {
+      throwMethodUndefined('hashToWhereConditions')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      sql attribute definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  attributesToSQL: function(attributes) {
+      throwMethodUndefined('attributesToSQL')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns all auto increment fields of a factory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    findAutoIncrementField: function(factory) {
+      throwMethodUndefined('findAutoIncrementField')
+    }
+  }
+
+  var throwMethodUndefined = function(methodName) {
+    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
+  }
+
+  return QueryGenerator
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/dialects/query.js.html b/docs/dialects/query.js.html
new file mode 100644
index 000000000000..ce09e58f7558
--- /dev/null
+++ b/docs/dialects/query.js.html
@@ -0,0 +1,216 @@
+Documentation
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Documentation
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ./lib/dialects/query.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require("../utils")
+
+module.exports = (function() {
+  var Query = function(database, sequelize, callee, options) {
+    throw new Error('Constructor was not overwritten!')
+  }
+  Utils._.extend(Query.prototype, require("../emitters/custom-event-emitter").prototype)
+
+  Query.prototype.run = function(sql) {
+    throw new Error("The run method wasn't overwritten!")
+  }
+
+  Query.prototype.success = Query.prototype.ok = function(fct) {
+    this.on('success', fct)
+    return this
+  }
+
+  Query.prototype.failure = Query.prototype.fail = Query.prototype.error = function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/dialects/sqlite/connector-manager.js.html b/docs/dialects/sqlite/connector-manager.js.html
new file mode 100644
index 000000000000..31a9cf651a14
--- /dev/null
+++ b/docs/dialects/sqlite/connector-manager.js.html
@@ -0,0 +1,147 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils   = require("../../utils")
+  , sqlite3 = require('sqlite3').verbose()
+  , Query   = require("./query")
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize) {
+    this.sequelize = sequelize
+    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    return new Query(this.database, this.sequelize, callee, options).run(sql)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/dialects/sqlite/query-generator.js.html b/docs/dialects/sqlite/query-generator.js.html
new file mode 100644
index 000000000000..553644a2df58
--- /dev/null
+++ b/docs/dialects/sqlite/query-generator.js.html
@@ -0,0 +1,279 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require("../../utils")
+  , util  = require("util")
+
+var escape = function(str) {
+  if (typeof str === 'string') {
+    return "'" + str.replace(/'/g, "''") + "'";
+  } else if (typeof str === 'boolean') {
+    return str ? 1 : 0; // SQLite has no type boolean
+  } else if (str === null || str === undefined) {
+    return 'NULL';
+  } else {
+    return str;
+  }
+};
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = options || {}
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , attrStr = []
+
+      for (var attr in attributes) {
+        var dataType = attributes[attr]
+
+        if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+        } else {
+          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    showTablesQuery: function() {
+      return "SELECT name FROM sqlite_master WHERE type='table';"
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: MySqlQueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: this.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if(Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if(dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey)
+            template += " NOT NULL"
+
+          if(dataType.defaultValue != undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if(dataType.unique) template += " UNIQUE"
+          if(dataType.primaryKey) template += " PRIMARY KEY"
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        var definition = factory.attributes[name]
+
+        if (definition && (definition.indexOf('INTEGER PRIMARY KEY') == 0)) {
+          fields.push(name)
+        }
+      }
+
+      return fields
+    }
+  }
+
+  var MySqlQueryGenerator = Utils._.extend(
+    Utils._.clone(require("../query-generator")),
+    Utils._.clone(require("../mysql/query-generator"))
+  )
+
+  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/dialects/sqlite/query.js.html b/docs/dialects/sqlite/query.js.html
new file mode 100644
index 000000000000..02ce096ab2cf
--- /dev/null
+++ b/docs/dialects/sqlite/query.js.html
@@ -0,0 +1,248 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+
+module.exports = (function() {
+  var Query = function(database, sequelize, callee, options) {
+    this.database = database
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    if(this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if(this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.run = function(sql) {
+    var self = this
+
+    this.sql = sql
+
+    if(this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var columnTypes = {};
+    this.database.serialize(function() {
+      var executeSql = function() {
+        self.database[databaseMethod](self.sql, function(err, results) {
+           //allow clients to listen to sql to do their own logging or whatnot
+          self.emit('sql', self.sql)
+          this.columnTypes = columnTypes;
+          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
+        })
+      };
+
+      var isInsertCommand = (self.sql.toLowerCase().indexOf('insert') == 0)
+        , isUpdateCommand = (self.sql.toLowerCase().indexOf('update') == 0)
+        , databaseMethod  = (isInsertCommand || isUpdateCommand) ? 'run' : 'all'
+      if (databaseMethod === 'all' && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
+        var tableName = RegExp.$1;
+        if (tableName !== 'sqlite_master') {
+          // get the column types
+          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
+            if (!err) {
+              for (var i=0, l=results.length; i
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/emitters/custom-event-emitter.js.html b/docs/emitters/custom-event-emitter.js.html
new file mode 100644
index 000000000000..e3f25876927f
--- /dev/null
+++ b/docs/emitters/custom-event-emitter.js.html
@@ -0,0 +1,176 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var util         = require("util")
+  , EventEmitter = require("events").EventEmitter
+
+module.exports = (function() {
+  var CustomEventEmitter = function(fct) {
+    this.fct = fct
+  }
+  util.inherits(CustomEventEmitter, EventEmitter)
+
+  CustomEventEmitter.prototype.run = function() {
+    var self = this
+
+    // delay the function call and return the emitter
+    setTimeout(function(){
+      self.fct.call(self, self)
+    }, 1)
+
+    return this
+  }
+
+  CustomEventEmitter.prototype.success =
+  CustomEventEmitter.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.failure =
+  CustomEventEmitter.prototype.fail =
+  CustomEventEmitter.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.done =
+  CustomEventEmitter.prototype.complete =
+  function(fct) {
+    this.on('error', function(err) { fct(err, null) })
+        .on('success', function(result) { fct(null, result) })
+    return this
+  }
+
+
+  return CustomEventEmitter
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index 469a8b574ddc..5655e17894c5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,124 +1,193 @@
-
-
-
-    
-    
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            Browse to a module or class using the sidebar to view its API documentation.
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Keyboard Shortcuts
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • Press s to focus the API search box.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • 
-
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • Use Up and Down to select classes, modules, and search results.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • 
-
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • With the API search box or sidebar focused, use ⌘-Left or ⌘-Right to switch sidebar tabs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • 
-
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • With the API search box or sidebar focused, use Ctrl+Left and Ctrl+Right to switch sidebar tabs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • 
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-
-
-
-
-
-
-
-
-
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              index.html
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/migration.js.html b/docs/migration.js.html
new file mode 100644
index 000000000000..451555136c36
--- /dev/null
+++ b/docs/migration.js.html
@@ -0,0 +1,261 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var moment         = require("moment")
+  , Utils          = require("./utils")
+  , DataTypes      = require("./data-types")
+  , QueryInterface = require("./query-interface")
+
+module.exports = (function() {
+  var Migration = function(migrator, path) {
+    var split = path.split('/')
+
+    this.migrator       = migrator
+    this.path           = path
+    this.filename       = Utils._.last(this.path.split('/'))
+
+    var parsed          = Migration.parseFilename(this.filename)
+
+    this.migrationId    = parsed.id
+    this.date           = parsed.date;
+    this.queryInterface = this.migrator.queryInterface
+    this.undoneMethods  = 0
+  }
+
+  ///////////////
+  // static /////
+  ///////////////
+
+  Migration.parseFilename = function(s) {
+    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
+
+    if(matches === null) {
+      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
+    }
+
+    return {
+      id: parseInt(matches[1]),
+      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
+    }
+  }
+
+  Migration.migrationHasInterfaceCalls = function(func) {
+    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
+      , hasCalls       = false
+
+    for(var method in QueryInterface.prototype) {
+      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
+      hasCalls = hasCalls || regex.test(functionString)
+    }
+
+    return hasCalls
+  }
+
+  ///////////////
+  // member /////
+  ///////////////
+
+  Object.defineProperty(Migration.prototype, 'migration', {
+    get: function() {
+      return require(this.path)
+    }
+  })
+
+  Migration.prototype.execute = function(options) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      options = Utils._.extend({
+        method: 'up'
+      }, options || {})
+
+      var onSuccess = function() { emitter.emit('success', null) }
+        , func      = self.migration[options.method]
+
+      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
+      func.call(null, self, DataTypes)
+
+      if(!Migration.migrationHasInterfaceCalls(func))
+        onSuccess()
+    }).run()
+  }
+
+  Migration.prototype.isBefore = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date > this.date) : (date >= this.date)
+  }
+
+  Migration.prototype.isAfter = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date < this.date) : (date <= this.date)
+  }
+
+  // extends the Migration prototype with all methods of QueryInterface.prototype
+  // with additional tracking of start and finish. this is done in order to minimize
+  // asynchronous handling in migrations
+  var extendMigrationWithQueryInterfaceMethods = function(callback) {
+    var self = this
+
+    for(var method in QueryInterface.prototype) {
+      (function(_method) {
+        self[_method] = function() {
+          var emitter = self.QueryInterface
+            , args    = Utils._.map(arguments, function(arg, _) { return arg })
+
+          self.undoneMethods++
+
+          // bind listeners to the query interface
+          // the event will have the same name like the method
+          self.queryInterface.on(_method, function(err) {
+            self.undoneMethods--
+            if(err)
+              throw new Error(err)
+            else
+              (self.undoneMethods == 0) && callback && callback()
+          })
+
+          self.queryInterface[_method].apply(self.queryInterface, args)
+        }
+      })(method)
+    }
+  }
+
+  return Migration
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/migrator.js.html b/docs/migrator.js.html
new file mode 100644
index 000000000000..788e2cea7654
--- /dev/null
+++ b/docs/migrator.js.html
@@ -0,0 +1,359 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  const fs     = require("fs")
+    , path   = require("path")
+    , moment = require("moment")
+
+var Utils          = require("./utils")
+  , Migration      = require("./migration")
+  , DataTypes      = require("./data-types")
+
+module.exports = (function() {
+  var Migrator = function(sequelize, options) {
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      path: __dirname + '/../migrations',
+      from: null,
+      to: null,
+      logging: console.log
+    }, options || {})
+
+    if(this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if(this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+
+  Object.defineProperty(Migrator.prototype, "queryInterface", {
+    get: function() {
+      return this.sequelize.getQueryInterface()
+    }
+  })
+
+  Migrator.prototype.migrate = function(options) {
+    var self = this
+
+    options = Utils._.extend({
+      method: 'up'
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.getUndoneMigrations(function(err, migrations) {
+        if(err) {
+          emitter.emit('error', err)
+        } else {
+          var chainer = new Utils.QueryChainer
+            , from    = migrations[0]
+
+          if(options.method == 'down') {
+            migrations.reverse()
+            from = migrations[0]
+          }
+
+          migrations.forEach(function(migration) {
+            chainer.add(migration, 'execute', [options], {
+              before: function(migration) {
+                if(self.options.logging !== false)
+                  self.options.logging('Executing migration: ' + migration.filename)
+              },
+              after: function(migration) {
+                if(self.options.logging !== false)
+                  self.options.logging('Executed migration: ' + migration.filename)
+              },
+              success: function(migration, callback) {
+                if(options.method == 'down')
+                  deleteUndoneMigration.call(self, from, migration, callback)
+                else
+                  saveSuccessfulMigration.call(self, from, migration, callback)
+              }
+            })
+          })
+
+          chainer
+            .runSerially({ skipOnError: true })
+            .success(function() { emitter.emit('success', null) })
+            .error(function(err) { emitter.emit('error', err) })
+        }
+      })
+    }).run()
+  }
+
+  Migrator.prototype.getUndoneMigrations = function(callback)  {
+    var self = this
+
+    var filterFrom = function(migrations, from, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
+      callback && callback(null, result)
+    }
+    var filterTo = function(migrations, to, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
+      callback && callback(null, result)
+    }
+
+    var migrationFiles = fs.readdirSync(this.options.path)
+
+    var migrations = migrationFiles.map(function(file) {
+      return new Migration(self, self.options.path + '/' + file)
+    })
+
+    migrations = migrations.sort(function(a,b){
+      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
+    })
+
+    if(this.options.from) {
+      filterFrom(migrations, this.options.from, function(err, migrations) {
+        if(self.options.to)
+          filterTo(migrations, self.options.to, callback)
+        else
+          callback && callback(null, migrations)
+      })
+    } else {
+      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
+        if(lastMigrationId) {
+          filterFrom(migrations, lastMigrationId, function(err, migrations) {
+            if(self.options.to)
+              filterTo(migrations, self.options.to, callback)
+            else
+              callback && callback(null, migrations)
+          }, { withoutEqual: true })
+        } else {
+          if(self.options.to)
+            filterTo(migrations, self.options.to, callback)
+          else
+            callback && callback(null, migrations)
+        }
+      }).error(function(err) {
+        callback && callback(err, null)
+      })
+    }
+  }
+
+  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
+        , SequelizeMeta = storedDAO
+
+      if(!storedDAO) {
+        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
+          from: DataTypes.STRING,
+          to:   DataTypes.STRING
+        }, {
+          timestamps: false
+        })
+      }
+
+      // force sync when model has newly created or if syncOptions are passed
+      if(!storedDAO || syncOptions) {
+        SequelizeMeta
+          .sync(syncOptions || {})
+          .success(function() { emitter.emit('success', SequelizeMeta) })
+          .error(function(err) { emitter.emit('error', err) })
+      } else {
+        emitter.emit('success', SequelizeMeta)
+      }
+    }).run()
+  }
+
+  // private
+
+  var getLastMigrationFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
+          emitter.emit('success', meta ? meta : null)
+        }).error(function(err) { emitter.emit('error', err) })
+      }).error(function(err) { emitter.emit(err) })
+    }).run()
+  }
+
+  var getLastMigrationIdFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      getLastMigrationFromDatabase.call(self)
+        .success(function(meta) {
+          emitter.emit('success', meta ? meta.to : null)
+        })
+        .error(function(err) {
+          emitter.emit('error', err)
+        })
+    }).run()
+  }
+
+  var getFormattedDateString = function(s) {
+    var result = null
+
+    try {
+      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
+    } catch(e) {
+      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
+    }
+
+    return result
+  }
+
+  var stringToDate = function(s) {
+    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
+  }
+
+  var saveSuccessfulMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .create({ from: from.migrationId, to: to.migrationId })
+        .success(callback)
+    })
+  }
+
+  var deleteUndoneMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .find({ from: from.migrationId, to: to.migrationId })
+        .success(function(meta) {
+          meta.destroy().success(callback)
+        })
+    })
+  }
+
+  return Migrator
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/query-chainer.js.html b/docs/query-chainer.js.html
new file mode 100644
index 000000000000..25cbcb95a163
--- /dev/null
+++ b/docs/query-chainer.js.html
@@ -0,0 +1,272 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils = require("./utils")
+
+module.exports = (function() {
+  var QueryChainer = function(emitters) {
+    var self = this
+
+    this.finishedEmits  = 0
+    this.emitters       = []
+    this.serials        = []
+    this.fails          = []
+    this.serialResults  = []
+    this.emitterResults = []
+    this.finished       = false
+    this.wasRunning     = false
+    this.eventEmitter   = null
+
+    emitters = emitters || []
+    emitters.forEach(function(emitter) {
+      if(Array.isArray(emitter)) {
+        self.add.apply(self, emitter)
+      } else {
+        self.add(emitter)
+      }
+    })
+  }
+
+  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
+    if(!!method) {
+      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
+    } else {
+      observeEmitter.call(this, emitterOrKlass)
+      this.emitters.push(emitterOrKlass)
+    }
+
+    return this
+  }
+
+  QueryChainer.prototype.run = function() {
+    var self = this
+    this.eventEmitter = new Utils.CustomEventEmitter(function() {
+      self.wasRunning = true
+      finish.call(self, 'emitterResults')
+    })
+    return this.eventEmitter.run()
+  }
+
+  QueryChainer.prototype.runSerially = function(options) {
+    var self       = this
+      , serialCopy = Utils._.clone(this.serials)
+
+    options = Utils._.extend({
+      skipOnError: false
+    }, options)
+
+    var exec = function() {
+      var serial = self.serials.pop()
+
+      if(serial) {
+        serial.options = serial.options || {}
+        serial.options.before && serial.options.before(serial.klass)
+
+        var onSuccess = function() {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          exec()
+        }
+
+        var onError = function(err) {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          self.fails.push(err)
+          exec()
+        }
+
+        if(options.skipOnError && (self.fails.length > 0)) {
+          onError('Skipped due to earlier error!')
+        } else {
+          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
+
+          emitter.success(function(result) {
+            self.serialResults[serialCopy.indexOf(serial)] = result
+
+            if(serial.options.success) {
+              serial.options.success(serial.klass, onSuccess)
+            } else {
+              onSuccess()
+            }
+          }).error(onError)
+        }
+      } else {
+        self.wasRunning = true
+        finish.call(self, 'serialResults')
+      }
+    }
+
+    this.serials.reverse()
+    this.eventEmitter = new Utils.CustomEventEmitter(exec)
+    return this.eventEmitter.run()
+  }
+
+  // private
+
+  var observeEmitter = function(emitter) {
+    var self = this
+
+    emitter
+      .success(function(result) {
+        self.emitterResults[self.emitters.indexOf(emitter)] = result
+        self.finishedEmits++
+        finish.call(self, 'emitterResults')
+      })
+      .error(function(err) {
+        self.finishedEmits++
+        self.fails.push(err)
+        finish.call(self, 'emitterResults')
+      })
+      .on('sql', function(sql) {
+        if(self.eventEmitter) {
+          self.eventEmitter.emit('sql', sql)
+        }
+      })
+  }
+
+  var finish = function(resultsName) {
+    this.finished = true
+
+    if(this.emitters.length > 0) {
+      this.finished = (this.finishedEmits == this.emitters.length)
+    } else if(this.serials.length > 0) {
+      this.finished = (this.finishedEmits == this.serials.length)
+    }
+
+    if(this.finished && this.wasRunning) {
+      var status = (this.fails.length == 0 ? 'success' : 'error')
+        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
+
+      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
+    }
+  }
+
+  return QueryChainer
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/query-interface.js.html b/docs/query-interface.js.html
new file mode 100644
index 000000000000..76dc08524f3c
--- /dev/null
+++ b/docs/query-interface.js.html
@@ -0,0 +1,402 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require('./utils')
+  , DataTypes = require('./data-types')
+
+module.exports = (function() {
+  var QueryInterface = function(sequelize) {
+    this.sequelize = sequelize
+    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+	 this.QueryGenerator.options = this.sequelize.options;
+  }
+  Utils.addEventEmitter(QueryInterface)
+
+  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
+    var attributeHashes = {}
+
+    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
+      if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+        attributeHashes[attributeName] = { type: dataTypeOrOptions }
+      else
+        attributeHashes[attributeName] = dataTypeOrOptions
+    })
+
+    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
+
+    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'createTable')
+  }
+
+  QueryInterface.prototype.dropTable = function(tableName) {
+    var sql = this.QueryGenerator.dropTableQuery(tableName)
+    return queryAndEmit.call(this, sql, 'dropTable')
+  }
+
+  QueryInterface.prototype.dropAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+
+      self.showAllTables().success(function(tableNames) {
+        tableNames.forEach(function(tableName) {
+          chainer.add(self.dropTable(tableName))
+        })
+        chainer
+          .run()
+          .success(function() {
+            self.emit('dropAllTables', null)
+            emitter.emit('success', null)
+          })
+          .error(function(err) {
+            self.emit('dropAllTables', err)
+            emitter.emit('error', err)
+          })
+      }).error(function(err) {
+        self.emit('dropAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.renameTable = function(before, after) {
+    var sql = this.QueryGenerator.renameTableQuery(before, after)
+    return queryAndEmit.call(this, sql, 'renameTable')
+  }
+
+  QueryInterface.prototype.showAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var showTablesSql = self.QueryGenerator.showTablesQuery()
+      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
+        self.emit('showAllTables', null)
+        emitter.emit('success', Utils._.flatten(tableNames))
+      }).error(function(err) {
+        self.emit('showAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.describeTable = function(tableName) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql;
+      if (self.QueryGenerator.describeTableQuery) {
+        sql = self.QueryGenerator.describeTableQuery(tableName)
+      } else {
+        sql = 'DESCRIBE `' + tableName + '`;'
+      }
+      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
+        emitter.emit('success', data)
+      }).error(function(err) {
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    else
+      attributes[attributeName] = dataTypeOrOptions
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'addColumn')
+  }
+
+  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
+    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
+    return queryAndEmit.call(this, sql, 'removeColumn')
+  }
+
+  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    else
+      attributes[attributeName] = dataTypeOrOptions
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'changeColumn')
+  }
+
+  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.describeTable(tableName).success(function(data) {
+        data = data.filter(function(h) { return h.Field == attrNameBefore })[0]
+
+        var options =  {}
+
+        options[attrNameAfter] = {
+          type: data.Type,
+          allowNull: data.Null == 'YES',
+          defaultValue: data.Default
+        }
+
+        var sql = self.QueryGenerator.renameColumnQuery(tableName,
+          attrNameBefore,
+          self.QueryGenerator.attributesToSQL(options)
+        )
+
+        self.sequelize.query(sql).success(function() {
+          self.emit('renameColumn', null)
+          emitter.emit('success', null)
+        }).error(function(err) {
+          self.emit('renameColumn', err)
+          emitter.emit('error', err)
+        })
+      }).error(function(err) {
+        self.emit('renameColumn', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
+    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'addIndex')
+  }
+
+  QueryInterface.prototype.showIndex = function(tableName, options) {
+    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
+    return queryAndEmit.call(this, sql, 'showIndex')
+  }
+
+  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
+    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
+    return queryAndEmit.call(this, sql, "removeIndex")
+  }
+
+  QueryInterface.prototype.insert = function(dao, tableName, values) {
+    var sql = this.QueryGenerator.insertQuery(tableName, values)
+    return queryAndEmit.call(this, [sql, dao], 'insert', {
+      success: function(obj) { obj.isNewRecord = false }
+    })
+  }
+
+  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
+    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'update')
+  }
+
+  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
+    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'delete')
+  }
+
+  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
+    var sql = this.QueryGenerator.selectQuery(tableName, options)
+    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
+  }
+
+  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
+    var self = this
+
+    if(attributeSelector == undefined) {
+      throw new Error('Please pass an attribute selector!')
+    }
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql = self.QueryGenerator.selectQuery(tableName, options)
+        , qry = self.sequelize.query(sql, null, { plain: true, raw: true })
+
+      qry
+        .success(function(data) {
+          var result = data[attributeSelector]
+
+          if (options && options.parseInt) {
+            result = parseInt(result)
+          }
+
+          self.emit('rawSelect', null)
+          emitter.emit('success', result)
+        })
+        .error(function(err) {
+          self.emit('rawSelect', err)
+          emitter.emit('error', err)
+        })
+        .on('sql', function(sql) {
+          emitter.emit('sql', sql)
+        })
+    }).run()
+  }
+
+  // private
+
+  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
+    var self = this
+
+    options = Utils._.extend({
+      success: function(obj){},
+      error: function(err){}
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var query = null
+
+      if(Array.isArray(sqlOrQueryParams)) {
+        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
+      } else {
+        query = self.sequelize.query(sqlOrQueryParams)
+      }
+
+      // append the query for better testing
+      emitter.query = query
+
+      query.success(function(obj) {
+        options.success && options.success(obj)
+        self.emit(methodName, null)
+        emitter.emit('success', obj)
+      }).error(function(err) {
+        options.error && options.error(err)
+        self.emit(methodName, err)
+        emitter.emit('error', err)
+      })
+      query.on('sql', function(sql) {
+        emitter.emit('sql', sql)
+      })
+    }).run()
+  }
+
+  return QueryInterface
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/sequelize.js.html b/docs/sequelize.js.html
new file mode 100644
index 000000000000..ccb1a00ef7f1
--- /dev/null
+++ b/docs/sequelize.js.html
@@ -0,0 +1,270 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Params:
+
+  - `database`
+  - `username`
+  - `password`, optional, default: null
+  - `options`, optional, default: {}
+
+Examples:
+
+    mymodule.write('foo')
+    mymodule.write('foo', { stream: process.stderr })
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Sequelize = function(database, username, password, options) {
+    this.options = Utils._.extend({
+      dialect: 'mysql',
+      host: 'localhost',
+      port: 3306,
+      protocol: 'tcp',
+      define: {},
+      query: {},
+      sync: {},
+      logging: console.log,
+      omitNull: false
+    }, options || {})
+
+    if(this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    this.config = {
+      database: database,
+      username: username,
+      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
+      host    : this.options.host,
+      port    : this.options.port,
+      pool    : this.options.pool,
+      protocol: this.options.protocol
+    }
+
+    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
+
+    this.daoFactoryManager = new DAOFactoryManager(this)
+    this.connectorManager  = new ConnectorManager(this, this.config)
+
+    this.importCache = {}
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize.Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Reference to Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize.Utils = Utils
+
+  for (var dataType in DataTypes) {
+    Sequelize[dataType] = DataTypes[dataType]
+  }
+
+  Sequelize.prototype.getQueryInterface = function() {
+    this.queryInterface = this.queryInterface || new QueryInterface(this)
+    return this.queryInterface
+  }
+
+  Sequelize.prototype.getMigrator = function(options, force) {
+    if(force) {
+      this.migrator = new Migrator(this, options)
+    } else {
+      this.migrator = this.migrator || new Migrator(this, options)
+    }
+
+    return this.migrator
+  }
+
+  Sequelize.prototype.define = function(daoName, attributes, options) {
+    options = options || {}
+    if(this.options.define) {
+      options = Sequelize.Utils.merge(options, this.options.define)
+    }
+    options.omitNull = this.options.omitNull
+
+    var factory = new DAOFactory(daoName, attributes, options)
+    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
+    return factory
+  }
+
+  Sequelize.prototype.isDefined = function(daoName) {
+    var daos = this.daoFactoryManager.daos
+    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
+  }
+
+  Sequelize.prototype.import = function(path) {
+    if (!this.importCache[path]) {
+      var defineCall = require(path)
+      this.importCache[path] = defineCall(this, DataTypes)
+    }
+
+    return this.importCache[path]
+  }
+
+  Sequelize.prototype.migrate = function(options) {
+    this.getMigrator().migrate(options)
+  }
+
+  Sequelize.prototype.query = function(sql, callee, options) {
+    options = Utils._.extend(Utils._.clone(this.options.query), options || {})
+    options = Utils._.extend(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log
+    })
+
+    return this.connectorManager.query(sql, callee, options)
+  }
+
+  Sequelize.prototype.sync = function(options) {
+    options = options || {}
+
+    if(this.options.sync) {
+      options = Sequelize.Utils.merge(options, this.options.sync)
+    }
+
+    var chainer = new Utils.QueryChainer()
+
+    this.daoFactoryManager.daos.forEach(function(dao) {
+      chainer.add(dao.sync(options))
+    })
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.drop = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer
+
+      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
+
+      chainer
+        .run()
+        .success(function() { emitter.emit('success', null) })
+        .error(function(err) { emitter.emit('error', err) })
+    }).run()
+  }
+
+  return Sequelize
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/utils.js.html b/docs/utils.js.html
new file mode 100644
index 000000000000..4625d2238245
--- /dev/null
+++ b/docs/utils.js.html
@@ -0,0 +1,309 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var mysql      = require("mysql")
+  , connection = mysql.createConnection({})
+  , util       = require("util")
+  , DataTypes  = require("./data-types")
+
+var Utils = module.exports = {
+  _: (function() {
+    var _  = require("underscore")
+      , _s = require('underscore.string')
+
+    _.mixin(_s.exports())
+    _.mixin({
+      includes: _s.include,
+      camelizeIf: function(string, condition) {
+        var result = string
+
+        if(condition) {
+          result = _.camelize(string)
+        }
+
+        return result
+      },
+      underscoredIf: function(string, condition) {
+        var result = string
+
+        if(condition) {
+          result = _.underscored(string)
+        }
+
+        return result
+      }
+    })
+
+    return _
+  })(),
+  addEventEmitter: function(_class) {
+    util.inherits(_class, require('events').EventEmitter)
+  },
+  TICK_CHAR: '`',
+  addTicks: function(s) {
+    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
+  },
+  removeTicks: function(s) {
+    return s.replace("`", "")
+  },
+  escape: function(s) {
+    return connection.escape(s).replace(/\\"/g, '"')
+  },
+  format: function(arr) {
+    var query        = arr[0]
+      , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
+
+    return connection.format.apply(connection, [query, replacements])
+  },
+  isHash: function(obj) {
+    return Utils._.isObject(obj) && !Utils._.isArray(obj);
+  },
+  toSqlDate: function(date) {
+    return [
+      [
+        date.getFullYear(),
+        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
+        ((date.getDate() < 10 ? '0' : '') + date.getDate())
+      ].join("-"),
+      date.toLocaleTimeString()
+    ].join(" ")
+  },
+  argsArePrimaryKeys: function(args, primaryKeys) {
+    var result = (args.length == Utils._.keys(primaryKeys).length)
+    Utils._.each(args, function(arg) {
+      if(result) {
+        if(['number', 'string'].indexOf(typeof arg) > -1)
+          result = true
+        else
+          result = (arg instanceof Date)
+
+      }
+    })
+    return result
+  },
+  combineTableNames: function(tableName1, tableName2) {
+    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
+  },
+
+  singularize: function(s) {
+    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
+  },
+
+  pluralize: function(s) {
+    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
+  },
+
+  merge: function(a, b){
+    for(var key in b) {
+      a[key] = b[key]
+    }
+    return a
+  },
+
+  removeCommentsFromFunctionString: function(s) {
+    s = s.replace(/\s*(\/\/.*)/g, '')
+    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
+
+    return s
+  },
+
+  toDefaultValue: function(value) {
+    return (value == DataTypes.NOW) ? new Date() : value
+  },
+
+  setAttributes: function(hash, identifier, instance, prefix) {
+    prefix = prefix || ''
+    if (this.isHash(identifier)) {
+      this._.each(identifier, function(elem, key) {
+        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
+      })
+    } else {
+      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
+    }
+
+    return hash
+  },
+
+  removeNullValuesFromHash: function(hash, omitNull) {
+    var result = hash
+
+    if(omitNull) {
+      var _hash = {}
+
+      Utils._.each(hash, function(val, key) {
+        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
+          _hash[key] = val;
+        }
+      })
+
+      result = _hash
+    }
+
+    return result
+  },
+
+  prependTableNameToHash: function(tableName, hash) {
+    if (tableName) {
+      var _hash = {}
+
+      for (var key in hash) {
+        if (key.indexOf('.') === -1) {
+          _hash[tableName + '.' + key] = hash[key]
+        } else {
+          _hash[key] = hash[key]
+        }
+      }
+
+      return _hash
+    } else {
+      return hash
+    }
+  },
+
+  inherit: function(subClass, superClass) {
+    if (superClass.constructor == Function) {
+      // Normal Inheritance
+      subClass.prototype = new superClass();
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass.prototype;
+    } else {
+      // Pure Virtual Inheritance
+      subClass.prototype = superClass;
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass;
+    }
+
+    return subClass;
+  }
+}
+
+Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
+Utils.QueryChainer = require("./query-chainer")
+Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file

From 104f2ed1eddd7976044860b953258716d19f89a7 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:23:48 +0100
Subject: [PATCH 132/360] removed docs folder change

---
 docs/associations/belongs-to.js.html          |  92 ++-
 .../has-many-double-linked.js.html            | 114 +++-
 .../has-many-single-linked.js.html            |  92 ++-
 docs/associations/has-many.js.html            | 108 ++-
 docs/associations/has-one.js.html             |  99 ++-
 docs/associations/mixin.js.html               | 111 +++-
 docs/dao-factory-manager.js.html              |  58 +-
 docs/dao-factory.js.html                      | 248 ++++++-
 docs/dao.js.html                              | 106 ++-
 docs/data-types.js.html                       |  64 +-
 docs/dialects/abstract/query.js.html          | 258 +++++++-
 docs/dialects/connector-manager.js.html       |  58 +-
 docs/dialects/mysql/connector-manager.js.html | 272 +++++++-
 docs/dialects/mysql/query-generator.js.html   | 236 ++++++-
 docs/dialects/mysql/query.js.html             |  85 ++-
 .../postgres/connector-manager.js.html        | 108 ++-
 .../dialects/postgres/query-generator.js.html | 337 +++++++++-
 docs/dialects/postgres/query.js.html          | 135 +++-
 docs/dialects/query-generator.js.html         |  58 +-
 .../dialects/sqlite/connector-manager.js.html |  58 +-
 docs/dialects/sqlite/query-generator.js.html  | 161 ++++-
 docs/dialects/sqlite/query.js.html            | 123 +++-
 docs/emitters/custom-event-emitter.js.html    |  58 +-
 docs/lib/associations/belongs-to.js.html      | 116 ++++
 .../has-many-double-linked.js.html            | 188 ++++++
 .../has-many-single-linked.js.html            | 106 +++
 docs/lib/associations/has-many.js.html        | 236 +++++++
 docs/lib/associations/has-one.js.html         | 139 ++++
 docs/lib/associations/mixin.js.html           | 112 ++++
 docs/lib/dao-factory-manager.js.html          |  80 +++
 docs/lib/dao-factory.js.html                  | 300 +++++++++
 docs/lib/dao.js.html                          | 210 ++++++
 docs/lib/data-types.js.html                   |  56 ++
 docs/lib/dialects/abstract/query.js.html      | 370 +++++++++++
 docs/lib/dialects/connector-manager.js.html   |  69 ++
 .../dialects/mysql/connector-manager.js.html  | 379 +++++++++++
 .../dialects/mysql/query-generator.js.html    | 483 ++++++++++++++
 docs/lib/dialects/mysql/query.js.html         |  84 +++
 .../postgres/connector-manager.js.html        | 146 ++++
 .../dialects/postgres/query-generator.js.html | 624 ++++++++++++++++++
 docs/lib/dialects/postgres/query.js.html      | 136 ++++
 docs/lib/dialects/query-generator.js.html     |  92 +++
 .../dialects/sqlite/connector-manager.js.html |  62 ++
 .../dialects/sqlite/query-generator.js.html   | 240 +++++++
 docs/lib/dialects/sqlite/query.js.html        | 160 +++++
 .../lib/emitters/custom-event-emitter.js.html |  91 +++
 docs/lib/migration.js.html                    | 177 +++++
 docs/lib/migrator.js.html                     | 282 ++++++++
 docs/lib/query-chainer.js.html                | 188 ++++++
 docs/lib/query-interface.js.html              | 329 +++++++++
 docs/lib/sequelize.js.html                    | 210 ++++++
 docs/lib/utils.js.html                        | 225 +++++++
 docs/migration.js.html                        |  77 ++-
 docs/migrator.js.html                         | 139 +++-
 docs/query-chainer.js.html                    |  93 ++-
 docs/query-interface.js.html                  | 130 +++-
 docs/sequelize.js.html                        | 116 +++-
 docs/utils.js.html                            | 114 +++-
 58 files changed, 9569 insertions(+), 29 deletions(-)
 create mode 100644 docs/lib/associations/belongs-to.js.html
 create mode 100644 docs/lib/associations/has-many-double-linked.js.html
 create mode 100644 docs/lib/associations/has-many-single-linked.js.html
 create mode 100644 docs/lib/associations/has-many.js.html
 create mode 100644 docs/lib/associations/has-one.js.html
 create mode 100644 docs/lib/associations/mixin.js.html
 create mode 100644 docs/lib/dao-factory-manager.js.html
 create mode 100644 docs/lib/dao-factory.js.html
 create mode 100644 docs/lib/dao.js.html
 create mode 100644 docs/lib/data-types.js.html
 create mode 100644 docs/lib/dialects/abstract/query.js.html
 create mode 100644 docs/lib/dialects/connector-manager.js.html
 create mode 100644 docs/lib/dialects/mysql/connector-manager.js.html
 create mode 100644 docs/lib/dialects/mysql/query-generator.js.html
 create mode 100644 docs/lib/dialects/mysql/query.js.html
 create mode 100644 docs/lib/dialects/postgres/connector-manager.js.html
 create mode 100644 docs/lib/dialects/postgres/query-generator.js.html
 create mode 100644 docs/lib/dialects/postgres/query.js.html
 create mode 100644 docs/lib/dialects/query-generator.js.html
 create mode 100644 docs/lib/dialects/sqlite/connector-manager.js.html
 create mode 100644 docs/lib/dialects/sqlite/query-generator.js.html
 create mode 100644 docs/lib/dialects/sqlite/query.js.html
 create mode 100644 docs/lib/emitters/custom-event-emitter.js.html
 create mode 100644 docs/lib/migration.js.html
 create mode 100644 docs/lib/migrator.js.html
 create mode 100644 docs/lib/query-chainer.js.html
 create mode 100644 docs/lib/query-interface.js.html
 create mode 100644 docs/lib/sequelize.js.html
 create mode 100644 docs/lib/utils.js.html

diff --git a/docs/associations/belongs-to.js.html b/docs/associations/belongs-to.js.html
index c30aa52eefec..772c008321c1 100644
--- a/docs/associations/belongs-to.js.html
+++ b/docs/associations/belongs-to.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("./../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -33,7 +75,11 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
+<<<<<<< HEAD
     if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+=======
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+>>>>>>> parent of db9f87e... removed old docs
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
     }
 
@@ -48,7 +94,15 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+<<<<<<< HEAD
     Utils._.extend(this.source.rawAttributes, newAttributes)
+=======
+    Utils._.defaults(this.source.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+>>>>>>> parent of db9f87e... removed old docs
     return this
   }
 
@@ -56,9 +110,24 @@
     var self     = this
       , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
+<<<<<<< HEAD
     obj[accessor] = function() {
       var id = obj[self.identifier]
       return self.target.find(id)
+=======
+    obj[accessor] = function(params) {
+      var id = this[self.identifier]
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: {id:id}}, params)
+        }
+      } else {
+        params = id
+      }
+
+      return self.target.find(params)
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
@@ -69,16 +138,24 @@
       , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
     obj[accessor] = function(associatedObject) {
+<<<<<<< HEAD
       obj[self.identifier] = associatedObject ? associatedObject.id : null
 
       // passes the changed field to save, so only that field get updated.
       return obj.save([ self.identifier ])
+=======
+      this[self.identifier] = associatedObject ? associatedObject.id : null
+
+      // passes the changed field to save, so only that field get updated.
+      return this.save([ self.identifier ])
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
   }
 
   return BelongsTo
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/associations/has-many-double-linked.js.html b/docs/associations/has-many-double-linked.js.html
index 7e0c03241b5e..1ad7037fa50a 100644
--- a/docs/associations/has-many-double-linked.js.html
+++ b/docs/associations/has-many-double-linked.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils = require('./../utils')
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils = require('./../utils')
+>>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var HasManyDoubleLinked = function(definition, instance) {
@@ -39,7 +81,11 @@
       //fully qualify
       where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
 
+<<<<<<< HEAD
       var primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+=======
+      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
+>>>>>>> parent of db9f87e... removed old docs
         , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
 
       where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
@@ -50,7 +96,11 @@
           options.where[self.__factory.target.tableName+"."+index] = value;
         });
 
+<<<<<<< HEAD
         options.where = options.where ? Utils.merge(options.where, where) : where
+=======
+        Utils._.extend(options.where, where)
+>>>>>>> parent of db9f87e... removed old docs
       } else {
         options.where = where;
       }
@@ -75,7 +125,15 @@
         var chainer             = new Utils.QueryChainer
           , association         = self.__factory.target.associations[self.__factory.associationAccessor]
           , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+<<<<<<< HEAD
           , unassociatedObjects = newAssociations.filter(function(obj) { return !obj.equalsOneOf(oldAssociations) })
+=======
+          , unassociatedObjects = newAssociations.filter(function (obj) { 
+              return !Utils._.find(oldAssociations, function (old) {
+                return obj.id === old.id
+              }) 
+            })
+>>>>>>> parent of db9f87e... removed old docs
 
         unassociatedObjects.forEach(function(unassociatedObject) {
           var attributes = {}
@@ -93,6 +151,23 @@
       })
   }
 
+<<<<<<< HEAD
+=======
+  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    var attributes = {}
+      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
+
+    attributes[this.__factory.identifier] = this.instance.id
+    attributes[foreignIdentifier] = newAssociation.id
+
+    this.__factory.connectorDAO.create(attributes)
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
+>>>>>>> parent of db9f87e... removed old docs
   // private
 
   var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
@@ -101,15 +176,30 @@
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
       var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
+<<<<<<< HEAD
       var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) })
 
       if(obsoleteAssociations.length === 0) {
+=======
+      var obsoleteAssociations = oldAssociations.filter(function (old) {
+        // Return only those old associations that are not found in new
+        return !Utils._.find(newAssociations, function (obj) {
+          return obj.id === old.id
+        })
+      })
+
+      if (obsoleteAssociations.length === 0) {
+>>>>>>> parent of db9f87e... removed old docs
         return emitter.emit('success', null)
       }
 
       obsoleteAssociations.forEach(function(associatedObject) {
         var where            = {}
+<<<<<<< HEAD
           , primaryKeys      = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
+=======
+          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
+>>>>>>> parent of db9f87e... removed old docs
           , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
           , notFoundEmitters = []
 
@@ -119,13 +209,21 @@
         self.__factory.connectorDAO
           .find({ where: where })
           .success(function(connector) {
+<<<<<<< HEAD
             if(connector === null) {
+=======
+            if (connector === null) {
+>>>>>>> parent of db9f87e... removed old docs
               notFoundEmitters.push(null)
             } else {
               chainer.add(connector.destroy())
             }
 
+<<<<<<< HEAD
             if((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+=======
+            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+>>>>>>> parent of db9f87e... removed old docs
               // found all obsolete connectors and will delete them now
               chainer
                 .run()
@@ -141,6 +239,7 @@
   }
 
   return HasManyDoubleLinked
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/associations/has-many-single-linked.js.html b/docs/associations/has-many-single-linked.js.html
index c8cf86b9f97e..129d6d71322a 100644
--- a/docs/associations/has-many-single-linked.js.html
+++ b/docs/associations/has-many-single-linked.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require('./../utils')
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require('./../utils')
+>>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var HasManySingleLinked = function(definition, instance) {
@@ -35,7 +77,11 @@
 
     where[this.__factory.identifier] = this.instance.id
 
+<<<<<<< HEAD
     options.where = options.where ? Utils.merge(options.where, where) : where
+=======
+    options.where = options.where ? Utils._.extend(options.where, where) : where
+>>>>>>> parent of db9f87e... removed old docs
     return this.__factory.target.findAll(options)
   }
 
@@ -43,15 +89,35 @@
     var self    = this
       , options = this.__factory.options
       , chainer = new Utils.QueryChainer()
+<<<<<<< HEAD
 
     // clear the old associations
     oldAssociations.forEach(function(associatedObject) {
+=======
+      , obsoleteAssociations = oldAssociations.filter(function (old) { 
+          return !Utils._.find(newAssociations, function (obj) {
+            return obj.id === old.id
+          }) 
+        })
+      , unassociatedObjects = newAssociations.filter(function (obj) { 
+          return !Utils._.find(oldAssociations, function (old) {
+            return obj.id === old.id
+          }) 
+        })
+
+    // clear the old associations
+    obsoleteAssociations.forEach(function(associatedObject) {
+>>>>>>> parent of db9f87e... removed old docs
       associatedObject[self.__factory.identifier] = null
       chainer.add(associatedObject.save())
     })
 
     // set the new associations
+<<<<<<< HEAD
     newAssociations.forEach(function(associatedObject) {
+=======
+    unassociatedObjects.forEach(function(associatedObject) {
+>>>>>>> parent of db9f87e... removed old docs
       associatedObject[self.__factory.identifier] = self.instance.id
       chainer.add(associatedObject.save())
     })
@@ -62,6 +128,7 @@
       .error(function(err) { emitter.emit('error', err) })
   }
 
+<<<<<<< HEAD
   return HasManySingleLinked
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/associations/has-many.js.html b/docs/associations/has-many.js.html
index cfc43bd7b913..0f1b2389321f 100644
--- a/docs/associations/has-many.js.html
+++ b/docs/associations/has-many.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils     = require("./../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils     = require("./../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 var HasManySingleLinked = require("./has-many-single-linked")
@@ -30,6 +72,10 @@
 
 module.exports = (function() {
   var HasMany = function(srcDAO, targetDAO, options) {
+<<<<<<< HEAD
+=======
+    this.associationType = 'HasMany'
+>>>>>>> parent of db9f87e... removed old docs
     this.source = srcDAO
     this.target = targetDAO
     this.options = options
@@ -64,7 +110,11 @@
     // or is the association on the model itself?
     if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
       // remove the obsolete association identifier from the source
+<<<<<<< HEAD
       if(this.isSelfAssociation) {
+=======
+      if (this.isSelfAssociation) {
+>>>>>>> parent of db9f87e... removed old docs
         this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
       } else {
         this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
@@ -77,19 +127,38 @@
       combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
+<<<<<<< HEAD
       if(!this.isSelfAssociation) {
         this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
       }
 
       if(this.options.syncOnAssociation) {
+=======
+
+      if (!this.isSelfAssociation) {
+        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
+      }
+
+      if (this.options.syncOnAssociation) {
+>>>>>>> parent of db9f87e... removed old docs
         this.connectorDAO.sync()
       }
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+<<<<<<< HEAD
       Utils._.extend(this.target.rawAttributes, newAttributes)
     }
 
+=======
+      Utils._.defaults(this.target.rawAttributes, newAttributes)
+    }
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+>>>>>>> parent of db9f87e... removed old docs
     return this
   }
 
@@ -145,7 +214,11 @@
     var self = this
 
     obj[this.accessors.set] = function(newAssociatedObjects) {
+<<<<<<< HEAD
       if(newAssociatedObjects === null) {
+=======
+      if (newAssociatedObjects === null) {
+>>>>>>> parent of db9f87e... removed old docs
         newAssociatedObjects = []
       }
 
@@ -169,6 +242,7 @@
 
     obj[this.accessors.add] = function(newAssociatedObject) {
       var instance = this
+<<<<<<< HEAD
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
         instance[self.accessors.get]()
           .error(function(err){ customEventEmitter.emit('error', err)})
@@ -182,6 +256,20 @@
           })
       })
       return customEventEmitter.run()
+=======
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
+          .error(function(err){ emitter.emit('error', err)})
+          .success(function(currentAssociatedObjects) {
+            if (currentAssociatedObjects.length === 0) {
+              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
+            } else {
+              emitter.emit('success', newAssociatedObject);
+            }
+          })
+      }).run()
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     obj[this.accessors.remove] = function(oldAssociatedObject) {
@@ -191,7 +279,11 @@
           var newAssociations = []
 
           currentAssociatedObjects.forEach(function(association) {
+<<<<<<< HEAD
             if(!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+=======
+            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+>>>>>>> parent of db9f87e... removed old docs
               newAssociations.push(association)
           })
 
@@ -207,6 +299,7 @@
   }
 
   return HasMany
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/associations/has-one.js.html b/docs/associations/has-one.js.html
index ae62c0c64278..88c00e5722e2 100644
--- a/docs/associations/has-one.js.html
+++ b/docs/associations/has-one.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("./../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -33,7 +75,11 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
+<<<<<<< HEAD
     if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+=======
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+>>>>>>> parent of db9f87e... removed old docs
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
     }
 
@@ -53,7 +99,14 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+<<<<<<< HEAD
     Utils._.extend(this.target.rawAttributes, newAttributes)
+=======
+    Utils._.defaults(this.target.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+>>>>>>> parent of db9f87e... removed old docs
 
     return this
   }
@@ -61,12 +114,30 @@
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
 
+<<<<<<< HEAD
     obj[this.accessors.get] = function() {
       var id    = obj.id
         , where = {}
 
       where[self.identifier] = id
       return self.target.find({where: where})
+=======
+    obj[this.accessors.get] = function(params) {
+      var id    = this.id
+        , where = {}
+
+      where[self.identifier] = id
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: where}, params)
+        }
+      } else {
+        params = {where: where}
+      }
+
+      return self.target.find(params)
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
@@ -77,15 +148,27 @@
       , options = self.options || {}
 
     obj[this.accessors.set] = function(associatedObject) {
+<<<<<<< HEAD
       return new Utils.CustomEventEmitter(function(emitter) {
         obj[self.accessors.get]().success(function(oldObj) {
           if(oldObj) {
+=======
+      var instance = this;
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]().success(function(oldObj) {
+          if (oldObj) {
+>>>>>>> parent of db9f87e... removed old docs
             oldObj[self.identifier] = null
             oldObj.save()
           }
 
+<<<<<<< HEAD
           if(associatedObject) {
             associatedObject[self.identifier] = obj.id
+=======
+          if (associatedObject) {
+            associatedObject[self.identifier] = instance.id
+>>>>>>> parent of db9f87e... removed old docs
             associatedObject
               .save()
               .success(function() { emitter.emit('success', associatedObject) })
@@ -102,6 +185,7 @@
   }
 
   return HasOne
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/associations/mixin.js.html b/docs/associations/mixin.js.html
index ed4a931aba33..bbb42af3116d 100644
--- a/docs/associations/mixin.js.html
+++ b/docs/associations/mixin.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Mixin = module.exports = function(){}
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Mixin = module.exports = function(){}
+>>>>>>> parent of db9f87e... removed old docs
 
 Mixin.hasOne = function(associatedDAO, options) {
   // the id is in the foreign table
   var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+<<<<<<< HEAD
+=======
+
+  association.injectGetter(this.DAO.prototype);
+  association.injectSetter(this.DAO.prototype);
+
+>>>>>>> parent of db9f87e... removed old docs
   return this
 }
 
 Mixin.belongsTo = function(associatedDAO, options) {
   // the id is in this table
+<<<<<<< HEAD
   var association = new BelongsTo(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+=======
+  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+>>>>>>> parent of db9f87e... removed old docs
   return this
 }
 
@@ -42,6 +100,7 @@
   // the id is in the foreign table or in a connecting table
   var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
+<<<<<<< HEAD
   return this
 }
 
@@ -53,10 +112,31 @@
 
     if (!result && (association.target === target)) {
       result = association
+=======
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+  return this
+}
+
+Mixin.getAssociation = function(target) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
+
+console.log(target.name, association.target.name)
+      if (!result && (association.target === target)) {
+        result = association
+      }
+>>>>>>> parent of db9f87e... removed old docs
     }
   }
 
   return result
+<<<<<<< HEAD
 }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    example for instance methods:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        console.log('asd')
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dao-factory-manager.js.html b/docs/dao-factory-manager.js.html
index 1c8bb2cedf87..0c2f049929f4 100644
--- a/docs/dao-factory-manager.js.html
+++ b/docs/dao-factory-manager.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports = (function() {
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports = (function() {
+>>>>>>> parent of db9f87e... removed old docs
   var DAOFactoryManager = function(sequelize) {
     this.daos = []
     this.sequelize = sequelize
@@ -56,6 +98,7 @@
   })
 
   return DAOFactoryManager
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dao-factory.js.html b/docs/dao-factory.js.html
index d00c3550494f..ebdeedf3ec29 100644
--- a/docs/dao-factory.js.html
+++ b/docs/dao-factory.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ptions.include =
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            includes.map(function(include) {
+        console.log(include instanceof DAOFactory)
+      })
+
+      includes.forEach(function(daoName) {
+        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+
+        if (!options.include[daoName]) {
+          options.include[daoName] = this.getAssociationByAlias(daoName).target
+        }
+      }.bind(this))
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      type:    'SELECT',
+      hasJoin: hasJoin
+    })
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   //right now, the caller (has-many-double-linked) is in charge of the where clause
@@ -122,6 +183,7 @@
     var optcpy = Utils._.clone(options)
     optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
 
+<<<<<<< HEAD
     return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy)
   }
 
@@ -129,11 +191,24 @@
     // no options defined?
     // return an emitter which emits null
     if([null, undefined].indexOf(options) > -1) {
+=======
+    // whereCollection is used for non-primary key updates
+    this.options.whereCollection = optcpy.where || null;
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            find
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAOFactory.prototype.find()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Search for an instance.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • @param:  {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • @: 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • @return:  {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAOFactory.prototype.find = function(options) {
+    var hasJoin = false
+
+    // no options defined?
+    // return an emitter which emits null
+    if ([null, undefined].indexOf(options) !== -1) {
+>>>>>>> parent of db9f87e... removed old docs
       return new Utils.CustomEventEmitter(function(emitter) {
         setTimeout(function() { emitter.emit('success', null) }, 10)
       }).run()
     }
 
+<<<<<<< HEAD
     // options is not a hash but an id
     if(typeof options === 'number') {
       options = { where: options }
@@ -155,11 +230,87 @@
       includes.forEach(function(daoName) {
         options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
       }.bind(this))
+=======
+    var primaryKeys = this.primaryKeys
+
+    // options is not a hash but an id
+    if (typeof options === 'number') {
+      options = { where: options }
+    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
+      var where = {}
+        , self  = this
+        , keys = Object.keys(primaryKeys)
+
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
+
+      options = { where: where }
+    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
+      var parsedId = parseInt(options, 10)
+
+      if (!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
+
+      options = { where: parsedId }
+    } else if (typeof options === 'object') {
+      var includes = null
+
+      options = Utils._.clone(options)
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          if (include instanceof DAOFactory) {
+            include = { daoFactory: include, as: include.tableName }
+          }
+
+          if (typeof include === 'object') {
+            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
+              var usesAlias = include.as !== include.tableName
+
+              // check if the current daoFactory is actually associated with the passed daoFactory
+              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
+                return include
+              } else {
+                var msg = include.daoFactory.name
+
+                if (usesAlias) {
+                  msg += " (" + include.as + ")"
+                }
+
+                msg += " is not associated to " + this.name + "!"
+
+                throw new Error(msg)
+              }
+            } else {
+              throw new Error('Include malformed. Expected attributes: daoFactory, as')
+            }
+          } else {
+            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
+          }
+        }.bind(this))
+      }
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     options.limit = 1
 
+<<<<<<< HEAD
     return this.QueryInterface.select(this, this.tableName, options, { plain: true })
+=======
+    return this.QueryInterface.select(this, this.tableName, options, {
+      plain: true,
+      type: 'SELECT',
+      hasJoin: hasJoin
+    })
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   DAOFactory.prototype.count = function(options) {
@@ -186,6 +337,7 @@
   }
 
   DAOFactory.prototype.build = function(values, options) {
+<<<<<<< HEAD
     var instance = new DAO(values, Utils._.extend(this.options, this.attributes, { hasPrimaryKeys: this.hasPrimaryKeys }))
       , self     = this
 
@@ -223,6 +375,14 @@
     })
 
     instance.isNewRecord = options.hasOwnProperty('isNewRecord') ? options.isNewRecord : true
+=======
+    options = options || {isNewRecord: true}
+
+    var self     = this
+      , instance = new this.DAO(values, this.options, options.isNewRecord)
+
+    instance.isNewRecord = options.isNewRecord
+>>>>>>> parent of db9f87e... removed old docs
 
     return instance
   }
@@ -231,6 +391,7 @@
     return this.build(values).save(fields)
   }
 
+<<<<<<< HEAD
   DAOFactory.prototype.__defineGetter__('primaryKeys', function() {
     var result = {}
     Utils._.each(this.attributes, function(dataTypeString, attributeName) {
@@ -240,16 +401,62 @@
 
     return result
   })
+=======
+  DAOFactory.prototype.findOrCreate = function (params, defaults) {
+    var self = this;
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          for (var attrname in defaults) {
+            params[attrname] = defaults[attrname];
+          }
+
+          self.create(params)
+	    .success(function (instance) {
+              emitter.emit('success', instance)
+            })
+	    .error( function (error) {
+              emitter.emit('error', error)
+            });
+        } else {
+          emitter.emit('success', instance)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      });
+    }).run()
+  }
+>>>>>>> parent of db9f87e... removed old docs
 
   // private
 
   var query = function() {
+<<<<<<< HEAD
     var args = Utils._.map(arguments, function(arg, _) { return arg })
       , s    = this.daoFactoryManager.sequelize
 
     // add this as the second argument
     if(arguments.length == 1) args.push(this)
     return s.query.apply(s, args)
+=======
+    var args      = Utils._.map(arguments, function(arg, _) { return arg })
+      , sequelize = this.daoFactoryManager.sequelize
+
+    // add this as the second argument
+    if (arguments.length === 1) {
+      args.push(this)
+    }
+
+    // add {} as options
+    if (args.length === 2) {
+      args.push({})
+    }
+
+    return sequelize.query.apply(sequelize, args)
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   var addOptionalClassMethods = function() {
@@ -268,6 +475,7 @@
         }
       }
 
+<<<<<<< HEAD
     if(this.hasPrimaryKeys) defaultAttributes = {}
 
     if(this.options.timestamps) {
@@ -275,6 +483,17 @@
       defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
 
       if(this.options.paranoid)
+=======
+    if (this.hasPrimaryKeys) {
+      defaultAttributes = {}
+    }
+
+    if (this.options.timestamps) {
+      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+
+      if (this.options.paranoid)
+>>>>>>> parent of db9f87e... removed old docs
         defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
     }
 
@@ -284,22 +503,36 @@
   }
 
   var findAutoIncrementField = function() {
+<<<<<<< HEAD
     var self   = this
       , fields = this.QueryGenerator.findAutoIncrementField(this)
+=======
+    var fields = this.QueryGenerator.findAutoIncrementField(this)
+>>>>>>> parent of db9f87e... removed old docs
 
     this.autoIncrementField = null
 
     fields.forEach(function(field) {
+<<<<<<< HEAD
       if(self.autoIncrementField)
         throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
       else
         self.autoIncrementField = field
     })
+=======
+      if (this.autoIncrementField) {
+        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
+      } else {
+        this.autoIncrementField = field
+      }
+    }.bind(this))
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
 
   return DAOFactory
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dao.js.html b/docs/dao.js.html
index 8f250b63ece6..b9f38a8260ad 100644
--- a/docs/dao.js.html
+++ b/docs/dao.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAO.prototype.validate = function() {
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            DAO.prototype.validate = function() {
+>>>>>>> parent of db9f87e... removed old docs
     var self = this
     var failures = {}
 
@@ -47,8 +89,13 @@
           // is it a validator module function?
           else {
             // extra args
+<<<<<<< HEAD
             fn_args = details.hasOwnProperty("args") ? details.args : []
             if (!Utils._.isArray(fn_args))
+=======
+            fn_args = details.hasOwnProperty("args") ? details.args : details
+            if (!Array.isArray(fn_args))
+>>>>>>> parent of db9f87e... removed old docs
               fn_args = [fn_args]
             // error msg
             fn_msg = details.hasOwnProperty("msg") ? details.msg : false
@@ -83,15 +130,25 @@
   }
 
 
+<<<<<<< HEAD
   DAO.prototype.updateAttributes = function(updates) {
     this.setAttributes(updates)
     return this.save()
+=======
+  DAO.prototype.updateAttributes = function(updates, fields) {
+    this.setAttributes(updates)
+    return this.save(fields)
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   DAO.prototype.setAttributes = function(updates) {
     var self = this
 
+<<<<<<< HEAD
     var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys)
+=======
+    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
+>>>>>>> parent of db9f87e... removed old docs
 
     readOnlyAttributes.push('id')
     readOnlyAttributes.push('createdAt')
@@ -109,7 +166,11 @@
   }
 
   DAO.prototype.destroy = function() {
+<<<<<<< HEAD
     if(this.__options.timestamps && this.__options.paranoid) {
+=======
+    if (this.__options.timestamps && this.__options.paranoid) {
+>>>>>>> parent of db9f87e... removed old docs
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
       this[attr] = new Date()
       return this.save()
@@ -141,7 +202,10 @@
 
   DAO.prototype.addAttribute = function(attribute, value) {
     this[attribute] = value
+<<<<<<< HEAD
     this.attributes.push(attribute)
+=======
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -154,7 +218,11 @@
 
   // private
 
+<<<<<<< HEAD
   var initAttributes = function(values) {
+=======
+  var initAttributes = function(values, isNewRecord) {
+>>>>>>> parent of db9f87e... removed old docs
     // add all passed values to the dao and store the attribute names in this.attributes
     for (var key in values) {
       if (values.hasOwnProperty(key)) {
@@ -164,6 +232,7 @@
 
     // set id to null if not passed as value
     // a newly created dao has no id
+<<<<<<< HEAD
     var defaults = this.__options.hasPrimaryKeys ? {} : { id: null }
 
     if(this.__options.timestamps) {
@@ -171,10 +240,20 @@
       defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
 
       if(this.__options.paranoid) {
+=======
+    var defaults = this.hasPrimaryKeys ? {} : { id: null }
+
+    if (this.__options.timestamps && isNewRecord) {
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+
+      if (this.__options.paranoid) {
+>>>>>>> parent of db9f87e... removed old docs
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
     }
 
+<<<<<<< HEAD
     for (var attr in defaults) {
       var value = defaults[attr]
 
@@ -291,4 +370,29 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
+=======
+    if (Utils._.size(defaults)) {
+      for (var attr in defaults) {
+        var value = defaults[attr]
+
+        if (!this.hasOwnProperty(attr)) {
+          this.addAttribute(attr, Utils.toDefaultValue(value))
+        }
+      }
+    }
+  }
+
+  return DAO
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/data-types.js.html b/docs/data-types.js.html
index 431695e88487..ec11b5515c51 100644
--- a/docs/data-types.js.html
+++ b/docs/data-types.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              module.exports = {
+  STRING: 'VARCHAR(255)',
+  TEXT: 'TEXT',
+  INTEGER: 'INTEGER',
+  BIGINT:  'BIGINT',
+  DATE: 'DATETIME',
+  BOOLEAN: 'TINYINT(1)',
+  FLOAT: 'FLOAT',
+  NOW: 'NOW',
+  ENUM: 'ENUM'
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/abstract/query.js.html b/docs/dialects/abstract/query.js.html
index 13d6c3a60671..1dfc7f235af9 100644
--- a/docs/dialects/abstract/query.js.html
+++ b/docs/dialects/abstract/query.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+>>>>>>> parent of db9f87e... removed old docs
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Examples
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query.run('SELECT 1')
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run = function(sql) {
     throw new Error("The run method wasn't overwritten!")
+<<<<<<< HEAD
+=======
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  checkLoggingOption
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Check the logging option of the instance and print deprecation warnings.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @return:  {void} 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption = function() {
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging === console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+>>>>>>> parent of db9f87e... removed old docs
   }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  formatResults
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  High level function that handles the results of a query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
 
+<<<<<<< HEAD
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       UserWithNames: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         name: 'barfooz',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Tasks: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         title: 'task',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         UserWithNameId: 1
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults = function(data) {
+=======
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       id: 1,              // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       attr2: 'snafu',     // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Tasks.id: 1,        // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults = function(data) {
+>>>>>>> parent of db9f87e... removed old docs
     var result  = this.callee
 
     if (isInsertQuery.call(this, data)) {
@@ -46,6 +105,11 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
       result = handleShowTableQuery.call(this, data)
     } else if (isShowOrDescribeQuery.call(this)) {
       result = data
+<<<<<<< HEAD
+=======
+    } else if (isCallQuery.call(this)) {
+      result = data[0]
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     return result
@@ -74,6 +138,7 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
   function(fct) {
     this.on('error', fct)
     return this
+<<<<<<< HEAD
   }
 
   var queryResultHasJoin = function(results) {
@@ -90,10 +155,73 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
 
     result = result && (this.sql.indexOf('INSERT INTO') === 0)
     result = result && results.hasOwnProperty('insertId')
+=======
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  send
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.send()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  This function is a wrapper for private methods.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {String} fctName The name of the private method.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.send = function(fctName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  arg1, arg2, arg3, ...
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    {
+    var args = Array.prototype.slice.call(arguments).slice(1)
+    return eval(fctName).apply(this, args)
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    getInsertIdField
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    AbstractQuery.prototype.getInsertIdField()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Get the attributes of an insert query, which contains the just inserted id.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @return:  {String} The field name.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    AbstractQuery.prototype.getInsertIdField = function() {
+    return 'insertId'
+  }
+
+  /////////////
+  // private //
+  /////////////
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    findTableNameInAttribute
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    findTableNameInAttribute()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    This method will also check association aliases ('as' option).
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @param:  {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @return:  {String} The found tableName / alias.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
+        tableName = daoFactory.tableName
+      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
+        tableName = Utils.singularize(daoFactory.tableName)
+      } else {
+        for (var associationName in daoFactory.associations) {
+          if (daoFactory.associations.hasOwnProperty(associationName)) {
+            var association = daoFactory.associations[associationName]
+
+            if (attribute.indexOf(association.options.as + ".") === 0) {
+              tableName = association.options.as
+            }
+          }
+        }
+      }
+    })
+
+    return tableName
+  }
+
+  var queryResultHasJoin = function(results) {
+    if (!!results[0]) {
+      var keys = Object.keys(results[0])
+
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
+
+    return false
+  }
+
+  var isInsertQuery = function(results, metaData) {
+    var result = true
+
+    // is insert query if sql contains insert into
+    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
+
+    // is insert query if no results are passed or if the result has the inserted id
+    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
+
+    // is insert query if no metadata are passed or if the metadata has the inserted id
+    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
+>>>>>>> parent of db9f87e... removed old docs
 
     return result
   }
 
+<<<<<<< HEAD
   var handleInsertQuery = function(results) {
     // add the inserted row id to the instance
     var autoIncrementField = this.callee.__factory.autoIncrementField
@@ -102,6 +230,23 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 
   var isShowTableQuery = function() {
     return (this.sql.indexOf('SHOW TABLES') === 0)
+=======
+  var handleInsertQuery = function(results, metaData) {
+    if (this.callee) {
+      // add the inserted row id to the instance
+      var autoIncrementField = this.callee.__factory.autoIncrementField
+        , id                 = null
+
+      id = id || (results && results[this.getInsertIdField()])
+      id = id || (metaData && metaData[this.getInsertIdField()])
+
+      this.callee[autoIncrementField] = id
+    }
+  }
+
+  var isShowTableQuery = function() {
+    return (this.sql.toLowerCase().indexOf('show tables') === 0)
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   var handleShowTableQuery = function(results) {
@@ -111,6 +256,7 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
   }
 
   var isSelectQuery = function() {
+<<<<<<< HEAD
     return (this.sql.indexOf('SELECT') === 0)
   }
 
@@ -121,6 +267,23 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
       result = results
     } else if (queryResultHasJoin(results)) {
       result = groupDataByCalleeFactory.call(this, results).map(function(result) {
+=======
+    return this.options.type === 'SELECT';
+  }
+
+  var isUpdateQuery = function() {
+    return (this.sql.toLowerCase().indexOf('update') === 0)
+  }
+
+  var handleSelectQuery = function(results) {
+    var result = null, self = this;
+
+    if (this.options.raw) {
+      result = results
+    } else if (this.options.hasJoin === true) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+>>>>>>> parent of db9f87e... removed old docs
         // let's build the actual dao instance first...
         var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
 
@@ -140,7 +303,11 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
     }
 
     // return the first real model instance if options.plain is set (e.g. Model.find)
+<<<<<<< HEAD
     if(this.options.plain) {
+=======
+    if (this.options.plain) {
+>>>>>>> parent of db9f87e... removed old docs
       result = (result.length === 0) ? null : result[0]
     }
 
@@ -148,14 +315,35 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
   }
 
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
+<<<<<<< HEAD
     var associatedDao = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
       , association   = this.callee.getAssociation(associatedDao)
       , accessor      = Utils._.camelize(associatedDao.tableName)
+=======
+    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association          = null
+
+    if (!!associatedDaoFactory) {
+      association = this.callee.getAssociation(associatedDaoFactory)
+    } else {
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+
+      if (!!associatedDaoFactory) {
+        association = this.callee.getAssociation(associatedDaoFactory)
+      } else {
+        association          = this.callee.getAssociationByAlias(tableName)
+        associatedDaoFactory = association.target
+      }
+    }
+
+    var accessor = Utils._.camelize(tableName)
+>>>>>>> parent of db9f87e... removed old docs
 
     // downcase the first char
     accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
 
     associationData.forEach(function(data) {
+<<<<<<< HEAD
       var daoInstance = associatedDao.build(data, { isNewRecord: false })
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
@@ -164,12 +352,41 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
       } else {
         dao[accessor] = dao[accessor] || []
         dao[accessor].push(daoInstance)
+=======
+      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+
+      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
+        accessor = Utils.singularize(accessor)
+        dao[accessor] = isEmpty ? null : daoInstance
+      } else {
+        dao[accessor] = dao[accessor] || []
+        if (! isEmpty)
+          dao[accessor].push(daoInstance)
+>>>>>>> parent of db9f87e... removed old docs
       }
     })
   }
 
   var isShowOrDescribeQuery = function() {
+<<<<<<< HEAD
     return (this.sql.indexOf('SHOW') === 0) || (this.sql.indexOf('DESCRIBE') === 0)
+=======
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
+    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
+
+    return  result
+  }
+
+  var isCallQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
+
+    return result
+>>>>>>> parent of db9f87e... removed old docs
   }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    groupDataByCalleeFactory
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    groupDataByCalleeFactory()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        the associated data by the callee.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example:
@@ -224,6 +441,7 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
     })
 
     return result
+<<<<<<< HEAD
   }
 
   return AbstractQuery
@@ -333,4 +551,42 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
+=======
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    prepareJoinData
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    prepareJoinData()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    This function will prepare the result of select queries with joins.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @param:  {Array} data This array contains objects.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • @return:  {Array} The array will have the needed format for groupDataByCalleeFactory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var prepareJoinData = function(data) {
+    var result = data.map(function(row) {
+      var nestedRow = {}
+
+      for (var key in row) {
+        if (row.hasOwnProperty(key)) {
+          var tableName = findTableNameInAttribute.call(this, key)
+
+          if (!!tableName) {
+            nestedRow[tableName] = nestedRow[tableName] || {}
+            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
+          } else {
+            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
+            nestedRow[this.callee.tableName][key] = row[key]
+          }
+        }
+      }
+
+      return nestedRow
+    }.bind(this))
+
+    return result
+  }
+
+  return AbstractQuery
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/connector-manager.js.html b/docs/dialects/connector-manager.js.html
index fd7f8f0f017c..a12e011f7e19 100644
--- a/docs/dialects/connector-manager.js.html
+++ b/docs/dialects/connector-manager.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      module.exports = (function(){
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports = (function(){
+>>>>>>> parent of db9f87e... removed old docs
   var ConnectorManager = function(sequelize, config) {
     throw new Error('Define the constructor!')
   }
@@ -45,6 +87,7 @@
   }
 
   return ConnectorManager
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/mysql/connector-manager.js.html b/docs/dialects/mysql/connector-manager.js.html
index 310eb1585663..9023333d04cf 100644
--- a/docs/dialects/mysql/connector-manager.js.html
+++ b/docs/dialects/mysql/connector-manager.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var mysql   = require("mysql")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var mysql   = require("mysql")
+>>>>>>> parent of db9f87e... removed old docs
   , Pooling = require('generic-pool')
   , Query   = require("./query")
   , Utils   = require("../../utils")
@@ -37,6 +79,7 @@
     this.queue = []
     this.activeQueue = []
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+<<<<<<< HEAD
     this.poolCfg = this.config.pool
 
     var self = this
@@ -55,6 +98,107 @@
             disconnect.call(self, client)
         },
         max: self.poolCfg.maxConnections,
+=======
+    this.poolCfg = Utils._.defaults(this.config.pool, {
+      maxConnections: 10,
+      minConnections: 0,
+      maxIdleTime: 1000
+    });
+    this.pendingQueries = 0;
+    this.useReplicaton = !!config.replication;
+    this.useQueue = config.queue !== undefined ? config.queue : true;
+
+    var self = this
+
+    if (this.useReplicaton) {
+      var reads = 0,
+        writes = 0;
+
+      // Init configs with options from config if not present
+      for (var i in config.replication.read) {
+        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
+          host: this.config.host,
+          port: this.config.port,
+          username: this.config.username,
+          password: this.config.password,
+          database: this.config.database
+        });
+      }
+      config.replication.write = Utils._.defaults(config.replication.write, {
+        host: this.config.host,
+        port: this.config.port,
+        username: this.config.username,
+        password: this.config.password,
+        database: this.config.database
+      });
+
+      // I'll make my own pool, with blackjack and hookers!
+      this.pool = {
+        release: function (client) {
+          if (client.queryType == 'read') {
+            return this.read.release(client);
+          } else {
+            return this.write.release(client);
+          }
+        },
+        acquire: function (callback, priority, queryType) {
+          if (queryType == 'SELECT') {
+            this.read.acquire(callback, priority);
+          } else {
+            this.write.acquire(callback, priority);
+          }
+        },
+        drain: function () {
+          this.read.drain();
+          this.write.drain();
+        },
+        read: Pooling.Pool({
+          name: 'sequelize-read',
+          create: function (done) {
+            if (reads >= self.config.replication.read.length) reads = 0;
+            var config = self.config.replication.read[reads++];
+
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'read'
+              done(null, connection)
+            }, config);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        }),
+        write: Pooling.Pool({
+          name: 'sequelize-write',
+          create: function (done) {
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'write'
+              done(null, connection)
+            }, self.config.replication.write);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        })
+      };
+    } else if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
+      this.pool = Pooling.Pool({
+        name: 'sequelize-mysql',
+        create: function (done) {
+          connect.call(self, done)
+        },
+        destroy: function(client) {
+          disconnect.call(self, client)
+        },
+        max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
+>>>>>>> parent of db9f87e... removed old docs
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
     }
@@ -71,6 +215,7 @@
     })
   }
 
+<<<<<<< HEAD
   Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
 
   var isConnecting = false
@@ -106,13 +251,96 @@
       disconnect.call(this, this.client)
     return
   }
+=======
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
+
+  var isConnecting = false;
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    if (!this.isConnected && !this.pool) {
+      this.connect()
+    }
+
+    if (this.useQueue) {
+      var queueItem = {
+        query: new Query(this.client, this.sequelize, callee, options || {}),
+        sql: sql
+      };
+
+      enqueue.call(this, queueItem, options);
+      return queueItem.query;
+    }
+
+    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
+    this.pendingQueries++;
+
+    query.done(function() {
+      self.pendingQueries--;
+      if (self.pool) self.pool.release(query.client);
+      else {
+        if (self.pendingQueries === 0) {
+          setTimeout(function() {
+            self.pendingQueries === 0 && self.disconnect.call(self);
+          }, 100);
+        }
+      }
+    });
+
+    if (!this.pool) {
+      query.run(sql);
+    }
+
+    else {
+      this.pool.acquire(function(err, client) {
+        if (err) return query.emit('error', err);
+
+        query.client = client;
+        query.run(sql);
+        return;
+      }, undefined, options.type);
+    }
+
+    return query;
+  };
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this;
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting || this.pool) {
+      return;
+    }
+    connect.call(self, function(err, client) {
+      self.client = client;
+      return;
+    });
+    return;
+  };
+
+  ConnectorManager.prototype.disconnect = function() {
+    if (this.client) disconnect.call(this, this.client);
+    return;
+  };
+>>>>>>> parent of db9f87e... removed old docs
 
 
   // private
 
   var disconnect = function(client) {
+<<<<<<< HEAD
     var self = this
     client.end(function() {
+=======
+    var self = this;
+    if (!this.useQueue) {
+      this.client = null;
+    }
+
+    client.end(function() {
+      if (!self.useQueue) {
+        return client.destroy();
+      }
+
+>>>>>>> parent of db9f87e... removed old docs
       var intervalObj = null
       var cleanup = function () {
         var retryCt = 0
@@ -133,6 +361,7 @@
     })
   }
 
+<<<<<<< HEAD
   var connect = function(done) {
     var connection = mysql.createConnection({
       host: this.config.host,
@@ -140,6 +369,16 @@
       user: this.config.username,
       password: this.config.password,
       database: this.config.database
+=======
+  var connect = function(done, config) {
+    config = config || this.config
+    var connection = mysql.createConnection({
+      host: config.host,
+      port: config.port,
+      user: config.username,
+      password: config.password,
+      database: config.database
+>>>>>>> parent of db9f87e... removed old docs
     })
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
@@ -147,8 +386,14 @@
     done(null, connection)
   }
 
+<<<<<<< HEAD
   var enqueue = function(queueItem) {
     if(this.activeQueue.length < this.maxConcurrentQueries) {
+=======
+  var enqueue = function(queueItem, options) {
+    options = options || {}
+    if (this.activeQueue.length < this.maxConcurrentQueries) {
+>>>>>>> parent of db9f87e... removed old docs
       this.activeQueue.push(queueItem)
       if (this.pool) {
         var self = this
@@ -163,10 +408,15 @@
           queueItem.client = client
           execQueueItem.call(self, queueItem)
           return
+<<<<<<< HEAD
         })
       }
       else
       {
+=======
+        }, undefined, options.type)
+      } else {
+>>>>>>> parent of db9f87e... removed old docs
         execQueueItem.call(this, queueItem)
       }
     } else {
@@ -184,10 +434,16 @@
 
   var transferQueuedItems = function(count) {
     for(var i = 0; i < count; i++) {
+<<<<<<< HEAD
       var queueItem = this.queue[0]
       if(queueItem) {
         enqueue.call(this, queueItem)
         this.queue = without(this.queue, queueItem)
+=======
+      var queueItem = this.queue.shift();
+      if (queueItem) {
+        enqueue.call(this, queueItem)
+>>>>>>> parent of db9f87e... removed old docs
       }
     }
   }
@@ -234,6 +490,7 @@
   }
 
   return ConnectorManager
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/mysql/query-generator.js.html b/docs/dialects/mysql/query-generator.js.html
index 22b4185358ce..ea8bdb822646 100644
--- a/docs/dialects/mysql/query-generator.js.html
+++ b/docs/dialects/mysql/query-generator.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("../../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("../../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require("../../data-types")
   , util      = require("util")
 
@@ -39,6 +81,7 @@
         , attrStr = []
 
       for (var attr in attributes) {
+<<<<<<< HEAD
         var dataType = attributes[attr]
 
         if (Utils._.includes(dataType, 'PRIMARY KEY')) {
@@ -46,6 +89,17 @@
           attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
         } else {
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
+=======
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+>>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -57,7 +111,11 @@
       }
       , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
 
+<<<<<<< HEAD
       if(pkString.length > 0) {
+=======
+      if (pkString.length > 0) {
+>>>>>>> parent of db9f87e... removed old docs
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
       }
 
@@ -137,9 +195,16 @@
 
     selectQuery: function(tableName, options) {
       var query = "SELECT <%= attributes %> FROM <%= table %>"
+<<<<<<< HEAD
 
       options = options || {}
       options.table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+=======
+        , table = null
+
+      options            = options || {}
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+>>>>>>> parent of db9f87e... removed old docs
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
           return [attr[0], Utils.addTicks(attr[1])].join(' as ')
@@ -150,6 +215,7 @@
       options.attributes = options.attributes || '*'
 
       if (options.include) {
+<<<<<<< HEAD
         var tableNames = []
 
         for (var daoName in options.include) {
@@ -169,12 +235,79 @@
       }
 
       if(options.group) {
+=======
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = Utils.addTicks(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
+              query += Utils.addTicks(foreignIdentifier) + '='
+              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(dao.tableName) + '.'
+              query += Utils.addTicks('id') + '='
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += Utils.addTicks(association.identifier) + '='
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, Utils.addTicks(attr)].join('.') +
+                  ' AS ' +
+                  Utils.addTicks([aliasName, attr].join('.'))
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      if (options.where) {
+        options.where = this.getWhereConditions(options.where, tableName)
+        query += " WHERE <%= where %>"
+      }
+
+      if (options.group) {
+>>>>>>> parent of db9f87e... removed old docs
         options.group = Utils.addTicks(options.group)
         query += " GROUP BY <%= group %>"
       }
 
+<<<<<<< HEAD
       if(options.limit && !(options.include && (options.limit === 1))) {
         if(options.offset) {
+=======
+      if (options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+
+      if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
+>>>>>>> parent of db9f87e... removed old docs
           query += " LIMIT <%= offset %>, <%= limit %>"
         } else {
           query += " LIMIT <%= limit %>"
@@ -193,7 +326,11 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
+<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+=======
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+>>>>>>> parent of db9f87e... removed old docs
         values: Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -240,6 +377,7 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
+<<<<<<< HEAD
         if(typeof attribute == 'string')
           return attribute
         else {
@@ -255,13 +393,37 @@
 
           if(attribute.order)
             result += ' ' + attribute.order
+=======
+        if(typeof attribute === 'string') {
+          return attribute
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += attribute.attribute
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+>>>>>>> parent of db9f87e... removed old docs
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
+<<<<<<< HEAD
         return (typeof attribute == 'string') ? attribute : attribute.attribute
+=======
+        return (typeof attribute === 'string') ? attribute : attribute.attribute
+>>>>>>> parent of db9f87e... removed old docs
       })
 
       options = Utils._.extend({
@@ -290,8 +452,14 @@
       var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
         , indexName = indexNameOrAttributes
 
+<<<<<<< HEAD
       if(typeof indexName != 'string')
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+=======
+      if (typeof indexName !== 'string') {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+>>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
     },
@@ -299,12 +467,21 @@
     getWhereConditions: function(smth, tableName) {
       var result = null
 
+<<<<<<< HEAD
       if(Utils.isHash(smth)) {
         smth   = Utils.prependTableNameToHash(tableName, smth)
         result = QueryGenerator.hashToWhereConditions(smth)
       } else if (typeof smth === 'number') {
         smth   = Utils.prependTableNameToHash(tableName, { id: smth })
         result = QueryGenerator.hashToWhereConditions(smth)
+=======
+      if (Utils.isHash(smth)) {
+        smth   = Utils.prependTableNameToHash(tableName, smth)
+        result = this.hashToWhereConditions(smth)
+      } else if (typeof smth === 'number') {
+        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
+        result = this.hashToWhereConditions(smth)
+>>>>>>> parent of db9f87e... removed old docs
       } else if (typeof smth === "string") {
         result = smth
       } else if (Array.isArray(smth)) {
@@ -326,7 +503,11 @@
 
         if (Array.isArray(value)) {
           // is value an array?
+<<<<<<< HEAD
 
+=======
+          if (value.length == 0) { value = [null] }
+>>>>>>> parent of db9f87e... removed old docs
           _value = "(" + value.map(function(subValue) {
             return Utils.escape(subValue);
           }).join(',') + ")"
@@ -353,6 +534,7 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
+<<<<<<< HEAD
         if(Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
@@ -366,15 +548,44 @@
           }
 
           if((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+=======
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template += " auto_increment"
+          }
+
+          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+>>>>>>> parent of db9f87e... removed old docs
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
+<<<<<<< HEAD
           if(dataType.unique) {
             template += " UNIQUE"
           }
 
           if(dataType.primaryKey) {
+=======
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+>>>>>>> parent of db9f87e... removed old docs
             template += " PRIMARY KEY"
           }
 
@@ -391,10 +602,19 @@
       var fields = []
 
       for (var name in factory.attributes) {
+<<<<<<< HEAD
         var definition = factory.attributes[name]
 
         if (definition && (definition.indexOf('auto_increment') > -1)) {
           fields.push(name)
+=======
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('auto_increment') > -1)) {
+            fields.push(name)
+          }
+>>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -403,6 +623,7 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/mysql/query.js.html b/docs/dialects/mysql/query.js.html
index c7cc42b26c67..65f22825df28 100644
--- a/docs/dialects/mysql/query.js.html
+++ b/docs/dialects/mysql/query.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils         = require("../../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils         = require("../../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
+<<<<<<< HEAD
     var self = this
 
+=======
+>>>>>>> parent of db9f87e... removed old docs
     this.client    = client
     this.callee    = callee
     this.sequelize = sequelize
@@ -38,6 +83,7 @@
       raw: false
     }, options || {})
 
+<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -209,4 +255,41 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
+=======
+    this.checkLoggingOption()
+  }
+
+  Utils.inherit(Query, AbstractQuery)
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    this.client.query(this.sql, function(err, results, fields) {
+      this.emit('sql', this.sql)
+
+      if (err) {
+        this.emit('error', err, this.callee)
+      } else {
+        this.emit('success', this.formatResults(results))
+      }
+    }.bind(this)).setMaxListeners(100)
+    return this
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/postgres/connector-manager.js.html b/docs/dialects/postgres/connector-manager.js.html
index 61a3be2c6c41..b5ad0446c0ff 100644
--- a/docs/dialects/postgres/connector-manager.js.html
+++ b/docs/dialects/postgres/connector-manager.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Query   = require("./query")
+  , Utils   = require("../../utils")
+>>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var ConnectorManager = function(sequelize, config) {
     this.sequelize = sequelize
+<<<<<<< HEAD
     this.client = null
     this.config = config || {}
     this.pooling = (this.config.poolCfg != null && this.config.poolCfg.maxConnections > 0)
@@ -38,6 +82,19 @@
       pg.defaults.poolSize = this.config.poolCfg.maxConnections
       pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
     }
+=======
+    this.client    = null
+    this.config    = config || {}
+    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
+    this.pg        = this.config.native ? require('pg').native : require('pg')
+
+    // set pooling parameters if specified
+    if (this.pooling) {
+      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
+      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
+    }
+
+>>>>>>> parent of db9f87e... removed old docs
     this.disconnectTimeoutId = null
     this.pendingQueries = 0
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
@@ -49,7 +106,14 @@
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
     var self = this
+<<<<<<< HEAD
     if (this.client == null) this.connect()
+=======
+    if (this.client == null) {
+      this.connect()
+    }
+
+>>>>>>> parent of db9f87e... removed old docs
     var query = new Query(this.client, this.sequelize, callee, options || {})
     self.pendingQueries += 1
     return query.run(sql)
@@ -69,9 +133,19 @@
 
   ConnectorManager.prototype.connect = function() {
     var self = this
+<<<<<<< HEAD
 
     // in case database is slow to connect, prevent orphaning the client
     if (this.isConnecting) return
+=======
+    var emitter = new (require('events').EventEmitter)()
+
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting) {
+      return
+    }
+
+>>>>>>> parent of db9f87e... removed old docs
     this.isConnecting = true
     this.isConnected  = false
 
@@ -79,7 +153,14 @@
 
     var connectCallback = function(err, client) {
       self.isConnecting = false
+<<<<<<< HEAD
       if (!err && client) {
+=======
+
+      if (!!err) {
+        emitter.emit('error', err)
+      } else if (client) {
+>>>>>>> parent of db9f87e... removed old docs
         client.query("SET TIME ZONE 'UTC'")
           .on('end', function() {
             self.isConnected = true
@@ -92,6 +173,7 @@
 
     if (this.pooling) {
       // acquire client from pool
+<<<<<<< HEAD
       pg.connect(uri, connectCallback)
 
     } else {
@@ -99,6 +181,16 @@
       this.client = new pg.Client(uri)
       this.client.connect(connectCallback)
     }
+=======
+      this.pg.connect(uri, connectCallback)
+    } else {
+      //create one-off client
+      this.client = new this.pg.Client(uri)
+      this.client.connect(connectCallback)
+    }
+
+    return emitter
+>>>>>>> parent of db9f87e... removed old docs
   }
 
   ConnectorManager.prototype.disconnect = function() {
@@ -110,6 +202,7 @@
   }
 
   return ConnectorManager
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/postgres/query-generator.js.html b/docs/dialects/postgres/query-generator.js.html
index 95a3629eb026..895fe76763fc 100644
--- a/docs/dialects/postgres/query-generator.js.html
+++ b/docs/dialects/postgres/query-generator.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require("../../utils")
   , util  = require("util")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require("../../utils")
+  , util  = require("util")
+  , DataTypes = require("../../data-types")
+>>>>>>> parent of db9f87e... removed old docs
   , tables = {}
   , primaryKeys = {};
 
@@ -34,6 +78,7 @@
 
 function addQuotes(s, quoteChar) {
   quoteChar = quoteChar || '"'
+<<<<<<< HEAD
   return quoteChar + removeQuotes(s) + quoteChar
 }
 
@@ -46,6 +91,40 @@
   }
 
   return s
+=======
+  return removeQuotes(s, quoteChar)
+    .split('.')
+    .map(function(e) { return quoteChar + String(e) + quoteChar })
+    .join('.')
+}
+
+function pgEscape(val) {
+  if (val === undefined || val === null) {
+    return 'NULL';
+  }
+
+  switch (typeof val) {
+    case 'boolean': return (val) ? 'true' : 'false';
+    case 'number': return val+'';
+  }
+
+  if (val instanceof Date) {
+    val = pgSqlDate(val);
+  }
+
+  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+  val = val.replace(/'/g, "''");
+  return "'"+val+"'";
+}
+
+function pgEscapeAndQuote(val) {
+  return addQuotes(removeQuotes(pgEscape(val), "'"))
+}
+
+function pgEnum(tableName, attr, dataType) {
+  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
+>>>>>>> parent of db9f87e... removed old docs
 }
 
 function padInt(i) {
@@ -77,6 +156,13 @@
     tables[tableName][attr] = 'serial'
   }
 
+<<<<<<< HEAD
+=======
+  if (dataType.match(/^ENUM\(/)) {
+    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
+  }
+
+>>>>>>> parent of db9f87e... removed old docs
   return dataType
 }
 
@@ -97,6 +183,13 @@
       for (var attr in attributes) {
         var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
         attrStr.push(addQuotes(attr) + " " + dataType)
+<<<<<<< HEAD
+=======
+
+        if (attributes[attr].match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attr, attributes[attr]) + query;
+        }
+>>>>>>> parent of db9f87e... removed old docs
       }
 
       var values  = {
@@ -115,7 +208,11 @@
     dropTableQuery: function(tableName, options) {
       options = options || {}
       var query = "DROP TABLE IF EXISTS <%= table %>;"
+<<<<<<< HEAD
       return Utils._.template(query)({table: addQuotes(tableName)})
+=======
+      return Utils._.template(query)({ table: addQuotes(tableName) })
+>>>>>>> parent of db9f87e... removed old docs
     },
 
     renameTableQuery: function(before, after) {
@@ -143,6 +240,13 @@
           attrName: addQuotes(attrName),
           definition: pgDataTypeMapping(tableName, attrName, definition)
         }))
+<<<<<<< HEAD
+=======
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attrName, definition) + query
+        }
+>>>>>>> parent of db9f87e... removed old docs
       }
 
       return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
@@ -158,6 +262,10 @@
         , sql   = []
 
       for (var attributeName in attributes) {
+<<<<<<< HEAD
+=======
+        var definition = attributes[attributeName]
+>>>>>>> parent of db9f87e... removed old docs
         var attrSql = ''
 
         if (definition.indexOf('NOT NULL') > 0) {
@@ -173,6 +281,14 @@
           })
         }
 
+<<<<<<< HEAD
+=======
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attributeName, definition) + query
+          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
+        }
+
+>>>>>>> parent of db9f87e... removed old docs
         attrSql += Utils._.template(query)({
           tableName: addQuotes(tableName),
           query: addQuotes(attributeName) + ' TYPE ' + definition
@@ -199,10 +315,20 @@
     },
 
     selectQuery: function(tableName, options) {
+<<<<<<< HEAD
       options = options || {}
       options.table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
+=======
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options = options || {}
+      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr) {
+        if (Array.isArray(attr) && attr.length === 2) {
+>>>>>>> parent of db9f87e... removed old docs
           return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
         } else if (attr.indexOf('`') >= 0) {
           return attr.replace(/`/g, '"')
@@ -210,27 +336,105 @@
           return addQuotes(attr)
         }
       }).join(", ")
+<<<<<<< HEAD
 
       options.attributes = options.attributes || '*'
 
       var query = "SELECT <%= attributes %> FROM <%= table %>"
+=======
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = addQuotes(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
+              query += addQuotes(association.connectorDAO.tableName) + '.'
+              query += addQuotes(foreignIdentifier) + '='
+              query += addQuotes(table) + '.' + addQuotes('id')
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(dao.tableName) + '.'
+              query += addQuotes('id') + '='
+              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += addQuotes(association.identifier) + '='
+              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, addQuotes(attr)].join('.') +
+                  ' AS "' +
+                  removeQuotes([aliasName, attr].join('.')) + '"'
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+>>>>>>> parent of db9f87e... removed old docs
 
       if(options.where) {
         options.where = QueryGenerator.getWhereConditions(options.where)
         query += " WHERE <%= where %>"
       }
+<<<<<<< HEAD
+=======
+
+>>>>>>> parent of db9f87e... removed old docs
       if(options.order) {
         options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
         query += " ORDER BY <%= order %>"
       }
+<<<<<<< HEAD
+=======
+
+>>>>>>> parent of db9f87e... removed old docs
       if(options.group) {
         options.group = addQuotes(options.group)
         query += " GROUP BY <%= group %>"
       }
+<<<<<<< HEAD
       if(options.limit) query += " LIMIT <%= limit %>"
       if(options.offset) query += " OFFSET <%= offset %>"
 
       query += ";"
+=======
+
+      if (!(options.include && (options.limit === 1))) {
+        if (options.limit) {
+          query += " LIMIT <%= limit %>"
+        }
+
+        if (options.offset) {
+          query += " OFFSET <%= offset %>"
+        }
+      }
+
+      query += ";"
+
+>>>>>>> parent of db9f87e... removed old docs
       return Utils._.template(query)(options)
     },
 
@@ -253,9 +457,15 @@
 
       var replacements  = {
         table: addQuotes(tableName),
+<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
           return pgEscape((value instanceof Date) ? pgSqlDate(value) : value)
+=======
+        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return pgEscape(value)
+>>>>>>> parent of db9f87e... removed old docs
         }).join(",")
       }
 
@@ -265,12 +475,20 @@
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
+<<<<<<< HEAD
       var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+=======
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
+>>>>>>> parent of db9f87e... removed old docs
         , values = []
 
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
+<<<<<<< HEAD
         values.push(addQuotes(key) + "=" + pgEscape((value instanceof Date) ? pgSqlDate(value) : value))
+=======
+        values.push(addQuotes(key) + "=" + pgEscape(value))
+>>>>>>> parent of db9f87e... removed old docs
       }
 
       var replacements = {
@@ -310,6 +528,7 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
+<<<<<<< HEAD
         if(typeof attribute == 'string')
           return addQuotes(attribute)
         else {
@@ -325,18 +544,48 @@
 
           if(attribute.order)
             result += ' ' + attribute.order
+=======
+        if (typeof attribute === 'string') {
+          return addQuotes(attribute)
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += addQuotes(attribute.attribute)
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+>>>>>>> parent of db9f87e... removed old docs
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
+<<<<<<< HEAD
         return (typeof attribute == 'string') ? attribute : attribute.attribute
       })
 
       options = Utils._.extend({
         indicesType: null,
         indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+=======
+        return (typeof attribute === "string") ? attribute : attribute.attribute
+      })
+
+      var indexTable = tableName.split('.')
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
+>>>>>>> parent of db9f87e... removed old docs
         parser: null
       }, options || {})
 
@@ -356,8 +605,14 @@
       var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
         , indexName = indexNameOrAttributes
 
+<<<<<<< HEAD
       if(typeof indexName != 'string')
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+=======
+      if (typeof indexName !== "string") {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+>>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
     },
@@ -365,6 +620,7 @@
     getWhereConditions: function(smth) {
       var result = null
 
+<<<<<<< HEAD
       if(Utils.isHash(smth))
         result = QueryGenerator.hashToWhereConditions(smth)
       else if(typeof smth == 'number')
@@ -373,6 +629,20 @@
         result = smth
       else if(Array.isArray(smth))
         result = Utils.format(smth)
+=======
+      if (Utils.isHash(smth)) {
+        result = QueryGenerator.hashToWhereConditions(smth)
+      }
+      else if (typeof smth === "number") {
+        result = '\"id\"' + "=" + pgEscape(smth)
+      }
+      else if (typeof smth === "string") {
+        result = smth
+      }
+      else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+>>>>>>> parent of db9f87e... removed old docs
 
       return result
     },
@@ -387,14 +657,23 @@
         var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
           , _value = null
 
+<<<<<<< HEAD
         if(Array.isArray(value)) {
+=======
+        if (Array.isArray(value)) {
+          if (value.length == 0) { value = [null] }
+>>>>>>> parent of db9f87e... removed old docs
           _value = "(" + value.map(function(subValue) {
             return pgEscape(subValue);
           }).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
         }
+<<<<<<< HEAD
         else if ((value) && (typeof value == 'object')) {
+=======
+        else if ((value) && (typeof value === "object")) {
+>>>>>>> parent of db9f87e... removed old docs
           //using as sentinel for join column => value
           _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
           result.push([_key, _value].join("="))
@@ -417,6 +696,7 @@
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
+<<<<<<< HEAD
           if(dataType.type == 'TINYINT(1)') dataType.type = 'BOOLEAN'
           if(dataType.type == 'DATETIME') dataType.type = 'TIMESTAMP'
 
@@ -428,6 +708,42 @@
           }
           if(dataType.unique) template += " UNIQUE"
           if(dataType.primaryKey) template += " PRIMARY KEY"
+=======
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.type === "TINYINT(1)") {
+            dataType.type = 'BOOLEAN'
+          }
+
+          if (dataType.type === "DATETIME") {
+            dataType.type = 'TIMESTAMP'
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template +=" SERIAL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = pgEscape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+>>>>>>> parent of db9f87e... removed old docs
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -456,8 +772,13 @@
       var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
 
       return Utils._.template(template)({
+<<<<<<< HEAD
         user: config.username,
         password: config.password,
+=======
+        user: encodeURIComponent(config.username),
+        password: encodeURIComponent(config.password),
+>>>>>>> parent of db9f87e... removed old docs
         database: config.database,
         host: config.host,
         port: config.port,
@@ -467,6 +788,7 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/postgres/query.js.html b/docs/dialects/postgres/query.js.html
index 91f09e1b2464..3a4698cafa61 100644
--- a/docs/dialects/postgres/query.js.html
+++ b/docs/dialects/postgres/query.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils         = require("../../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils         = require("../../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
+<<<<<<< HEAD
     var self = this
 
+=======
+>>>>>>> parent of db9f87e... removed old docs
     this.client = client
     this.sequelize = sequelize
     this.callee = callee
@@ -38,6 +83,7 @@
       raw: false
     }, options || {})
 
+<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -47,10 +93,14 @@
       // using just console.log will break in node < 0.6
       this.options.logging = function(s) { console.log(s) }
     }
+=======
+    this.checkLoggingOption()
+>>>>>>> parent of db9f87e... removed old docs
   }
   Utils.inherit(Query, AbstractQuery)
 
   Query.prototype.run = function(sql) {
+<<<<<<< HEAD
     var self = this
 
     this.sql = sql
@@ -113,10 +163,41 @@
       receivedError = true
       self.emit('error', err, self.callee)
     });
+=======
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var receivedError = false
+      , query         = this.client.query(sql)
+      , rows          = []
+
+    query.on('row', function(row) {
+      rows.push(row)
+    })
+
+    query.on('error', function(err) {
+      receivedError = true
+      this.emit('error', err, this.callee)
+    }.bind(this))
+
+    query.on('end', function() {
+      this.emit('sql', this.sql)
+
+      if (receivedError) {
+        return
+      }
+
+      onSuccess.call(this, rows)
+    }.bind(this))
+>>>>>>> parent of db9f87e... removed old docs
 
     return this
   }
 
+<<<<<<< HEAD
   return Query
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/query-generator.js.html b/docs/dialects/query-generator.js.html
index 3ebd02f14d9b..6350d109ae3d 100644
--- a/docs/dialects/query-generator.js.html
+++ b/docs/dialects/query-generator.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                createTableQuery: function(tableName, attributes, options) {
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  createTableQuery: function(tableName, attributes, options) {
+>>>>>>> parent of db9f87e... removed old docs
       throwMethodUndefined('createTableQuery')
     },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a query for dropping a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    dropTableQuery: function(tableName, options) {
       throwMethodUndefined('dropTableQuery')
@@ -68,6 +110,7 @@
   }
 
   return QueryGenerator
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/sqlite/connector-manager.js.html b/docs/dialects/sqlite/connector-manager.js.html
index 31a9cf651a14..b5b36944c344 100644
--- a/docs/dialects/sqlite/connector-manager.js.html
+++ b/docs/dialects/sqlite/connector-manager.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils   = require("../../utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils   = require("../../utils")
+>>>>>>> parent of db9f87e... removed old docs
   , sqlite3 = require('sqlite3').verbose()
   , Query   = require("./query")
 
@@ -38,6 +80,7 @@
   }
 
   return ConnectorManager
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/sqlite/query-generator.js.html b/docs/dialects/sqlite/query-generator.js.html
index 553644a2df58..5730e2c31a3a 100644
--- a/docs/dialects/sqlite/query-generator.js.html
+++ b/docs/dialects/sqlite/query-generator.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require("../../utils")
   , util  = require("util")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require("../../utils")
+  , DataTypes = require("../../data-types")
+var MySqlQueryGenerator = Utils._.extend(
+  Utils._.clone(require("../query-generator")),
+  Utils._.clone(require("../mysql/query-generator"))
+)
+
+var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
+>>>>>>> parent of db9f87e... removed old docs
 
 var escape = function(str) {
   if (typeof str === 'string') {
@@ -44,6 +93,7 @@
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
 
+<<<<<<< HEAD
       var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
         , attrStr = []
 
@@ -54,6 +104,26 @@
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
         } else {
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
+=======
+      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , primaryKeys = []
+        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
+                    return Utils._.includes(definition, 'PRIMARY KEY')
+                  }).length > 1)
+        , attrStr     = []
+
+
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+>>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -62,12 +132,24 @@
         attributes: attrStr.join(", "),
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
+<<<<<<< HEAD
+=======
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+>>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(query)(values).trim() + ";"
     },
 
     showTablesQuery: function() {
+<<<<<<< HEAD
       return "SELECT name FROM sqlite_master WHERE type='table';"
+=======
+      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+>>>>>>> parent of db9f87e... removed old docs
     },
 
     insertQuery: function(tableName, attrValueHash) {
@@ -77,7 +159,11 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
+<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+=======
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+>>>>>>> parent of db9f87e... removed old docs
         values: Utils._.values(attrValueHash).map(function(value){
           return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -125,6 +211,7 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
+<<<<<<< HEAD
         if(Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
@@ -133,12 +220,41 @@
             template += " NOT NULL"
 
           if(dataType.defaultValue != undefined) {
+=======
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM) {
+	          replacements.type = "INTEGER"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+>>>>>>> parent of db9f87e... removed old docs
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
+<<<<<<< HEAD
           if(dataType.unique) template += " UNIQUE"
           if(dataType.primaryKey) template += " PRIMARY KEY"
+=======
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+
+            if (dataType.autoIncrement) {
+              template += ' AUTOINCREMENT'
+            }
+          }
+>>>>>>> parent of db9f87e... removed old docs
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -153,14 +269,24 @@
       var fields = []
 
       for (var name in factory.attributes) {
+<<<<<<< HEAD
         var definition = factory.attributes[name]
 
         if (definition && (definition.indexOf('INTEGER PRIMARY KEY') == 0)) {
           fields.push(name)
+=======
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
+            fields.push(name)
+          }
+>>>>>>> parent of db9f87e... removed old docs
         }
       }
 
       return fields
+<<<<<<< HEAD
     }
   }
 
@@ -276,4 +402,37 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
+=======
+    },
+
+    hashToWhereConditions: function(hash) {
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          var value = hash[key]
+
+          if (typeof value === 'boolean') {
+            value = !!value ? 1 : 0
+          }
+
+          hash[key] = value
+        }
+      }
+
+      return hashToWhereConditions(hash).replace(/\\'/g, "''");
+    }
+  }
+
+  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/dialects/sqlite/query.js.html b/docs/dialects/sqlite/query.js.html
index 02ce096ab2cf..3f5d66b6260b 100644
--- a/docs/dialects/sqlite/query.js.html
+++ b/docs/dialects/sqlite/query.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils         = require("../../utils")
   , AbstractQuery = require('../abstract/query')
 
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+>>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var Query = function(database, sequelize, callee, options) {
@@ -37,6 +80,7 @@
       raw: false
     }, options || {})
 
+<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -49,31 +93,56 @@
   }
   Utils.inherit(Query, AbstractQuery)
 
+=======
+    this.checkLoggingOption()
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.getInsertIdField = function() {
+    return 'lastID'
+  }
+
+>>>>>>> parent of db9f87e... removed old docs
   Query.prototype.run = function(sql) {
     var self = this
 
     this.sql = sql
 
+<<<<<<< HEAD
     if(this.options.logging !== false) {
+=======
+    if (this.options.logging !== false) {
+>>>>>>> parent of db9f87e... removed old docs
       this.options.logging('Executing: ' + this.sql)
     }
 
     var columnTypes = {};
     this.database.serialize(function() {
       var executeSql = function() {
+<<<<<<< HEAD
         self.database[databaseMethod](self.sql, function(err, results) {
            //allow clients to listen to sql to do their own logging or whatnot
+=======
+        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
+          // allow clients to listen to sql to do their own logging or whatnot
+>>>>>>> parent of db9f87e... removed old docs
           self.emit('sql', self.sql)
           this.columnTypes = columnTypes;
           err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
         })
       };
 
+<<<<<<< HEAD
       var isInsertCommand = (self.sql.toLowerCase().indexOf('insert') == 0)
         , isUpdateCommand = (self.sql.toLowerCase().indexOf('update') == 0)
         , databaseMethod  = (isInsertCommand || isUpdateCommand) ? 'run' : 'all'
       if (databaseMethod === 'all' && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
         var tableName = RegExp.$1;
+=======
+      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
+        var tableName = RegExp.$1;
+
+>>>>>>> parent of db9f87e... removed old docs
         if (tableName !== 'sqlite_master') {
           // get the column types
           self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
@@ -97,11 +166,23 @@
 
   //private
 
+<<<<<<< HEAD
+=======
+  var getDatabaseMethod = function() {
+    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
+      return 'run'
+    } else {
+      return 'all'
+    }
+  }
+
+>>>>>>> parent of db9f87e... removed old docs
   var onSuccess = function(results, metaData) {
     var result = this.callee
       , self   = this
 
     // add the inserted row id to the instance
+<<<<<<< HEAD
     if (this.callee && (this.sql.indexOf('INSERT INTO') == 0) && metaData.hasOwnProperty('lastID')) {
       var autoIncrementField = this.callee.__factory.autoIncrementField
       this.callee[autoIncrementField] = metaData.lastID
@@ -130,6 +211,32 @@
         result = (result.length == 0) ? null : result[0]
     } else if((this.sql.indexOf('SHOW') == 0) || (this.sql.indexOf('DESCRIBE') == 0))
       result = results
+=======
+    if (this.send('isInsertQuery', results, metaData)) {
+      this.send('handleInsertQuery', results, metaData)
+    }
+
+    if (this.sql.indexOf('sqlite_master') !== -1) {
+      result = results.map(function(resultSet) { return resultSet.name })
+    } else if (this.send('isSelectQuery')) {
+      // we need to convert the timestamps into actual date objects
+
+      if(!this.options.raw) {
+        results = results.map(function(result) {
+          for (var name in result) {
+            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
+              result[name] = new Date(result[name]);
+            }
+          }
+          return result
+        })
+      }
+
+      result = this.send('handleSelectQuery', results)
+    } else if (this.send('isShowOrDescribeQuery')) {
+      result = results
+    }
+>>>>>>> parent of db9f87e... removed old docs
 
     this.emit('success', result)
   }
@@ -139,6 +246,7 @@
   }
 
   return Query
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/emitters/custom-event-emitter.js.html b/docs/emitters/custom-event-emitter.js.html
index e3f25876927f..9feadda2de3d 100644
--- a/docs/emitters/custom-event-emitter.js.html
+++ b/docs/emitters/custom-event-emitter.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var util         = require("util")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var util         = require("util")
+>>>>>>> parent of db9f87e... removed old docs
   , EventEmitter = require("events").EventEmitter
 
 module.exports = (function() {
@@ -67,6 +109,7 @@
 
 
   return CustomEventEmitter
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/lib/associations/belongs-to.js.html b/docs/lib/associations/belongs-to.js.html
new file mode 100644
index 000000000000..c8fe5b78362c
--- /dev/null
+++ b/docs/lib/associations/belongs-to.js.html
@@ -0,0 +1,116 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var BelongsTo = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'BelongsTo'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+  }
+
+  // the id is in the source table
+  BelongsTo.prototype.injectAttributes = function() {
+    var newAttributes  = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.defaults(this.source.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  BelongsTo.prototype.injectGetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function(params) {
+      var id = this[self.identifier]
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: {id:id}}, params)
+        }
+      } else {
+        params = id
+      }
+
+      return self.target.find(params)
+    }
+
+    return this
+  }
+
+  BelongsTo.prototype.injectSetter = function(obj) {
+    var self     = this
+      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+
+    obj[accessor] = function(associatedObject) {
+      this[self.identifier] = associatedObject ? associatedObject.id : null
+
+      // passes the changed field to save, so only that field get updated.
+      return this.save([ self.identifier ])
+    }
+
+    return this
+  }
+
+  return BelongsTo
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/associations/has-many-double-linked.js.html b/docs/lib/associations/has-many-double-linked.js.html
new file mode 100644
index 000000000000..53b55bbe4101
--- /dev/null
+++ b/docs/lib/associations/has-many-double-linked.js.html
@@ -0,0 +1,188 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManyDoubleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManyDoubleLinked.prototype.injectGetter = function(options) {
+    var self = this, _options = options
+
+    var customEventEmitter = new Utils.CustomEventEmitter(function() {
+      var where = {}, options = _options || {};
+
+      //fully qualify
+      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
+
+      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
+        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+
+      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
+
+      if (options.where) {
+        Utils._.each(options.where, function(value, index) {
+          delete options.where[index];
+          options.where[self.__factory.target.tableName+"."+index] = value;
+        });
+
+        Utils._.extend(options.where, where)
+      } else {
+        options.where = where;
+      }
+
+      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
+        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
+        .on('error', function(err){ customEventEmitter.emit('error', err) })
+        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
+    })
+
+    return customEventEmitter.run()
+  }
+
+  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
+    var self = this
+
+    destroyObsoleteAssociations
+      .call(this, oldAssociations, newAssociations)
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .success(function() {
+        var chainer             = new Utils.QueryChainer
+          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
+          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+          , unassociatedObjects = newAssociations.filter(function (obj) { 
+              return !Utils._.find(oldAssociations, function (old) {
+                return obj.id === old.id
+              }) 
+            })
+
+        unassociatedObjects.forEach(function(unassociatedObject) {
+          var attributes = {}
+          attributes[self.__factory.identifier] = self.instance.id
+          attributes[foreignIdentifier] = unassociatedObject.id
+
+          chainer.add(self.__factory.connectorDAO.create(attributes))
+        })
+
+        chainer
+          .run()
+          .success(function() { emitterProxy.emit('success', newAssociations) })
+          .error(function(err) { emitterProxy.emit('error', err) })
+          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+      })
+  }
+
+  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    var attributes = {}
+      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
+
+    attributes[this.__factory.identifier] = this.instance.id
+    attributes[foreignIdentifier] = newAssociation.id
+
+    this.__factory.connectorDAO.create(attributes)
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
+  // private
+
+  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
+      var obsoleteAssociations = oldAssociations.filter(function (old) {
+        // Return only those old associations that are not found in new
+        return !Utils._.find(newAssociations, function (obj) {
+          return obj.id === old.id
+        })
+      })
+
+      if (obsoleteAssociations.length === 0) {
+        return emitter.emit('success', null)
+      }
+
+      obsoleteAssociations.forEach(function(associatedObject) {
+        var where            = {}
+          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
+          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+          , notFoundEmitters = []
+
+        where[self.__factory.identifier] = self.instance.id
+        where[foreignKey] = associatedObject.id
+
+        self.__factory.connectorDAO
+          .find({ where: where })
+          .success(function(connector) {
+            if (connector === null) {
+              notFoundEmitters.push(null)
+            } else {
+              chainer.add(connector.destroy())
+            }
+
+            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
+              // found all obsolete connectors and will delete them now
+              chainer
+                .run()
+                .success(function() { emitter.emit('success', null) })
+                .error(function(err) { emitter.emit('error', err) })
+                .on('sql', function(sql) { emitter.emit('sql', sql) })
+            }
+          })
+          .error(function(err) { emitter.emit('error', err) })
+          .on('sql', function(sql) { emitter.emit('sql', sql) })
+      })
+    }).run()
+  }
+
+  return HasManyDoubleLinked
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/associations/has-many-single-linked.js.html b/docs/lib/associations/has-many-single-linked.js.html
new file mode 100644
index 000000000000..e31294c02045
--- /dev/null
+++ b/docs/lib/associations/has-many-single-linked.js.html
@@ -0,0 +1,106 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require('./../utils')
+
+module.exports = (function() {
+  var HasManySingleLinked = function(definition, instance) {
+    this.__factory = definition
+    this.instance = instance
+  }
+
+  HasManySingleLinked.prototype.injectGetter = function(options) {
+    var where = {}, options = options || {}
+
+    where[this.__factory.identifier] = this.instance.id
+
+    options.where = options.where ? Utils._.extend(options.where, where) : where
+    return this.__factory.target.findAll(options)
+  }
+
+  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
+    var self    = this
+      , options = this.__factory.options
+      , chainer = new Utils.QueryChainer()
+      , obsoleteAssociations = oldAssociations.filter(function (old) { 
+          return !Utils._.find(newAssociations, function (obj) {
+            return obj.id === old.id
+          }) 
+        })
+      , unassociatedObjects = newAssociations.filter(function (obj) { 
+          return !Utils._.find(oldAssociations, function (old) {
+            return obj.id === old.id
+          }) 
+        })
+
+    // clear the old associations
+    obsoleteAssociations.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = null
+      chainer.add(associatedObject.save())
+    })
+
+    // set the new associations
+    unassociatedObjects.forEach(function(associatedObject) {
+      associatedObject[self.__factory.identifier] = self.instance.id
+      chainer.add(associatedObject.save())
+    })
+
+    chainer
+      .run()
+      .success(function() { emitter.emit('success', newAssociations) })
+      .error(function(err) { emitter.emit('error', err) })
+  }
+
+  HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
+    newAssociation[this.__factory.identifier] = this.instance.id
+
+    newAssociation.save()
+      .success(function() { emitterProxy.emit('success', newAssociation) })
+      .error(function(err) { emitterProxy.emit('error', err) })
+      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
+  }
+
+  return HasManySingleLinked
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/associations/has-many.js.html b/docs/lib/associations/has-many.js.html
new file mode 100644
index 000000000000..f5673f11ccfe
--- /dev/null
+++ b/docs/lib/associations/has-many.js.html
@@ -0,0 +1,236 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+var HasManySingleLinked = require("./has-many-single-linked")
+  , HasManyMultiLinked  = require("./has-many-double-linked")
+
+module.exports = (function() {
+  var HasMany = function(srcDAO, targetDAO, options) {
+    this.associationType = 'HasMany'
+    this.source = srcDAO
+    this.target = targetDAO
+    this.options = options
+    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
+    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
+
+    var combinedTableName = Utils.combineTableNames(
+      this.source.tableName,
+      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
+    )
+    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
+
+    var as = (this.options.as || Utils.pluralize(this.target.tableName))
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + as),
+      set: Utils._.camelize('set_' + as),
+      add: Utils._.camelize(Utils.singularize('add_' + as)),
+      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
+      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
+      hasAll: Utils._.camelize('has_' + as)
+    }
+  }
+
+  // the id is in the target table
+  // or in an extra table which connects two tables
+  HasMany.prototype.injectAttributes = function() {
+    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+
+    // is there already a single sided association between the source and the target?
+    // or is the association on the model itself?
+    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
+      // remove the obsolete association identifier from the source
+      if (this.isSelfAssociation) {
+        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
+      } else {
+        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
+        delete this.source.rawAttributes[this.foreignIdentifier]
+      }
+
+      // define a new model, which connects the models
+      var combinedTableAttributes = {}
+      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
+
+      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
+
+      if (!this.isSelfAssociation) {
+        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
+      }
+
+      if (this.options.syncOnAssociation) {
+        this.connectorDAO.sync()
+      }
+    } else {
+      var newAttributes = {}
+      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      Utils._.defaults(this.target.rawAttributes, newAttributes)
+    }
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  HasMany.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function(options) {
+      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+      return new Class(self, this).injectGetter(options)
+    }
+
+   obj[this.accessors.hasAll] = function(objects) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.all(objects, function(o) {
+              return Utils._.any(associatedObjects, function(associatedObject) {
+                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                  return o[identifier] == associatedObject[identifier];
+                });
+              })
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    obj[this.accessors.hasSingle] = function(o) {
+    var instance = this;
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]()
+        .error(function(err){ customEventEmitter.emit('error', err)})
+        .success(function(associatedObjects) {
+          customEventEmitter.emit('success',
+            Utils._.any(associatedObjects, function(associatedObject) {
+              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
+                return o[identifier] == associatedObject[identifier];
+              });
+            })
+          )
+        })
+      })
+      return customEventEmitter.run()
+    }
+    return this
+  }
+
+  HasMany.prototype.injectSetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.set] = function(newAssociatedObjects) {
+      if (newAssociatedObjects === null) {
+        newAssociatedObjects = []
+      }
+
+      var instance = this
+
+      // define the returned customEventEmitter, which will emit the success event once everything is done
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]()
+          .success(function(oldAssociatedObjects) {
+            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
+          })
+          .error(function(err) {
+            emitter.emit('error', err)
+          })
+          .on('sql', function(sql) {
+            emitter.emit('sql', sql)
+          })
+      }).run()
+    }
+
+    obj[this.accessors.add] = function(newAssociatedObject) {
+      var instance = this
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
+          .error(function(err){ emitter.emit('error', err)})
+          .success(function(currentAssociatedObjects) {
+            if (currentAssociatedObjects.length === 0) {
+              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
+              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
+            } else {
+              emitter.emit('success', newAssociatedObject);
+            }
+          })
+      }).run()
+    }
+
+    obj[this.accessors.remove] = function(oldAssociatedObject) {
+      var instance = this
+      var customEventEmitter = new Utils.CustomEventEmitter(function() {
+        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
+          var newAssociations = []
+
+          currentAssociatedObjects.forEach(function(association) {
+            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
+              newAssociations.push(association)
+          })
+
+          instance[self.accessors.set](newAssociations)
+            .success(function() { customEventEmitter.emit('success', null) })
+            .error(function(err) { customEventEmitter.emit('error', err) })
+        })
+      })
+      return customEventEmitter.run()
+    }
+
+    return this
+  }
+
+  return HasMany
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/associations/has-one.js.html b/docs/lib/associations/has-one.js.html
new file mode 100644
index 000000000000..bb831a89a231
--- /dev/null
+++ b/docs/lib/associations/has-one.js.html
@@ -0,0 +1,139 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
+  , DataTypes = require('./../data-types')
+
+module.exports = (function() {
+  var HasOne = function(srcDAO, targetDAO, options) {
+    this.associationType   = 'HasOne'
+    this.source            = srcDAO
+    this.target            = targetDAO
+    this.options           = options
+    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
+
+    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
+      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
+    }
+
+    this.associationAccessor = this.isSelfAssociation
+      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      : this.options.as || this.target.tableName
+
+    this.accessors = {
+      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
+      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+    }
+  }
+
+  // the id is in the target table
+  HasOne.prototype.injectAttributes = function() {
+    var newAttributes = {}
+
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    Utils._.defaults(this.target.rawAttributes, newAttributes)
+
+    // Sync attributes to DAO proto each time a new assoc is added
+    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
+
+    return this
+  }
+
+  HasOne.prototype.injectGetter = function(obj) {
+    var self = this
+
+    obj[this.accessors.get] = function(params) {
+      var id    = this.id
+        , where = {}
+
+      where[self.identifier] = id
+
+      if (!Utils._.isUndefined(params)) {
+        if (!Utils._.isUndefined(params.attributes)) {
+          params = Utils._.extend({where: where}, params)
+        }
+      } else {
+        params = {where: where}
+      }
+
+      return self.target.find(params)
+    }
+
+    return this
+  }
+
+  HasOne.prototype.injectSetter = function(obj) {
+    var self    = this
+      , options = self.options || {}
+
+    obj[this.accessors.set] = function(associatedObject) {
+      var instance = this;
+      return new Utils.CustomEventEmitter(function(emitter) {
+        instance[self.accessors.get]().success(function(oldObj) {
+          if (oldObj) {
+            oldObj[self.identifier] = null
+            oldObj.save()
+          }
+
+          if (associatedObject) {
+            associatedObject[self.identifier] = instance.id
+            associatedObject
+              .save()
+              .success(function() { emitter.emit('success', associatedObject) })
+              .error(function(err) { emitter.emit('error', err) })
+          } else {
+            emitter.emit('success', null)
+          }
+
+        })
+      }).run()
+    }
+
+    return this
+  }
+
+  return HasOne
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/associations/mixin.js.html b/docs/lib/associations/mixin.js.html
new file mode 100644
index 000000000000..6375d9c5bf22
--- /dev/null
+++ b/docs/lib/associations/mixin.js.html
@@ -0,0 +1,112 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Mixin = module.exports = function(){}
+
+Mixin.hasOne = function(associatedDAO, options) {
+  // the id is in the foreign table
+  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype);
+  association.injectSetter(this.DAO.prototype);
+
+  return this
+}
+
+Mixin.belongsTo = function(associatedDAO, options) {
+  // the id is in this table
+  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+  return this
+}
+
+Mixin.hasMany = function(associatedDAO, options) {
+  // the id is in the foreign table or in a connecting table
+  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
+  this.associations[association.associationAccessor] = association.injectAttributes()
+
+  association.injectGetter(this.DAO.prototype)
+  association.injectSetter(this.DAO.prototype)
+
+  return this
+}
+
+Mixin.getAssociation = function(target) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
+
+console.log(target.name, association.target.name)
+      if (!result && (association.target === target)) {
+        result = association
+      }
+    }
+  }
+
+  return result
+}
+
+Mixin.getAssociationByAlias = function(alias) {
+  var result = null
+
+  for (var associationName in this.associations) {
+    if (this.associations.hasOwnProperty(associationName)) {
+      var association = this.associations[associationName]
+
+      if (!result && (association.options.as === alias)) {
+        result = association
+      }
+    }
+  }
+
+  return result
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  example for instance methods:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      console.log('asd')
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/dao-factory-manager.js.html b/docs/lib/dao-factory-manager.js.html
new file mode 100644
index 000000000000..575fbf8362f4
--- /dev/null
+++ b/docs/lib/dao-factory-manager.js.html
@@ -0,0 +1,80 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    module.exports = (function() {
+  var DAOFactoryManager = function(sequelize) {
+    this.daos = []
+    this.sequelize = sequelize
+  }
+
+  DAOFactoryManager.prototype.addDAO = function(dao) {
+    this.daos.push(dao)
+
+    return dao
+  }
+
+  DAOFactoryManager.prototype.removeDAO = function(dao) {
+    this.daos = this.daos.filter(function(_dao) {
+      return _dao.name != dao.name
+    })
+  }
+
+  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
+    options = options || {}
+    options.attribute = options.attribute || 'name'
+
+    var dao = this.daos.filter(function(dao) {
+      return dao[options.attribute] === daoName
+    })
+
+    return !!dao ? dao[0] : null
+  }
+
+  DAOFactoryManager.prototype.__defineGetter__('all', function() {
+    return this.daos
+  })
+
+  return DAOFactoryManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/dao-factory.js.html b/docs/lib/dao-factory.js.html
new file mode 100644
index 000000000000..5c1b38fae016
--- /dev/null
+++ b/docs/lib/dao-factory.js.html
@@ -0,0 +1,300 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ptions.include =
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      includes.map(function(include) {
+        console.log(include instanceof DAOFactory)
+      })
+
+      includes.forEach(function(daoName) {
+        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
+
+        if (!options.include[daoName]) {
+          options.include[daoName] = this.getAssociationByAlias(daoName).target
+        }
+      }.bind(this))
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      type:    'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  //right now, the caller (has-many-double-linked) is in charge of the where clause
+  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
+    var optcpy = Utils._.clone(options)
+    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
+
+    // whereCollection is used for non-primary key updates
+    this.options.whereCollection = optcpy.where || null;
+
+    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      find
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      DAOFactory.prototype.find()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @: @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @return:  {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Search for an instance.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      DAOFactory.prototype.find = function(options) {
+    var hasJoin = false
+
+    // no options defined?
+    // return an emitter which emits null
+    if ([null, undefined].indexOf(options) !== -1) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        setTimeout(function() { emitter.emit('success', null) }, 10)
+      }).run()
+    }
+
+    var primaryKeys = this.primaryKeys
+
+    // options is not a hash but an id
+    if (typeof options === 'number') {
+      options = { where: options }
+    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
+      var where = {}
+        , self  = this
+        , keys = Object.keys(primaryKeys)
+
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
+
+      options = { where: where }
+    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
+      var parsedId = parseInt(options, 10)
+
+      if (!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
+
+      options = { where: parsedId }
+    } else if (typeof options === 'object') {
+      var includes = null
+
+      options = Utils._.clone(options)
+
+      if (options.hasOwnProperty('include')) {
+        hasJoin = true
+
+        options.include = options.include.map(function(include) {
+          if (include instanceof DAOFactory) {
+            include = { daoFactory: include, as: include.tableName }
+          }
+
+          if (typeof include === 'object') {
+            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
+              var usesAlias = include.as !== include.tableName
+
+              // check if the current daoFactory is actually associated with the passed daoFactory
+              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
+                return include
+              } else {
+                var msg = include.daoFactory.name
+
+                if (usesAlias) {
+                  msg += " (" + include.as + ")"
+                }
+
+                msg += " is not associated to " + this.name + "!"
+
+                throw new Error(msg)
+              }
+            } else {
+              throw new Error('Include malformed. Expected attributes: daoFactory, as')
+            }
+          } else {
+            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
+          }
+        }.bind(this))
+      }
+
+      // whereCollection is used for non-primary key updates
+      this.options.whereCollection = options.where || null
+    }
+
+    options.limit = 1
+
+    return this.QueryInterface.select(this, this.tableName, options, {
+      plain: true,
+      type: 'SELECT',
+      hasJoin: hasJoin
+    })
+  }
+
+  DAOFactory.prototype.count = function(options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['count(*)', 'count'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
+  }
+
+  DAOFactory.prototype.max = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['max(' + field + ')', 'max'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
+  }
+  DAOFactory.prototype.min = function(field, options) {
+    options = Utils._.extend({ attributes: [] }, options || {})
+    options.attributes.push(['min(' + field + ')', 'min'])
+    options.parseInt = true
+
+    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
+  }
+
+  DAOFactory.prototype.build = function(values, options) {
+    options = options || {isNewRecord: true}
+
+    var self     = this
+      , instance = new this.DAO(values, this.options, options.isNewRecord)
+
+    instance.isNewRecord = options.isNewRecord
+
+    return instance
+  }
+
+  DAOFactory.prototype.create = function(values, fields) {
+    return this.build(values).save(fields)
+  }
+
+  DAOFactory.prototype.findOrCreate = function (params, defaults) {
+    var self = this;
+
+    return new Utils.CustomEventEmitter(function (emitter) {
+      self.find({
+        where: params
+      }).success(function (instance) {
+        if (instance === null) {
+          for (var attrname in defaults) {
+            params[attrname] = defaults[attrname];
+          }
+
+          self.create(params)
+	    .success(function (instance) {
+              emitter.emit('success', instance)
+            })
+	    .error( function (error) {
+              emitter.emit('error', error)
+            });
+        } else {
+          emitter.emit('success', instance)
+        }
+      }).error(function (error) {
+        emitter.emit('error', error)
+      });
+    }).run()
+  }
+
+  // private
+
+  var query = function() {
+    var args      = Utils._.map(arguments, function(arg, _) { return arg })
+      , sequelize = this.daoFactoryManager.sequelize
+
+    // add this as the second argument
+    if (arguments.length === 1) {
+      args.push(this)
+    }
+
+    // add {} as options
+    if (args.length === 2) {
+      args.push({})
+    }
+
+    return sequelize.query.apply(sequelize, args)
+  }
+
+  var addOptionalClassMethods = function() {
+    var self = this
+    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
+  }
+
+  var addDefaultAttributes = function() {
+    var self              = this
+      , defaultAttributes = {
+        id: {
+          type: DataTypes.INTEGER,
+          allowNull: false,
+          primaryKey: true,
+          autoIncrement: true
+        }
+      }
+
+    if (this.hasPrimaryKeys) {
+      defaultAttributes = {}
+    }
+
+    if (this.options.timestamps) {
+      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
+
+      if (this.options.paranoid)
+        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
+    }
+
+    Utils._.each(defaultAttributes, function(value, attr) {
+      self.rawAttributes[attr] = value
+    })
+  }
+
+  var findAutoIncrementField = function() {
+    var fields = this.QueryGenerator.findAutoIncrementField(this)
+
+    this.autoIncrementField = null
+
+    fields.forEach(function(field) {
+      if (this.autoIncrementField) {
+        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
+      } else {
+        this.autoIncrementField = field
+      }
+    }.bind(this))
+  }
+
+  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
+
+  return DAOFactory
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/dao.js.html b/docs/lib/dao.js.html
new file mode 100644
index 000000000000..d1ad7b8131b0
--- /dev/null
+++ b/docs/lib/dao.js.html
@@ -0,0 +1,210 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      DAO.prototype.validate = function() {
+    var self = this
+    var failures = {}
+
+    // for each field and value
+    Utils._.each(self.values, function(value, field) {
+
+      // if field has validators
+      if (self.validators.hasOwnProperty(field)) {
+        // for each validator
+        Utils._.each(self.validators[field], function(details, validatorType) {
+
+          var is_custom_fn = false  // if true then it's a custom validation method
+          var fn_method = null      // the validation function to call
+          var fn_args = []          // extra arguments to pass to validation function
+          var fn_msg = ""           // the error message to return if validation fails
+
+          // is it a custom validator function?
+          if (Utils._.isFunction(details)) {
+            is_custom_fn = true
+            fn_method = Utils._.bind(details, self, value)
+          }
+          // is it a validator module function?
+          else {
+            // extra args
+            fn_args = details.hasOwnProperty("args") ? details.args : details
+            if (!Array.isArray(fn_args))
+              fn_args = [fn_args]
+            // error msg
+            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
+            // check method exists
+            var v = Validator.check(value, fn_msg)
+            if (!Utils._.isFunction(v[validatorType]))
+              throw new Error("Invalid validator function: " + validatorType)
+            // bind to validator obj
+            fn_method = Utils._.bind(v[validatorType], v)
+          }
+
+          try {
+            fn_method.apply(null, fn_args)
+          } catch (err) {
+            err = err.message
+            // if we didn't provide a custom error message then augment the default one returned by the validator
+            if (!fn_msg && !is_custom_fn)
+              err += ": " + field
+            // each field can have multiple validation failures stored against it
+            if (failures.hasOwnProperty(field)) {
+              failures[field].push(err)
+            } else {
+              failures[field] = [err]
+            }
+          }
+
+        }) // for each validator for this field
+      } // if field has validator set
+    }) // for each field
+
+    return (Utils._.isEmpty(failures) ? null : failures)
+  }
+
+
+  DAO.prototype.updateAttributes = function(updates, fields) {
+    this.setAttributes(updates)
+    return this.save(fields)
+  }
+
+  DAO.prototype.setAttributes = function(updates) {
+    var self = this
+
+    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
+
+    readOnlyAttributes.push('id')
+    readOnlyAttributes.push('createdAt')
+    readOnlyAttributes.push('updatedAt')
+    readOnlyAttributes.push('deletedAt')
+
+    Utils._.each(updates, function(value, attr) {
+      var updateAllowed = (
+        (readOnlyAttributes.indexOf(attr) == -1) &&
+        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
+        (self.attributes.indexOf(attr) > -1)
+      )
+      updateAllowed && (self[attr] = value)
+    })
+  }
+
+  DAO.prototype.destroy = function() {
+    if (this.__options.timestamps && this.__options.paranoid) {
+      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
+      this[attr] = new Date()
+      return this.save()
+    } else {
+      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
+      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
+    }
+  }
+
+  DAO.prototype.equals = function(other) {
+    var result = true
+      , self   = this
+
+    Utils._.each(this.values, function(value, key) {
+      result = result && (value == other[key])
+    })
+
+    return result
+  }
+
+  DAO.prototype.equalsOneOf = function(others) {
+    var result = false
+      , self   = this
+
+    others.forEach(function(other) { result = result || self.equals(other) })
+
+    return result
+  }
+
+  DAO.prototype.addAttribute = function(attribute, value) {
+    this[attribute] = value
+  }
+
+  DAO.prototype.setValidators = function(attribute, validators) {
+    this.validators[attribute] = validators
+  }
+
+  DAO.prototype.toJSON = function() {
+    return this.values;
+  }
+
+  // private
+
+  var initAttributes = function(values, isNewRecord) {
+    // add all passed values to the dao and store the attribute names in this.attributes
+    for (var key in values) {
+      if (values.hasOwnProperty(key)) {
+        this.addAttribute(key, values[key])
+      }
+    }
+
+    // set id to null if not passed as value
+    // a newly created dao has no id
+    var defaults = this.hasPrimaryKeys ? {} : { id: null }
+
+    if (this.__options.timestamps && isNewRecord) {
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+
+      if (this.__options.paranoid) {
+        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
+      }
+    }
+
+    if (Utils._.size(defaults)) {
+      for (var attr in defaults) {
+        var value = defaults[attr]
+
+        if (!this.hasOwnProperty(attr)) {
+          this.addAttribute(attr, Utils.toDefaultValue(value))
+        }
+      }
+    }
+  }
+
+  return DAO
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/data-types.js.html b/docs/lib/data-types.js.html
new file mode 100644
index 000000000000..2c8836782536
--- /dev/null
+++ b/docs/lib/data-types.js.html
@@ -0,0 +1,56 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports = {
+  STRING: 'VARCHAR(255)',
+  TEXT: 'TEXT',
+  INTEGER: 'INTEGER',
+  BIGINT:  'BIGINT',
+  DATE: 'DATETIME',
+  BOOLEAN: 'TINYINT(1)',
+  FLOAT: 'FLOAT',
+  NOW: 'NOW',
+  ENUM: 'ENUM'
+}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/dialects/abstract/query.js.html b/docs/lib/dialects/abstract/query.js.html
new file mode 100644
index 000000000000..0d59cc648345
--- /dev/null
+++ b/docs/lib/dialects/abstract/query.js.html
@@ -0,0 +1,370 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @param:  {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Examples
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          query.run('SELECT 1')
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.run = function(sql) {
+    throw new Error("The run method wasn't overwritten!")
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          checkLoggingOption
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.checkLoggingOption()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @return:  {void} 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Check the logging option of the instance and print deprecation warnings.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.checkLoggingOption = function() {
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging === console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          formatResults
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          High level function that handles the results of a query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               id: 1,              // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               attr2: 'snafu',     // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Tasks.id: 1,        // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          AbstractQuery.prototype.formatResults = function(data) {
+    var result  = this.callee
+
+    if (isInsertQuery.call(this, data)) {
+      handleInsertQuery.call(this, data)
+    }
+
+    if (isSelectQuery.call(this)) {
+      result = handleSelectQuery.call(this, data)
+    } else if (isShowTableQuery.call(this)) {
+      result = handleShowTableQuery.call(this, data)
+    } else if (isShowOrDescribeQuery.call(this)) {
+      result = data
+    } else if (isCallQuery.call(this)) {
+      result = data[0]
+    }
+
+    return result
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Shortcut methods (success, ok) for listening for success events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Params:
+  - fct: A function that gets executed once the *success* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            AbstractQuery.prototype.success =
+  AbstractQuery.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Shortcut methods (failure, fail, error) for listening for error events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Params:
+  - fct: A function that gets executed once the *error* event was triggered.
+
+Result:
+  The function returns the instance of the query.
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              AbstractQuery.prototype.failure =
+  AbstractQuery.prototype.fail =
+  AbstractQuery.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              send
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              AbstractQuery.prototype.send()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • @param:  {String} fctName The name of the private method.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              This function is a wrapper for private methods.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              AbstractQuery.prototype.send = function(fctName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                arg1, arg2, arg3, ...
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                {
+    var args = Array.prototype.slice.call(arguments).slice(1)
+    return eval(fctName).apply(this, args)
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                getInsertIdField
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                AbstractQuery.prototype.getInsertIdField()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @return:  {String} The field name.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Get the attributes of an insert query, which contains the just inserted id.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                AbstractQuery.prototype.getInsertIdField = function() {
+    return 'insertId'
+  }
+
+  /////////////
+  // private //
+  /////////////
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                findTableNameInAttribute
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                findTableNameInAttribute()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @param:  {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @return:  {String} The found tableName / alias.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                This method will also check association aliases ('as' option).
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var findTableNameInAttribute = function(attribute) {
+    var tableName = null
+
+    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
+      if (!!tableName) {
+        return
+      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
+        tableName = daoFactory.tableName
+      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
+        tableName = Utils.singularize(daoFactory.tableName)
+      } else {
+        for (var associationName in daoFactory.associations) {
+          if (daoFactory.associations.hasOwnProperty(associationName)) {
+            var association = daoFactory.associations[associationName]
+
+            if (attribute.indexOf(association.options.as + ".") === 0) {
+              tableName = association.options.as
+            }
+          }
+        }
+      }
+    })
+
+    return tableName
+  }
+
+  var queryResultHasJoin = function(results) {
+    if (!!results[0]) {
+      var keys = Object.keys(results[0])
+
+      for (var i = 0; i < keys.length; i++) {
+        if (!!findTableNameInAttribute.call(this, keys[i])) {
+          return true
+        }
+      }
+    }
+
+    return false
+  }
+
+  var isInsertQuery = function(results, metaData) {
+    var result = true
+
+    // is insert query if sql contains insert into
+    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
+
+    // is insert query if no results are passed or if the result has the inserted id
+    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
+
+    // is insert query if no metadata are passed or if the metadata has the inserted id
+    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
+
+    return result
+  }
+
+  var handleInsertQuery = function(results, metaData) {
+    if (this.callee) {
+      // add the inserted row id to the instance
+      var autoIncrementField = this.callee.__factory.autoIncrementField
+        , id                 = null
+
+      id = id || (results && results[this.getInsertIdField()])
+      id = id || (metaData && metaData[this.getInsertIdField()])
+
+      this.callee[autoIncrementField] = id
+    }
+  }
+
+  var isShowTableQuery = function() {
+    return (this.sql.toLowerCase().indexOf('show tables') === 0)
+  }
+
+  var handleShowTableQuery = function(results) {
+    return Utils._.flatten(results.map(function(resultSet) {
+      return Utils._.values(resultSet)
+    }))
+  }
+
+  var isSelectQuery = function() {
+    return this.options.type === 'SELECT';
+  }
+
+  var isUpdateQuery = function() {
+    return (this.sql.toLowerCase().indexOf('update') === 0)
+  }
+
+  var handleSelectQuery = function(results) {
+    var result = null, self = this;
+
+    if (this.options.raw) {
+      result = results
+    } else if (this.options.hasJoin === true) {
+      result = prepareJoinData.call(this, results)
+      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+        // let's build the actual dao instance first...
+        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+        // ... and afterwards the prefetched associations
+        for (var tableName in result) {
+          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+          }
+        }
+
+        return dao
+      }.bind(this))
+    } else {
+      result = results.map(function(result) {
+        return this.callee.build(result, { isNewRecord: false })
+      }.bind(this))
+    }
+
+    // return the first real model instance if options.plain is set (e.g. Model.find)
+    if (this.options.plain) {
+      result = (result.length === 0) ? null : result[0]
+    }
+
+    return result
+  }
+
+  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
+    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
+      , association          = null
+
+    if (!!associatedDaoFactory) {
+      association = this.callee.getAssociation(associatedDaoFactory)
+    } else {
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+
+      if (!!associatedDaoFactory) {
+        association = this.callee.getAssociation(associatedDaoFactory)
+      } else {
+        association          = this.callee.getAssociationByAlias(tableName)
+        associatedDaoFactory = association.target
+      }
+    }
+
+    var accessor = Utils._.camelize(tableName)
+
+    // downcase the first char
+    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
+
+    associationData.forEach(function(data) {
+      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
+        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+
+      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
+        accessor = Utils.singularize(accessor)
+        dao[accessor] = isEmpty ? null : daoInstance
+      } else {
+        dao[accessor] = dao[accessor] || []
+        if (! isEmpty)
+          dao[accessor].push(daoInstance)
+      }
+    })
+  }
+
+  var isShowOrDescribeQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
+    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
+
+    return  result
+  }
+
+  var isCallQuery = function() {
+    var result = false
+
+    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
+
+    return result
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                groupDataByCalleeFactory
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                groupDataByCalleeFactory()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      the associated data by the callee.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example:
+  groupDataByCalleeFactory([
+    {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 1 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 2 }
+    }, {
+      callee: { some: 'data', id: 1 },
+      association: { foo: 'bar', id: 3 }
+    }
+  ])
+
+Result:
+  Something like this:
+
+  [
+    {
+      callee:  { some: 'data', id: 1 },
+      association: [
+        { foo: 'bar', id: 1 },
+        { foo: 'bar', id: 2 },
+        { foo: 'bar', id: 3 }
+      ]
+    }
+  ]
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var groupDataByCalleeFactory = function(data) {
+    var result          = []
+      , calleeTableName = this.callee.tableName
+
+    data.forEach(function(row) {
+      var calleeData    = row[calleeTableName]
+        , existingEntry = result.filter(function(groupedRow) {
+            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
+          })[0]
+
+      if (!existingEntry) {
+        existingEntry = {}
+        result.push(existingEntry)
+        existingEntry[calleeTableName] = calleeData
+      }
+
+      for (var attrName in row) {
+        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
+          existingEntry[attrName] = existingEntry[attrName] || []
+          existingEntry[attrName].push(row[attrName])
+        }
+      }
+    })
+
+    return result
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  prepareJoinData
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  prepareJoinData()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {Array} data This array contains objects.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @return:  {Array} The array will have the needed format for groupDataByCalleeFactory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  This function will prepare the result of select queries with joins.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var prepareJoinData = function(data) {
+    var result = data.map(function(row) {
+      var nestedRow = {}
+
+      for (var key in row) {
+        if (row.hasOwnProperty(key)) {
+          var tableName = findTableNameInAttribute.call(this, key)
+
+          if (!!tableName) {
+            nestedRow[tableName] = nestedRow[tableName] || {}
+            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
+          } else {
+            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
+            nestedRow[this.callee.tableName][key] = row[key]
+          }
+        }
+      }
+
+      return nestedRow
+    }.bind(this))
+
+    return result
+  }
+
+  return AbstractQuery
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/dialects/connector-manager.js.html b/docs/lib/dialects/connector-manager.js.html
new file mode 100644
index 000000000000..f4df4ed4c7c7
--- /dev/null
+++ b/docs/lib/dialects/connector-manager.js.html
@@ -0,0 +1,69 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    module.exports = (function(){
+  var ConnectorManager = function(sequelize, config) {
+    throw new Error('Define the constructor!')
+  }
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    throw new Error('Define the query method!')
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    throw new Error('Define the connect method!')
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    throw new Error('Define the disconnect method!')
+  }
+
+  ConnectorManager.prototype.reconnect = function() {
+    this.disconnect()
+    this.connect()
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/connector-manager.js.html b/docs/lib/dialects/mysql/connector-manager.js.html
new file mode 100644
index 000000000000..d2c59be8c783
--- /dev/null
+++ b/docs/lib/dialects/mysql/connector-manager.js.html
@@ -0,0 +1,379 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var mysql   = require("mysql")
+  , Pooling = require('generic-pool')
+  , Query   = require("./query")
+  , Utils   = require("../../utils")
+  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client = null
+    this.config = config || {}
+    this.disconnectTimeoutId = null
+    this.queue = []
+    this.activeQueue = []
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+    this.poolCfg = Utils._.defaults(this.config.pool, {
+      maxConnections: 10,
+      minConnections: 0,
+      maxIdleTime: 1000
+    });
+    this.pendingQueries = 0;
+    this.useReplicaton = !!config.replication;
+    this.useQueue = config.queue !== undefined ? config.queue : true;
+
+    var self = this
+
+    if (this.useReplicaton) {
+      var reads = 0,
+        writes = 0;
+
+      // Init configs with options from config if not present
+      for (var i in config.replication.read) {
+        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
+          host: this.config.host,
+          port: this.config.port,
+          username: this.config.username,
+          password: this.config.password,
+          database: this.config.database
+        });
+      }
+      config.replication.write = Utils._.defaults(config.replication.write, {
+        host: this.config.host,
+        port: this.config.port,
+        username: this.config.username,
+        password: this.config.password,
+        database: this.config.database
+      });
+
+      // I'll make my own pool, with blackjack and hookers!
+      this.pool = {
+        release: function (client) {
+          if (client.queryType == 'read') {
+            return this.read.release(client);
+          } else {
+            return this.write.release(client);
+          }
+        },
+        acquire: function (callback, priority, queryType) {
+          if (queryType == 'SELECT') {
+            this.read.acquire(callback, priority);
+          } else {
+            this.write.acquire(callback, priority);
+          }
+        },
+        drain: function () {
+          this.read.drain();
+          this.write.drain();
+        },
+        read: Pooling.Pool({
+          name: 'sequelize-read',
+          create: function (done) {
+            if (reads >= self.config.replication.read.length) reads = 0;
+            var config = self.config.replication.read[reads++];
+
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'read'
+              done(null, connection)
+            }, config);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        }),
+        write: Pooling.Pool({
+          name: 'sequelize-write',
+          create: function (done) {
+            connect.call(self, function (err, connection) {
+              connection.queryType = 'write'
+              done(null, connection)
+            }, self.config.replication.write);
+          },
+          destroy: function(client) {
+            disconnect.call(self, client)
+          },
+          max: self.poolCfg.maxConnections,
+          min: self.poolCfg.minConnections,
+          idleTimeoutMillis: self.poolCfg.maxIdleTime
+        })
+      };
+    } else if (this.poolCfg) {
+      //the user has requested pooling, so create our connection pool
+      this.pool = Pooling.Pool({
+        name: 'sequelize-mysql',
+        create: function (done) {
+          connect.call(self, done)
+        },
+        destroy: function(client) {
+          disconnect.call(self, client)
+        },
+        max: self.poolCfg.maxConnections,
+        min: self.poolCfg.minConnections,
+        idleTimeoutMillis: self.poolCfg.maxIdleTime
+      })
+    }
+
+    process.on('exit', function () {
+      //be nice & close our connections on exit
+      if (self.pool) {
+        self.pool.drain()
+      } else if (self.client) {
+        disconnect(self.client)
+      }
+
+      return
+    })
+  }
+
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
+
+  var isConnecting = false;
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    if (!this.isConnected && !this.pool) {
+      this.connect()
+    }
+
+    if (this.useQueue) {
+      var queueItem = {
+        query: new Query(this.client, this.sequelize, callee, options || {}),
+        sql: sql
+      };
+
+      enqueue.call(this, queueItem, options);
+      return queueItem.query;
+    }
+
+    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
+    this.pendingQueries++;
+
+    query.done(function() {
+      self.pendingQueries--;
+      if (self.pool) self.pool.release(query.client);
+      else {
+        if (self.pendingQueries === 0) {
+          setTimeout(function() {
+            self.pendingQueries === 0 && self.disconnect.call(self);
+          }, 100);
+        }
+      }
+    });
+
+    if (!this.pool) {
+      query.run(sql);
+    }
+
+    else {
+      this.pool.acquire(function(err, client) {
+        if (err) return query.emit('error', err);
+
+        query.client = client;
+        query.run(sql);
+        return;
+      }, undefined, options.type);
+    }
+
+    return query;
+  };
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this;
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting || this.pool) {
+      return;
+    }
+    connect.call(self, function(err, client) {
+      self.client = client;
+      return;
+    });
+    return;
+  };
+
+  ConnectorManager.prototype.disconnect = function() {
+    if (this.client) disconnect.call(this, this.client);
+    return;
+  };
+
+
+  // private
+
+  var disconnect = function(client) {
+    var self = this;
+    if (!this.useQueue) {
+      this.client = null;
+    }
+
+    client.end(function() {
+      if (!self.useQueue) {
+        return client.destroy();
+      }
+
+      var intervalObj = null
+      var cleanup = function () {
+        var retryCt = 0
+        // make sure to let client finish before calling destroy
+        if (self && self.hasQueuedItems) {
+          return
+        }
+        // needed to prevent mysql connection leak
+        client.destroy()
+        if (self && self.client) {
+          self.client = null
+        }
+        clearInterval(intervalObj)
+      }
+      intervalObj = setInterval(cleanup, 10)
+      cleanup()
+      return
+    })
+  }
+
+  var connect = function(done, config) {
+    config = config || this.config
+    var connection = mysql.createConnection({
+      host: config.host,
+      port: config.port,
+      user: config.username,
+      password: config.password,
+      database: config.database
+    })
+    // client.setMaxListeners(self.maxConcurrentQueries)
+    this.isConnecting = false
+
+    done(null, connection)
+  }
+
+  var enqueue = function(queueItem, options) {
+    options = options || {}
+    if (this.activeQueue.length < this.maxConcurrentQueries) {
+      this.activeQueue.push(queueItem)
+      if (this.pool) {
+        var self = this
+        this.pool.acquire(function(err, client) {
+          if (err) {
+            queueItem.query.emit('error', err)
+            return
+          }
+          //we set the client here, asynchronously, when getting a pooled connection
+          //allowing the ConnectorManager.query method to remain synchronous
+          queueItem.query.client = client
+          queueItem.client = client
+          execQueueItem.call(self, queueItem)
+          return
+        }, undefined, options.type)
+      } else {
+        execQueueItem.call(this, queueItem)
+      }
+    } else {
+      this.queue.push(queueItem)
+    }
+  }
+
+  var dequeue = function(queueItem) {
+    //return the item's connection to the pool
+    if (this.pool) {
+      this.pool.release(queueItem.client)
+    }
+    this.activeQueue = without(this.activeQueue, queueItem)
+  }
+
+  var transferQueuedItems = function(count) {
+    for(var i = 0; i < count; i++) {
+      var queueItem = this.queue.shift();
+      if (queueItem) {
+        enqueue.call(this, queueItem)
+      }
+    }
+  }
+
+  var afterQuery = function(queueItem) {
+    var self = this
+
+    dequeue.call(this, queueItem)
+    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
+    disconnectIfNoConnections.call(this)
+  }
+
+
+  var execQueueItem = function(queueItem) {
+    var self = this
+
+    queueItem.query
+      .success(function(){ afterQuery.call(self, queueItem) })
+      .error(function(){ afterQuery.call(self, queueItem) })
+
+    queueItem.query.run(queueItem.sql, queueItem.client)
+  }
+
+  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
+    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
+  })
+
+  // legacy
+  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
+    return !this.hasQueuedItems
+  })
+
+  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
+    return this.client != null
+  })
+
+  var disconnectIfNoConnections = function() {
+    var self = this
+
+    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
+    this.disconnectTimeoutId = setTimeout(function() {
+      self.isConnected && !self.hasQueuedItems && self.disconnect()
+    }, 100)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/query-generator.js.html b/docs/lib/dialects/mysql/query-generator.js.html
new file mode 100644
index 000000000000..37a073b4bafd
--- /dev/null
+++ b/docs/lib/dialects/mysql/query-generator.js.html
@@ -0,0 +1,483 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils     = require("../../utils")
+  , DataTypes = require("../../data-types")
+  , util      = require("util")
+
+module.exports = (function() {
+  var QueryGenerator = {
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+        engine: 'InnoDB',
+        charset: null
+      }, options || {})
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
+        , primaryKeys = []
+        , attrStr = []
+
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        engine: options.engine,
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+
+      return Utils._.template(query)({table: Utils.addTicks(tableName)})
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
+      return Utils._.template(query)({ before: before, after: after })
+    },
+
+    showTablesQuery: function() {
+      return 'SHOW TABLES;'
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
+      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
+          attrName: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
+      var attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
+          before: attrBefore,
+          after: attrName,
+          definition: definition
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options            = options || {}
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr){
+        if(Array.isArray(attr) && attr.length == 2) {
+          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
+        } else {
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = Utils.addTicks(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
+              query += Utils.addTicks(foreignIdentifier) + '='
+              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
+
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(dao.tableName) + '.'
+              query += Utils.addTicks('id') + '='
+              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += Utils.addTicks(association.identifier) + '='
+              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, Utils.addTicks(attr)].join('.') +
+                  ' AS ' +
+                  Utils.addTicks([aliasName, attr].join('.'))
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      if (options.where) {
+        options.where = this.getWhereConditions(options.where, tableName)
+        query += " WHERE <%= where %>"
+      }
+
+      if (options.group) {
+        options.group = Utils.addTicks(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+
+      if (options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+
+      if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
+          query += " LIMIT <%= offset %>, <%= limit %>"
+        } else {
+          query += " LIMIT <%= limit %>"
+        }
+      }
+
+      query += ";"
+
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value  = attrValueHash[key]
+          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+
+        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if(typeof attribute === 'string') {
+          return attribute
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += attribute.attribute
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute === 'string') ? attribute : attribute.attribute
+      })
+
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", options.indexName,
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
+        (options.parser ? "WITH PARSER " + options.parser : undefined)
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
+      return Utils._.template(sql)({
+        tableName: tableName,
+        options: (options || {}).database ? ' FROM ' + options.database : ''
+      })
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
+        , indexName = indexNameOrAttributes
+
+      if (typeof indexName !== 'string') {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+
+      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
+    },
+
+    getWhereConditions: function(smth, tableName) {
+      var result = null
+
+      if (Utils.isHash(smth)) {
+        smth   = Utils.prependTableNameToHash(tableName, smth)
+        result = this.hashToWhereConditions(smth)
+      } else if (typeof smth === 'number') {
+        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
+        result = this.hashToWhereConditions(smth)
+      } else if (typeof smth === "string") {
+        result = smth
+      } else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+         //handle qualified key names
+        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
+          , _value = null
+
+        if (Array.isArray(value)) {
+          // is value an array?
+          if (value.length == 0) { value = [null] }
+          _value = "(" + value.map(function(subValue) {
+            return Utils.escape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        } else if ((value) && (typeof value == 'object')) {
+          // is value an object?
+
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = Utils.escape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(" AND ")
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template += " auto_increment"
+          }
+
+          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('auto_increment') > -1)) {
+            fields.push(name)
+          }
+        }
+      }
+
+      return fields
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/query.js.html b/docs/lib/dialects/mysql/query.js.html
new file mode 100644
index 000000000000..887013c4c7fd
--- /dev/null
+++ b/docs/lib/dialects/mysql/query.js.html
@@ -0,0 +1,84 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client    = client
+    this.callee    = callee
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+
+  Utils.inherit(Query, AbstractQuery)
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    this.client.query(this.sql, function(err, results, fields) {
+      this.emit('sql', this.sql)
+
+      if (err) {
+        this.emit('error', err, this.callee)
+      } else {
+        this.emit('success', this.formatResults(results))
+      }
+    }.bind(this)).setMaxListeners(100)
+    return this
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/connector-manager.js.html b/docs/lib/dialects/postgres/connector-manager.js.html
new file mode 100644
index 000000000000..34fdeea94af3
--- /dev/null
+++ b/docs/lib/dialects/postgres/connector-manager.js.html
@@ -0,0 +1,146 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Query   = require("./query")
+  , Utils   = require("../../utils")
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize, config) {
+    this.sequelize = sequelize
+    this.client    = null
+    this.config    = config || {}
+    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
+    this.pg        = this.config.native ? require('pg').native : require('pg')
+
+    // set pooling parameters if specified
+    if (this.pooling) {
+      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
+      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
+    }
+
+    this.disconnectTimeoutId = null
+    this.pendingQueries = 0
+    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  var isConnecting = false
+  var isConnected  = false
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    var self = this
+    if (this.client == null) {
+      this.connect()
+    }
+
+    var query = new Query(this.client, this.sequelize, callee, options || {})
+    self.pendingQueries += 1
+    return query.run(sql)
+      .success(function() { self.endQuery.call(self) })
+      .error(function() { self.endQuery.call(self) })
+  }
+
+  ConnectorManager.prototype.endQuery = function() {
+    var self = this
+    self.pendingQueries -= 1
+    if (self.pendingQueries == 0) {
+      setTimeout(function() {
+        self.pendingQueries == 0 && self.disconnect.call(self)
+      }, 100)
+    }
+  }
+
+  ConnectorManager.prototype.connect = function() {
+    var self = this
+    var emitter = new (require('events').EventEmitter)()
+
+    // in case database is slow to connect, prevent orphaning the client
+    if (this.isConnecting) {
+      return
+    }
+
+    this.isConnecting = true
+    this.isConnected  = false
+
+    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
+
+    var connectCallback = function(err, client) {
+      self.isConnecting = false
+
+      if (!!err) {
+        emitter.emit('error', err)
+      } else if (client) {
+        client.query("SET TIME ZONE 'UTC'")
+          .on('end', function() {
+            self.isConnected = true
+            this.client = client
+          });
+      } else {
+        this.client = null
+      }
+    }
+
+    if (this.pooling) {
+      // acquire client from pool
+      this.pg.connect(uri, connectCallback)
+    } else {
+      //create one-off client
+      this.client = new this.pg.Client(uri)
+      this.client.connect(connectCallback)
+    }
+
+    return emitter
+  }
+
+  ConnectorManager.prototype.disconnect = function() {
+    var self = this
+    if (this.client) this.client.end()
+    this.client = null
+    this.isConnecting = false
+    this.isConnected  = false
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/query-generator.js.html b/docs/lib/dialects/postgres/query-generator.js.html
new file mode 100644
index 000000000000..9fa2f4993154
--- /dev/null
+++ b/docs/lib/dialects/postgres/query-generator.js.html
@@ -0,0 +1,624 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils = require("../../utils")
+  , util  = require("util")
+  , DataTypes = require("../../data-types")
+  , tables = {}
+  , primaryKeys = {};
+
+function removeQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return s.replace(new RegExp(quoteChar, 'g'), '')
+}
+
+function addQuotes(s, quoteChar) {
+  quoteChar = quoteChar || '"'
+  return removeQuotes(s, quoteChar)
+    .split('.')
+    .map(function(e) { return quoteChar + String(e) + quoteChar })
+    .join('.')
+}
+
+function pgEscape(val) {
+  if (val === undefined || val === null) {
+    return 'NULL';
+  }
+
+  switch (typeof val) {
+    case 'boolean': return (val) ? 'true' : 'false';
+    case 'number': return val+'';
+  }
+
+  if (val instanceof Date) {
+    val = pgSqlDate(val);
+  }
+
+  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+  val = val.replace(/'/g, "''");
+  return "'"+val+"'";
+}
+
+function pgEscapeAndQuote(val) {
+  return addQuotes(removeQuotes(pgEscape(val), "'"))
+}
+
+function pgEnum(tableName, attr, dataType) {
+  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
+}
+
+function padInt(i) {
+  return (i < 10) ? '0' + i.toString() : i.toString()
+}
+function pgSqlDate(dt) {
+  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
+  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
+  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
+}
+
+function pgDataTypeMapping(tableName, attr, dataType) {
+  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+    primaryKeys[tableName].push(attr)
+    dataType = dataType.replace(/PRIMARY KEY/, '')
+  }
+
+  if (Utils._.includes(dataType, 'TINYINT(1)')) {
+    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
+  }
+
+  if (Utils._.includes(dataType, 'DATETIME')) {
+    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
+  }
+
+  if (Utils._.includes(dataType, 'SERIAL')) {
+    dataType = dataType.replace(/INTEGER/, '')
+    dataType = dataType.replace(/NOT NULL/, '')
+    tables[tableName][attr] = 'serial'
+  }
+
+  if (dataType.match(/^ENUM\(/)) {
+    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
+  }
+
+  return dataType
+}
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = Utils._.extend({
+      }, options || {})
+
+      primaryKeys[tableName] = []
+      tables[tableName] = {}
+
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , attrStr = []
+
+      for (var attr in attributes) {
+        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
+        attrStr.push(addQuotes(attr) + " " + dataType)
+
+        if (attributes[attr].match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attr, attributes[attr]) + query;
+        }
+      }
+
+      var values  = {
+        table: addQuotes(tableName),
+        attributes: attrStr.join(", "),
+      }
+
+      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
+      if (pks.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pks + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    dropTableQuery: function(tableName, options) {
+      options = options || {}
+      var query = "DROP TABLE IF EXISTS <%= table %>;"
+      return Utils._.template(query)({ table: addQuotes(tableName) })
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
+      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
+    },
+
+    showTablesQuery: function() {
+      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
+    },
+
+    describeTableQuery: function(tableName) {
+      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
+      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
+    },
+
+    addColumnQuery: function(tableName, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
+        , attrString = []
+
+      for (var attrName in attributes) {
+        var definition = attributes[attrName]
+
+        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
+          attrName: addQuotes(attrName),
+          definition: pgDataTypeMapping(tableName, attrName, definition)
+        }))
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attrName, definition) + query
+        }
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    removeColumnQuery: function(tableName, attributeName) {
+      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
+    },
+
+    changeColumnQuery: function(tableName, attributes) {
+      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
+        , sql   = []
+
+      for (var attributeName in attributes) {
+        var definition = attributes[attributeName]
+        var attrSql = ''
+
+        if (definition.indexOf('NOT NULL') > 0) {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' SET NOT NULL'
+          })
+          definition = definition.replace('NOT NULL', '').trim()
+        } else {
+          attrSql += Utils._.template(query)({
+            tableName: addQuotes(tableName),
+            query: addQuotes(attributeName) + ' DROP NOT NULL'
+          })
+        }
+
+        if (definition.match(/^ENUM\(/)) {
+          query = pgEnum(tableName, attributeName, definition) + query
+          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
+        }
+
+        attrSql += Utils._.template(query)({
+          tableName: addQuotes(tableName),
+          query: addQuotes(attributeName) + ' TYPE ' + definition
+        })
+
+        sql.push(attrSql)
+      }
+
+      return sql.join('')
+    },
+
+    renameColumnQuery: function(tableName, attrBefore, attributes) {
+      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
+      var attrString = []
+
+      for (var attributeName in attributes) {
+        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
+          before: addQuotes(attrBefore),
+          after: addQuotes(attributeName),
+        }))
+      }
+
+      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+    },
+
+    selectQuery: function(tableName, options) {
+      var query = "SELECT <%= attributes %> FROM <%= table %>"
+        , table = null
+
+      options = options || {}
+      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr) {
+        if (Array.isArray(attr) && attr.length === 2) {
+          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
+        } else if (attr.indexOf('`') >= 0) {
+          return attr.replace(/`/g, '"')
+        } else {
+          return addQuotes(attr)
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = [options.table + '.*']
+
+        for (var daoName in options.include) {
+          if (options.include.hasOwnProperty(daoName)) {
+            var dao         = options.include[daoName]
+              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
+                  attribute: 'tableName'
+                })
+              , _tableName  = addQuotes(dao.tableName)
+              , association = dao.getAssociation(daoFactory)
+
+            if (association.connectorDAO) {
+              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
+                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
+              })[0]
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
+              query += addQuotes(association.connectorDAO.tableName) + '.'
+              query += addQuotes(foreignIdentifier) + '='
+              query += addQuotes(table) + '.' + addQuotes('id')
+
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(dao.tableName) + '.'
+              query += addQuotes('id') + '='
+              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
+            } else {
+              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
+              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
+              query += addQuotes(association.identifier) + '='
+              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
+            }
+
+            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
+              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
+
+            optAttributes = optAttributes.concat(
+              Object.keys(dao.attributes).map(function(attr) {
+                return '' +
+                  [_tableName, addQuotes(attr)].join('.') +
+                  ' AS "' +
+                  removeQuotes([aliasName, attr].join('.')) + '"'
+              })
+            )
+          }
+        }
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      if(options.where) {
+        options.where = QueryGenerator.getWhereConditions(options.where)
+        query += " WHERE <%= where %>"
+      }
+
+      if(options.order) {
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
+        query += " ORDER BY <%= order %>"
+      }
+
+      if(options.group) {
+        options.group = addQuotes(options.group)
+        query += " GROUP BY <%= group %>"
+      }
+
+      if (!(options.include && (options.limit === 1))) {
+        if (options.limit) {
+          query += " LIMIT <%= limit %>"
+        }
+
+        if (options.offset) {
+          query += " OFFSET <%= offset %>"
+        }
+      }
+
+      query += ";"
+
+      return Utils._.template(query)(options)
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
+        , returning = []
+
+      Utils._.forEach(attrValueHash, function(value, key, hash) {
+        if (tables[tableName] && tables[tableName][key]) {
+          switch (tables[tableName][key]) {
+            case 'serial':
+              delete hash[key]
+              returning.push(key)
+              break
+          }
+        }
+      });
+
+      var replacements  = {
+        table: addQuotes(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return pgEscape(value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(addQuotes(key) + "=" + pgEscape(value))
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        values: values.join(","),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+      options.limit = options.limit || 1
+
+      primaryKeys[tableName] = primaryKeys[tableName] || [];
+
+      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
+
+      var pks;
+      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
+        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
+      } else {
+        pks = addQuotes('id')
+      }
+
+      var replacements = {
+        table: addQuotes(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        limit: pgEscape(options.limit),
+        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
+        primaryKeysSelection: pks
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    addIndexQuery: function(tableName, attributes, options) {
+      var transformedAttributes = attributes.map(function(attribute) {
+        if (typeof attribute === 'string') {
+          return addQuotes(attribute)
+        } else {
+          var result = ""
+
+          if (!attribute.attribute) {
+            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
+          }
+
+          result += addQuotes(attribute.attribute)
+
+          if (attribute.length) {
+            result += '(' + attribute.length + ')'
+          }
+
+          if (attribute.order) {
+            result += ' ' + attribute.order
+          }
+
+          return result
+        }
+      })
+
+      var onlyAttributeNames = attributes.map(function(attribute) {
+        return (typeof attribute === "string") ? attribute : attribute.attribute
+      })
+
+      var indexTable = tableName.split('.')
+      options = Utils._.extend({
+        indicesType: null,
+        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
+        parser: null
+      }, options || {})
+
+      return Utils._.compact([
+        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
+        (options.indexType ? ('USING ' + options.indexType) : undefined),
+        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
+      ]).join(' ')
+    },
+
+    showIndexQuery: function(tableName, options) {
+      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
+      return Utils._.template(query)({ tableName: tableName });
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
+        , indexName = indexNameOrAttributes
+
+      if (typeof indexName !== "string") {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+
+      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
+    },
+
+    getWhereConditions: function(smth) {
+      var result = null
+
+      if (Utils.isHash(smth)) {
+        result = QueryGenerator.hashToWhereConditions(smth)
+      }
+      else if (typeof smth === "number") {
+        result = '\"id\"' + "=" + pgEscape(smth)
+      }
+      else if (typeof smth === "string") {
+        result = smth
+      }
+      else if (Array.isArray(smth)) {
+        result = Utils.format(smth)
+      }
+
+      return result
+    },
+
+    hashToWhereConditions: function(hash) {
+      var result = []
+
+      for (var key in hash) {
+        var value = hash[key]
+
+        //handle qualified key names
+        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
+          , _value = null
+
+        if (Array.isArray(value)) {
+          if (value.length == 0) { value = [null] }
+          _value = "(" + value.map(function(subValue) {
+            return pgEscape(subValue);
+          }).join(',') + ")"
+
+          result.push([_key, _value].join(" IN "))
+        }
+        else if ((value) && (typeof value === "object")) {
+          //using as sentinel for join column => value
+          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
+          result.push([_key, _value].join("="))
+        } else {
+          _value = pgEscape(value)
+          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
+        }
+      }
+
+      return result.join(' AND ')
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if(Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
+            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              return Utils.escape(value)
+            }).join(", ") + ")"
+          }
+
+          if (dataType.type === "TINYINT(1)") {
+            dataType.type = 'BOOLEAN'
+          }
+
+          if (dataType.type === "DATETIME") {
+            dataType.type = 'TIMESTAMP'
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.autoIncrement) {
+            template +=" SERIAL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = pgEscape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        var definition = factory.attributes[name]
+
+        if (definition && (definition.indexOf('SERIAL') > -1)) {
+          fields.push(name)
+        }
+      }
+
+      return fields
+    },
+
+    databaseConnectionUri: function(config) {
+      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
+
+      return Utils._.template(template)({
+        user: encodeURIComponent(config.username),
+        password: encodeURIComponent(config.password),
+        database: config.database,
+        host: config.host,
+        port: config.port,
+        protocol: config.protocol
+      })
+    }
+  }
+
+  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/query.js.html b/docs/lib/dialects/postgres/query.js.html
new file mode 100644
index 000000000000..7cc35de3456d
--- /dev/null
+++ b/docs/lib/dialects/postgres/query.js.html
@@ -0,0 +1,136 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(client, sequelize, callee, options) {
+    this.client = client
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.run = function(sql) {
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var receivedError = false
+      , query         = this.client.query(sql)
+      , rows          = []
+
+    query.on('row', function(row) {
+      rows.push(row)
+    })
+
+    query.on('error', function(err) {
+      receivedError = true
+      this.emit('error', err, this.callee)
+    }.bind(this))
+
+    query.on('end', function() {
+      this.emit('sql', this.sql)
+
+      if (receivedError) {
+        return
+      }
+
+      onSuccess.call(this, rows)
+    }.bind(this))
+
+    return this
+  }
+
+  Query.prototype.getInsertIdField = function() {
+    return 'id'
+  }
+
+  var onSuccess = function(rows) {
+    var results          = []
+      , isTableNameQuery = (this.sql.indexOf('SELECT table_name FROM information_schema.tables') === 0)
+      , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
+
+    if (isTableNameQuery || isRelNameQuery) {
+      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
+    }
+
+    if (this.send('isSelectQuery')) {
+      this.emit('success', this.send('handleSelectQuery', rows))
+    } else if (this.send('isShowOrDescribeQuery')) {
+      this.emit('success', results)
+    } else if (this.send('isInsertQuery')) {
+      for (var key in rows[0]) {
+        if (rows[0].hasOwnProperty(key)) {
+          this.callee[key] = rows[0][key]
+        }
+      }
+
+      this.emit('success', this.callee)
+    } else if (this.send('isUpdateQuery')) {
+      for (var key in rows[0]) {
+        if (rows[0].hasOwnProperty(key)) {
+          this.callee[key] = rows[0][key]
+        }
+      }
+
+      this.emit('success', this.callee)
+    } else {
+      this.emit('success', results)
+    }
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/dialects/query-generator.js.html b/docs/lib/dialects/query-generator.js.html
new file mode 100644
index 000000000000..5756467cb969
--- /dev/null
+++ b/docs/lib/dialects/query-generator.js.html
@@ -0,0 +1,92 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  createTableQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('createTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns a query for dropping a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    dropTableQuery: function(tableName, options) {
+      throwMethodUndefined('dropTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns a rename table query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - originalTableName: Name of the table before execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - futureTableName: Name of the table after execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      renameTableQuery: function(originalTableName, futureTableName) {
+      throwMethodUndefined('renameTableQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Returns a query, which gets all available table names in the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        showTablesQuery: function() {
+      throwMethodUndefined('showTablesQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns a query, which adds an attribute to an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          addColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('addColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Returns a query, which removes an attribute from an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - tableName: Name of the existing table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - attributeName: Name of the obsolete attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            removeColumnQuery: function(tableName, attributeName) {
+      throwMethodUndefined('removeColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              changeColumnQuery: function(tableName, attributes) {
+      throwMethodUndefined('changeColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns a query, which renames an existing attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - attrNameAfter: The name of the attribute, after renaming.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
+      throwMethodUndefined('renameColumnQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a query for selecting elements in the table .
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - order -> e.g. 'id DESC'
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - group
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - limit -> The maximum count you want to get.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - offset -> An offset value to start from. Only useable with limit!
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  selectQuery: function(tableName, options) {
+      throwMethodUndefined('selectQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    insertQuery: function(tableName, attrValueHash) {
+      throwMethodUndefined('insertQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns an update query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - values -> A hash with attribute-value-pairs
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      updateQuery: function(tableName, values, where) {
+      throwMethodUndefined('updateQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Returns a deletion query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - limit -> Maximaum count of lines to delete
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        deleteQuery: function(tableName, where, options) {
+      throwMethodUndefined('deleteQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns an add index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - tableName -> Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - attributes:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      An array of attributes as string or as hash.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      If the attribute is a hash, it must have the following content:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - attribute: The name of the attribute/column
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - length: An integer. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - indexName: The name of the index. Default is 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - parser
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          addIndexQuery: function(tableName, attributes, options) {
+      throwMethodUndefined('addIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Returns an show index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - database: Name of the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            showIndexQuery: function(tableName, options) {
+      throwMethodUndefined('showIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a remove index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - indexNameOrAttributes: The name of the index as string or an array of attribute names.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      throwMethodUndefined('removeIndexQuery')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Takes something and transforms it into values of a where condition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                getWhereConditions: function(smth) {
+      throwMethodUndefined('getWhereConditions')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        The values are transformed by the relevant datatype.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  hashToWhereConditions: function(hash) {
+      throwMethodUndefined('hashToWhereConditions')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          sql attribute definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    attributesToSQL: function(attributes) {
+      throwMethodUndefined('attributesToSQL')
+    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns all auto increment fields of a factory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      findAutoIncrementField: function(factory) {
+      throwMethodUndefined('findAutoIncrementField')
+    }
+  }
+
+  var throwMethodUndefined = function(methodName) {
+    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
+  }
+
+  return QueryGenerator
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/connector-manager.js.html b/docs/lib/dialects/sqlite/connector-manager.js.html
new file mode 100644
index 000000000000..a9c529724116
--- /dev/null
+++ b/docs/lib/dialects/sqlite/connector-manager.js.html
@@ -0,0 +1,62 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils   = require("../../utils")
+  , sqlite3 = require('sqlite3').verbose()
+  , Query   = require("./query")
+
+module.exports = (function() {
+  var ConnectorManager = function(sequelize) {
+    this.sequelize = sequelize
+    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
+  }
+  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
+
+  ConnectorManager.prototype.query = function(sql, callee, options) {
+    return new Query(this.database, this.sequelize, callee, options).run(sql)
+  }
+
+  return ConnectorManager
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/query-generator.js.html b/docs/lib/dialects/sqlite/query-generator.js.html
new file mode 100644
index 000000000000..22fab71dfb54
--- /dev/null
+++ b/docs/lib/dialects/sqlite/query-generator.js.html
@@ -0,0 +1,240 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require("../../utils")
+  , DataTypes = require("../../data-types")
+var MySqlQueryGenerator = Utils._.extend(
+  Utils._.clone(require("../query-generator")),
+  Utils._.clone(require("../mysql/query-generator"))
+)
+
+var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
+
+var escape = function(str) {
+  if (typeof str === 'string') {
+    return "'" + str.replace(/'/g, "''") + "'";
+  } else if (typeof str === 'boolean') {
+    return str ? 1 : 0; // SQLite has no type boolean
+  } else if (str === null || str === undefined) {
+    return 'NULL';
+  } else {
+    return str;
+  }
+};
+
+module.exports = (function() {
+  var QueryGenerator = {
+    options: {},
+
+    createTableQuery: function(tableName, attributes, options) {
+      options = options || {}
+
+      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
+        , primaryKeys = []
+        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
+                    return Utils._.includes(definition, 'PRIMARY KEY')
+                  }).length > 1)
+        , attrStr     = []
+
+
+      for (var attr in attributes) {
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
+
+          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
+            primaryKeys.push(attr)
+            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
+        }
+      }
+
+      var values = {
+        table: Utils.addTicks(tableName),
+        attributes: attrStr.join(", "),
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+      }
+      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+
+      if (pkString.length > 0) {
+        values.attributes += ", PRIMARY KEY (" + pkString + ")"
+      }
+
+      return Utils._.template(query)(values).trim() + ";"
+    },
+
+    showTablesQuery: function() {
+      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+    },
+
+    insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        values: Utils._.values(attrValueHash).map(function(value){
+          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+        }).join(",")
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
+      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+        , values = []
+
+      for (var key in attrValueHash) {
+        var value = attrValueHash[key]
+        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
+      }
+
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        values: values.join(","),
+        where: MySqlQueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    deleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: this.getWhereConditions(where),
+        limit: Utils.escape(options.limit)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
+    attributesToSQL: function(attributes) {
+      var result = {}
+
+      for (var name in attributes) {
+        var dataType = attributes[name]
+
+        if (Utils.isHash(dataType)) {
+          var template     = "<%= type %>"
+            , replacements = { type: dataType.type }
+
+          if (dataType.type === DataTypes.ENUM) {
+	          replacements.type = "INTEGER"
+          }
+
+          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
+            template += " NOT NULL"
+          }
+
+          if (dataType.defaultValue !== undefined) {
+            template += " DEFAULT <%= defaultValue %>"
+            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+          }
+
+          if (dataType.unique) {
+            template += " UNIQUE"
+          }
+
+          if (dataType.primaryKey) {
+            template += " PRIMARY KEY"
+
+            if (dataType.autoIncrement) {
+              template += ' AUTOINCREMENT'
+            }
+          }
+
+          result[name] = Utils._.template(template)(replacements)
+        } else {
+          result[name] = dataType
+        }
+      }
+
+      return result
+    },
+
+    findAutoIncrementField: function(factory) {
+      var fields = []
+
+      for (var name in factory.attributes) {
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
+
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
+            fields.push(name)
+          }
+        }
+      }
+
+      return fields
+    },
+
+    hashToWhereConditions: function(hash) {
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          var value = hash[key]
+
+          if (typeof value === 'boolean') {
+            value = !!value ? 1 : 0
+          }
+
+          hash[key] = value
+        }
+      }
+
+      return hashToWhereConditions(hash).replace(/\\'/g, "''");
+    }
+  }
+
+  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/query.js.html b/docs/lib/dialects/sqlite/query.js.html
new file mode 100644
index 000000000000..009ae88f2f7f
--- /dev/null
+++ b/docs/lib/dialects/sqlite/query.js.html
@@ -0,0 +1,160 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils         = require("../../utils")
+  , AbstractQuery = require('../abstract/query')
+
+module.exports = (function() {
+  var Query = function(database, sequelize, callee, options) {
+    this.database = database
+    this.sequelize = sequelize
+    this.callee = callee
+    this.options = Utils._.extend({
+      logging: console.log,
+      plain: false,
+      raw: false
+    }, options || {})
+
+    this.checkLoggingOption()
+  }
+  Utils.inherit(Query, AbstractQuery)
+
+  Query.prototype.getInsertIdField = function() {
+    return 'lastID'
+  }
+
+  Query.prototype.run = function(sql) {
+    var self = this
+
+    this.sql = sql
+
+    if (this.options.logging !== false) {
+      this.options.logging('Executing: ' + this.sql)
+    }
+
+    var columnTypes = {};
+    this.database.serialize(function() {
+      var executeSql = function() {
+        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
+          // allow clients to listen to sql to do their own logging or whatnot
+          self.emit('sql', self.sql)
+          this.columnTypes = columnTypes;
+          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
+        })
+      };
+
+      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
+        var tableName = RegExp.$1;
+
+        if (tableName !== 'sqlite_master') {
+          // get the column types
+          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
+            if (!err) {
+              for (var i=0, l=results.length; i<l; i++) {
+                columnTypes[results[i].name] = results[i].type;
+              }
+            }
+            executeSql();
+          });
+        } else {
+          executeSql();
+        }
+      } else {
+        executeSql();
+      }
+    })
+
+    return this
+  }
+
+  //private
+
+  var getDatabaseMethod = function() {
+    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
+      return 'run'
+    } else {
+      return 'all'
+    }
+  }
+
+  var onSuccess = function(results, metaData) {
+    var result = this.callee
+      , self   = this
+
+    // add the inserted row id to the instance
+    if (this.send('isInsertQuery', results, metaData)) {
+      this.send('handleInsertQuery', results, metaData)
+    }
+
+    if (this.sql.indexOf('sqlite_master') !== -1) {
+      result = results.map(function(resultSet) { return resultSet.name })
+    } else if (this.send('isSelectQuery')) {
+      // we need to convert the timestamps into actual date objects
+
+      if(!this.options.raw) {
+        results = results.map(function(result) {
+          for (var name in result) {
+            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
+              result[name] = new Date(result[name]);
+            }
+          }
+          return result
+        })
+      }
+
+      result = this.send('handleSelectQuery', results)
+    } else if (this.send('isShowOrDescribeQuery')) {
+      result = results
+    }
+
+    this.emit('success', result)
+  }
+
+  var onFailure = function(err) {
+    this.emit('error', err, this.callee)
+  }
+
+  return Query
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/emitters/custom-event-emitter.js.html b/docs/lib/emitters/custom-event-emitter.js.html
new file mode 100644
index 000000000000..20612915a3d6
--- /dev/null
+++ b/docs/lib/emitters/custom-event-emitter.js.html
@@ -0,0 +1,91 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var util         = require("util")
+  , EventEmitter = require("events").EventEmitter
+
+module.exports = (function() {
+  var CustomEventEmitter = function(fct) {
+    this.fct = fct
+  }
+  util.inherits(CustomEventEmitter, EventEmitter)
+
+  CustomEventEmitter.prototype.run = function() {
+    var self = this
+
+    // delay the function call and return the emitter
+    setTimeout(function(){
+      self.fct.call(self, self)
+    }, 1)
+
+    return this
+  }
+
+  CustomEventEmitter.prototype.success =
+  CustomEventEmitter.prototype.ok =
+  function(fct) {
+    this.on('success', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.failure =
+  CustomEventEmitter.prototype.fail =
+  CustomEventEmitter.prototype.error =
+  function(fct) {
+    this.on('error', fct)
+    return this
+  }
+
+  CustomEventEmitter.prototype.done =
+  CustomEventEmitter.prototype.complete =
+  function(fct) {
+    this.on('error', function(err) { fct(err, null) })
+        .on('success', function(result) { fct(null, result) })
+    return this
+  }
+
+
+  return CustomEventEmitter
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/migration.js.html b/docs/lib/migration.js.html
new file mode 100644
index 000000000000..7e103cf9a4d7
--- /dev/null
+++ b/docs/lib/migration.js.html
@@ -0,0 +1,177 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var moment         = require("moment")
+  , Utils          = require("./utils")
+  , DataTypes      = require("./data-types")
+  , QueryInterface = require("./query-interface")
+
+module.exports = (function() {
+  var Migration = function(migrator, path) {
+    var split = path.split('/')
+
+    this.migrator       = migrator
+    this.path           = path
+    this.filename       = Utils._.last(this.path.split('/'))
+
+    var parsed          = Migration.parseFilename(this.filename)
+
+    this.migrationId    = parsed.id
+    this.date           = parsed.date;
+    this.queryInterface = this.migrator.queryInterface
+    this.undoneMethods  = 0
+  }
+
+  ///////////////
+  // static /////
+  ///////////////
+
+  Migration.parseFilename = function(s) {
+    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
+
+    if (matches === null) {
+      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
+    }
+
+    return {
+      id: parseInt(matches[1]),
+      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
+    }
+  }
+
+  Migration.migrationHasInterfaceCalls = function(func) {
+    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
+      , hasCalls       = false
+
+    for(var method in QueryInterface.prototype) {
+      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
+      hasCalls = hasCalls || regex.test(functionString)
+    }
+
+    return hasCalls
+  }
+
+  ///////////////
+  // member /////
+  ///////////////
+
+  Object.defineProperty(Migration.prototype, 'migration', {
+    get: function() {
+      return require(this.path)
+    }
+  })
+
+  Migration.prototype.execute = function(options) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      options = Utils._.extend({
+        method: 'up'
+      }, options || {})
+
+      var onSuccess = function() { emitter.emit('success', null) }
+        , func      = self.migration[options.method]
+
+      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
+      func.call(null, self, DataTypes)
+
+      if (!Migration.migrationHasInterfaceCalls(func))
+        onSuccess()
+    }).run()
+  }
+
+  Migration.prototype.isBefore = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date > this.date) : (date >= this.date)
+  }
+
+  Migration.prototype.isAfter = function(dateString, options) {
+    options = Utils._.extend({
+      withoutEquals: false
+    }, options || {})
+
+    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
+
+    return options.withoutEqual ? (date < this.date) : (date <= this.date)
+  }
+
+  // extends the Migration prototype with all methods of QueryInterface.prototype
+  // with additional tracking of start and finish. this is done in order to minimize
+  // asynchronous handling in migrations
+  var extendMigrationWithQueryInterfaceMethods = function(callback) {
+    var self = this
+
+    for(var method in QueryInterface.prototype) {
+      (function(_method) {
+        self[_method] = function() {
+          var emitter = self.QueryInterface
+            , args    = Utils._.map(arguments, function(arg, _) { return arg })
+
+          self.undoneMethods++
+
+          // bind listeners to the query interface
+          // the event will have the same name like the method
+          self.queryInterface.on(_method, function(err) {
+            self.undoneMethods--
+            if (err) {
+              throw new Error(err)
+            } else {
+              (self.undoneMethods == 0) && callback && callback()
+            }
+          })
+
+          return self.queryInterface[_method].apply(self.queryInterface, args)
+        }
+      })(method)
+    }
+  }
+
+  return Migration
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/migrator.js.html b/docs/lib/migrator.js.html
new file mode 100644
index 000000000000..bd080fb8c64e
--- /dev/null
+++ b/docs/lib/migrator.js.html
@@ -0,0 +1,282 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  const fs     = require("fs")
+    , path   = require("path")
+    , moment = require("moment")
+
+var Utils          = require("./utils")
+  , Migration      = require("./migration")
+  , DataTypes      = require("./data-types")
+
+module.exports = (function() {
+  var Migrator = function(sequelize, options) {
+    this.sequelize = sequelize
+    this.options   = Utils._.extend({
+      path: __dirname + '/../migrations',
+      from: null,
+      to: null,
+      logging: console.log
+    }, options || {})
+
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    if (this.options.logging == console.log) {
+      // using just console.log will break in node < 0.6
+      this.options.logging = function(s) { console.log(s) }
+    }
+  }
+
+  Object.defineProperty(Migrator.prototype, "queryInterface", {
+    get: function() {
+      return this.sequelize.getQueryInterface()
+    }
+  })
+
+  Migrator.prototype.migrate = function(options) {
+    var self = this
+
+    options = Utils._.extend({
+      method: 'up'
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.getUndoneMigrations(function(err, migrations) {
+        if (err) {
+          emitter.emit('error', err)
+        } else {
+          var chainer = new Utils.QueryChainer
+            , from    = migrations[0]
+
+          if (options.method === 'down') {
+            from = migrations[0]
+            migrations.reverse()
+          }
+
+          migrations.forEach(function(migration) {
+            chainer.add(migration, 'execute', [options], {
+              before: function(migration) {
+                if (self.options.logging !== false) {
+                  self.options.logging('Executing migration: ' + migration.filename)
+                }
+              },
+              after: function(migration) {
+                if (self.options.logging !== false) {
+                  self.options.logging('Executed migration: ' + migration.filename)
+                }
+              },
+              success: function(migration, callback) {
+                if (options.method === 'down') {
+                  deleteUndoneMigration.call(self, from, migration, callback)
+                } else {
+                  saveSuccessfulMigration.call(self, from, migration, callback)
+                }
+              }
+            })
+          })
+
+          chainer
+            .runSerially({ skipOnError: true })
+            .success(function() { emitter.emit('success', null) })
+            .error(function(err) { emitter.emit('error', err) })
+        }
+      })
+    }).run()
+  }
+
+  Migrator.prototype.getUndoneMigrations = function(callback)  {
+    var self = this
+
+    var filterFrom = function(migrations, from, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
+      callback && callback(null, result)
+    }
+    var filterTo = function(migrations, to, callback, options) {
+      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
+      callback && callback(null, result)
+    }
+
+    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
+      return /\.js$/.test(file)
+    })
+
+    var migrations = migrationFiles.map(function(file) {
+      return new Migration(self, self.options.path + '/' + file)
+    })
+
+    migrations = migrations.sort(function(a,b){
+      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
+    })
+
+    if (this.options.from) {
+      filterFrom(migrations, this.options.from, function(err, migrations) {
+        if (self.options.to) {
+          filterTo(migrations, self.options.to, callback)
+        } else {
+          callback && callback(null, migrations)
+        }
+      })
+    } else {
+      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
+        if (lastMigrationId) {
+          filterFrom(migrations, lastMigrationId, function(err, migrations) {
+            if (self.options.to) {
+              filterTo(migrations, self.options.to, callback)
+            } else {
+              callback && callback(null, migrations)
+            }
+          }, { withoutEqual: true })
+        } else {
+          if (self.options.to) {
+            filterTo(migrations, self.options.to, callback)
+          } else {
+            callback && callback(null, migrations)
+          }
+        }
+      }).error(function(err) {
+        callback && callback(err, null)
+      })
+    }
+  }
+
+  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
+        , SequelizeMeta = storedDAO
+
+      if (!storedDAO) {
+        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
+          from: DataTypes.STRING,
+          to:   DataTypes.STRING
+        }, {
+          timestamps: false
+        })
+      }
+
+      // force sync when model has newly created or if syncOptions are passed
+      if (!storedDAO || syncOptions) {
+        SequelizeMeta
+          .sync(syncOptions || {})
+          .success(function() { emitter.emit('success', SequelizeMeta) })
+          .error(function(err) { emitter.emit('error', err) })
+      } else {
+        emitter.emit('success', SequelizeMeta)
+      }
+    }).run()
+  }
+
+  // private
+
+  var getLastMigrationFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
+          emitter.emit('success', meta ? meta : null)
+        }).error(function(err) { emitter.emit('error', err) })
+      }).error(function(err) { emitter.emit(err) })
+    }).run()
+  }
+
+  var getLastMigrationIdFromDatabase = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      getLastMigrationFromDatabase.call(self)
+        .success(function(meta) {
+          emitter.emit('success', meta ? meta.to : null)
+        })
+        .error(function(err) {
+          emitter.emit('error', err)
+        })
+    }).run()
+  }
+
+  var getFormattedDateString = function(s) {
+    var result = null
+
+    try {
+      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
+    } catch(e) {
+      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
+    }
+
+    return result
+  }
+
+  var stringToDate = function(s) {
+    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
+  }
+
+  var saveSuccessfulMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .create({ from: from.migrationId, to: to.migrationId })
+        .success(callback)
+    })
+  }
+
+  var deleteUndoneMigration = function(from, to, callback) {
+    var self = this
+
+    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
+      SequelizeMeta
+        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
+        .success(function(meta) {
+          meta.destroy().success(callback)
+        })
+    })
+  }
+
+  return Migrator
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/query-chainer.js.html b/docs/lib/query-chainer.js.html
new file mode 100644
index 000000000000..2b39bd8beafe
--- /dev/null
+++ b/docs/lib/query-chainer.js.html
@@ -0,0 +1,188 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils = require("./utils")
+
+module.exports = (function() {
+  var QueryChainer = function(emitters) {
+    var self = this
+
+    this.finishedEmits  = 0
+    this.emitters       = []
+    this.serials        = []
+    this.fails          = []
+    this.serialResults  = []
+    this.emitterResults = []
+    this.finished       = false
+    this.wasRunning     = false
+    this.eventEmitter   = null
+
+    emitters = emitters || []
+    emitters.forEach(function(emitter) {
+      if (Array.isArray(emitter)) {
+        self.add.apply(self, emitter)
+      } else {
+        self.add(emitter)
+      }
+    })
+  }
+
+  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
+    if (!!method) {
+      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
+    } else {
+      observeEmitter.call(this, emitterOrKlass)
+      this.emitters.push(emitterOrKlass)
+    }
+
+    return this
+  }
+
+  QueryChainer.prototype.run = function() {
+    var self = this
+    this.eventEmitter = new Utils.CustomEventEmitter(function() {
+      self.wasRunning = true
+      finish.call(self, 'emitterResults')
+    })
+    return this.eventEmitter.run()
+  }
+
+  QueryChainer.prototype.runSerially = function(options) {
+    var self       = this
+      , serialCopy = Utils._.clone(this.serials)
+
+    options = Utils._.extend({
+      skipOnError: false
+    }, options)
+
+    var exec = function() {
+      var serial = self.serials.pop()
+
+      if (serial) {
+        serial.options = serial.options || {}
+        serial.options.before && serial.options.before(serial.klass)
+
+        var onSuccess = function() {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          exec()
+        }
+
+        var onError = function(err) {
+          serial.options.after && serial.options.after(serial.klass)
+          self.finishedEmits++
+          self.fails.push(err)
+          exec()
+        }
+
+        if (options.skipOnError && (self.fails.length > 0)) {
+          onError('Skipped due to earlier error!')
+        } else {
+          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
+
+          emitter.success(function(result) {
+            self.serialResults[serialCopy.indexOf(serial)] = result
+
+            if (serial.options.success) {
+              serial.options.success(serial.klass, onSuccess)
+            } else {
+              onSuccess()
+            }
+          }).error(onError)
+        }
+      } else {
+        self.wasRunning = true
+        finish.call(self, 'serialResults')
+      }
+    }
+
+    this.serials.reverse()
+    this.eventEmitter = new Utils.CustomEventEmitter(exec)
+    return this.eventEmitter.run()
+  }
+
+  // private
+
+  var observeEmitter = function(emitter) {
+    var self = this
+
+    emitter
+      .success(function(result) {
+        self.emitterResults[self.emitters.indexOf(emitter)] = result
+        self.finishedEmits++
+        finish.call(self, 'emitterResults')
+      })
+      .error(function(err) {
+        self.finishedEmits++
+        self.fails.push(err)
+        finish.call(self, 'emitterResults')
+      })
+      .on('sql', function(sql) {
+        if (self.eventEmitter) {
+          self.eventEmitter.emit('sql', sql)
+        }
+      })
+  }
+
+  var finish = function(resultsName) {
+    this.finished = true
+
+    if (this.emitters.length > 0) {
+      this.finished = (this.finishedEmits == this.emitters.length)
+    }
+    else if (this.serials.length > 0) {
+      this.finished = (this.finishedEmits == this.serials.length)
+    }
+
+    if (this.finished && this.wasRunning) {
+      var status = (this.fails.length == 0 ? 'success' : 'error')
+        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
+
+      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
+    }
+  }
+
+  return QueryChainer
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/query-interface.js.html b/docs/lib/query-interface.js.html
new file mode 100644
index 000000000000..950173235ccd
--- /dev/null
+++ b/docs/lib/query-interface.js.html
@@ -0,0 +1,329 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require('./utils')
+  , DataTypes = require('./data-types')
+
+module.exports = (function() {
+  var QueryInterface = function(sequelize) {
+    this.sequelize = sequelize
+    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+   this.QueryGenerator.options = this.sequelize.options;
+  }
+  Utils.addEventEmitter(QueryInterface)
+
+  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
+    var attributeHashes = {}
+
+    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
+      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+        attributeHashes[attributeName] = { type: dataTypeOrOptions }
+      } else {
+        attributeHashes[attributeName] = dataTypeOrOptions
+      }
+    })
+
+    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
+
+    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'createTable')
+  }
+
+  QueryInterface.prototype.dropTable = function(tableName) {
+    var sql = this.QueryGenerator.dropTableQuery(tableName)
+    return queryAndEmit.call(this, sql, 'dropTable')
+  }
+
+  QueryInterface.prototype.dropAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+
+      self.showAllTables().success(function(tableNames) {
+        tableNames.forEach(function(tableName) {
+          chainer.add(self.dropTable(tableName))
+        })
+        chainer
+          .run()
+          .success(function() {
+            self.emit('dropAllTables', null)
+            emitter.emit('success', null)
+          })
+          .error(function(err) {
+            self.emit('dropAllTables', err)
+            emitter.emit('error', err)
+          })
+      }).error(function(err) {
+        self.emit('dropAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.renameTable = function(before, after) {
+    var sql = this.QueryGenerator.renameTableQuery(before, after)
+    return queryAndEmit.call(this, sql, 'renameTable')
+  }
+
+  QueryInterface.prototype.showAllTables = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var showTablesSql = self.QueryGenerator.showTablesQuery()
+      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
+        self.emit('showAllTables', null)
+        emitter.emit('success', Utils._.flatten(tableNames))
+      }).error(function(err) {
+        self.emit('showAllTables', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.describeTable = function(tableName) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql;
+      if (self.QueryGenerator.describeTableQuery) {
+        sql = self.QueryGenerator.describeTableQuery(tableName)
+      } else {
+        sql = 'DESCRIBE `' + tableName + '`;'
+      }
+      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
+        emitter.emit('success', data)
+      }).error(function(err) {
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'addColumn')
+  }
+
+  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
+    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
+    return queryAndEmit.call(this, sql, 'removeColumn')
+  }
+
+  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
+    var attributes = {}
+
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+
+    var options = this.QueryGenerator.attributesToSQL(attributes)
+      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
+
+    return queryAndEmit.call(this, sql, 'changeColumn')
+  }
+
+  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      self.describeTable(tableName).success(function(data) {
+        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
+
+        var options =  {}
+
+        options[attrNameAfter] = {
+          type: data.Type,
+          allowNull: data.Null == 'YES',
+          defaultValue: data.Default
+        }
+
+        var sql = self.QueryGenerator.renameColumnQuery(tableName,
+          attrNameBefore,
+          self.QueryGenerator.attributesToSQL(options)
+        )
+
+        self.sequelize.query(sql, null, {}).success(function() {
+          self.emit('renameColumn', null)
+          emitter.emit('success', null)
+        }).error(function(err) {
+          self.emit('renameColumn', err)
+          emitter.emit('error', err)
+        })
+      }).error(function(err) {
+        self.emit('renameColumn', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
+    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
+    return queryAndEmit.call(this, sql, 'addIndex')
+  }
+
+  QueryInterface.prototype.showIndex = function(tableName, options) {
+    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
+    return queryAndEmit.call(this, sql, 'showIndex')
+  }
+
+  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
+    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
+    return queryAndEmit.call(this, sql, "removeIndex")
+  }
+
+  QueryInterface.prototype.insert = function(dao, tableName, values) {
+    var sql = this.QueryGenerator.insertQuery(tableName, values)
+    return queryAndEmit.call(this, [sql, dao], 'insert', {
+      success: function(obj) { obj.isNewRecord = false }
+    })
+  }
+
+  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
+    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'update')
+  }
+
+  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
+    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
+    return queryAndEmit.call(this, [sql, dao], 'delete')
+  }
+
+  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
+    var sql = this.QueryGenerator.selectQuery(tableName, options)
+    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
+    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
+  }
+
+  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
+    var self = this
+
+    if (attributeSelector === undefined) {
+      throw new Error('Please pass an attribute selector!')
+    }
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql = self.QueryGenerator.selectQuery(tableName, options)
+        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
+
+      qry
+        .success(function(data) {
+          var result = data[attributeSelector]
+
+          if (options && options.parseInt) {
+            result = parseInt(result)
+          }
+
+          self.emit('rawSelect', null)
+          emitter.emit('success', result)
+        })
+        .error(function(err) {
+          self.emit('rawSelect', err)
+          emitter.emit('error', err)
+        })
+        .on('sql', function(sql) {
+          emitter.emit('sql', sql)
+        })
+    }).run()
+  }
+
+  // private
+
+  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
+    var self = this
+
+    options = Utils._.extend({
+      success: function(){},
+      error: function(){}
+    }, options || {})
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var query = null
+
+      if (Array.isArray(sqlOrQueryParams)) {
+        if (sqlOrQueryParams.length === 1) {
+          sqlOrQueryParams.push(null)
+        }
+
+        if (sqlOrQueryParams.length === 2) {
+          sqlOrQueryParams.push({})
+        }
+
+        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
+      } else {
+        query = self.sequelize.query(sqlOrQueryParams, null, {})
+      }
+
+      // append the query for better testing
+      emitter.query = query
+
+      query.success(function(obj) {
+        options.success && options.success(obj)
+        self.emit(methodName, null)
+        emitter.emit('success', obj)
+      }).error(function(err) {
+        options.error && options.error(err)
+        self.emit(methodName, err)
+        emitter.emit('error', err)
+      })
+      query.on('sql', function(sql) {
+        emitter.emit('sql', sql)
+      });
+    }).run()
+  }
+
+  return QueryInterface
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/sequelize.js.html b/docs/lib/sequelize.js.html
new file mode 100644
index 000000000000..44a5a046b894
--- /dev/null
+++ b/docs/lib/sequelize.js.html
@@ -0,0 +1,210 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Params:
+
+  - `database`
+  - `username`
+  - `password`, optional, default: null
+  - `options`, optional, default: {}
+
+Examples:
+
+    mymodule.write('foo')
+    mymodule.write('foo', { stream: process.stderr })
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Sequelize = function(database, username, password, options) {
+    this.options = Utils._.extend({
+      dialect: 'mysql',
+      host: 'localhost',
+      port: 3306,
+      protocol: 'tcp',
+      define: {},
+      query: {},
+      sync: {},
+      logging: console.log,
+      omitNull: false,
+      queue: true,
+      native: false,
+      replication: false,
+      pool: {}
+    }, options || {})
+
+    if (this.options.logging === true) {
+      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
+      this.options.logging = console.log
+    }
+
+    this.config = {
+      database: database,
+      username: username,
+      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
+      host    : this.options.host,
+      port    : this.options.port,
+      pool    : this.options.pool,
+      protocol: this.options.protocol,
+      queue   : this.options.queue,
+      native  : this.options.native,
+      replication: this.options.replication,
+      maxConcurrentQueries: this.options.maxConcurrentQueries
+    }
+
+    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
+
+    this.daoFactoryManager = new DAOFactoryManager(this)
+    this.connectorManager  = new ConnectorManager(this, this.config)
+
+    this.importCache = {}
+  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize.Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Reference to Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize.Utils = Utils
+
+  for (var dataType in DataTypes) {
+    Sequelize[dataType] = DataTypes[dataType]
+  }
+
+  Sequelize.prototype.getQueryInterface = function() {
+    this.queryInterface = this.queryInterface || new QueryInterface(this)
+    return this.queryInterface
+  }
+
+  Sequelize.prototype.getMigrator = function(options, force) {
+    if (force) {
+      this.migrator = new Migrator(this, options)
+    } else {
+      this.migrator = this.migrator || new Migrator(this, options)
+    }
+
+    return this.migrator
+  }
+
+  Sequelize.prototype.define = function(daoName, attributes, options) {
+    options = options || {}
+    var globalOptions = this.options
+
+    if (globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if (globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
+    }
+    options.omitNull = globalOptions.omitNull
+
+    var factory = new DAOFactory(daoName, attributes, options)
+    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
+    return factory
+  }
+
+  Sequelize.prototype.isDefined = function(daoName) {
+    var daos = this.daoFactoryManager.daos
+    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
+  }
+
+  Sequelize.prototype.import = function(path) {
+    if (!this.importCache[path]) {
+      var defineCall = require(path)
+      this.importCache[path] = defineCall(this, DataTypes)
+    }
+
+    return this.importCache[path]
+  }
+
+  Sequelize.prototype.migrate = function(options) {
+    this.getMigrator().migrate(options)
+  }
+
+  Sequelize.prototype.query = function(sql, callee, options) {
+    if (arguments.length === 3) {
+      options = options
+    } else if (arguments.length === 2) {
+      options = {}
+    } else {
+      options = { raw: true }
+    }
+
+    options = Utils._.extend(Utils._.clone(this.options.query), options)
+    options = Utils._.defaults(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
+      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
+    })
+
+    return this.connectorManager.query(sql, callee, options)
+  }
+
+  Sequelize.prototype.sync = function(options) {
+    options = options || {}
+
+    if (this.options.sync) {
+      options = Utils._.extend({}, this.options.sync, options)
+    }
+
+    var chainer = new Utils.QueryChainer()
+
+    this.daoFactoryManager.daos.forEach(function(dao) {
+      chainer.add(dao.sync(options))
+    })
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.drop = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer
+
+      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
+
+      chainer
+        .run()
+        .success(function() { emitter.emit('success', null) })
+        .error(function(err) { emitter.emit('error', err) })
+    }).run()
+  }
+
+  return Sequelize
+})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/utils.js.html b/docs/lib/utils.js.html
new file mode 100644
index 000000000000..ea21c0b3a1b8
--- /dev/null
+++ b/docs/lib/utils.js.html
@@ -0,0 +1,225 @@
+Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var mysql      = require("mysql")
+  , connection = mysql.createConnection({})
+  , util       = require("util")
+  , DataTypes  = require("./data-types")
+
+var Utils = module.exports = {
+  _: (function() {
+    var _  = require("underscore")
+      , _s = require('underscore.string')
+
+    _.mixin(_s.exports())
+    _.mixin({
+      includes: _s.include,
+      camelizeIf: function(string, condition) {
+        var result = string
+
+        if (condition) {
+          result = _.camelize(string)
+        }
+
+        return result
+      },
+      underscoredIf: function(string, condition) {
+        var result = string
+
+        if (condition) {
+          result = _.underscored(string)
+        }
+
+        return result
+      }
+    })
+
+    return _
+  })(),
+  addEventEmitter: function(_class) {
+    util.inherits(_class, require('events').EventEmitter)
+  },
+  TICK_CHAR: '`',
+  addTicks: function(s) {
+    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
+  },
+  removeTicks: function(s) {
+    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
+  },
+  escape: function(s) {
+    return connection.escape(s).replace(/\\"/g, '"')
+  },
+  format: function(arr) {
+    return connection.format.apply(connection, [arr.shift(), arr])
+  },
+  isHash: function(obj) {
+    return Utils._.isObject(obj) && !Array.isArray(obj);
+  },
+  toSqlDate: function(date) {
+    return [
+      [
+        date.getFullYear(),
+        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
+        ((date.getDate() < 10 ? '0' : '') + date.getDate())
+      ].join("-"),
+      date.toLocaleTimeString()
+    ].join(" ")
+  },
+  argsArePrimaryKeys: function(args, primaryKeys) {
+    var result = (args.length == Object.keys(primaryKeys).length)
+    if (result) {
+      Utils._.each(args, function(arg) {
+        if (result) {
+          if (['number', 'string'].indexOf(typeof arg) !== -1) {
+            result = true
+          } else {
+            result = (arg instanceof Date)
+          }
+        }
+      })
+    }
+    return result
+  },
+  combineTableNames: function(tableName1, tableName2) {
+    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
+  },
+
+  singularize: function(s) {
+    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
+  },
+
+  pluralize: function(s) {
+    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
+  },
+
+  removeCommentsFromFunctionString: function(s) {
+    s = s.replace(/\s*(\/\/.*)/g, '')
+    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
+
+    return s
+  },
+
+  toDefaultValue: function(value) {
+    return (value == DataTypes.NOW) ? new Date() : value
+  },
+
+  setAttributes: function(hash, identifier, instance, prefix) {
+    prefix = prefix || ''
+    if (this.isHash(identifier)) {
+      this._.each(identifier, function(elem, key) {
+        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
+      })
+    } else {
+      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
+    }
+
+    return hash
+  },
+
+  removeNullValuesFromHash: function(hash, omitNull) {
+    var result = hash
+
+    if (omitNull) {
+      var _hash = {}
+
+      Utils._.each(hash, function(val, key) {
+        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
+          _hash[key] = val;
+        }
+      })
+
+      result = _hash
+    }
+
+    return result
+  },
+
+  prependTableNameToHash: function(tableName, hash) {
+    if (tableName) {
+      var _hash = {}
+
+      for (var key in hash) {
+        if (key.indexOf('.') === -1) {
+          _hash[tableName + '.' + key] = hash[key]
+        } else {
+          _hash[key] = hash[key]
+        }
+      }
+
+      return _hash
+    } else {
+      return hash
+    }
+  },
+
+  firstValueOfHash: function(obj) {
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key))
+        return obj[key]
+    }
+    return null
+  },
+
+  inherit: function(subClass, superClass) {
+    if (superClass.constructor == Function) {
+      // Normal Inheritance
+      subClass.prototype = new superClass();
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass.prototype;
+    } else {
+      // Pure Virtual Inheritance
+      subClass.prototype = superClass;
+      subClass.prototype.constructor = subClass;
+      subClass.prototype.parent = superClass;
+    }
+
+    return subClass;
+  }
+
+}
+
+Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
+Utils.QueryChainer = require("./query-chainer")
+Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/migration.js.html b/docs/migration.js.html
index 451555136c36..845f8339dd5c 100644
--- a/docs/migration.js.html
+++ b/docs/migration.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var moment         = require("moment")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var moment         = require("moment")
+>>>>>>> parent of db9f87e... removed old docs
   , Utils          = require("./utils")
   , DataTypes      = require("./data-types")
   , QueryInterface = require("./query-interface")
@@ -50,7 +92,11 @@
   Migration.parseFilename = function(s) {
     var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
 
+<<<<<<< HEAD
     if(matches === null) {
+=======
+    if (matches === null) {
+>>>>>>> parent of db9f87e... removed old docs
       throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
     }
 
@@ -96,7 +142,11 @@
       extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
       func.call(null, self, DataTypes)
 
+<<<<<<< HEAD
       if(!Migration.migrationHasInterfaceCalls(func))
+=======
+      if (!Migration.migrationHasInterfaceCalls(func))
+>>>>>>> parent of db9f87e... removed old docs
         onSuccess()
     }).run()
   }
@@ -139,6 +189,7 @@
           // the event will have the same name like the method
           self.queryInterface.on(_method, function(err) {
             self.undoneMethods--
+<<<<<<< HEAD
             if(err)
               throw new Error(err)
             else
@@ -146,12 +197,23 @@
           })
 
           self.queryInterface[_method].apply(self.queryInterface, args)
+=======
+            if (err) {
+              throw new Error(err)
+            } else {
+              (self.undoneMethods == 0) && callback && callback()
+            }
+          })
+
+          return self.queryInterface[_method].apply(self.queryInterface, args)
+>>>>>>> parent of db9f87e... removed old docs
         }
       })(method)
     }
   }
 
   return Migration
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/migrator.js.html b/docs/migrator.js.html
index 788e2cea7654..81605d57ca30 100644
--- a/docs/migrator.js.html
+++ b/docs/migrator.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  const fs     = require("fs")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    const fs     = require("fs")
+>>>>>>> parent of db9f87e... removed old docs
     , path   = require("path")
     , moment = require("moment")
 
@@ -40,12 +82,20 @@
       logging: console.log
     }, options || {})
 
+<<<<<<< HEAD
     if(this.options.logging === true) {
+=======
+    if (this.options.logging === true) {
+>>>>>>> parent of db9f87e... removed old docs
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
 
+<<<<<<< HEAD
     if(this.options.logging == console.log) {
+=======
+    if (this.options.logging == console.log) {
+>>>>>>> parent of db9f87e... removed old docs
       // using just console.log will break in node < 0.6
       this.options.logging = function(s) { console.log(s) }
     }
@@ -66,20 +116,31 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.getUndoneMigrations(function(err, migrations) {
+<<<<<<< HEAD
         if(err) {
+=======
+        if (err) {
+>>>>>>> parent of db9f87e... removed old docs
           emitter.emit('error', err)
         } else {
           var chainer = new Utils.QueryChainer
             , from    = migrations[0]
 
+<<<<<<< HEAD
           if(options.method == 'down') {
             migrations.reverse()
             from = migrations[0]
+=======
+          if (options.method === 'down') {
+            from = migrations[0]
+            migrations.reverse()
+>>>>>>> parent of db9f87e... removed old docs
           }
 
           migrations.forEach(function(migration) {
             chainer.add(migration, 'execute', [options], {
               before: function(migration) {
+<<<<<<< HEAD
                 if(self.options.logging !== false)
                   self.options.logging('Executing migration: ' + migration.filename)
               },
@@ -92,6 +153,23 @@
                   deleteUndoneMigration.call(self, from, migration, callback)
                 else
                   saveSuccessfulMigration.call(self, from, migration, callback)
+=======
+                if (self.options.logging !== false) {
+                  self.options.logging('Executing migration: ' + migration.filename)
+                }
+              },
+              after: function(migration) {
+                if (self.options.logging !== false) {
+                  self.options.logging('Executed migration: ' + migration.filename)
+                }
+              },
+              success: function(migration, callback) {
+                if (options.method === 'down') {
+                  deleteUndoneMigration.call(self, from, migration, callback)
+                } else {
+                  saveSuccessfulMigration.call(self, from, migration, callback)
+                }
+>>>>>>> parent of db9f87e... removed old docs
               }
             })
           })
@@ -117,7 +195,13 @@
       callback && callback(null, result)
     }
 
+<<<<<<< HEAD
     var migrationFiles = fs.readdirSync(this.options.path)
+=======
+    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
+      return /\.js$/.test(file)
+    })
+>>>>>>> parent of db9f87e... removed old docs
 
     var migrations = migrationFiles.map(function(file) {
       return new Migration(self, self.options.path + '/' + file)
@@ -127,6 +211,7 @@
       return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
     })
 
+<<<<<<< HEAD
     if(this.options.from) {
       filterFrom(migrations, this.options.from, function(err, migrations) {
         if(self.options.to)
@@ -148,6 +233,32 @@
             filterTo(migrations, self.options.to, callback)
           else
             callback && callback(null, migrations)
+=======
+    if (this.options.from) {
+      filterFrom(migrations, this.options.from, function(err, migrations) {
+        if (self.options.to) {
+          filterTo(migrations, self.options.to, callback)
+        } else {
+          callback && callback(null, migrations)
+        }
+      })
+    } else {
+      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
+        if (lastMigrationId) {
+          filterFrom(migrations, lastMigrationId, function(err, migrations) {
+            if (self.options.to) {
+              filterTo(migrations, self.options.to, callback)
+            } else {
+              callback && callback(null, migrations)
+            }
+          }, { withoutEqual: true })
+        } else {
+          if (self.options.to) {
+            filterTo(migrations, self.options.to, callback)
+          } else {
+            callback && callback(null, migrations)
+          }
+>>>>>>> parent of db9f87e... removed old docs
         }
       }).error(function(err) {
         callback && callback(err, null)
@@ -162,7 +273,11 @@
       var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
         , SequelizeMeta = storedDAO
 
+<<<<<<< HEAD
       if(!storedDAO) {
+=======
+      if (!storedDAO) {
+>>>>>>> parent of db9f87e... removed old docs
         SequelizeMeta = self.sequelize.define('SequelizeMeta', {
           from: DataTypes.STRING,
           to:   DataTypes.STRING
@@ -172,7 +287,11 @@
       }
 
       // force sync when model has newly created or if syncOptions are passed
+<<<<<<< HEAD
       if(!storedDAO || syncOptions) {
+=======
+      if (!storedDAO || syncOptions) {
+>>>>>>> parent of db9f87e... removed old docs
         SequelizeMeta
           .sync(syncOptions || {})
           .success(function() { emitter.emit('success', SequelizeMeta) })
@@ -242,7 +361,11 @@
 
     self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
       SequelizeMeta
+<<<<<<< HEAD
         .find({ from: from.migrationId, to: to.migrationId })
+=======
+        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
+>>>>>>> parent of db9f87e... removed old docs
         .success(function(meta) {
           meta.destroy().success(callback)
         })
@@ -250,6 +373,7 @@
   }
 
   return Migrator
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/query-chainer.js.html b/docs/query-chainer.js.html
index 25cbcb95a163..c9b3127f9d40 100644
--- a/docs/query-chainer.js.html
+++ b/docs/query-chainer.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require("./utils")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require("./utils")
+>>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var QueryChainer = function(emitters) {
@@ -40,7 +82,11 @@
 
     emitters = emitters || []
     emitters.forEach(function(emitter) {
+<<<<<<< HEAD
       if(Array.isArray(emitter)) {
+=======
+      if (Array.isArray(emitter)) {
+>>>>>>> parent of db9f87e... removed old docs
         self.add.apply(self, emitter)
       } else {
         self.add(emitter)
@@ -49,7 +95,11 @@
   }
 
   QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
+<<<<<<< HEAD
     if(!!method) {
+=======
+    if (!!method) {
+>>>>>>> parent of db9f87e... removed old docs
       this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
     } else {
       observeEmitter.call(this, emitterOrKlass)
@@ -79,7 +129,11 @@
     var exec = function() {
       var serial = self.serials.pop()
 
+<<<<<<< HEAD
       if(serial) {
+=======
+      if (serial) {
+>>>>>>> parent of db9f87e... removed old docs
         serial.options = serial.options || {}
         serial.options.before && serial.options.before(serial.klass)
 
@@ -96,7 +150,11 @@
           exec()
         }
 
+<<<<<<< HEAD
         if(options.skipOnError && (self.fails.length > 0)) {
+=======
+        if (options.skipOnError && (self.fails.length > 0)) {
+>>>>>>> parent of db9f87e... removed old docs
           onError('Skipped due to earlier error!')
         } else {
           var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
@@ -104,7 +162,11 @@
           emitter.success(function(result) {
             self.serialResults[serialCopy.indexOf(serial)] = result
 
+<<<<<<< HEAD
             if(serial.options.success) {
+=======
+            if (serial.options.success) {
+>>>>>>> parent of db9f87e... removed old docs
               serial.options.success(serial.klass, onSuccess)
             } else {
               onSuccess()
@@ -139,7 +201,11 @@
         finish.call(self, 'emitterResults')
       })
       .on('sql', function(sql) {
+<<<<<<< HEAD
         if(self.eventEmitter) {
+=======
+        if (self.eventEmitter) {
+>>>>>>> parent of db9f87e... removed old docs
           self.eventEmitter.emit('sql', sql)
         }
       })
@@ -148,6 +214,7 @@
   var finish = function(resultsName) {
     this.finished = true
 
+<<<<<<< HEAD
     if(this.emitters.length > 0) {
       this.finished = (this.finishedEmits == this.emitters.length)
     } else if(this.serials.length > 0) {
@@ -155,6 +222,16 @@
     }
 
     if(this.finished && this.wasRunning) {
+=======
+    if (this.emitters.length > 0) {
+      this.finished = (this.finishedEmits == this.emitters.length)
+    }
+    else if (this.serials.length > 0) {
+      this.finished = (this.finishedEmits == this.serials.length)
+    }
+
+    if (this.finished && this.wasRunning) {
+>>>>>>> parent of db9f87e... removed old docs
       var status = (this.fails.length == 0 ? 'success' : 'error')
         , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
 
@@ -163,6 +240,7 @@
   }
 
   return QueryChainer
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/query-interface.js.html b/docs/query-interface.js.html
index 76dc08524f3c..f2d630d46c7d 100644
--- a/docs/query-interface.js.html
+++ b/docs/query-interface.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils     = require('./utils')
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils     = require('./utils')
+>>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./data-types')
 
 module.exports = (function() {
   var QueryInterface = function(sequelize) {
     this.sequelize = sequelize
     this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+<<<<<<< HEAD
 	 this.QueryGenerator.options = this.sequelize.options;
+=======
+   this.QueryGenerator.options = this.sequelize.options;
+>>>>>>> parent of db9f87e... removed old docs
   }
   Utils.addEventEmitter(QueryInterface)
 
@@ -37,10 +83,18 @@
     var attributeHashes = {}
 
     Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
+<<<<<<< HEAD
       if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
         attributeHashes[attributeName] = { type: dataTypeOrOptions }
       else
         attributeHashes[attributeName] = dataTypeOrOptions
+=======
+      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+        attributeHashes[attributeName] = { type: dataTypeOrOptions }
+      } else {
+        attributeHashes[attributeName] = dataTypeOrOptions
+      }
+>>>>>>> parent of db9f87e... removed old docs
     })
 
     attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
@@ -122,10 +176,18 @@
   QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
+<<<<<<< HEAD
     if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
     else
       attributes[attributeName] = dataTypeOrOptions
+=======
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+>>>>>>> parent of db9f87e... removed old docs
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
@@ -141,10 +203,18 @@
   QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
+<<<<<<< HEAD
     if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
     else
       attributes[attributeName] = dataTypeOrOptions
+=======
+    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+    } else {
+      attributes[attributeName] = dataTypeOrOptions
+    }
+>>>>>>> parent of db9f87e... removed old docs
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
@@ -157,7 +227,11 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.describeTable(tableName).success(function(data) {
+<<<<<<< HEAD
         data = data.filter(function(h) { return h.Field == attrNameBefore })[0]
+=======
+        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
+>>>>>>> parent of db9f87e... removed old docs
 
         var options =  {}
 
@@ -172,7 +246,11 @@
           self.QueryGenerator.attributesToSQL(options)
         )
 
+<<<<<<< HEAD
         self.sequelize.query(sql).success(function() {
+=======
+        self.sequelize.query(sql, null, {}).success(function() {
+>>>>>>> parent of db9f87e... removed old docs
           self.emit('renameColumn', null)
           emitter.emit('success', null)
         }).error(function(err) {
@@ -220,19 +298,31 @@
 
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
     var sql = this.QueryGenerator.selectQuery(tableName, options)
+<<<<<<< HEAD
+=======
+    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
+>>>>>>> parent of db9f87e... removed old docs
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
   }
 
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
 
+<<<<<<< HEAD
     if(attributeSelector == undefined) {
+=======
+    if (attributeSelector === undefined) {
+>>>>>>> parent of db9f87e... removed old docs
       throw new Error('Please pass an attribute selector!')
     }
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var sql = self.QueryGenerator.selectQuery(tableName, options)
+<<<<<<< HEAD
         , qry = self.sequelize.query(sql, null, { plain: true, raw: true })
+=======
+        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
+>>>>>>> parent of db9f87e... removed old docs
 
       qry
         .success(function(data) {
@@ -261,17 +351,37 @@
     var self = this
 
     options = Utils._.extend({
+<<<<<<< HEAD
       success: function(obj){},
       error: function(err){}
+=======
+      success: function(){},
+      error: function(){}
+>>>>>>> parent of db9f87e... removed old docs
     }, options || {})
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var query = null
 
+<<<<<<< HEAD
       if(Array.isArray(sqlOrQueryParams)) {
         query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
       } else {
         query = self.sequelize.query(sqlOrQueryParams)
+=======
+      if (Array.isArray(sqlOrQueryParams)) {
+        if (sqlOrQueryParams.length === 1) {
+          sqlOrQueryParams.push(null)
+        }
+
+        if (sqlOrQueryParams.length === 2) {
+          sqlOrQueryParams.push({})
+        }
+
+        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
+      } else {
+        query = self.sequelize.query(sqlOrQueryParams, null, {})
+>>>>>>> parent of db9f87e... removed old docs
       }
 
       // append the query for better testing
@@ -288,11 +398,16 @@
       })
       query.on('sql', function(sql) {
         emitter.emit('sql', sql)
+<<<<<<< HEAD
       })
+=======
+      });
+>>>>>>> parent of db9f87e... removed old docs
     }).run()
   }
 
   return QueryInterface
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/sequelize.js.html b/docs/sequelize.js.html
index ccb1a00ef7f1..68ca2d8c6bda 100644
--- a/docs/sequelize.js.html
+++ b/docs/sequelize.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Params:
 
@@ -45,10 +87,21 @@
       query: {},
       sync: {},
       logging: console.log,
+<<<<<<< HEAD
       omitNull: false
     }, options || {})
 
     if(this.options.logging === true) {
+=======
+      omitNull: false,
+      queue: true,
+      native: false,
+      replication: false,
+      pool: {}
+    }, options || {})
+
+    if (this.options.logging === true) {
+>>>>>>> parent of db9f87e... removed old docs
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
@@ -60,7 +113,15 @@
       host    : this.options.host,
       port    : this.options.port,
       pool    : this.options.pool,
+<<<<<<< HEAD
       protocol: this.options.protocol
+=======
+      protocol: this.options.protocol,
+      queue   : this.options.queue,
+      native  : this.options.native,
+      replication: this.options.replication,
+      maxConcurrentQueries: this.options.maxConcurrentQueries
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
@@ -81,7 +142,11 @@
   }
 
   Sequelize.prototype.getMigrator = function(options, force) {
+<<<<<<< HEAD
     if(force) {
+=======
+    if (force) {
+>>>>>>> parent of db9f87e... removed old docs
       this.migrator = new Migrator(this, options)
     } else {
       this.migrator = this.migrator || new Migrator(this, options)
@@ -92,10 +157,25 @@
 
   Sequelize.prototype.define = function(daoName, attributes, options) {
     options = options || {}
+<<<<<<< HEAD
     if(this.options.define) {
       options = Sequelize.Utils.merge(options, this.options.define)
     }
     options.omitNull = this.options.omitNull
+=======
+    var globalOptions = this.options
+
+    if (globalOptions.define) {
+      options = Utils._.extend({}, globalOptions.define, options)
+      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
+        if (globalOptions.define[key]) {
+          options[key] = options[key] || {}
+          Utils._.extend(options[key], globalOptions.define[key])
+        }
+      })
+    }
+    options.omitNull = globalOptions.omitNull
+>>>>>>> parent of db9f87e... removed old docs
 
     var factory = new DAOFactory(daoName, attributes, options)
     this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
@@ -121,9 +201,24 @@
   }
 
   Sequelize.prototype.query = function(sql, callee, options) {
+<<<<<<< HEAD
     options = Utils._.extend(Utils._.clone(this.options.query), options || {})
     options = Utils._.extend(options, {
       logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log
+=======
+    if (arguments.length === 3) {
+      options = options
+    } else if (arguments.length === 2) {
+      options = {}
+    } else {
+      options = { raw: true }
+    }
+
+    options = Utils._.extend(Utils._.clone(this.options.query), options)
+    options = Utils._.defaults(options, {
+      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
+      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
+>>>>>>> parent of db9f87e... removed old docs
     })
 
     return this.connectorManager.query(sql, callee, options)
@@ -132,8 +227,13 @@
   Sequelize.prototype.sync = function(options) {
     options = options || {}
 
+<<<<<<< HEAD
     if(this.options.sync) {
       options = Sequelize.Utils.merge(options, this.options.sync)
+=======
+    if (this.options.sync) {
+      options = Utils._.extend({}, this.options.sync, options)
+>>>>>>> parent of db9f87e... removed old docs
     }
 
     var chainer = new Utils.QueryChainer()
@@ -161,6 +261,7 @@
   }
 
   return Sequelize
+<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+>>>>>>> parent of db9f87e... removed old docs
diff --git a/docs/utils.js.html b/docs/utils.js.html
index 4625d2238245..6e83b9a6b3b4 100644
--- a/docs/utils.js.html
+++ b/docs/utils.js.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var mysql      = require("mysql")
+=======
+}
+#folder-structure > ul > li ul:not(.active) {
+  display: none
+}
+#folder-structure > ul li a:hover {
+  background: #eee;
+}
+#folder-structure > ul ul.active {
+  border-left: 4px solid #eee;
+  padding-left: 10px;
+}
+#folder-structure li.active {
+  font-weight: bold;
+  background: #FAFAFA;
+}
+
+#folder-structure > ul > li a {
+  display: block;
+}
+
+#folder-structure h6 {
+  background: #eee;
+  padding: 10px;
+  cursor: pointer;
+  margin: 10px 0 0 0;
+}
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var mysql      = require("mysql")
+>>>>>>> parent of db9f87e... removed old docs
   , connection = mysql.createConnection({})
   , util       = require("util")
   , DataTypes  = require("./data-types")
@@ -38,7 +80,11 @@
       camelizeIf: function(string, condition) {
         var result = string
 
+<<<<<<< HEAD
         if(condition) {
+=======
+        if (condition) {
+>>>>>>> parent of db9f87e... removed old docs
           result = _.camelize(string)
         }
 
@@ -47,7 +93,11 @@
       underscoredIf: function(string, condition) {
         var result = string
 
+<<<<<<< HEAD
         if(condition) {
+=======
+        if (condition) {
+>>>>>>> parent of db9f87e... removed old docs
           result = _.underscored(string)
         }
 
@@ -65,12 +115,17 @@
     return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
   },
   removeTicks: function(s) {
+<<<<<<< HEAD
     return s.replace("`", "")
+=======
+    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
+>>>>>>> parent of db9f87e... removed old docs
   },
   escape: function(s) {
     return connection.escape(s).replace(/\\"/g, '"')
   },
   format: function(arr) {
+<<<<<<< HEAD
     var query        = arr[0]
       , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
 
@@ -78,6 +133,12 @@
   },
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Utils._.isArray(obj);
+=======
+    return connection.format.apply(connection, [arr.shift(), arr])
+  },
+  isHash: function(obj) {
+    return Utils._.isObject(obj) && !Array.isArray(obj);
+>>>>>>> parent of db9f87e... removed old docs
   },
   toSqlDate: function(date) {
     return [
@@ -90,6 +151,7 @@
     ].join(" ")
   },
   argsArePrimaryKeys: function(args, primaryKeys) {
+<<<<<<< HEAD
     var result = (args.length == Utils._.keys(primaryKeys).length)
     Utils._.each(args, function(arg) {
       if(result) {
@@ -100,6 +162,20 @@
 
       }
     })
+=======
+    var result = (args.length == Object.keys(primaryKeys).length)
+    if (result) {
+      Utils._.each(args, function(arg) {
+        if (result) {
+          if (['number', 'string'].indexOf(typeof arg) !== -1) {
+            result = true
+          } else {
+            result = (arg instanceof Date)
+          }
+        }
+      })
+    }
+>>>>>>> parent of db9f87e... removed old docs
     return result
   },
   combineTableNames: function(tableName1, tableName2) {
@@ -114,6 +190,7 @@
     return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
   },
 
+<<<<<<< HEAD
   merge: function(a, b){
     for(var key in b) {
       a[key] = b[key]
@@ -121,6 +198,8 @@
     return a
   },
 
+=======
+>>>>>>> parent of db9f87e... removed old docs
   removeCommentsFromFunctionString: function(s) {
     s = s.replace(/\s*(\/\/.*)/g, '')
     s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
@@ -148,7 +227,11 @@
   removeNullValuesFromHash: function(hash, omitNull) {
     var result = hash
 
+<<<<<<< HEAD
     if(omitNull) {
+=======
+    if (omitNull) {
+>>>>>>> parent of db9f87e... removed old docs
       var _hash = {}
 
       Utils._.each(hash, function(val, key) {
@@ -181,6 +264,17 @@
     }
   },
 
+<<<<<<< HEAD
+=======
+  firstValueOfHash: function(obj) {
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key))
+        return obj[key]
+    }
+    return null
+  },
+
+>>>>>>> parent of db9f87e... removed old docs
   inherit: function(subClass, superClass) {
     if (superClass.constructor == Function) {
       // Normal Inheritance
@@ -196,10 +290,15 @@
 
     return subClass;
   }
+<<<<<<< HEAD
+=======
+
+>>>>>>> parent of db9f87e... removed old docs
 }
 
 Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
 Utils.QueryChainer = require("./query-chainer")
+<<<<<<< HEAD
 Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+>>>>>>> parent of db9f87e... removed old docs

From befd42f2c14fb24bd968a3f9a33b6af59e35dfeb Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:24:35 +0100
Subject: [PATCH 133/360] old docs are back

---
 docs/associations/belongs-to.js.html          |  92 +----
 .../has-many-double-linked.js.html            | 114 +-----
 .../has-many-single-linked.js.html            |  92 +----
 docs/associations/has-many.js.html            | 108 +-----
 docs/associations/has-one.js.html             |  99 +----
 docs/associations/mixin.js.html               | 111 +-----
 docs/dao-factory-manager.js.html              |  58 +--
 docs/dao-factory.js.html                      | 248 +------------
 docs/dao.js.html                              | 106 +-----
 docs/data-types.js.html                       |  64 +---
 docs/dialects/abstract/query.js.html          | 258 +-------------
 docs/dialects/connector-manager.js.html       |  58 +--
 docs/dialects/mysql/connector-manager.js.html | 272 +-------------
 docs/dialects/mysql/query-generator.js.html   | 236 +-----------
 docs/dialects/mysql/query.js.html             |  85 +----
 .../postgres/connector-manager.js.html        | 108 +-----
 .../dialects/postgres/query-generator.js.html | 337 +-----------------
 docs/dialects/postgres/query.js.html          | 135 +------
 docs/dialects/query-generator.js.html         |  58 +--
 .../dialects/sqlite/connector-manager.js.html |  58 +--
 docs/dialects/sqlite/query-generator.js.html  | 161 +--------
 docs/dialects/sqlite/query.js.html            | 123 +------
 docs/emitters/custom-event-emitter.js.html    |  58 +--
 docs/migration.js.html                        |  77 +---
 docs/migrator.js.html                         | 139 +-------
 docs/query-chainer.js.html                    |  93 +----
 docs/query-interface.js.html                  | 130 +------
 docs/sequelize.js.html                        | 116 +-----
 docs/utils.js.html                            | 114 +-----
 29 files changed, 29 insertions(+), 3679 deletions(-)

diff --git a/docs/associations/belongs-to.js.html b/docs/associations/belongs-to.js.html
index 772c008321c1..c30aa52eefec 100644
--- a/docs/associations/belongs-to.js.html
+++ b/docs/associations/belongs-to.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils     = require("./../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./../utils")
->>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -75,11 +33,7 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
-<<<<<<< HEAD
     if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-=======
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
->>>>>>> parent of db9f87e... removed old docs
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
     }
 
@@ -94,15 +48,7 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-<<<<<<< HEAD
     Utils._.extend(this.source.rawAttributes, newAttributes)
-=======
-    Utils._.defaults(this.source.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
->>>>>>> parent of db9f87e... removed old docs
     return this
   }
 
@@ -110,24 +56,9 @@
     var self     = this
       , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
-<<<<<<< HEAD
     obj[accessor] = function() {
       var id = obj[self.identifier]
       return self.target.find(id)
-=======
-    obj[accessor] = function(params) {
-      var id = this[self.identifier]
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: {id:id}}, params)
-        }
-      } else {
-        params = id
-      }
-
-      return self.target.find(params)
->>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
@@ -138,24 +69,16 @@
       , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
 
     obj[accessor] = function(associatedObject) {
-<<<<<<< HEAD
       obj[self.identifier] = associatedObject ? associatedObject.id : null
 
       // passes the changed field to save, so only that field get updated.
       return obj.save([ self.identifier ])
-=======
-      this[self.identifier] = associatedObject ? associatedObject.id : null
-
-      // passes the changed field to save, so only that field get updated.
-      return this.save([ self.identifier ])
->>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
   }
 
   return BelongsTo
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/associations/has-many-double-linked.js.html b/docs/associations/has-many-double-linked.js.html
index 1ad7037fa50a..7e0c03241b5e 100644
--- a/docs/associations/has-many-double-linked.js.html
+++ b/docs/associations/has-many-double-linked.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require('./../utils')
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils = require('./../utils')
->>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var HasManyDoubleLinked = function(definition, instance) {
@@ -81,11 +39,7 @@
       //fully qualify
       where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
 
-<<<<<<< HEAD
       var primaryKeys = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
-=======
-      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
->>>>>>> parent of db9f87e... removed old docs
         , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
 
       where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
@@ -96,11 +50,7 @@
           options.where[self.__factory.target.tableName+"."+index] = value;
         });
 
-<<<<<<< HEAD
         options.where = options.where ? Utils.merge(options.where, where) : where
-=======
-        Utils._.extend(options.where, where)
->>>>>>> parent of db9f87e... removed old docs
       } else {
         options.where = where;
       }
@@ -125,15 +75,7 @@
         var chainer             = new Utils.QueryChainer
           , association         = self.__factory.target.associations[self.__factory.associationAccessor]
           , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
-<<<<<<< HEAD
           , unassociatedObjects = newAssociations.filter(function(obj) { return !obj.equalsOneOf(oldAssociations) })
-=======
-          , unassociatedObjects = newAssociations.filter(function (obj) { 
-              return !Utils._.find(oldAssociations, function (old) {
-                return obj.id === old.id
-              }) 
-            })
->>>>>>> parent of db9f87e... removed old docs
 
         unassociatedObjects.forEach(function(unassociatedObject) {
           var attributes = {}
@@ -151,23 +93,6 @@
       })
   }
 
-<<<<<<< HEAD
-=======
-  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    var attributes = {}
-      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
-
-    attributes[this.__factory.identifier] = this.instance.id
-    attributes[foreignIdentifier] = newAssociation.id
-
-    this.__factory.connectorDAO.create(attributes)
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
->>>>>>> parent of db9f87e... removed old docs
   // private
 
   var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
@@ -176,30 +101,15 @@
     return new Utils.CustomEventEmitter(function(emitter) {
       var chainer = new Utils.QueryChainer()
       var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
-<<<<<<< HEAD
       var obsoleteAssociations = oldAssociations.filter(function(obj) { return !obj.equalsOneOf(newAssociations) })
 
       if(obsoleteAssociations.length === 0) {
-=======
-      var obsoleteAssociations = oldAssociations.filter(function (old) {
-        // Return only those old associations that are not found in new
-        return !Utils._.find(newAssociations, function (obj) {
-          return obj.id === old.id
-        })
-      })
-
-      if (obsoleteAssociations.length === 0) {
->>>>>>> parent of db9f87e... removed old docs
         return emitter.emit('success', null)
       }
 
       obsoleteAssociations.forEach(function(associatedObject) {
         var where            = {}
-<<<<<<< HEAD
           , primaryKeys      = Utils._.keys(self.__factory.connectorDAO.rawAttributes)
-=======
-          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
->>>>>>> parent of db9f87e... removed old docs
           , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
           , notFoundEmitters = []
 
@@ -209,21 +119,13 @@
         self.__factory.connectorDAO
           .find({ where: where })
           .success(function(connector) {
-<<<<<<< HEAD
             if(connector === null) {
-=======
-            if (connector === null) {
->>>>>>> parent of db9f87e... removed old docs
               notFoundEmitters.push(null)
             } else {
               chainer.add(connector.destroy())
             }
 
-<<<<<<< HEAD
             if((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
-=======
-            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
->>>>>>> parent of db9f87e... removed old docs
               // found all obsolete connectors and will delete them now
               chainer
                 .run()
@@ -239,7 +141,6 @@
   }
 
   return HasManyDoubleLinked
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/associations/has-many-single-linked.js.html b/docs/associations/has-many-single-linked.js.html
index 129d6d71322a..c8cf86b9f97e 100644
--- a/docs/associations/has-many-single-linked.js.html
+++ b/docs/associations/has-many-single-linked.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils = require('./../utils')
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require('./../utils')
->>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var HasManySingleLinked = function(definition, instance) {
@@ -77,11 +35,7 @@
 
     where[this.__factory.identifier] = this.instance.id
 
-<<<<<<< HEAD
     options.where = options.where ? Utils.merge(options.where, where) : where
-=======
-    options.where = options.where ? Utils._.extend(options.where, where) : where
->>>>>>> parent of db9f87e... removed old docs
     return this.__factory.target.findAll(options)
   }
 
@@ -89,35 +43,15 @@
     var self    = this
       , options = this.__factory.options
       , chainer = new Utils.QueryChainer()
-<<<<<<< HEAD
 
     // clear the old associations
     oldAssociations.forEach(function(associatedObject) {
-=======
-      , obsoleteAssociations = oldAssociations.filter(function (old) { 
-          return !Utils._.find(newAssociations, function (obj) {
-            return obj.id === old.id
-          }) 
-        })
-      , unassociatedObjects = newAssociations.filter(function (obj) { 
-          return !Utils._.find(oldAssociations, function (old) {
-            return obj.id === old.id
-          }) 
-        })
-
-    // clear the old associations
-    obsoleteAssociations.forEach(function(associatedObject) {
->>>>>>> parent of db9f87e... removed old docs
       associatedObject[self.__factory.identifier] = null
       chainer.add(associatedObject.save())
     })
 
     // set the new associations
-<<<<<<< HEAD
     newAssociations.forEach(function(associatedObject) {
-=======
-    unassociatedObjects.forEach(function(associatedObject) {
->>>>>>> parent of db9f87e... removed old docs
       associatedObject[self.__factory.identifier] = self.instance.id
       chainer.add(associatedObject.save())
     })
@@ -128,7 +62,6 @@
       .error(function(err) { emitter.emit('error', err) })
   }
 
-<<<<<<< HEAD
   return HasManySingleLinked
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/associations/has-many.js.html b/docs/associations/has-many.js.html
index 0f1b2389321f..cfc43bd7b913 100644
--- a/docs/associations/has-many.js.html
+++ b/docs/associations/has-many.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("./../utils")
->>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 var HasManySingleLinked = require("./has-many-single-linked")
@@ -72,10 +30,6 @@
 
 module.exports = (function() {
   var HasMany = function(srcDAO, targetDAO, options) {
-<<<<<<< HEAD
-=======
-    this.associationType = 'HasMany'
->>>>>>> parent of db9f87e... removed old docs
     this.source = srcDAO
     this.target = targetDAO
     this.options = options
@@ -110,11 +64,7 @@
     // or is the association on the model itself?
     if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
       // remove the obsolete association identifier from the source
-<<<<<<< HEAD
       if(this.isSelfAssociation) {
-=======
-      if (this.isSelfAssociation) {
->>>>>>> parent of db9f87e... removed old docs
         this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
       } else {
         this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
@@ -127,38 +77,19 @@
       combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
-<<<<<<< HEAD
       if(!this.isSelfAssociation) {
         this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
       }
 
       if(this.options.syncOnAssociation) {
-=======
-
-      if (!this.isSelfAssociation) {
-        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
-      }
-
-      if (this.options.syncOnAssociation) {
->>>>>>> parent of db9f87e... removed old docs
         this.connectorDAO.sync()
       }
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-<<<<<<< HEAD
       Utils._.extend(this.target.rawAttributes, newAttributes)
     }
 
-=======
-      Utils._.defaults(this.target.rawAttributes, newAttributes)
-    }
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
->>>>>>> parent of db9f87e... removed old docs
     return this
   }
 
@@ -214,11 +145,7 @@
     var self = this
 
     obj[this.accessors.set] = function(newAssociatedObjects) {
-<<<<<<< HEAD
       if(newAssociatedObjects === null) {
-=======
-      if (newAssociatedObjects === null) {
->>>>>>> parent of db9f87e... removed old docs
         newAssociatedObjects = []
       }
 
@@ -242,7 +169,6 @@
 
     obj[this.accessors.add] = function(newAssociatedObject) {
       var instance = this
-<<<<<<< HEAD
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
         instance[self.accessors.get]()
           .error(function(err){ customEventEmitter.emit('error', err)})
@@ -256,20 +182,6 @@
           })
       })
       return customEventEmitter.run()
-=======
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
-          .error(function(err){ emitter.emit('error', err)})
-          .success(function(currentAssociatedObjects) {
-            if (currentAssociatedObjects.length === 0) {
-              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
-            } else {
-              emitter.emit('success', newAssociatedObject);
-            }
-          })
-      }).run()
->>>>>>> parent of db9f87e... removed old docs
     }
 
     obj[this.accessors.remove] = function(oldAssociatedObject) {
@@ -279,11 +191,7 @@
           var newAssociations = []
 
           currentAssociatedObjects.forEach(function(association) {
-<<<<<<< HEAD
             if(!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
-=======
-            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
->>>>>>> parent of db9f87e... removed old docs
               newAssociations.push(association)
           })
 
@@ -299,7 +207,6 @@
   }
 
   return HasMany
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/associations/has-one.js.html b/docs/associations/has-one.js.html
index 88c00e5722e2..ae62c0c64278 100644
--- a/docs/associations/has-one.js.html
+++ b/docs/associations/has-one.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils     = require("./../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./../utils")
->>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./../data-types')
 
 module.exports = (function() {
@@ -75,11 +33,7 @@
     this.options           = options
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
-<<<<<<< HEAD
     if(this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-=======
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
->>>>>>> parent of db9f87e... removed old docs
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
     }
 
@@ -99,14 +53,7 @@
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-<<<<<<< HEAD
     Utils._.extend(this.target.rawAttributes, newAttributes)
-=======
-    Utils._.defaults(this.target.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
->>>>>>> parent of db9f87e... removed old docs
 
     return this
   }
@@ -114,30 +61,12 @@
   HasOne.prototype.injectGetter = function(obj) {
     var self = this
 
-<<<<<<< HEAD
     obj[this.accessors.get] = function() {
       var id    = obj.id
         , where = {}
 
       where[self.identifier] = id
       return self.target.find({where: where})
-=======
-    obj[this.accessors.get] = function(params) {
-      var id    = this.id
-        , where = {}
-
-      where[self.identifier] = id
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: where}, params)
-        }
-      } else {
-        params = {where: where}
-      }
-
-      return self.target.find(params)
->>>>>>> parent of db9f87e... removed old docs
     }
 
     return this
@@ -148,27 +77,15 @@
       , options = self.options || {}
 
     obj[this.accessors.set] = function(associatedObject) {
-<<<<<<< HEAD
       return new Utils.CustomEventEmitter(function(emitter) {
         obj[self.accessors.get]().success(function(oldObj) {
           if(oldObj) {
-=======
-      var instance = this;
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]().success(function(oldObj) {
-          if (oldObj) {
->>>>>>> parent of db9f87e... removed old docs
             oldObj[self.identifier] = null
             oldObj.save()
           }
 
-<<<<<<< HEAD
           if(associatedObject) {
             associatedObject[self.identifier] = obj.id
-=======
-          if (associatedObject) {
-            associatedObject[self.identifier] = instance.id
->>>>>>> parent of db9f87e... removed old docs
             associatedObject
               .save()
               .success(function() { emitter.emit('success', associatedObject) })
@@ -185,7 +102,6 @@
   }
 
   return HasOne
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/associations/mixin.js.html b/docs/associations/mixin.js.html
index bbb42af3116d..ed4a931aba33 100644
--- a/docs/associations/mixin.js.html
+++ b/docs/associations/mixin.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Mixin = module.exports = function(){}
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Mixin = module.exports = function(){}
->>>>>>> parent of db9f87e... removed old docs
 
 Mixin.hasOne = function(associatedDAO, options) {
   // the id is in the foreign table
   var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
-<<<<<<< HEAD
-=======
-
-  association.injectGetter(this.DAO.prototype);
-  association.injectSetter(this.DAO.prototype);
-
->>>>>>> parent of db9f87e... removed old docs
   return this
 }
 
 Mixin.belongsTo = function(associatedDAO, options) {
   // the id is in this table
-<<<<<<< HEAD
   var association = new BelongsTo(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
-=======
-  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
->>>>>>> parent of db9f87e... removed old docs
   return this
 }
 
@@ -100,7 +42,6 @@
   // the id is in the foreign table or in a connecting table
   var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
   this.associations[association.associationAccessor] = association.injectAttributes()
-<<<<<<< HEAD
   return this
 }
 
@@ -112,31 +53,10 @@
 
     if (!result && (association.target === target)) {
       result = association
-=======
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.getAssociation = function(target) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-console.log(target.name, association.target.name)
-      if (!result && (association.target === target)) {
-        result = association
-      }
->>>>>>> parent of db9f87e... removed old docs
     }
   }
 
   return result
-<<<<<<< HEAD
 }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        example for instance methods:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            console.log('asd')
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dao-factory-manager.js.html b/docs/dao-factory-manager.js.html
index 0c2f049929f4..1c8bb2cedf87 100644
--- a/docs/dao-factory-manager.js.html
+++ b/docs/dao-factory-manager.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports = (function() {
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              module.exports = (function() {
->>>>>>> parent of db9f87e... removed old docs
   var DAOFactoryManager = function(sequelize) {
     this.daos = []
     this.sequelize = sequelize
@@ -98,7 +56,6 @@
   })
 
   return DAOFactoryManager
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dao-factory.js.html b/docs/dao-factory.js.html
index ebdeedf3ec29..d00c3550494f 100644
--- a/docs/dao-factory.js.html
+++ b/docs/dao-factory.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ptions.include =
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                includes.map(function(include) {
-        console.log(include instanceof DAOFactory)
-      })
-
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
-
-        if (!options.include[daoName]) {
-          options.include[daoName] = this.getAssociationByAlias(daoName).target
-        }
-      }.bind(this))
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      type:    'SELECT',
-      hasJoin: hasJoin
-    })
->>>>>>> parent of db9f87e... removed old docs
   }
 
   //right now, the caller (has-many-double-linked) is in charge of the where clause
@@ -183,7 +122,6 @@
     var optcpy = Utils._.clone(options)
     optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
 
-<<<<<<< HEAD
     return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy)
   }
 
@@ -191,24 +129,11 @@
     // no options defined?
     // return an emitter which emits null
     if([null, undefined].indexOf(options) > -1) {
-=======
-    // whereCollection is used for non-primary key updates
-    this.options.whereCollection = optcpy.where || null;
-
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                find
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAOFactory.prototype.find()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Search for an instance.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @param:  {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @: 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @return:  {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAOFactory.prototype.find = function(options) {
-    var hasJoin = false
-
-    // no options defined?
-    // return an emitter which emits null
-    if ([null, undefined].indexOf(options) !== -1) {
->>>>>>> parent of db9f87e... removed old docs
       return new Utils.CustomEventEmitter(function(emitter) {
         setTimeout(function() { emitter.emit('success', null) }, 10)
       }).run()
     }
 
-<<<<<<< HEAD
     // options is not a hash but an id
     if(typeof options === 'number') {
       options = { where: options }
@@ -230,87 +155,11 @@
       includes.forEach(function(daoName) {
         options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
       }.bind(this))
-=======
-    var primaryKeys = this.primaryKeys
-
-    // options is not a hash but an id
-    if (typeof options === 'number') {
-      options = { where: options }
-    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-      var where = {}
-        , self  = this
-        , keys = Object.keys(primaryKeys)
-
-      Utils._.each(arguments, function(arg, i) {
-        var key = keys[i]
-        where[key] = arg
-      })
-
-      options = { where: where }
-    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
-      var parsedId = parseInt(options, 10)
-
-      if (!Utils._.isFinite(parsedId)) {
-        throw new Error('Invalid argument to find(). Must be an id or an options object.')
-      }
-
-      options = { where: parsedId }
-    } else if (typeof options === 'object') {
-      var includes = null
-
-      options = Utils._.clone(options)
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          if (include instanceof DAOFactory) {
-            include = { daoFactory: include, as: include.tableName }
-          }
-
-          if (typeof include === 'object') {
-            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
-              var usesAlias = include.as !== include.tableName
-
-              // check if the current daoFactory is actually associated with the passed daoFactory
-              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
-                return include
-              } else {
-                var msg = include.daoFactory.name
-
-                if (usesAlias) {
-                  msg += " (" + include.as + ")"
-                }
-
-                msg += " is not associated to " + this.name + "!"
-
-                throw new Error(msg)
-              }
-            } else {
-              throw new Error('Include malformed. Expected attributes: daoFactory, as')
-            }
-          } else {
-            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
-          }
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
->>>>>>> parent of db9f87e... removed old docs
     }
 
     options.limit = 1
 
-<<<<<<< HEAD
     return this.QueryInterface.select(this, this.tableName, options, { plain: true })
-=======
-    return this.QueryInterface.select(this, this.tableName, options, {
-      plain: true,
-      type: 'SELECT',
-      hasJoin: hasJoin
-    })
->>>>>>> parent of db9f87e... removed old docs
   }
 
   DAOFactory.prototype.count = function(options) {
@@ -337,7 +186,6 @@
   }
 
   DAOFactory.prototype.build = function(values, options) {
-<<<<<<< HEAD
     var instance = new DAO(values, Utils._.extend(this.options, this.attributes, { hasPrimaryKeys: this.hasPrimaryKeys }))
       , self     = this
 
@@ -375,14 +223,6 @@
     })
 
     instance.isNewRecord = options.hasOwnProperty('isNewRecord') ? options.isNewRecord : true
-=======
-    options = options || {isNewRecord: true}
-
-    var self     = this
-      , instance = new this.DAO(values, this.options, options.isNewRecord)
-
-    instance.isNewRecord = options.isNewRecord
->>>>>>> parent of db9f87e... removed old docs
 
     return instance
   }
@@ -391,7 +231,6 @@
     return this.build(values).save(fields)
   }
 
-<<<<<<< HEAD
   DAOFactory.prototype.__defineGetter__('primaryKeys', function() {
     var result = {}
     Utils._.each(this.attributes, function(dataTypeString, attributeName) {
@@ -401,62 +240,16 @@
 
     return result
   })
-=======
-  DAOFactory.prototype.findOrCreate = function (params, defaults) {
-    var self = this;
-
-    return new Utils.CustomEventEmitter(function (emitter) {
-      self.find({
-        where: params
-      }).success(function (instance) {
-        if (instance === null) {
-          for (var attrname in defaults) {
-            params[attrname] = defaults[attrname];
-          }
-
-          self.create(params)
-	    .success(function (instance) {
-              emitter.emit('success', instance)
-            })
-	    .error( function (error) {
-              emitter.emit('error', error)
-            });
-        } else {
-          emitter.emit('success', instance)
-        }
-      }).error(function (error) {
-        emitter.emit('error', error)
-      });
-    }).run()
-  }
->>>>>>> parent of db9f87e... removed old docs
 
   // private
 
   var query = function() {
-<<<<<<< HEAD
     var args = Utils._.map(arguments, function(arg, _) { return arg })
       , s    = this.daoFactoryManager.sequelize
 
     // add this as the second argument
     if(arguments.length == 1) args.push(this)
     return s.query.apply(s, args)
-=======
-    var args      = Utils._.map(arguments, function(arg, _) { return arg })
-      , sequelize = this.daoFactoryManager.sequelize
-
-    // add this as the second argument
-    if (arguments.length === 1) {
-      args.push(this)
-    }
-
-    // add {} as options
-    if (args.length === 2) {
-      args.push({})
-    }
-
-    return sequelize.query.apply(sequelize, args)
->>>>>>> parent of db9f87e... removed old docs
   }
 
   var addOptionalClassMethods = function() {
@@ -475,7 +268,6 @@
         }
       }
 
-<<<<<<< HEAD
     if(this.hasPrimaryKeys) defaultAttributes = {}
 
     if(this.options.timestamps) {
@@ -483,17 +275,6 @@
       defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
 
       if(this.options.paranoid)
-=======
-    if (this.hasPrimaryKeys) {
-      defaultAttributes = {}
-    }
-
-    if (this.options.timestamps) {
-      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-
-      if (this.options.paranoid)
->>>>>>> parent of db9f87e... removed old docs
         defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
     }
 
@@ -503,36 +284,22 @@
   }
 
   var findAutoIncrementField = function() {
-<<<<<<< HEAD
     var self   = this
       , fields = this.QueryGenerator.findAutoIncrementField(this)
-=======
-    var fields = this.QueryGenerator.findAutoIncrementField(this)
->>>>>>> parent of db9f87e... removed old docs
 
     this.autoIncrementField = null
 
     fields.forEach(function(field) {
-<<<<<<< HEAD
       if(self.autoIncrementField)
         throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
       else
         self.autoIncrementField = field
     })
-=======
-      if (this.autoIncrementField) {
-        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      } else {
-        this.autoIncrementField = field
-      }
-    }.bind(this))
->>>>>>> parent of db9f87e... removed old docs
   }
 
   Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
 
   return DAOFactory
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dao.js.html b/docs/dao.js.html
index b9f38a8260ad..8f250b63ece6 100644
--- a/docs/dao.js.html
+++ b/docs/dao.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAO.prototype.validate = function() {
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                DAO.prototype.validate = function() {
->>>>>>> parent of db9f87e... removed old docs
     var self = this
     var failures = {}
 
@@ -89,13 +47,8 @@
           // is it a validator module function?
           else {
             // extra args
-<<<<<<< HEAD
             fn_args = details.hasOwnProperty("args") ? details.args : []
             if (!Utils._.isArray(fn_args))
-=======
-            fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Array.isArray(fn_args))
->>>>>>> parent of db9f87e... removed old docs
               fn_args = [fn_args]
             // error msg
             fn_msg = details.hasOwnProperty("msg") ? details.msg : false
@@ -130,25 +83,15 @@
   }
 
 
-<<<<<<< HEAD
   DAO.prototype.updateAttributes = function(updates) {
     this.setAttributes(updates)
     return this.save()
-=======
-  DAO.prototype.updateAttributes = function(updates, fields) {
-    this.setAttributes(updates)
-    return this.save(fields)
->>>>>>> parent of db9f87e... removed old docs
   }
 
   DAO.prototype.setAttributes = function(updates) {
     var self = this
 
-<<<<<<< HEAD
     var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys)
-=======
-    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
->>>>>>> parent of db9f87e... removed old docs
 
     readOnlyAttributes.push('id')
     readOnlyAttributes.push('createdAt')
@@ -166,11 +109,7 @@
   }
 
   DAO.prototype.destroy = function() {
-<<<<<<< HEAD
     if(this.__options.timestamps && this.__options.paranoid) {
-=======
-    if (this.__options.timestamps && this.__options.paranoid) {
->>>>>>> parent of db9f87e... removed old docs
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
       this[attr] = new Date()
       return this.save()
@@ -202,10 +141,7 @@
 
   DAO.prototype.addAttribute = function(attribute, value) {
     this[attribute] = value
-<<<<<<< HEAD
     this.attributes.push(attribute)
-=======
->>>>>>> parent of db9f87e... removed old docs
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -218,11 +154,7 @@
 
   // private
 
-<<<<<<< HEAD
   var initAttributes = function(values) {
-=======
-  var initAttributes = function(values, isNewRecord) {
->>>>>>> parent of db9f87e... removed old docs
     // add all passed values to the dao and store the attribute names in this.attributes
     for (var key in values) {
       if (values.hasOwnProperty(key)) {
@@ -232,7 +164,6 @@
 
     // set id to null if not passed as value
     // a newly created dao has no id
-<<<<<<< HEAD
     var defaults = this.__options.hasPrimaryKeys ? {} : { id: null }
 
     if(this.__options.timestamps) {
@@ -240,20 +171,10 @@
       defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
 
       if(this.__options.paranoid) {
-=======
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
-
-    if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
-
-      if (this.__options.paranoid) {
->>>>>>> parent of db9f87e... removed old docs
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
     }
 
-<<<<<<< HEAD
     for (var attr in defaults) {
       var value = defaults[attr]
 
@@ -370,29 +291,4 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
-=======
-    if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        var value = defaults[attr]
-
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
-        }
-      }
-    }
-  }
-
-  return DAO
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/data-types.js.html b/docs/data-types.js.html
index ec11b5515c51..431695e88487 100644
--- a/docs/data-types.js.html
+++ b/docs/data-types.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  module.exports = {
-  STRING: 'VARCHAR(255)',
-  TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
-  DATE: 'DATETIME',
-  BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
-  NOW: 'NOW',
-  ENUM: 'ENUM'
-}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/abstract/query.js.html b/docs/dialects/abstract/query.js.html
index 1dfc7f235af9..13d6c3a60671 100644
--- a/docs/dialects/abstract/query.js.html
+++ b/docs/dialects/abstract/query.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
->>>>>>> parent of db9f87e... removed old docs
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Examples
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      query.run('SELECT 1')
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.run = function(sql) {
     throw new Error("The run method wasn't overwritten!")
-<<<<<<< HEAD
-=======
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      checkLoggingOption
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.checkLoggingOption()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Check the logging option of the instance and print deprecation warnings.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @return:  {void} 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.checkLoggingOption = function() {
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging === console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
->>>>>>> parent of db9f87e... removed old docs
   }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      formatResults
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      High level function that handles the results of a query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
-<<<<<<< HEAD
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           UserWithNames: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             name: 'barfooz',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           Tasks: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             title: 'task',
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             id: 1,
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             createdAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             updatedAt: Sat Oct 06 2012 14:46:36 GMT+0200 (CEST),
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             UserWithNameId: 1
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.formatResults = function(data) {
-=======
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           id: 1,              // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           attr2: 'snafu',     // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           Tasks.id: 1,        // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.formatResults = function(data) {
->>>>>>> parent of db9f87e... removed old docs
     var result  = this.callee
 
     if (isInsertQuery.call(this, data)) {
@@ -105,11 +46,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
       result = handleShowTableQuery.call(this, data)
     } else if (isShowOrDescribeQuery.call(this)) {
       result = data
-<<<<<<< HEAD
-=======
-    } else if (isCallQuery.call(this)) {
-      result = data[0]
->>>>>>> parent of db9f87e... removed old docs
     }
 
     return result
@@ -138,7 +74,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
   function(fct) {
     this.on('error', fct)
     return this
-<<<<<<< HEAD
   }
 
   var queryResultHasJoin = function(results) {
@@ -155,73 +90,10 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
     result = result && (this.sql.indexOf('INSERT INTO') === 0)
     result = result && results.hasOwnProperty('insertId')
-=======
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      send
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      This function is a wrapper for private methods.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {String} fctName The name of the private method.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send = function(fctName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      arg1, arg2, arg3, ...
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        {
-    var args = Array.prototype.slice.call(arguments).slice(1)
-    return eval(fctName).apply(this, args)
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        getInsertIdField
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Get the attributes of an insert query, which contains the just inserted id.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @return:  {String} The field name.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField = function() {
-    return 'insertId'
-  }
-
-  /////////////
-  // private //
-  /////////////
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        This method will also check association aliases ('as' option).
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @param:  {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @return:  {String} The found tableName / alias.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
-
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
-    })
-
-    return tableName
-  }
-
-  var queryResultHasJoin = function(results) {
-    if (!!results[0]) {
-      var keys = Object.keys(results[0])
-
-      for (var i = 0; i < keys.length; i++) {
-        if (!!findTableNameInAttribute.call(this, keys[i])) {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
-  var isInsertQuery = function(results, metaData) {
-    var result = true
-
-    // is insert query if sql contains insert into
-    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
-
-    // is insert query if no results are passed or if the result has the inserted id
-    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
-
-    // is insert query if no metadata are passed or if the metadata has the inserted id
-    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
->>>>>>> parent of db9f87e... removed old docs
 
     return result
   }
 
-<<<<<<< HEAD
   var handleInsertQuery = function(results) {
     // add the inserted row id to the instance
     var autoIncrementField = this.callee.__factory.autoIncrementField
@@ -230,23 +102,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
 
   var isShowTableQuery = function() {
     return (this.sql.indexOf('SHOW TABLES') === 0)
-=======
-  var handleInsertQuery = function(results, metaData) {
-    if (this.callee) {
-      // add the inserted row id to the instance
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-        , id                 = null
-
-      id = id || (results && results[this.getInsertIdField()])
-      id = id || (metaData && metaData[this.getInsertIdField()])
-
-      this.callee[autoIncrementField] = id
-    }
-  }
-
-  var isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0)
->>>>>>> parent of db9f87e... removed old docs
   }
 
   var handleShowTableQuery = function(results) {
@@ -256,7 +111,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
   }
 
   var isSelectQuery = function() {
-<<<<<<< HEAD
     return (this.sql.indexOf('SELECT') === 0)
   }
 
@@ -267,23 +121,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
       result = results
     } else if (queryResultHasJoin(results)) {
       result = groupDataByCalleeFactory.call(this, results).map(function(result) {
-=======
-    return this.options.type === 'SELECT';
-  }
-
-  var isUpdateQuery = function() {
-    return (this.sql.toLowerCase().indexOf('update') === 0)
-  }
-
-  var handleSelectQuery = function(results) {
-    var result = null, self = this;
-
-    if (this.options.raw) {
-      result = results
-    } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
->>>>>>> parent of db9f87e... removed old docs
         // let's build the actual dao instance first...
         var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
 
@@ -303,11 +140,7 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
     }
 
     // return the first real model instance if options.plain is set (e.g. Model.find)
-<<<<<<< HEAD
     if(this.options.plain) {
-=======
-    if (this.options.plain) {
->>>>>>> parent of db9f87e... removed old docs
       result = (result.length === 0) ? null : result[0]
     }
 
@@ -315,35 +148,14 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
   }
 
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-<<<<<<< HEAD
     var associatedDao = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
       , association   = this.callee.getAssociation(associatedDao)
       , accessor      = Utils._.camelize(associatedDao.tableName)
-=======
-    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association          = null
-
-    if (!!associatedDaoFactory) {
-      association = this.callee.getAssociation(associatedDaoFactory)
-    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
-
-      if (!!associatedDaoFactory) {
-        association = this.callee.getAssociation(associatedDaoFactory)
-      } else {
-        association          = this.callee.getAssociationByAlias(tableName)
-        associatedDaoFactory = association.target
-      }
-    }
-
-    var accessor = Utils._.camelize(tableName)
->>>>>>> parent of db9f87e... removed old docs
 
     // downcase the first char
     accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
 
     associationData.forEach(function(data) {
-<<<<<<< HEAD
       var daoInstance = associatedDao.build(data, { isNewRecord: false })
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
@@ -352,41 +164,12 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
       } else {
         dao[accessor] = dao[accessor] || []
         dao[accessor].push(daoInstance)
-=======
-      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
-
-      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
-        dao[accessor] = isEmpty ? null : daoInstance
-      } else {
-        dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
-          dao[accessor].push(daoInstance)
->>>>>>> parent of db9f87e... removed old docs
       }
     })
   }
 
   var isShowOrDescribeQuery = function() {
-<<<<<<< HEAD
     return (this.sql.indexOf('SHOW') === 0) || (this.sql.indexOf('DESCRIBE') === 0)
-=======
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
-    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
-
-    return  result
-  }
-
-  var isCallQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
-
-    return result
->>>>>>> parent of db9f87e... removed old docs
   }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            the associated data by the callee.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example:
@@ -441,7 +224,6 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
     })
 
     return result
-<<<<<<< HEAD
   }
 
   return AbstractQuery
@@ -551,42 +333,4 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
-=======
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        prepareJoinData
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        prepareJoinData()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        This function will prepare the result of select queries with joins.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @param:  {Array} data This array contains objects.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @return:  {Array} The array will have the needed format for groupDataByCalleeFactory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var prepareJoinData = function(data) {
-    var result = data.map(function(row) {
-      var nestedRow = {}
-
-      for (var key in row) {
-        if (row.hasOwnProperty(key)) {
-          var tableName = findTableNameInAttribute.call(this, key)
-
-          if (!!tableName) {
-            nestedRow[tableName] = nestedRow[tableName] || {}
-            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
-          } else {
-            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
-            nestedRow[this.callee.tableName][key] = row[key]
-          }
-        }
-      }
-
-      return nestedRow
-    }.bind(this))
-
-    return result
-  }
-
-  return AbstractQuery
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/connector-manager.js.html b/docs/dialects/connector-manager.js.html
index a12e011f7e19..fd7f8f0f017c 100644
--- a/docs/dialects/connector-manager.js.html
+++ b/docs/dialects/connector-manager.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports = (function(){
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports = (function(){
->>>>>>> parent of db9f87e... removed old docs
   var ConnectorManager = function(sequelize, config) {
     throw new Error('Define the constructor!')
   }
@@ -87,7 +45,6 @@
   }
 
   return ConnectorManager
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/mysql/connector-manager.js.html b/docs/dialects/mysql/connector-manager.js.html
index 9023333d04cf..310eb1585663 100644
--- a/docs/dialects/mysql/connector-manager.js.html
+++ b/docs/dialects/mysql/connector-manager.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var mysql   = require("mysql")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var mysql   = require("mysql")
->>>>>>> parent of db9f87e... removed old docs
   , Pooling = require('generic-pool')
   , Query   = require("./query")
   , Utils   = require("../../utils")
@@ -79,7 +37,6 @@
     this.queue = []
     this.activeQueue = []
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-<<<<<<< HEAD
     this.poolCfg = this.config.pool
 
     var self = this
@@ -98,107 +55,6 @@
             disconnect.call(self, client)
         },
         max: self.poolCfg.maxConnections,
-=======
-    this.poolCfg = Utils._.defaults(this.config.pool, {
-      maxConnections: 10,
-      minConnections: 0,
-      maxIdleTime: 1000
-    });
-    this.pendingQueries = 0;
-    this.useReplicaton = !!config.replication;
-    this.useQueue = config.queue !== undefined ? config.queue : true;
-
-    var self = this
-
-    if (this.useReplicaton) {
-      var reads = 0,
-        writes = 0;
-
-      // Init configs with options from config if not present
-      for (var i in config.replication.read) {
-        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
-          host: this.config.host,
-          port: this.config.port,
-          username: this.config.username,
-          password: this.config.password,
-          database: this.config.database
-        });
-      }
-      config.replication.write = Utils._.defaults(config.replication.write, {
-        host: this.config.host,
-        port: this.config.port,
-        username: this.config.username,
-        password: this.config.password,
-        database: this.config.database
-      });
-
-      // I'll make my own pool, with blackjack and hookers!
-      this.pool = {
-        release: function (client) {
-          if (client.queryType == 'read') {
-            return this.read.release(client);
-          } else {
-            return this.write.release(client);
-          }
-        },
-        acquire: function (callback, priority, queryType) {
-          if (queryType == 'SELECT') {
-            this.read.acquire(callback, priority);
-          } else {
-            this.write.acquire(callback, priority);
-          }
-        },
-        drain: function () {
-          this.read.drain();
-          this.write.drain();
-        },
-        read: Pooling.Pool({
-          name: 'sequelize-read',
-          create: function (done) {
-            if (reads >= self.config.replication.read.length) reads = 0;
-            var config = self.config.replication.read[reads++];
-
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'read'
-              done(null, connection)
-            }, config);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        }),
-        write: Pooling.Pool({
-          name: 'sequelize-write',
-          create: function (done) {
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'write'
-              done(null, connection)
-            }, self.config.replication.write);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        })
-      };
-    } else if (this.poolCfg) {
-      //the user has requested pooling, so create our connection pool
-      this.pool = Pooling.Pool({
-        name: 'sequelize-mysql',
-        create: function (done) {
-          connect.call(self, done)
-        },
-        destroy: function(client) {
-          disconnect.call(self, client)
-        },
-        max: self.poolCfg.maxConnections,
-        min: self.poolCfg.minConnections,
->>>>>>> parent of db9f87e... removed old docs
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
     }
@@ -215,7 +71,6 @@
     })
   }
 
-<<<<<<< HEAD
   Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
 
   var isConnecting = false
@@ -251,96 +106,13 @@
       disconnect.call(this, this.client)
     return
   }
-=======
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
-
-  var isConnecting = false;
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    if (!this.isConnected && !this.pool) {
-      this.connect()
-    }
-
-    if (this.useQueue) {
-      var queueItem = {
-        query: new Query(this.client, this.sequelize, callee, options || {}),
-        sql: sql
-      };
-
-      enqueue.call(this, queueItem, options);
-      return queueItem.query;
-    }
-
-    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
-    this.pendingQueries++;
-
-    query.done(function() {
-      self.pendingQueries--;
-      if (self.pool) self.pool.release(query.client);
-      else {
-        if (self.pendingQueries === 0) {
-          setTimeout(function() {
-            self.pendingQueries === 0 && self.disconnect.call(self);
-          }, 100);
-        }
-      }
-    });
-
-    if (!this.pool) {
-      query.run(sql);
-    }
-
-    else {
-      this.pool.acquire(function(err, client) {
-        if (err) return query.emit('error', err);
-
-        query.client = client;
-        query.run(sql);
-        return;
-      }, undefined, options.type);
-    }
-
-    return query;
-  };
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this;
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting || this.pool) {
-      return;
-    }
-    connect.call(self, function(err, client) {
-      self.client = client;
-      return;
-    });
-    return;
-  };
-
-  ConnectorManager.prototype.disconnect = function() {
-    if (this.client) disconnect.call(this, this.client);
-    return;
-  };
->>>>>>> parent of db9f87e... removed old docs
 
 
   // private
 
   var disconnect = function(client) {
-<<<<<<< HEAD
     var self = this
     client.end(function() {
-=======
-    var self = this;
-    if (!this.useQueue) {
-      this.client = null;
-    }
-
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
-      }
-
->>>>>>> parent of db9f87e... removed old docs
       var intervalObj = null
       var cleanup = function () {
         var retryCt = 0
@@ -361,7 +133,6 @@
     })
   }
 
-<<<<<<< HEAD
   var connect = function(done) {
     var connection = mysql.createConnection({
       host: this.config.host,
@@ -369,16 +140,6 @@
       user: this.config.username,
       password: this.config.password,
       database: this.config.database
-=======
-  var connect = function(done, config) {
-    config = config || this.config
-    var connection = mysql.createConnection({
-      host: config.host,
-      port: config.port,
-      user: config.username,
-      password: config.password,
-      database: config.database
->>>>>>> parent of db9f87e... removed old docs
     })
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
@@ -386,14 +147,8 @@
     done(null, connection)
   }
 
-<<<<<<< HEAD
   var enqueue = function(queueItem) {
     if(this.activeQueue.length < this.maxConcurrentQueries) {
-=======
-  var enqueue = function(queueItem, options) {
-    options = options || {}
-    if (this.activeQueue.length < this.maxConcurrentQueries) {
->>>>>>> parent of db9f87e... removed old docs
       this.activeQueue.push(queueItem)
       if (this.pool) {
         var self = this
@@ -408,15 +163,10 @@
           queueItem.client = client
           execQueueItem.call(self, queueItem)
           return
-<<<<<<< HEAD
         })
       }
       else
       {
-=======
-        }, undefined, options.type)
-      } else {
->>>>>>> parent of db9f87e... removed old docs
         execQueueItem.call(this, queueItem)
       }
     } else {
@@ -434,16 +184,10 @@
 
   var transferQueuedItems = function(count) {
     for(var i = 0; i < count; i++) {
-<<<<<<< HEAD
       var queueItem = this.queue[0]
       if(queueItem) {
         enqueue.call(this, queueItem)
         this.queue = without(this.queue, queueItem)
-=======
-      var queueItem = this.queue.shift();
-      if (queueItem) {
-        enqueue.call(this, queueItem)
->>>>>>> parent of db9f87e... removed old docs
       }
     }
   }
@@ -490,7 +234,6 @@
   }
 
   return ConnectorManager
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/mysql/query-generator.js.html b/docs/dialects/mysql/query-generator.js.html
index ea8bdb822646..22b4185358ce 100644
--- a/docs/dialects/mysql/query-generator.js.html
+++ b/docs/dialects/mysql/query-generator.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils     = require("../../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("../../utils")
->>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require("../../data-types")
   , util      = require("util")
 
@@ -81,7 +39,6 @@
         , attrStr = []
 
       for (var attr in attributes) {
-<<<<<<< HEAD
         var dataType = attributes[attr]
 
         if (Utils._.includes(dataType, 'PRIMARY KEY')) {
@@ -89,17 +46,6 @@
           attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
         } else {
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
-=======
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
->>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -111,11 +57,7 @@
       }
       , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
 
-<<<<<<< HEAD
       if(pkString.length > 0) {
-=======
-      if (pkString.length > 0) {
->>>>>>> parent of db9f87e... removed old docs
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
       }
 
@@ -195,16 +137,9 @@
 
     selectQuery: function(tableName, options) {
       var query = "SELECT <%= attributes %> FROM <%= table %>"
-<<<<<<< HEAD
 
       options = options || {}
       options.table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
-=======
-        , table = null
-
-      options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
->>>>>>> parent of db9f87e... removed old docs
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
           return [attr[0], Utils.addTicks(attr[1])].join(' as ')
@@ -215,7 +150,6 @@
       options.attributes = options.attributes || '*'
 
       if (options.include) {
-<<<<<<< HEAD
         var tableNames = []
 
         for (var daoName in options.include) {
@@ -235,79 +169,12 @@
       }
 
       if(options.group) {
-=======
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = Utils.addTicks(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
-              query += Utils.addTicks(foreignIdentifier) + '='
-              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(dao.tableName) + '.'
-              query += Utils.addTicks('id') + '='
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += Utils.addTicks(association.identifier) + '='
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, Utils.addTicks(attr)].join('.') +
-                  ' AS ' +
-                  Utils.addTicks([aliasName, attr].join('.'))
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if (options.where) {
-        options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
-      }
-
-      if (options.group) {
->>>>>>> parent of db9f87e... removed old docs
         options.group = Utils.addTicks(options.group)
         query += " GROUP BY <%= group %>"
       }
 
-<<<<<<< HEAD
       if(options.limit && !(options.include && (options.limit === 1))) {
         if(options.offset) {
-=======
-      if (options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
-
-      if (options.limit && !(options.include && (options.limit === 1))) {
-        if (options.offset) {
->>>>>>> parent of db9f87e... removed old docs
           query += " LIMIT <%= offset %>, <%= limit %>"
         } else {
           query += " LIMIT <%= limit %>"
@@ -326,11 +193,7 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
-<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-=======
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
->>>>>>> parent of db9f87e... removed old docs
         values: Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -377,7 +240,6 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
-<<<<<<< HEAD
         if(typeof attribute == 'string')
           return attribute
         else {
@@ -393,37 +255,13 @@
 
           if(attribute.order)
             result += ' ' + attribute.order
-=======
-        if(typeof attribute === 'string') {
-          return attribute
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += attribute.attribute
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
->>>>>>> parent of db9f87e... removed old docs
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
-<<<<<<< HEAD
         return (typeof attribute == 'string') ? attribute : attribute.attribute
-=======
-        return (typeof attribute === 'string') ? attribute : attribute.attribute
->>>>>>> parent of db9f87e... removed old docs
       })
 
       options = Utils._.extend({
@@ -452,14 +290,8 @@
       var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
         , indexName = indexNameOrAttributes
 
-<<<<<<< HEAD
       if(typeof indexName != 'string')
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-=======
-      if (typeof indexName !== 'string') {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
->>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
     },
@@ -467,21 +299,12 @@
     getWhereConditions: function(smth, tableName) {
       var result = null
 
-<<<<<<< HEAD
       if(Utils.isHash(smth)) {
         smth   = Utils.prependTableNameToHash(tableName, smth)
         result = QueryGenerator.hashToWhereConditions(smth)
       } else if (typeof smth === 'number') {
         smth   = Utils.prependTableNameToHash(tableName, { id: smth })
         result = QueryGenerator.hashToWhereConditions(smth)
-=======
-      if (Utils.isHash(smth)) {
-        smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === 'number') {
-        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = this.hashToWhereConditions(smth)
->>>>>>> parent of db9f87e... removed old docs
       } else if (typeof smth === "string") {
         result = smth
       } else if (Array.isArray(smth)) {
@@ -503,11 +326,7 @@
 
         if (Array.isArray(value)) {
           // is value an array?
-<<<<<<< HEAD
 
-=======
-          if (value.length == 0) { value = [null] }
->>>>>>> parent of db9f87e... removed old docs
           _value = "(" + value.map(function(subValue) {
             return Utils.escape(subValue);
           }).join(',') + ")"
@@ -534,7 +353,6 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
-<<<<<<< HEAD
         if(Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
@@ -548,44 +366,15 @@
           }
 
           if((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-=======
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template += " auto_increment"
-          }
-
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
->>>>>>> parent of db9f87e... removed old docs
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
-<<<<<<< HEAD
           if(dataType.unique) {
             template += " UNIQUE"
           }
 
           if(dataType.primaryKey) {
-=======
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
->>>>>>> parent of db9f87e... removed old docs
             template += " PRIMARY KEY"
           }
 
@@ -602,19 +391,10 @@
       var fields = []
 
       for (var name in factory.attributes) {
-<<<<<<< HEAD
         var definition = factory.attributes[name]
 
         if (definition && (definition.indexOf('auto_increment') > -1)) {
           fields.push(name)
-=======
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('auto_increment') > -1)) {
-            fields.push(name)
-          }
->>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -623,7 +403,6 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/mysql/query.js.html b/docs/dialects/mysql/query.js.html
index 65f22825df28..c7cc42b26c67 100644
--- a/docs/dialects/mysql/query.js.html
+++ b/docs/dialects/mysql/query.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils         = require("../../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils         = require("../../utils")
->>>>>>> parent of db9f87e... removed old docs
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
-<<<<<<< HEAD
     var self = this
 
-=======
->>>>>>> parent of db9f87e... removed old docs
     this.client    = client
     this.callee    = callee
     this.sequelize = sequelize
@@ -83,7 +38,6 @@
       raw: false
     }, options || {})
 
-<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -255,41 +209,4 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
-=======
-    this.checkLoggingOption()
-  }
-
-  Utils.inherit(Query, AbstractQuery)
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    this.client.query(this.sql, function(err, results, fields) {
-      this.emit('sql', this.sql)
-
-      if (err) {
-        this.emit('error', err, this.callee)
-      } else {
-        this.emit('success', this.formatResults(results))
-      }
-    }.bind(this)).setMaxListeners(100)
-    return this
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/postgres/connector-manager.js.html b/docs/dialects/postgres/connector-manager.js.html
index b5ad0446c0ff..61a3be2c6c41 100644
--- a/docs/dialects/postgres/connector-manager.js.html
+++ b/docs/dialects/postgres/connector-manager.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Query   = require("./query")
-  , Utils   = require("../../utils")
->>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var ConnectorManager = function(sequelize, config) {
     this.sequelize = sequelize
-<<<<<<< HEAD
     this.client = null
     this.config = config || {}
     this.pooling = (this.config.poolCfg != null && this.config.poolCfg.maxConnections > 0)
@@ -82,19 +38,6 @@
       pg.defaults.poolSize = this.config.poolCfg.maxConnections
       pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
     }
-=======
-    this.client    = null
-    this.config    = config || {}
-    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
-    this.pg        = this.config.native ? require('pg').native : require('pg')
-
-    // set pooling parameters if specified
-    if (this.pooling) {
-      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
-      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
-    }
-
->>>>>>> parent of db9f87e... removed old docs
     this.disconnectTimeoutId = null
     this.pendingQueries = 0
     this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
@@ -106,14 +49,7 @@
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
     var self = this
-<<<<<<< HEAD
     if (this.client == null) this.connect()
-=======
-    if (this.client == null) {
-      this.connect()
-    }
-
->>>>>>> parent of db9f87e... removed old docs
     var query = new Query(this.client, this.sequelize, callee, options || {})
     self.pendingQueries += 1
     return query.run(sql)
@@ -133,19 +69,9 @@
 
   ConnectorManager.prototype.connect = function() {
     var self = this
-<<<<<<< HEAD
 
     // in case database is slow to connect, prevent orphaning the client
     if (this.isConnecting) return
-=======
-    var emitter = new (require('events').EventEmitter)()
-
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting) {
-      return
-    }
-
->>>>>>> parent of db9f87e... removed old docs
     this.isConnecting = true
     this.isConnected  = false
 
@@ -153,14 +79,7 @@
 
     var connectCallback = function(err, client) {
       self.isConnecting = false
-<<<<<<< HEAD
       if (!err && client) {
-=======
-
-      if (!!err) {
-        emitter.emit('error', err)
-      } else if (client) {
->>>>>>> parent of db9f87e... removed old docs
         client.query("SET TIME ZONE 'UTC'")
           .on('end', function() {
             self.isConnected = true
@@ -173,7 +92,6 @@
 
     if (this.pooling) {
       // acquire client from pool
-<<<<<<< HEAD
       pg.connect(uri, connectCallback)
 
     } else {
@@ -181,16 +99,6 @@
       this.client = new pg.Client(uri)
       this.client.connect(connectCallback)
     }
-=======
-      this.pg.connect(uri, connectCallback)
-    } else {
-      //create one-off client
-      this.client = new this.pg.Client(uri)
-      this.client.connect(connectCallback)
-    }
-
-    return emitter
->>>>>>> parent of db9f87e... removed old docs
   }
 
   ConnectorManager.prototype.disconnect = function() {
@@ -202,7 +110,6 @@
   }
 
   return ConnectorManager
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/postgres/query-generator.js.html b/docs/dialects/postgres/query-generator.js.html
index 895fe76763fc..95a3629eb026 100644
--- a/docs/dialects/postgres/query-generator.js.html
+++ b/docs/dialects/postgres/query-generator.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require("../../utils")
   , util  = require("util")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils = require("../../utils")
-  , util  = require("util")
-  , DataTypes = require("../../data-types")
->>>>>>> parent of db9f87e... removed old docs
   , tables = {}
   , primaryKeys = {};
 
@@ -78,7 +34,6 @@
 
 function addQuotes(s, quoteChar) {
   quoteChar = quoteChar || '"'
-<<<<<<< HEAD
   return quoteChar + removeQuotes(s) + quoteChar
 }
 
@@ -91,40 +46,6 @@
   }
 
   return s
-=======
-  return removeQuotes(s, quoteChar)
-    .split('.')
-    .map(function(e) { return quoteChar + String(e) + quoteChar })
-    .join('.')
-}
-
-function pgEscape(val) {
-  if (val === undefined || val === null) {
-    return 'NULL';
-  }
-
-  switch (typeof val) {
-    case 'boolean': return (val) ? 'true' : 'false';
-    case 'number': return val+'';
-  }
-
-  if (val instanceof Date) {
-    val = pgSqlDate(val);
-  }
-
-  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-  val = val.replace(/'/g, "''");
-  return "'"+val+"'";
-}
-
-function pgEscapeAndQuote(val) {
-  return addQuotes(removeQuotes(pgEscape(val), "'"))
-}
-
-function pgEnum(tableName, attr, dataType) {
-  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
-  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
->>>>>>> parent of db9f87e... removed old docs
 }
 
 function padInt(i) {
@@ -156,13 +77,6 @@
     tables[tableName][attr] = 'serial'
   }
 
-<<<<<<< HEAD
-=======
-  if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
-  }
-
->>>>>>> parent of db9f87e... removed old docs
   return dataType
 }
 
@@ -183,13 +97,6 @@
       for (var attr in attributes) {
         var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
         attrStr.push(addQuotes(attr) + " " + dataType)
-<<<<<<< HEAD
-=======
-
-        if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr]) + query;
-        }
->>>>>>> parent of db9f87e... removed old docs
       }
 
       var values  = {
@@ -208,11 +115,7 @@
     dropTableQuery: function(tableName, options) {
       options = options || {}
       var query = "DROP TABLE IF EXISTS <%= table %>;"
-<<<<<<< HEAD
       return Utils._.template(query)({table: addQuotes(tableName)})
-=======
-      return Utils._.template(query)({ table: addQuotes(tableName) })
->>>>>>> parent of db9f87e... removed old docs
     },
 
     renameTableQuery: function(before, after) {
@@ -240,13 +143,6 @@
           attrName: addQuotes(attrName),
           definition: pgDataTypeMapping(tableName, attrName, definition)
         }))
-<<<<<<< HEAD
-=======
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attrName, definition) + query
-        }
->>>>>>> parent of db9f87e... removed old docs
       }
 
       return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
@@ -262,10 +158,6 @@
         , sql   = []
 
       for (var attributeName in attributes) {
-<<<<<<< HEAD
-=======
-        var definition = attributes[attributeName]
->>>>>>> parent of db9f87e... removed old docs
         var attrSql = ''
 
         if (definition.indexOf('NOT NULL') > 0) {
@@ -281,14 +173,6 @@
           })
         }
 
-<<<<<<< HEAD
-=======
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attributeName, definition) + query
-          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
-        }
-
->>>>>>> parent of db9f87e... removed old docs
         attrSql += Utils._.template(query)({
           tableName: addQuotes(tableName),
           query: addQuotes(attributeName) + ' TYPE ' + definition
@@ -315,20 +199,10 @@
     },
 
     selectQuery: function(tableName, options) {
-<<<<<<< HEAD
       options = options || {}
       options.table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
-=======
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options = options || {}
-      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr) {
-        if (Array.isArray(attr) && attr.length === 2) {
->>>>>>> parent of db9f87e... removed old docs
           return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
         } else if (attr.indexOf('`') >= 0) {
           return attr.replace(/`/g, '"')
@@ -336,105 +210,27 @@
           return addQuotes(attr)
         }
       }).join(", ")
-<<<<<<< HEAD
 
       options.attributes = options.attributes || '*'
 
       var query = "SELECT <%= attributes %> FROM <%= table %>"
-=======
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = addQuotes(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
-              query += addQuotes(association.connectorDAO.tableName) + '.'
-              query += addQuotes(foreignIdentifier) + '='
-              query += addQuotes(table) + '.' + addQuotes('id')
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(dao.tableName) + '.'
-              query += addQuotes('id') + '='
-              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += addQuotes(association.identifier) + '='
-              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, addQuotes(attr)].join('.') +
-                  ' AS "' +
-                  removeQuotes([aliasName, attr].join('.')) + '"'
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
->>>>>>> parent of db9f87e... removed old docs
 
       if(options.where) {
         options.where = QueryGenerator.getWhereConditions(options.where)
         query += " WHERE <%= where %>"
       }
-<<<<<<< HEAD
-=======
-
->>>>>>> parent of db9f87e... removed old docs
       if(options.order) {
         options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
         query += " ORDER BY <%= order %>"
       }
-<<<<<<< HEAD
-=======
-
->>>>>>> parent of db9f87e... removed old docs
       if(options.group) {
         options.group = addQuotes(options.group)
         query += " GROUP BY <%= group %>"
       }
-<<<<<<< HEAD
       if(options.limit) query += " LIMIT <%= limit %>"
       if(options.offset) query += " OFFSET <%= offset %>"
 
       query += ";"
-=======
-
-      if (!(options.include && (options.limit === 1))) {
-        if (options.limit) {
-          query += " LIMIT <%= limit %>"
-        }
-
-        if (options.offset) {
-          query += " OFFSET <%= offset %>"
-        }
-      }
-
-      query += ";"
-
->>>>>>> parent of db9f87e... removed old docs
       return Utils._.template(query)(options)
     },
 
@@ -457,15 +253,9 @@
 
       var replacements  = {
         table: addQuotes(tableName),
-<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
           return pgEscape((value instanceof Date) ? pgSqlDate(value) : value)
-=======
-        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape(value)
->>>>>>> parent of db9f87e... removed old docs
         }).join(",")
       }
 
@@ -475,20 +265,12 @@
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-<<<<<<< HEAD
       var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-=======
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
->>>>>>> parent of db9f87e... removed old docs
         , values = []
 
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
-<<<<<<< HEAD
         values.push(addQuotes(key) + "=" + pgEscape((value instanceof Date) ? pgSqlDate(value) : value))
-=======
-        values.push(addQuotes(key) + "=" + pgEscape(value))
->>>>>>> parent of db9f87e... removed old docs
       }
 
       var replacements = {
@@ -528,7 +310,6 @@
 
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
-<<<<<<< HEAD
         if(typeof attribute == 'string')
           return addQuotes(attribute)
         else {
@@ -544,48 +325,18 @@
 
           if(attribute.order)
             result += ' ' + attribute.order
-=======
-        if (typeof attribute === 'string') {
-          return addQuotes(attribute)
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += addQuotes(attribute.attribute)
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
->>>>>>> parent of db9f87e... removed old docs
 
           return result
         }
       })
 
       var onlyAttributeNames = attributes.map(function(attribute) {
-<<<<<<< HEAD
         return (typeof attribute == 'string') ? attribute : attribute.attribute
       })
 
       options = Utils._.extend({
         indicesType: null,
         indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
-=======
-        return (typeof attribute === "string") ? attribute : attribute.attribute
-      })
-
-      var indexTable = tableName.split('.')
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
->>>>>>> parent of db9f87e... removed old docs
         parser: null
       }, options || {})
 
@@ -605,14 +356,8 @@
       var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
         , indexName = indexNameOrAttributes
 
-<<<<<<< HEAD
       if(typeof indexName != 'string')
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-=======
-      if (typeof indexName !== "string") {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
->>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
     },
@@ -620,7 +365,6 @@
     getWhereConditions: function(smth) {
       var result = null
 
-<<<<<<< HEAD
       if(Utils.isHash(smth))
         result = QueryGenerator.hashToWhereConditions(smth)
       else if(typeof smth == 'number')
@@ -629,20 +373,6 @@
         result = smth
       else if(Array.isArray(smth))
         result = Utils.format(smth)
-=======
-      if (Utils.isHash(smth)) {
-        result = QueryGenerator.hashToWhereConditions(smth)
-      }
-      else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + pgEscape(smth)
-      }
-      else if (typeof smth === "string") {
-        result = smth
-      }
-      else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
->>>>>>> parent of db9f87e... removed old docs
 
       return result
     },
@@ -657,23 +387,14 @@
         var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
           , _value = null
 
-<<<<<<< HEAD
         if(Array.isArray(value)) {
-=======
-        if (Array.isArray(value)) {
-          if (value.length == 0) { value = [null] }
->>>>>>> parent of db9f87e... removed old docs
           _value = "(" + value.map(function(subValue) {
             return pgEscape(subValue);
           }).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
         }
-<<<<<<< HEAD
         else if ((value) && (typeof value == 'object')) {
-=======
-        else if ((value) && (typeof value === "object")) {
->>>>>>> parent of db9f87e... removed old docs
           //using as sentinel for join column => value
           _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
           result.push([_key, _value].join("="))
@@ -696,7 +417,6 @@
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-<<<<<<< HEAD
           if(dataType.type == 'TINYINT(1)') dataType.type = 'BOOLEAN'
           if(dataType.type == 'DATETIME') dataType.type = 'TIMESTAMP'
 
@@ -708,42 +428,6 @@
           }
           if(dataType.unique) template += " UNIQUE"
           if(dataType.primaryKey) template += " PRIMARY KEY"
-=======
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.type === "TINYINT(1)") {
-            dataType.type = 'BOOLEAN'
-          }
-
-          if (dataType.type === "DATETIME") {
-            dataType.type = 'TIMESTAMP'
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template +=" SERIAL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = pgEscape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
->>>>>>> parent of db9f87e... removed old docs
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -772,13 +456,8 @@
       var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
 
       return Utils._.template(template)({
-<<<<<<< HEAD
         user: config.username,
         password: config.password,
-=======
-        user: encodeURIComponent(config.username),
-        password: encodeURIComponent(config.password),
->>>>>>> parent of db9f87e... removed old docs
         database: config.database,
         host: config.host,
         port: config.port,
@@ -788,7 +467,6 @@
   }
 
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/postgres/query.js.html b/docs/dialects/postgres/query.js.html
index 3a4698cafa61..91f09e1b2464 100644
--- a/docs/dialects/postgres/query.js.html
+++ b/docs/dialects/postgres/query.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils         = require("../../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils         = require("../../utils")
->>>>>>> parent of db9f87e... removed old docs
   , AbstractQuery = require('../abstract/query')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
-<<<<<<< HEAD
     var self = this
 
-=======
->>>>>>> parent of db9f87e... removed old docs
     this.client = client
     this.sequelize = sequelize
     this.callee = callee
@@ -83,7 +38,6 @@
       raw: false
     }, options || {})
 
-<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -93,14 +47,10 @@
       // using just console.log will break in node < 0.6
       this.options.logging = function(s) { console.log(s) }
     }
-=======
-    this.checkLoggingOption()
->>>>>>> parent of db9f87e... removed old docs
   }
   Utils.inherit(Query, AbstractQuery)
 
   Query.prototype.run = function(sql) {
-<<<<<<< HEAD
     var self = this
 
     this.sql = sql
@@ -163,41 +113,10 @@
       receivedError = true
       self.emit('error', err, self.callee)
     });
-=======
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var receivedError = false
-      , query         = this.client.query(sql)
-      , rows          = []
-
-    query.on('row', function(row) {
-      rows.push(row)
-    })
-
-    query.on('error', function(err) {
-      receivedError = true
-      this.emit('error', err, this.callee)
-    }.bind(this))
-
-    query.on('end', function() {
-      this.emit('sql', this.sql)
-
-      if (receivedError) {
-        return
-      }
-
-      onSuccess.call(this, rows)
-    }.bind(this))
->>>>>>> parent of db9f87e... removed old docs
 
     return this
   }
 
-<<<<<<< HEAD
   return Query
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/query-generator.js.html b/docs/dialects/query-generator.js.html
index 6350d109ae3d..3ebd02f14d9b 100644
--- a/docs/dialects/query-generator.js.html
+++ b/docs/dialects/query-generator.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    createTableQuery: function(tableName, attributes, options) {
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      createTableQuery: function(tableName, attributes, options) {
->>>>>>> parent of db9f87e... removed old docs
       throwMethodUndefined('createTableQuery')
     },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns a query for dropping a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        dropTableQuery: function(tableName, options) {
       throwMethodUndefined('dropTableQuery')
@@ -110,7 +68,6 @@
   }
 
   return QueryGenerator
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/sqlite/connector-manager.js.html b/docs/dialects/sqlite/connector-manager.js.html
index b5b36944c344..31a9cf651a14 100644
--- a/docs/dialects/sqlite/connector-manager.js.html
+++ b/docs/dialects/sqlite/connector-manager.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var Utils   = require("../../utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils   = require("../../utils")
->>>>>>> parent of db9f87e... removed old docs
   , sqlite3 = require('sqlite3').verbose()
   , Query   = require("./query")
 
@@ -80,7 +38,6 @@
   }
 
   return ConnectorManager
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/sqlite/query-generator.js.html b/docs/dialects/sqlite/query-generator.js.html
index 5730e2c31a3a..553644a2df58 100644
--- a/docs/dialects/sqlite/query-generator.js.html
+++ b/docs/dialects/sqlite/query-generator.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils = require("../../utils")
   , util  = require("util")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils = require("../../utils")
-  , DataTypes = require("../../data-types")
-var MySqlQueryGenerator = Utils._.extend(
-  Utils._.clone(require("../query-generator")),
-  Utils._.clone(require("../mysql/query-generator"))
-)
-
-var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
->>>>>>> parent of db9f87e... removed old docs
 
 var escape = function(str) {
   if (typeof str === 'string') {
@@ -93,7 +44,6 @@
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
 
-<<<<<<< HEAD
       var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
         , attrStr = []
 
@@ -104,26 +54,6 @@
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
         } else {
           attrStr.push(Utils.addTicks(attr) + " " + dataType)
-=======
-      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , primaryKeys = []
-        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
-                    return Utils._.includes(definition, 'PRIMARY KEY')
-                  }).length > 1)
-        , attrStr     = []
-
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
->>>>>>> parent of db9f87e... removed old docs
         }
       }
 
@@ -132,24 +62,12 @@
         attributes: attrStr.join(", "),
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
-<<<<<<< HEAD
-=======
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
->>>>>>> parent of db9f87e... removed old docs
 
       return Utils._.template(query)(values).trim() + ";"
     },
 
     showTablesQuery: function() {
-<<<<<<< HEAD
       return "SELECT name FROM sqlite_master WHERE type='table';"
-=======
-      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
->>>>>>> parent of db9f87e... removed old docs
     },
 
     insertQuery: function(tableName, attrValueHash) {
@@ -159,11 +77,7 @@
 
       var replacements  = {
         table: Utils.addTicks(tableName),
-<<<<<<< HEAD
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-=======
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
->>>>>>> parent of db9f87e... removed old docs
         values: Utils._.values(attrValueHash).map(function(value){
           return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -211,7 +125,6 @@
       for (var name in attributes) {
         var dataType = attributes[name]
 
-<<<<<<< HEAD
         if(Utils.isHash(dataType)) {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
@@ -220,41 +133,12 @@
             template += " NOT NULL"
 
           if(dataType.defaultValue != undefined) {
-=======
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM) {
-	          replacements.type = "INTEGER"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
->>>>>>> parent of db9f87e... removed old docs
             template += " DEFAULT <%= defaultValue %>"
             replacements.defaultValue = Utils.escape(dataType.defaultValue)
           }
 
-<<<<<<< HEAD
           if(dataType.unique) template += " UNIQUE"
           if(dataType.primaryKey) template += " PRIMARY KEY"
-=======
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-
-            if (dataType.autoIncrement) {
-              template += ' AUTOINCREMENT'
-            }
-          }
->>>>>>> parent of db9f87e... removed old docs
 
           result[name] = Utils._.template(template)(replacements)
         } else {
@@ -269,24 +153,14 @@
       var fields = []
 
       for (var name in factory.attributes) {
-<<<<<<< HEAD
         var definition = factory.attributes[name]
 
         if (definition && (definition.indexOf('INTEGER PRIMARY KEY') == 0)) {
           fields.push(name)
-=======
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
-            fields.push(name)
-          }
->>>>>>> parent of db9f87e... removed old docs
         }
       }
 
       return fields
-<<<<<<< HEAD
     }
   }
 
@@ -402,37 +276,4 @@
  */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={languages:{insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);Object.prototype.toString.call(e)==="[object Object]"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent.trim();if(!f)return;f=f.replace(/&/g,"&").replace(//g,">").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data));l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r){return n.stringify(t.tokenize(e,r))},tokenize:function(e,n){var r=t.Token,i=[e],s=n.rest;if(s){for(var o in s)n[o]=s[o];delete n.rest}e:for(var o in n){if(!n.hasOwnProperty(o)||!n[o])continue;var u=n[o],a=u.inside,f=!!u.lookbehind||0;u=u.pattern||u;for(var l=0;le.length)break e;if(c instanceof r)continue;u.lastIndex=0;var h=u.exec(c);if(h){f&&(f=h[1].length);var p=h.index-1+f,h=h[0].slice(f),d=h.length,v=p+d,m=c.slice(0,p+1),g=c.slice(v+1),y=[l,1];m&&y.push(m);var b=new r(o,a?t.tokenize(h,a):h);y.push(b);g&&y.push(g);Array.prototype.splice.apply(i,y)}}}return i},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]"){for(var r=0;r"+i.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();
 Prism.languages.markup={comment:/<!--[\w\W]*?--(>|>)/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]+?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*[\w\W]*?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});
 Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});
-Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
-=======
-    },
-
-    hashToWhereConditions: function(hash) {
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          var value = hash[key]
-
-          if (typeof value === 'boolean') {
-            value = !!value ? 1 : 0
-          }
-
-          hash[key] = value
-        }
-      }
-
-      return hashToWhereConditions(hash).replace(/\\'/g, "''");
-    }
-  }
-
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/dialects/sqlite/query.js.html b/docs/dialects/sqlite/query.js.html
index 3f5d66b6260b..02ce096ab2cf 100644
--- a/docs/dialects/sqlite/query.js.html
+++ b/docs/dialects/sqlite/query.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils         = require("../../utils")
   , AbstractQuery = require('../abstract/query')
 
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
->>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var Query = function(database, sequelize, callee, options) {
@@ -80,7 +37,6 @@
       raw: false
     }, options || {})
 
-<<<<<<< HEAD
     if(this.options.logging === true) {
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
@@ -93,56 +49,31 @@
   }
   Utils.inherit(Query, AbstractQuery)
 
-=======
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.getInsertIdField = function() {
-    return 'lastID'
-  }
-
->>>>>>> parent of db9f87e... removed old docs
   Query.prototype.run = function(sql) {
     var self = this
 
     this.sql = sql
 
-<<<<<<< HEAD
     if(this.options.logging !== false) {
-=======
-    if (this.options.logging !== false) {
->>>>>>> parent of db9f87e... removed old docs
       this.options.logging('Executing: ' + this.sql)
     }
 
     var columnTypes = {};
     this.database.serialize(function() {
       var executeSql = function() {
-<<<<<<< HEAD
         self.database[databaseMethod](self.sql, function(err, results) {
            //allow clients to listen to sql to do their own logging or whatnot
-=======
-        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
-          // allow clients to listen to sql to do their own logging or whatnot
->>>>>>> parent of db9f87e... removed old docs
           self.emit('sql', self.sql)
           this.columnTypes = columnTypes;
           err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
         })
       };
 
-<<<<<<< HEAD
       var isInsertCommand = (self.sql.toLowerCase().indexOf('insert') == 0)
         , isUpdateCommand = (self.sql.toLowerCase().indexOf('update') == 0)
         , databaseMethod  = (isInsertCommand || isUpdateCommand) ? 'run' : 'all'
       if (databaseMethod === 'all' && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
         var tableName = RegExp.$1;
-=======
-      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
-        var tableName = RegExp.$1;
-
->>>>>>> parent of db9f87e... removed old docs
         if (tableName !== 'sqlite_master') {
           // get the column types
           self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
@@ -166,23 +97,11 @@
 
   //private
 
-<<<<<<< HEAD
-=======
-  var getDatabaseMethod = function() {
-    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
-      return 'run'
-    } else {
-      return 'all'
-    }
-  }
-
->>>>>>> parent of db9f87e... removed old docs
   var onSuccess = function(results, metaData) {
     var result = this.callee
       , self   = this
 
     // add the inserted row id to the instance
-<<<<<<< HEAD
     if (this.callee && (this.sql.indexOf('INSERT INTO') == 0) && metaData.hasOwnProperty('lastID')) {
       var autoIncrementField = this.callee.__factory.autoIncrementField
       this.callee[autoIncrementField] = metaData.lastID
@@ -211,32 +130,6 @@
         result = (result.length == 0) ? null : result[0]
     } else if((this.sql.indexOf('SHOW') == 0) || (this.sql.indexOf('DESCRIBE') == 0))
       result = results
-=======
-    if (this.send('isInsertQuery', results, metaData)) {
-      this.send('handleInsertQuery', results, metaData)
-    }
-
-    if (this.sql.indexOf('sqlite_master') !== -1) {
-      result = results.map(function(resultSet) { return resultSet.name })
-    } else if (this.send('isSelectQuery')) {
-      // we need to convert the timestamps into actual date objects
-
-      if(!this.options.raw) {
-        results = results.map(function(result) {
-          for (var name in result) {
-            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
-              result[name] = new Date(result[name]);
-            }
-          }
-          return result
-        })
-      }
-
-      result = this.send('handleSelectQuery', results)
-    } else if (this.send('isShowOrDescribeQuery')) {
-      result = results
-    }
->>>>>>> parent of db9f87e... removed old docs
 
     this.emit('success', result)
   }
@@ -246,7 +139,6 @@
   }
 
   return Query
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/emitters/custom-event-emitter.js.html b/docs/emitters/custom-event-emitter.js.html
index 9feadda2de3d..e3f25876927f 100644
--- a/docs/emitters/custom-event-emitter.js.html
+++ b/docs/emitters/custom-event-emitter.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var util         = require("util")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var util         = require("util")
->>>>>>> parent of db9f87e... removed old docs
   , EventEmitter = require("events").EventEmitter
 
 module.exports = (function() {
@@ -109,7 +67,6 @@
 
 
   return CustomEventEmitter
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/migration.js.html b/docs/migration.js.html
index 845f8339dd5c..451555136c36 100644
--- a/docs/migration.js.html
+++ b/docs/migration.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var moment         = require("moment")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var moment         = require("moment")
->>>>>>> parent of db9f87e... removed old docs
   , Utils          = require("./utils")
   , DataTypes      = require("./data-types")
   , QueryInterface = require("./query-interface")
@@ -92,11 +50,7 @@
   Migration.parseFilename = function(s) {
     var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
 
-<<<<<<< HEAD
     if(matches === null) {
-=======
-    if (matches === null) {
->>>>>>> parent of db9f87e... removed old docs
       throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
     }
 
@@ -142,11 +96,7 @@
       extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
       func.call(null, self, DataTypes)
 
-<<<<<<< HEAD
       if(!Migration.migrationHasInterfaceCalls(func))
-=======
-      if (!Migration.migrationHasInterfaceCalls(func))
->>>>>>> parent of db9f87e... removed old docs
         onSuccess()
     }).run()
   }
@@ -189,7 +139,6 @@
           // the event will have the same name like the method
           self.queryInterface.on(_method, function(err) {
             self.undoneMethods--
-<<<<<<< HEAD
             if(err)
               throw new Error(err)
             else
@@ -197,23 +146,12 @@
           })
 
           self.queryInterface[_method].apply(self.queryInterface, args)
-=======
-            if (err) {
-              throw new Error(err)
-            } else {
-              (self.undoneMethods == 0) && callback && callback()
-            }
-          })
-
-          return self.queryInterface[_method].apply(self.queryInterface, args)
->>>>>>> parent of db9f87e... removed old docs
         }
       })(method)
     }
   }
 
   return Migration
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/migrator.js.html b/docs/migrator.js.html
index 81605d57ca30..788e2cea7654 100644
--- a/docs/migrator.js.html
+++ b/docs/migrator.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              const fs     = require("fs")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                const fs     = require("fs")
->>>>>>> parent of db9f87e... removed old docs
     , path   = require("path")
     , moment = require("moment")
 
@@ -82,20 +40,12 @@
       logging: console.log
     }, options || {})
 
-<<<<<<< HEAD
     if(this.options.logging === true) {
-=======
-    if (this.options.logging === true) {
->>>>>>> parent of db9f87e... removed old docs
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
 
-<<<<<<< HEAD
     if(this.options.logging == console.log) {
-=======
-    if (this.options.logging == console.log) {
->>>>>>> parent of db9f87e... removed old docs
       // using just console.log will break in node < 0.6
       this.options.logging = function(s) { console.log(s) }
     }
@@ -116,31 +66,20 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.getUndoneMigrations(function(err, migrations) {
-<<<<<<< HEAD
         if(err) {
-=======
-        if (err) {
->>>>>>> parent of db9f87e... removed old docs
           emitter.emit('error', err)
         } else {
           var chainer = new Utils.QueryChainer
             , from    = migrations[0]
 
-<<<<<<< HEAD
           if(options.method == 'down') {
             migrations.reverse()
             from = migrations[0]
-=======
-          if (options.method === 'down') {
-            from = migrations[0]
-            migrations.reverse()
->>>>>>> parent of db9f87e... removed old docs
           }
 
           migrations.forEach(function(migration) {
             chainer.add(migration, 'execute', [options], {
               before: function(migration) {
-<<<<<<< HEAD
                 if(self.options.logging !== false)
                   self.options.logging('Executing migration: ' + migration.filename)
               },
@@ -153,23 +92,6 @@
                   deleteUndoneMigration.call(self, from, migration, callback)
                 else
                   saveSuccessfulMigration.call(self, from, migration, callback)
-=======
-                if (self.options.logging !== false) {
-                  self.options.logging('Executing migration: ' + migration.filename)
-                }
-              },
-              after: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executed migration: ' + migration.filename)
-                }
-              },
-              success: function(migration, callback) {
-                if (options.method === 'down') {
-                  deleteUndoneMigration.call(self, from, migration, callback)
-                } else {
-                  saveSuccessfulMigration.call(self, from, migration, callback)
-                }
->>>>>>> parent of db9f87e... removed old docs
               }
             })
           })
@@ -195,13 +117,7 @@
       callback && callback(null, result)
     }
 
-<<<<<<< HEAD
     var migrationFiles = fs.readdirSync(this.options.path)
-=======
-    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      return /\.js$/.test(file)
-    })
->>>>>>> parent of db9f87e... removed old docs
 
     var migrations = migrationFiles.map(function(file) {
       return new Migration(self, self.options.path + '/' + file)
@@ -211,7 +127,6 @@
       return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
     })
 
-<<<<<<< HEAD
     if(this.options.from) {
       filterFrom(migrations, this.options.from, function(err, migrations) {
         if(self.options.to)
@@ -233,32 +148,6 @@
             filterTo(migrations, self.options.to, callback)
           else
             callback && callback(null, migrations)
-=======
-    if (this.options.from) {
-      filterFrom(migrations, this.options.from, function(err, migrations) {
-        if (self.options.to) {
-          filterTo(migrations, self.options.to, callback)
-        } else {
-          callback && callback(null, migrations)
-        }
-      })
-    } else {
-      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
-        if (lastMigrationId) {
-          filterFrom(migrations, lastMigrationId, function(err, migrations) {
-            if (self.options.to) {
-              filterTo(migrations, self.options.to, callback)
-            } else {
-              callback && callback(null, migrations)
-            }
-          }, { withoutEqual: true })
-        } else {
-          if (self.options.to) {
-            filterTo(migrations, self.options.to, callback)
-          } else {
-            callback && callback(null, migrations)
-          }
->>>>>>> parent of db9f87e... removed old docs
         }
       }).error(function(err) {
         callback && callback(err, null)
@@ -273,11 +162,7 @@
       var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
         , SequelizeMeta = storedDAO
 
-<<<<<<< HEAD
       if(!storedDAO) {
-=======
-      if (!storedDAO) {
->>>>>>> parent of db9f87e... removed old docs
         SequelizeMeta = self.sequelize.define('SequelizeMeta', {
           from: DataTypes.STRING,
           to:   DataTypes.STRING
@@ -287,11 +172,7 @@
       }
 
       // force sync when model has newly created or if syncOptions are passed
-<<<<<<< HEAD
       if(!storedDAO || syncOptions) {
-=======
-      if (!storedDAO || syncOptions) {
->>>>>>> parent of db9f87e... removed old docs
         SequelizeMeta
           .sync(syncOptions || {})
           .success(function() { emitter.emit('success', SequelizeMeta) })
@@ -361,11 +242,7 @@
 
     self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
       SequelizeMeta
-<<<<<<< HEAD
         .find({ from: from.migrationId, to: to.migrationId })
-=======
-        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
->>>>>>> parent of db9f87e... removed old docs
         .success(function(meta) {
           meta.destroy().success(callback)
         })
@@ -373,7 +250,6 @@
   }
 
   return Migrator
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/query-chainer.js.html b/docs/query-chainer.js.html
index c9b3127f9d40..25cbcb95a163 100644
--- a/docs/query-chainer.js.html
+++ b/docs/query-chainer.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils = require("./utils")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils = require("./utils")
->>>>>>> parent of db9f87e... removed old docs
 
 module.exports = (function() {
   var QueryChainer = function(emitters) {
@@ -82,11 +40,7 @@
 
     emitters = emitters || []
     emitters.forEach(function(emitter) {
-<<<<<<< HEAD
       if(Array.isArray(emitter)) {
-=======
-      if (Array.isArray(emitter)) {
->>>>>>> parent of db9f87e... removed old docs
         self.add.apply(self, emitter)
       } else {
         self.add(emitter)
@@ -95,11 +49,7 @@
   }
 
   QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
-<<<<<<< HEAD
     if(!!method) {
-=======
-    if (!!method) {
->>>>>>> parent of db9f87e... removed old docs
       this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
     } else {
       observeEmitter.call(this, emitterOrKlass)
@@ -129,11 +79,7 @@
     var exec = function() {
       var serial = self.serials.pop()
 
-<<<<<<< HEAD
       if(serial) {
-=======
-      if (serial) {
->>>>>>> parent of db9f87e... removed old docs
         serial.options = serial.options || {}
         serial.options.before && serial.options.before(serial.klass)
 
@@ -150,11 +96,7 @@
           exec()
         }
 
-<<<<<<< HEAD
         if(options.skipOnError && (self.fails.length > 0)) {
-=======
-        if (options.skipOnError && (self.fails.length > 0)) {
->>>>>>> parent of db9f87e... removed old docs
           onError('Skipped due to earlier error!')
         } else {
           var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
@@ -162,11 +104,7 @@
           emitter.success(function(result) {
             self.serialResults[serialCopy.indexOf(serial)] = result
 
-<<<<<<< HEAD
             if(serial.options.success) {
-=======
-            if (serial.options.success) {
->>>>>>> parent of db9f87e... removed old docs
               serial.options.success(serial.klass, onSuccess)
             } else {
               onSuccess()
@@ -201,11 +139,7 @@
         finish.call(self, 'emitterResults')
       })
       .on('sql', function(sql) {
-<<<<<<< HEAD
         if(self.eventEmitter) {
-=======
-        if (self.eventEmitter) {
->>>>>>> parent of db9f87e... removed old docs
           self.eventEmitter.emit('sql', sql)
         }
       })
@@ -214,7 +148,6 @@
   var finish = function(resultsName) {
     this.finished = true
 
-<<<<<<< HEAD
     if(this.emitters.length > 0) {
       this.finished = (this.finishedEmits == this.emitters.length)
     } else if(this.serials.length > 0) {
@@ -222,16 +155,6 @@
     }
 
     if(this.finished && this.wasRunning) {
-=======
-    if (this.emitters.length > 0) {
-      this.finished = (this.finishedEmits == this.emitters.length)
-    }
-    else if (this.serials.length > 0) {
-      this.finished = (this.finishedEmits == this.serials.length)
-    }
-
-    if (this.finished && this.wasRunning) {
->>>>>>> parent of db9f87e... removed old docs
       var status = (this.fails.length == 0 ? 'success' : 'error')
         , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
 
@@ -240,7 +163,6 @@
   }
 
   return QueryChainer
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/query-interface.js.html b/docs/query-interface.js.html
index f2d630d46c7d..76dc08524f3c 100644
--- a/docs/query-interface.js.html
+++ b/docs/query-interface.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require('./utils')
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils     = require('./utils')
->>>>>>> parent of db9f87e... removed old docs
   , DataTypes = require('./data-types')
 
 module.exports = (function() {
   var QueryInterface = function(sequelize) {
     this.sequelize = sequelize
     this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-<<<<<<< HEAD
 	 this.QueryGenerator.options = this.sequelize.options;
-=======
-   this.QueryGenerator.options = this.sequelize.options;
->>>>>>> parent of db9f87e... removed old docs
   }
   Utils.addEventEmitter(QueryInterface)
 
@@ -83,18 +37,10 @@
     var attributeHashes = {}
 
     Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
-<<<<<<< HEAD
       if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
         attributeHashes[attributeName] = { type: dataTypeOrOptions }
       else
         attributeHashes[attributeName] = dataTypeOrOptions
-=======
-      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-        attributeHashes[attributeName] = { type: dataTypeOrOptions }
-      } else {
-        attributeHashes[attributeName] = dataTypeOrOptions
-      }
->>>>>>> parent of db9f87e... removed old docs
     })
 
     attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
@@ -176,18 +122,10 @@
   QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
-<<<<<<< HEAD
     if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
     else
       attributes[attributeName] = dataTypeOrOptions
-=======
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
->>>>>>> parent of db9f87e... removed old docs
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
@@ -203,18 +141,10 @@
   QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
     var attributes = {}
 
-<<<<<<< HEAD
     if(Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1)
       attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
     else
       attributes[attributeName] = dataTypeOrOptions
-=======
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
->>>>>>> parent of db9f87e... removed old docs
 
     var options = this.QueryGenerator.attributesToSQL(attributes)
       , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
@@ -227,11 +157,7 @@
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.describeTable(tableName).success(function(data) {
-<<<<<<< HEAD
         data = data.filter(function(h) { return h.Field == attrNameBefore })[0]
-=======
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
->>>>>>> parent of db9f87e... removed old docs
 
         var options =  {}
 
@@ -246,11 +172,7 @@
           self.QueryGenerator.attributesToSQL(options)
         )
 
-<<<<<<< HEAD
         self.sequelize.query(sql).success(function() {
-=======
-        self.sequelize.query(sql, null, {}).success(function() {
->>>>>>> parent of db9f87e... removed old docs
           self.emit('renameColumn', null)
           emitter.emit('success', null)
         }).error(function(err) {
@@ -298,31 +220,19 @@
 
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
     var sql = this.QueryGenerator.selectQuery(tableName, options)
-<<<<<<< HEAD
-=======
-    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
->>>>>>> parent of db9f87e... removed old docs
     return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
   }
 
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
 
-<<<<<<< HEAD
     if(attributeSelector == undefined) {
-=======
-    if (attributeSelector === undefined) {
->>>>>>> parent of db9f87e... removed old docs
       throw new Error('Please pass an attribute selector!')
     }
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var sql = self.QueryGenerator.selectQuery(tableName, options)
-<<<<<<< HEAD
         , qry = self.sequelize.query(sql, null, { plain: true, raw: true })
-=======
-        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
->>>>>>> parent of db9f87e... removed old docs
 
       qry
         .success(function(data) {
@@ -351,37 +261,17 @@
     var self = this
 
     options = Utils._.extend({
-<<<<<<< HEAD
       success: function(obj){},
       error: function(err){}
-=======
-      success: function(){},
-      error: function(){}
->>>>>>> parent of db9f87e... removed old docs
     }, options || {})
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var query = null
 
-<<<<<<< HEAD
       if(Array.isArray(sqlOrQueryParams)) {
         query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
       } else {
         query = self.sequelize.query(sqlOrQueryParams)
-=======
-      if (Array.isArray(sqlOrQueryParams)) {
-        if (sqlOrQueryParams.length === 1) {
-          sqlOrQueryParams.push(null)
-        }
-
-        if (sqlOrQueryParams.length === 2) {
-          sqlOrQueryParams.push({})
-        }
-
-        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
-      } else {
-        query = self.sequelize.query(sqlOrQueryParams, null, {})
->>>>>>> parent of db9f87e... removed old docs
       }
 
       // append the query for better testing
@@ -398,16 +288,11 @@
       })
       query.on('sql', function(sql) {
         emitter.emit('sql', sql)
-<<<<<<< HEAD
       })
-=======
-      });
->>>>>>> parent of db9f87e... removed old docs
     }).run()
   }
 
   return QueryInterface
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/sequelize.js.html b/docs/sequelize.js.html
index 68ca2d8c6bda..ccb1a00ef7f1 100644
--- a/docs/sequelize.js.html
+++ b/docs/sequelize.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Params:
 
@@ -87,21 +45,10 @@
       query: {},
       sync: {},
       logging: console.log,
-<<<<<<< HEAD
       omitNull: false
     }, options || {})
 
     if(this.options.logging === true) {
-=======
-      omitNull: false,
-      queue: true,
-      native: false,
-      replication: false,
-      pool: {}
-    }, options || {})
-
-    if (this.options.logging === true) {
->>>>>>> parent of db9f87e... removed old docs
       console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
       this.options.logging = console.log
     }
@@ -113,15 +60,7 @@
       host    : this.options.host,
       port    : this.options.port,
       pool    : this.options.pool,
-<<<<<<< HEAD
       protocol: this.options.protocol
-=======
-      protocol: this.options.protocol,
-      queue   : this.options.queue,
-      native  : this.options.native,
-      replication: this.options.replication,
-      maxConcurrentQueries: this.options.maxConcurrentQueries
->>>>>>> parent of db9f87e... removed old docs
     }
 
     var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
@@ -142,11 +81,7 @@
   }
 
   Sequelize.prototype.getMigrator = function(options, force) {
-<<<<<<< HEAD
     if(force) {
-=======
-    if (force) {
->>>>>>> parent of db9f87e... removed old docs
       this.migrator = new Migrator(this, options)
     } else {
       this.migrator = this.migrator || new Migrator(this, options)
@@ -157,25 +92,10 @@
 
   Sequelize.prototype.define = function(daoName, attributes, options) {
     options = options || {}
-<<<<<<< HEAD
     if(this.options.define) {
       options = Sequelize.Utils.merge(options, this.options.define)
     }
     options.omitNull = this.options.omitNull
-=======
-    var globalOptions = this.options
-
-    if (globalOptions.define) {
-      options = Utils._.extend({}, globalOptions.define, options)
-      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
-        if (globalOptions.define[key]) {
-          options[key] = options[key] || {}
-          Utils._.extend(options[key], globalOptions.define[key])
-        }
-      })
-    }
-    options.omitNull = globalOptions.omitNull
->>>>>>> parent of db9f87e... removed old docs
 
     var factory = new DAOFactory(daoName, attributes, options)
     this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
@@ -201,24 +121,9 @@
   }
 
   Sequelize.prototype.query = function(sql, callee, options) {
-<<<<<<< HEAD
     options = Utils._.extend(Utils._.clone(this.options.query), options || {})
     options = Utils._.extend(options, {
       logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log
-=======
-    if (arguments.length === 3) {
-      options = options
-    } else if (arguments.length === 2) {
-      options = {}
-    } else {
-      options = { raw: true }
-    }
-
-    options = Utils._.extend(Utils._.clone(this.options.query), options)
-    options = Utils._.defaults(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
-      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
->>>>>>> parent of db9f87e... removed old docs
     })
 
     return this.connectorManager.query(sql, callee, options)
@@ -227,13 +132,8 @@
   Sequelize.prototype.sync = function(options) {
     options = options || {}
 
-<<<<<<< HEAD
     if(this.options.sync) {
       options = Sequelize.Utils.merge(options, this.options.sync)
-=======
-    if (this.options.sync) {
-      options = Utils._.extend({}, this.options.sync, options)
->>>>>>> parent of db9f87e... removed old docs
     }
 
     var chainer = new Utils.QueryChainer()
@@ -261,7 +161,6 @@
   }
 
   return Sequelize
-<<<<<<< HEAD
 })()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file
diff --git a/docs/utils.js.html b/docs/utils.js.html
index 6e83b9a6b3b4..4625d2238245 100644
--- a/docs/utils.js.html
+++ b/docs/utils.js.html
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var mysql      = require("mysql")
-=======
-}
-#folder-structure > ul > li ul:not(.active) {
-  display: none
-}
-#folder-structure > ul li a:hover {
-  background: #eee;
-}
-#folder-structure > ul ul.active {
-  border-left: 4px solid #eee;
-  padding-left: 10px;
-}
-#folder-structure li.active {
-  font-weight: bold;
-  background: #FAFAFA;
-}
-
-#folder-structure > ul > li a {
-  display: block;
-}
-
-#folder-structure h6 {
-  background: #eee;
-  padding: 10px;
-  cursor: pointer;
-  margin: 10px 0 0 0;
-}
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var mysql      = require("mysql")
->>>>>>> parent of db9f87e... removed old docs
   , connection = mysql.createConnection({})
   , util       = require("util")
   , DataTypes  = require("./data-types")
@@ -80,11 +38,7 @@
       camelizeIf: function(string, condition) {
         var result = string
 
-<<<<<<< HEAD
         if(condition) {
-=======
-        if (condition) {
->>>>>>> parent of db9f87e... removed old docs
           result = _.camelize(string)
         }
 
@@ -93,11 +47,7 @@
       underscoredIf: function(string, condition) {
         var result = string
 
-<<<<<<< HEAD
         if(condition) {
-=======
-        if (condition) {
->>>>>>> parent of db9f87e... removed old docs
           result = _.underscored(string)
         }
 
@@ -115,17 +65,12 @@
     return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
   },
   removeTicks: function(s) {
-<<<<<<< HEAD
     return s.replace("`", "")
-=======
-    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
->>>>>>> parent of db9f87e... removed old docs
   },
   escape: function(s) {
     return connection.escape(s).replace(/\\"/g, '"')
   },
   format: function(arr) {
-<<<<<<< HEAD
     var query        = arr[0]
       , replacements = Utils._.compact(arr.map(function(obj) { return obj != query ? obj : null}))
 
@@ -133,12 +78,6 @@
   },
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Utils._.isArray(obj);
-=======
-    return connection.format.apply(connection, [arr.shift(), arr])
-  },
-  isHash: function(obj) {
-    return Utils._.isObject(obj) && !Array.isArray(obj);
->>>>>>> parent of db9f87e... removed old docs
   },
   toSqlDate: function(date) {
     return [
@@ -151,7 +90,6 @@
     ].join(" ")
   },
   argsArePrimaryKeys: function(args, primaryKeys) {
-<<<<<<< HEAD
     var result = (args.length == Utils._.keys(primaryKeys).length)
     Utils._.each(args, function(arg) {
       if(result) {
@@ -162,20 +100,6 @@
 
       }
     })
-=======
-    var result = (args.length == Object.keys(primaryKeys).length)
-    if (result) {
-      Utils._.each(args, function(arg) {
-        if (result) {
-          if (['number', 'string'].indexOf(typeof arg) !== -1) {
-            result = true
-          } else {
-            result = (arg instanceof Date)
-          }
-        }
-      })
-    }
->>>>>>> parent of db9f87e... removed old docs
     return result
   },
   combineTableNames: function(tableName1, tableName2) {
@@ -190,7 +114,6 @@
     return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
   },
 
-<<<<<<< HEAD
   merge: function(a, b){
     for(var key in b) {
       a[key] = b[key]
@@ -198,8 +121,6 @@
     return a
   },
 
-=======
->>>>>>> parent of db9f87e... removed old docs
   removeCommentsFromFunctionString: function(s) {
     s = s.replace(/\s*(\/\/.*)/g, '')
     s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
@@ -227,11 +148,7 @@
   removeNullValuesFromHash: function(hash, omitNull) {
     var result = hash
 
-<<<<<<< HEAD
     if(omitNull) {
-=======
-    if (omitNull) {
->>>>>>> parent of db9f87e... removed old docs
       var _hash = {}
 
       Utils._.each(hash, function(val, key) {
@@ -264,17 +181,6 @@
     }
   },
 
-<<<<<<< HEAD
-=======
-  firstValueOfHash: function(obj) {
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key))
-        return obj[key]
-    }
-    return null
-  },
-
->>>>>>> parent of db9f87e... removed old docs
   inherit: function(subClass, superClass) {
     if (superClass.constructor == Function) {
       // Normal Inheritance
@@ -290,15 +196,10 @@
 
     return subClass;
   }
-<<<<<<< HEAD
-=======
-
->>>>>>> parent of db9f87e... removed old docs
 }
 
 Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
 Utils.QueryChainer = require("./query-chainer")
-<<<<<<< HEAD
 Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
->>>>>>> parent of db9f87e... removed old docs
+Prism.languages.javascript={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0},keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?\d+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});
\ No newline at end of file

From 1532dad26d4d5c745da45b413fda4c01b12a9f55 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:25:37 +0100
Subject: [PATCH 134/360] ha! works!

---
 docs/api.js                                   |  17 -
 docs/assets/css/external-small.png            | Bin 491 -> 0 bytes
 docs/assets/css/logo.png                      | Bin 6308 -> 0 bytes
 docs/assets/css/main.css                      | 782 ------------------
 docs/assets/favicon.png                       | Bin 740 -> 0 bytes
 docs/assets/img/spinner.gif                   | Bin 2685 -> 0 bytes
 docs/assets/index.html                        |  10 -
 docs/assets/js/api-filter.js                  |  52 --
 docs/assets/js/api-list.js                    | 251 ------
 docs/assets/js/api-search.js                  |  98 ---
 docs/assets/js/apidocs.js                     | 370 ---------
 docs/assets/js/yui-prettify.js                |  17 -
 docs/assets/vendor/prettify/CHANGES.html      | 130 ---
 docs/assets/vendor/prettify/COPYING           | 202 -----
 docs/assets/vendor/prettify/README.html       | 203 -----
 docs/assets/vendor/prettify/prettify-min.css  |   1 -
 docs/assets/vendor/prettify/prettify-min.js   |   1 -
 docs/classes/Sequelize.html                   | 338 --------
 docs/classes/index.html                       |  10 -
 docs/data.json                                | 301 -------
 docs/files/index.html                         |  10 -
 docs/files/index.js.html                      | 115 ---
 docs/files/lib_dao-factory.js.html            | 523 ------------
 .../files/lib_dialects_abstract_query.js.html | 519 ------------
 docs/files/lib_sequelize.js.html              | 303 -------
 docs/lib/associations/belongs-to.js.html      | 116 ---
 .../has-many-double-linked.js.html            | 188 -----
 .../has-many-single-linked.js.html            | 106 ---
 docs/lib/associations/has-many.js.html        | 236 ------
 docs/lib/associations/has-one.js.html         | 139 ----
 docs/lib/associations/mixin.js.html           | 112 ---
 docs/lib/dao-factory-manager.js.html          |  80 --
 docs/lib/dao-factory.js.html                  | 300 -------
 docs/lib/dao.js.html                          | 210 -----
 docs/lib/data-types.js.html                   |  56 --
 docs/lib/dialects/abstract/query.js.html      | 370 ---------
 docs/lib/dialects/connector-manager.js.html   |  69 --
 .../dialects/mysql/connector-manager.js.html  | 379 ---------
 .../dialects/mysql/query-generator.js.html    | 483 -----------
 docs/lib/dialects/mysql/query.js.html         |  84 --
 .../postgres/connector-manager.js.html        | 146 ----
 .../dialects/postgres/query-generator.js.html | 624 --------------
 docs/lib/dialects/postgres/query.js.html      | 136 ---
 docs/lib/dialects/query-generator.js.html     |  92 ---
 .../dialects/sqlite/connector-manager.js.html |  62 --
 .../dialects/sqlite/query-generator.js.html   | 240 ------
 docs/lib/dialects/sqlite/query.js.html        | 160 ----
 .../lib/emitters/custom-event-emitter.js.html |  91 --
 docs/lib/migration.js.html                    | 177 ----
 docs/lib/migrator.js.html                     | 282 -------
 docs/lib/query-chainer.js.html                | 188 -----
 docs/lib/query-interface.js.html              | 329 --------
 docs/lib/sequelize.js.html                    | 210 -----
 docs/lib/utils.js.html                        | 225 -----
 docs/modules/index.html                       |  10 -
 docs/modules/sequelize.html                   | 147 ----
 56 files changed, 10300 deletions(-)
 delete mode 100644 docs/api.js
 delete mode 100644 docs/assets/css/external-small.png
 delete mode 100644 docs/assets/css/logo.png
 delete mode 100644 docs/assets/css/main.css
 delete mode 100644 docs/assets/favicon.png
 delete mode 100644 docs/assets/img/spinner.gif
 delete mode 100644 docs/assets/index.html
 delete mode 100644 docs/assets/js/api-filter.js
 delete mode 100644 docs/assets/js/api-list.js
 delete mode 100644 docs/assets/js/api-search.js
 delete mode 100644 docs/assets/js/apidocs.js
 delete mode 100644 docs/assets/js/yui-prettify.js
 delete mode 100644 docs/assets/vendor/prettify/CHANGES.html
 delete mode 100644 docs/assets/vendor/prettify/COPYING
 delete mode 100644 docs/assets/vendor/prettify/README.html
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.css
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.js
 delete mode 100644 docs/classes/Sequelize.html
 delete mode 100644 docs/classes/index.html
 delete mode 100644 docs/data.json
 delete mode 100644 docs/files/index.html
 delete mode 100644 docs/files/index.js.html
 delete mode 100644 docs/files/lib_dao-factory.js.html
 delete mode 100644 docs/files/lib_dialects_abstract_query.js.html
 delete mode 100644 docs/files/lib_sequelize.js.html
 delete mode 100644 docs/lib/associations/belongs-to.js.html
 delete mode 100644 docs/lib/associations/has-many-double-linked.js.html
 delete mode 100644 docs/lib/associations/has-many-single-linked.js.html
 delete mode 100644 docs/lib/associations/has-many.js.html
 delete mode 100644 docs/lib/associations/has-one.js.html
 delete mode 100644 docs/lib/associations/mixin.js.html
 delete mode 100644 docs/lib/dao-factory-manager.js.html
 delete mode 100644 docs/lib/dao-factory.js.html
 delete mode 100644 docs/lib/dao.js.html
 delete mode 100644 docs/lib/data-types.js.html
 delete mode 100644 docs/lib/dialects/abstract/query.js.html
 delete mode 100644 docs/lib/dialects/connector-manager.js.html
 delete mode 100644 docs/lib/dialects/mysql/connector-manager.js.html
 delete mode 100644 docs/lib/dialects/mysql/query-generator.js.html
 delete mode 100644 docs/lib/dialects/mysql/query.js.html
 delete mode 100644 docs/lib/dialects/postgres/connector-manager.js.html
 delete mode 100644 docs/lib/dialects/postgres/query-generator.js.html
 delete mode 100644 docs/lib/dialects/postgres/query.js.html
 delete mode 100644 docs/lib/dialects/query-generator.js.html
 delete mode 100644 docs/lib/dialects/sqlite/connector-manager.js.html
 delete mode 100644 docs/lib/dialects/sqlite/query-generator.js.html
 delete mode 100644 docs/lib/dialects/sqlite/query.js.html
 delete mode 100644 docs/lib/emitters/custom-event-emitter.js.html
 delete mode 100644 docs/lib/migration.js.html
 delete mode 100644 docs/lib/migrator.js.html
 delete mode 100644 docs/lib/query-chainer.js.html
 delete mode 100644 docs/lib/query-interface.js.html
 delete mode 100644 docs/lib/sequelize.js.html
 delete mode 100644 docs/lib/utils.js.html
 delete mode 100644 docs/modules/index.html
 delete mode 100644 docs/modules/sequelize.html

diff --git a/docs/api.js b/docs/api.js
deleted file mode 100644
index a2be985c6f9b..000000000000
--- a/docs/api.js
+++ /dev/null
@@ -1,17 +0,0 @@
-YUI.add("yuidoc-meta", function(Y) {
-   Y.YUIDoc = { meta: {
-    "classes": [
-        "Sequelize"
-    ],
-    "modules": [
-        "sequelize"
-    ],
-    "allModules": [
-        {
-            "displayName": "sequelize",
-            "name": "sequelize",
-            "description": "The entry point."
-        }
-    ]
-} };
-});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
deleted file mode 100644
index 759a1cdcb5b1697e5be290d98b830e279cd71f3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 491
zcmVDs{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce)^8hM>B_8

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
deleted file mode 100644
index 609b336c7cc5ef0c787a0068d221d9b8d69b1241..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6308
zcmV;V7+dFwP)EI3}K
zJAc0RviDlMYT7$`hje!Kj@LB3B$v~Qd;9X^3|$AqFu>69Z0KMbrezvAWa@n&$tpT|
zTCH{cyjdVi(gp+w@V^dOksB0A>WW6xhIlO6Tv?HM0X_i}I#y60{PpGwx9vPMtFtRN
zzNw#+=Tj2u`-uL(#+a*U!Mhu
zc*G(+@nj+A1708rA$uKO;<-VVr3MVYxhNW0pGl{-r;6j7{t5L6rgfY5PJ8CL9kUwu
zbudgU8eg2Ex&np2&cRTd`wY)J^i1Ra5;fuU*mdm4tUfgDMK5-q{|m=*>K
zmt0VX&YeBdQ=)fa$R^1smi%+SgBQrVaGN@ES(A;8iY#qZRr%H8m*V6T)hnK*O
z|1pC?@pvK+BT#UNUrSjdWbFT{Dzm@;L_uBh$8ED$
zuiJfPTW9`aY$8*RdjnUUrlU^R+`03|hDm_i5Luwnq7j
z3E6ba0VDwiwDHfNDd`afqMg
z;ri!g_m!HW5oK|Cwq!YmyzwIm^+yk_|MHs+Eq9xyRnxCJok*4f#gVLpK`K!hOA`m7
zrXArDhy&z@@Nn!4VdiZ&EK2}
z!>Wpb{OnM$1DNA}{p_I4v2VIXKZ_VEfRJY;Iuu1&R+5T8o=vA-I4+<*_iE$hMa%1N
z?C8v0J+L~7s%)S@Ol>?uPErsk33`wuLuSY*+7vE48>%1a67ze?luG!wOC|%)EeI?C
zwx8(O`zi;pKd^^yj)74>4y=|X<3)=q%hS&sGpIj(bkp1oZ|%Pi=bIBl)oF$l5s2@M
zMR71BQ;7WmRiZH{$yVb?Qlg!quu66K@%K)LY$gGSZT&zB6I6^-H+0k^z+_eD?rXV0
z5L1qV!A8eorwW24lZ?>%SS-4rYDo5p4;AW7cfWM)yL&qBv%JW5V0Dtllaoax+#e8V
zB$k8}28x_x5pbFwuF@G(hQL=Zo$NO}umKO_6oH2kR4wxSrWK}m#G&)Saemf6U$B$#
zrk6{FSmir^W1qZLRh7qwRhQrMfkT~l``>=_UTe?oZtBgd(=tsiMRB8Ch$x^WV>B2V
z2&ft>#tNPJ}C{6fYwxz@4|uh6E0@Tu_z>Hq6&SP$9h8q(!7amKNbU6FeVQ}e16NTW!wW&xj$800_2i8@Oqgl}(
zBSw)>zyh$kWustb6XGlYV~&}Q<#hu4I2f+-v+5yb_Z=xziTz{6OS|eQ&>jY;WnVK<
zC-H4sK93taZ#RBkqo1YXxB%3K83r_hfuO2dE_W1xNt
zM0PXiOoA)J`RvVj-Ko>7p*$P6lX{8PUSW6R0a&^20BmcNVdIuIyv<@%guE030oxG(
zo?N~Tw)_KN*^1o|jTX^uTeiLne_Xi>wrta2?JLbpT^KQ7kpLFMd+=F!t3ij~|9Kbg
z?DqNBz4A8v^@Y9gWXeu*Dj4zq2_$oi{Sn_&7~dqZ!8iyBqiKY1-HN?Zbxp
z%=7P#eQfF0WjMl}6i_FHX+zXqpqdRdnk@lERXCvF0o8ev8*_ky@1qUVbX2O_VCif!
zOA{`dJI)8?n7Q8GJgo=&{!!u@9x-4gSFN;#Wx7XCFDZ2R-^B-`>$|$O;BgpV=&2U}
z-Q8pFvun>G@B2G;?!_leayJd!-|j}>eA>jQmQBmt-)qs>p$50j1G}3J?B0K%?el|%
zx@g(fW!SGx;?$}8e$6$vE>IHb7L}!O&LszcA`fWZ1BxUClIbB{7o-bn0SpGFZEjhm
zo_0zNl$XUR7}31)&e3Uf$=!|^VBqa9R+|tCDKB!$WE+_&GKBtskbs5t>4?=n8%zm6
zT_c8sC>^X}`MkEYvAJbUOKbb5`h`00w$<0;#+>ZJ^wb$URR>Z?Vx4f)LgW^bpmC?862+
zeD`4UR^}Rb;~wIXya
zx}t0;$f`{JW*AUX!*zWr@rlJ{c42`nT#(?%bnnhM{!~QV~&KNRZ#a{m5J7Kckw5%_+cXV&s
z_uio&gqq*8PN}*Irw$#QI-SpXVs7&`+!!{wYCH6phTRT*q+&i
zpen_P7awo-tl@TG#Be~I=>}f$d>RxuQqc6W0UN7Y
z2%dwDv>`;fo++^0j!d_f;1u&G`}QAv`A}Qe6b|ZjS4`VDW<>GTE>JzsE0w4>l1e}n
zr!I(zZbhK>-4+{Y0{c)>G4k?Ua8+t@zLb8}-E}t5Y-tgkb=pWH1T>gdk
z4zzuPOKI+#f8NrHZ0ttjKdCwypmI?Z66I+ds8IkYGYmy7NCzAsGDz@>fAhQV0prFVph_Hz=*3y7?lo;8z0y7vcglvC70-
z79pQygD(HHCAbZLffYNMD?Tjw`NcmQT9LTPg-K=-g{6j;4+zvAxsa#nL8@Z7N7Em(
zXZa8rmHIGEFL*lVj8TsNl5Q-Ld#=|Q#%%}FJ
zRJOwbmnK0dM8uU9fv;gBKDQ*^|7Tj
zL+oDe0X2g_b=U0bP*OpBp$v$tn}nHN=Wk{`39L?;S_PHmNk3|Jf+JC}T;mBUMj+;^
zq2Z|=fQjqGT-O64g{DA-{49H`&X0T@Ul@Sx`{m&6L&O&-z=4Q`*WH`LId=}bO8wbX
zDlv6Oc
zF|f-^0Gr;}1G;fCsH$-9l*<-Fz$V5m`SIaEc4OfiB(Ie4sfB*2uYJSgA}MUn0uJF5E5f`SZN`Q@Aca6eYyMD{kC2-IMJ
zD$zJZyTd+E%wI!*LgKd5E$g^gQgQu3i20i%lzrX4Azr%{ZY=-)GG_Pp?wJT@gfTbI92Oa;8JDdj#9Gc;WI2NX9I$xmh(wh8>uPK67)(Jw6zcMYm(2a*x1N5aqpkZI8))7Ks`Ef&
zC1s$fMgGoQ!M;GmOP411_he#vy^FI=u>Eig_!n*YV9A#*|J*cq@(-I~*MT@a=ihg>
z!}cAxg^dQg$77RbNqC#AdI}XMvNjfrz^&i;3_Sju*I~!*JY8SEy#?yG?ZuxMQJ^^W
zrSW(KzVd~WVA6y%KCBsDHgwv+4R|c?dVEV^Im3dGW10NIg5`h(VtG~$t<2nr1EKmO
zx=GHZHVZDfcHGGHJk!uRIG|ddQLPT?$`PR|^^5d+fpVb1r8Fl@EO&1ASzi0oo@-go
zpbN{3q@7_HP(3sY-@Nh+xbVypNW|Qe<46bxP~MEE@nb6B*6YuPx{-1SQv3hm!^+{N
z>rRKyoSlKvlBjbm)dA_uPPF@jo6doA&LU&j4Idt!5^=JhDUxM=JM$U*>oJ}6berXk
zA8Jg-V_%$9H)8JL0PQzWBGZC9KKrXxFKv6}!AGC_c1ugo)gsVDX*np7B0nb;Ml<+D
z1vb(({RodytZjN-^W=PTYuJpRMa)e|qS|OQ3g?|Q5$2qQ;J_gZE3E^%dUSe>qNoIQ
zqtZ|_G>*@e!ySg0L)p)>EZ+o@kBMXgzIf?raPj9%IM8aqtFJYY@Qi-FvLXTF#$@m^
zj(@*Kuf>HUIlt}X>Eqz(KWxKkRvbnSE3w@Nt5oN=dlrc`$Bsq98#*G2{Mf|0kw-M@
z;jjjC|JS1D&V1tOHTQINbHOc-B&*w6MTiu`molOp4j)*Q{iGik72{Q6bry!7Iq=Fd89#@Nf_
zMao|#?58}SLgmQ4Ps$b-OrglYsfhqUZ?FFTsznFe`>qTh&7g-A9D>CL+Z1DeI;kQMSlA}X2`)^_Q>|!@#k7am
zF$>th3Ouvk+S*AT?r_d!Ispk2j4>k%+4F!CpxH1aH(=$W@nBGA@go`N`TRRS^tVe=
zVhj$J+ZnXK6*pY;Nz!2VR4E-ivgI_5N(FkF)X8|G&RN_)V4
z^8;SC9PEJBHiKUA@M>%sOoNFuc_40YuzXX%6a!2re+-FUo#?{itQUI++@fKWgrp{%
za{YYL_>p&i5RY9P5!9DAHBZqrV*+2Ww}R=5DXNn#;@bh!n9&(Vp>AI0r#8qjscvIi
zZq7Hzw8yf02CRO5Grn5;WgpY0)X-qZZFN6|KwjX($e)3WJd5BxpydTYY~YI6z{mS-
zy+bVDweuVGUc&3TN%pbtIi&fOe4g(2(6d5JH*?bg`^pZNrCl)NzP
zqd?lzy!RkHvSbY$?2u?(m{ydWi1Xhsp9wRkW$hFT|3LIL$0hB+3%
zlAJISiP2|l=xwp1s6vIAV;uN&MpR{4CR4J!Zp`rG?p;d9!FTw&p&s>
z6`4$o1K1x}=DlUX*WZX`JA{s+ycjgcc-a|IlvVLWY}H98j(Z4>k}&_nY<%rV8byJt0*nyoo@3wI~{SwW6$a{pgX^&%sA5cF)n9#9&GxwgR
z{Zs0xV^FE`UP%o^P=X8QK;aQ!TAjwSMDZdq=Skc3kWr9qOVj$|TMUy@2RjU7Gg
zIrtb)=y-bFI+?cA|6}%{w$5tu%FgzVo|%5E5)Kw8`kl#Syxx^LPA%$(R%SQBCwTgQ
a0R{k+kX}`<%LV)Z0000
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -   blocks. */
-pre code, pre kbd, pre samp { font-size: 100%; }
-
-/* Used to denote text that shouldn't be selectable, such as line numbers or
-   shell prompts. Guess which browser this doesn't work in. */
-.noselect {
-    -moz-user-select: -moz-none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-}
-
-/* -- Lists ----------------------------------------------------------------- */
-dd { margin: 0.2em 0 0.7em 1em; }
-dl { margin: 1em 0; }
-dt { font-weight: bold; }
-
-/* -- Tables ---------------------------------------------------------------- */
-caption, th { text-align: left; }
-
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-td, th {
-    border: 1px solid #fff;
-    padding: 5px 12px;
-    vertical-align: top;
-}
-
-td { background: #E6E9F5; }
-td dl { margin: 0; }
-td dl dl { margin: 1em 0; }
-td pre:first-child { margin-top: 0; }
-
-th {
-    background: #D2D7E6;/*#97A0BF*/
-    border-bottom: none;
-    border-top: none;
-    color: #000;/*#FFF1D5*/
-    font-family: 'Trebuchet MS', sans-serif;
-    font-weight: bold;
-    line-height: 1.3;
-    white-space: nowrap;
-}
-
-
-/* -- Layout and Content ---------------------------------------------------- */
-#doc {
-    margin: auto;
-    min-width: 1024px;
-}
-
-.content { padding: 0 20px 0 25px; }
-
-.sidebar {
-    padding: 0 15px 0 10px;
-}
-#bd {
-    padding: 7px 0 130px;
-    position: relative;
-    width: 99%;
-}
-
-/* -- Table of Contents ----------------------------------------------------- */
-
-/* The #toc id refers to the single global table of contents, while the .toc
-   class refers to generic TOC lists that could be used throughout the page. */
-
-.toc code, .toc kbd, .toc samp { font-size: 100%; }
-.toc li { font-weight: bold; }
-.toc li li { font-weight: normal; }
-
-/* -- Intro and Example Boxes ----------------------------------------------- */
-/*
-.intro, .example { margin-bottom: 2em; }
-.example {
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: 0 0 5px #bfbfbf;
-    -webkit-box-shadow: 0 0 5px #bfbfbf;
-    box-shadow: 0 0 5px #bfbfbf;
-    padding: 1em;
-}
-.intro {
-    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
-}
-*/
-
-/* -- Other Styles ---------------------------------------------------------- */
-
-/* These are probably YUI-specific, and should be moved out of Selleck's default
-   theme. */
-
-.button {
-    border: 1px solid #dadada;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    color: #444;
-    display: inline-block;
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 92.308%;
-    font-weight: bold;
-    padding: 4px 13px 3px;
-    -moz-text-shadow: 1px 1px 0 #fff;
-    -webkit-text-shadow: 1px 1px 0 #fff;
-    text-shadow: 1px 1px 0 #fff;
-    white-space: nowrap;
-
-    background: #EFEFEF; /* old browsers */
-    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
-}
-
-.button:hover {
-    border-color: #466899;
-    color: #fff;
-    text-decoration: none;
-    -moz-text-shadow: 1px 1px 0 #222;
-    -webkit-text-shadow: 1px 1px 0 #222;
-    text-shadow: 1px 1px 0 #222;
-
-    background: #6396D8; /* old browsers */
-    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
-}
-
-.newwindow { text-align: center; }
-
-.header .version em {
-    display: block;
-    text-align: right;
-}
-
-
-#classdocs .item {
-    border-bottom: 1px solid #466899;
-    margin: 1em 0;
-    padding: 1.5em;
-}
-
-#classdocs .item .params p,
-    #classdocs .item .returns p,{
-    display: inline;
-}
-
-#classdocs .item em code, #classdocs .item em.comment {
-    color: green;
-}
-
-#classdocs .item em.comment a {
-    color: green;
-    text-decoration: underline;
-}
-
-#classdocs .foundat {
-    font-size: 11px;
-    font-style: normal;
-}
-
-.attrs .emits {
-    margin-left: 2em;
-    padding: .5em;
-    border-left: 1px dashed #ccc;
-}
-
-abbr {
-    border-bottom: 1px dashed #ccc;
-    font-size: 80%;
-    cursor: help;
-}
-
-.prettyprint li.L0, 
-.prettyprint li.L1, 
-.prettyprint li.L2, 
-.prettyprint li.L3, 
-.prettyprint li.L5, 
-.prettyprint li.L6, 
-.prettyprint li.L7, 
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-ul li p {
-    margin-top: 0;
-}
-
-.method .name {
-    font-size: 110%;
-}
-
-.apidocs .methods .extends .method,
-.apidocs .properties .extends .property,
-.apidocs .attrs .extends .attr,
-.apidocs .events .extends .event {
-    font-weight: bold;
-}
-
-.apidocs .methods .extends .inherited,
-.apidocs .properties .extends .inherited,
-.apidocs .attrs .extends .inherited,
-.apidocs .events .extends .inherited {
-    font-weight: normal;
-}
-
-#hd {
-    background: whiteSmoke;
-    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
-    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
-    border-bottom: 1px solid #DFDFDF;
-    padding: 0 15px 1px 20px;
-    margin-bottom: 15px;
-}
-
-#hd img {
-    margin-right: 10px;
-    vertical-align: middle;
-}
-
-
-/* -- API Docs CSS ---------------------------------------------------------- */
-
-/*
-This file is organized so that more generic styles are nearer the top, and more
-specific styles are nearer the bottom of the file. This allows us to take full
-advantage of the cascade to avoid redundant style rules. Please respect this
-convention when making changes.
-*/
-
-/* -- Generic TabView styles ------------------------------------------------ */
-
-/*
-These styles apply to all API doc tabviews. To change styles only for a
-specific tabview, see the other sections below.
-*/
-
-.yui3-js-enabled .apidocs .tabview {
-    visibility: hidden; /* Hide until the TabView finishes rendering. */
-    _visibility: visible;
-}
-
-.apidocs .tabview.yui3-tabview-content { visibility: visible; }
-.apidocs .tabview .yui3-tabview-panel { background: #fff; }
-
-/* -- Generic Content Styles ------------------------------------------------ */
-
-/* Headings */
-h2, h3, h4, h5, h6 {
-    border: none;
-    color: #30418C;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.link-docs {
-    float: right;
-    font-size: 15px;
-    margin: 4px 4px 6px;
-    padding: 6px 30px 5px;
-}
-
-.apidocs { zoom: 1; }
-
-/* Generic box styles. */
-.apidocs .box {
-    border: 1px solid;
-    border-radius: 3px;
-    margin: 1em 0;
-    padding: 0 1em;
-}
-
-/* A flag is a compact, capsule-like indicator of some kind. It's used to
-   indicate private and protected items, item return types, etc. in an
-   attractive and unobtrusive way. */
-.apidocs .flag {
-    background: #bababa;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 11px;
-    margin: 0 0.5em;
-    padding: 2px 4px 1px;
-}
-
-/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
-.apidocs .meta {
-    background: #f9f9f9;
-    border-color: #efefef;
-    color: #555;
-    font-size: 11px;
-    padding: 3px 6px;
-}
-
-.apidocs .meta p { margin: 0; }
-
-/* Deprecation warning. */
-.apidocs .box.deprecated,
-.apidocs .flag.deprecated {
-    background: #fdac9f;
-    border: 1px solid #fd7775;
-}
-
-.apidocs .box.deprecated p { margin: 0.5em 0; }
-.apidocs .flag.deprecated { color: #333; }
-
-/* Module/Class intro description. */
-.apidocs .intro {
-    background: #f0f1f8;
-    border-color: #d4d8eb;
-}
-
-/* Loading spinners. */
-#bd.loading .apidocs,
-#api-list.loading .yui3-tabview-panel {
-    background: #fff url(../img/spinner.gif) no-repeat center 70px;
-    min-height: 150px;
-}
-
-#bd.loading .apidocs .content,
-#api-list.loading .yui3-tabview-panel .apis {
-    display: none;
-}
-
-.apidocs .no-visible-items { color: #666; }
-
-/* Generic inline list. */
-.apidocs ul.inline {
-    display: inline;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.apidocs ul.inline li { display: inline; }
-
-/* Comma-separated list. */
-.apidocs ul.commas li:after { content: ','; }
-.apidocs ul.commas li:last-child:after { content: ''; }
-
-/* Keyboard shortcuts. */
-kbd .cmd { font-family: Monaco, Helvetica; }
-
-/* -- Generic Access Level styles ------------------------------------------- */
-.apidocs .item.protected,
-.apidocs .item.private,
-.apidocs .index-item.protected,
-.apidocs .index-item.deprecated,
-.apidocs .index-item.private {
-    display: none;
-}
-
-.show-deprecated .item.deprecated,
-.show-deprecated .index-item.deprecated,
-.show-protected .item.protected,
-.show-protected .index-item.protected,
-.show-private .item.private,
-.show-private .index-item.private {
-    display: block;
-}
-
-.hide-inherited .item.inherited,
-.hide-inherited .index-item.inherited {
-    display: none;
-}
-
-/* -- Generic Item Index styles --------------------------------------------- */
-.apidocs .index { margin: 1.5em 0 3em; }
-
-.apidocs .index h3 {
-    border-bottom: 1px solid #efefef;
-    color: #333;
-    font-size: 13px;
-    margin: 2em 0 0.6em;
-    padding-bottom: 2px;
-}
-
-.apidocs .index .no-visible-items { margin-top: 2em; }
-
-.apidocs .index-list {
-    border-color: #efefef;
-    font-size: 12px;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    -moz-column-count: 4;
-    -moz-column-gap: 10px;
-    -moz-column-width: 170px;
-    -ms-column-count: 4;
-    -ms-column-gap: 10px;
-    -ms-column-width: 170px;
-    -o-column-count: 4;
-    -o-column-gap: 10px;
-    -o-column-width: 170px;
-    -webkit-column-count: 4;
-    -webkit-column-gap: 10px;
-    -webkit-column-width: 170px;
-    column-count: 4;
-    column-gap: 10px;
-    column-width: 170px;
-}
-
-.apidocs .no-columns .index-list {
-    -moz-column-count: 1;
-    -ms-column-count: 1;
-    -o-column-count: 1;
-    -webkit-column-count: 1;
-    column-count: 1;
-}
-
-.apidocs .index-item { white-space: nowrap; }
-
-.apidocs .index-item .flag {
-    background: none;
-    border: none;
-    color: #afafaf;
-    display: inline;
-    margin: 0 0 0 0.2em;
-    padding: 0;
-}
-
-/* -- Generic API item styles ----------------------------------------------- */
-.apidocs .args {
-    display: inline;
-    margin: 0 0.5em;
-}
-
-.apidocs .flag.chainable { background: #46ca3b; }
-.apidocs .flag.protected { background: #9b86fc; }
-.apidocs .flag.private { background: #fd6b1b; }
-.apidocs .flag.async { background: #356de4; }
-.apidocs .flag.required { background: #e60923; }
-
-.apidocs .item {
-    border-bottom: 1px solid #efefef;
-    margin: 1.5em 0 2em;
-    padding-bottom: 2em;
-}
-
-.apidocs .item h4,
-.apidocs .item h5,
-.apidocs .item h6 {
-    color: #333;
-    font-family: inherit;
-    font-size: 100%;
-}
-
-.apidocs .item .description p,
-.apidocs .item pre.code {
-    margin: 1em 0 0;
-}
-
-.apidocs .item .meta {
-    background: none;
-    border: none;
-    padding: 0;
-}
-
-.apidocs .item .name {
-    display: inline;
-    font-size: 14px;
-}
-
-.apidocs .item .type,
-.apidocs .item .type a,
-.apidocs .returns-inline {
-    color: #555;
-}
-
-.apidocs .item .type,
-.apidocs .returns-inline {
-    font-size: 11px;
-    margin: 0 0 0 0;
-}
-
-.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
-.apidocs .item .type a:hover { border: none; }
-
-/* -- Item Parameter List --------------------------------------------------- */
-.apidocs .params-list {
-    list-style: square;
-    margin: 1em 0 0 2em;
-    padding: 0;
-}
-
-.apidocs .param { margin-bottom: 1em; }
-
-.apidocs .param .type,
-.apidocs .param .type a {
-    color: #666;
-}
-
-.apidocs .param .type {
-    margin: 0 0 0 0.5em;
-    *margin-left: 0.5em;
-}
-
-.apidocs .param-name { font-weight: bold; }
-
-/* -- Item "Emits" block ---------------------------------------------------- */
-.apidocs .item .emits {
-    background: #f9f9f9;
-    border-color: #eaeaea;
-}
-
-/* -- Item "Returns" block -------------------------------------------------- */
-.apidocs .item .returns .type,
-.apidocs .item .returns .type a {
-    font-size: 100%;
-    margin: 0;
-}
-
-/* -- Class Constructor block ----------------------------------------------- */
-.apidocs .constructor .item {
-    border: none;
-    padding-bottom: 0;
-}
-
-/* -- File Source View ------------------------------------------------------ */
-.apidocs .file pre.code,
-#doc .apidocs .file pre.prettyprint {
-    background: inherit;
-    border: none;
-    overflow: visible;
-    padding: 0;
-}
-
-.apidocs .L0,
-.apidocs .L1,
-.apidocs .L2,
-.apidocs .L3,
-.apidocs .L4,
-.apidocs .L5,
-.apidocs .L6,
-.apidocs .L7,
-.apidocs .L8,
-.apidocs .L9 {
-    background: inherit;
-}
-
-/* -- Submodule List -------------------------------------------------------- */
-.apidocs .module-submodule-description {
-    font-size: 12px;
-    margin: 0.3em 0 1em;
-}
-
-.apidocs .module-submodule-description p:first-child { margin-top: 0; }
-
-/* -- Sidebar TabView ------------------------------------------------------- */
-#api-tabview { margin-top: 0.6em; }
-
-#api-tabview-filter,
-#api-tabview-panel {
-    border: 1px solid #dfdfdf;
-}
-
-#api-tabview-filter {
-    border-bottom: none;
-    border-top: none;
-    padding: 0.6em 10px 0 10px;
-}
-
-#api-tabview-panel { border-top: none; }
-#api-filter { width: 97%; }
-
-/* -- Content TabView ------------------------------------------------------- */
-#classdocs .yui3-tabview-panel { border: none; }
-
-/* -- Source File Contents -------------------------------------------------- */
-.prettyprint li.L0,
-.prettyprint li.L1,
-.prettyprint li.L2,
-.prettyprint li.L3,
-.prettyprint li.L5,
-.prettyprint li.L6,
-.prettyprint li.L7,
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-/* -- API options ----------------------------------------------------------- */
-#api-options {
-    font-size: 11px;
-    margin-top: 2.2em;
-    position: absolute;
-    right: 1.5em;
-}
-
-/*#api-options label { margin-right: 0.6em; }*/
-
-/* -- API list -------------------------------------------------------------- */
-#api-list {
-    margin-top: 1.5em;
-    *zoom: 1;
-}
-
-.apis {
-    font-size: 12px;
-    line-height: 1.4;
-    list-style: none;
-    margin: 0;
-    padding: 0.5em 0 0.5em 0.4em;
-}
-
-.apis a {
-    border: 1px solid transparent;
-    display: block;
-    margin: 0 0 0 -4px;
-    padding: 1px 4px 0;
-    text-decoration: none;
-    _border: none;
-    _display: inline;
-}
-
-.apis a:hover,
-.apis a:focus {
-    background: #E8EDFC;
-    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
-    border-color: #AAC0FA;
-    border-radius: 3px;
-    color: #333;
-    outline: none;
-}
-
-.api-list-item a:hover,
-.api-list-item a:focus {
-    font-weight: bold;
-    text-shadow: 1px 1px 1px #fff;
-}
-
-.apis .message { color: #888; }
-.apis .result a { padding: 3px 5px 2px; }
-
-.apis .result .type {
-    right: 4px;
-    top: 7px;
-}
-
-.api-list-item .yui3-highlight {
-    font-weight: bold;
-}
-
diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
deleted file mode 100644
index 5a95ddab6ff6735b52596ecea54f2b68298cae91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmV~sYqK3Gcus4xPHVF@NRlx_jU+UHO>DGCVWd%Mvj6}8PiwO?MUOK>
zh#e_-OJS-kK8Z|Xt0XgkGe(eqj=e%xpEO30J581!Eqg~?q%T2?Ek21)YqKpribYwO
zO>DFvE_`l(vNA-DP-?S5PK0`q!bDh@Mq8vgOqNb&rhJXTL|2zvaI{oyv}%RBafiZK
zXPjk$xItE*Ls+3FH-t7xlT2l%b%(okjlX(}z(iM=T5+{UVWUxLu~2HVQ*5(wfwpIY
zx^suTO<$u_Wt}fTi)DPfVSTqxX0Jh2pF>!pWqY$FG=V!yh%`o#I!lpBUZ_i9sy$Mh
zbd0`wjKM-wmsoDGM_{8+Xt7mktWRsRQE9SmezIwQzG;8GYk{~+U!725o-93xU~{x&
zdA3hxu0U0uNL!jG$nRJA=b%wh=O^H2C
zi#SY{S8At7V4_fHuux~PPinJicdKW6vS@y|OI(^NI)+?xw@qZNU~r`!DtSIqoCqvd
zm;e9(D|Av$Qve|DfN(%S$B)~`AYc$64eo$|fIvW?+sFBE5P*O{KtQ1G#~^@FK%hjn
zkdomz0002TNkl`w>G^{kLDnt;%<*|0o$}R6`^xy<@RoEM1
zqurZYT;p`r!P4>0S(y=fId&Oc5+FWDLu^>Hac!Eup}&RRh(iLlN#v|TEqoX
z5F2J5;1i==(bn!4tN;>_E30vHG)PRY)6s2(SgB^~Xzyu~5Z0B?0uj)%)~>X1@wKpO
z<%S6GDhHV+Ih7Q7iNigiX=l`)U1%u_7vT4<*Qrj=V?+3pPb|D3u#*89NQ6#w1ZBuqOP1eV&xzQwK$cK
zkb?<_1QC!z6+{~vj><7mpp+3&q{5Dt1$U9<3{C|V26e`6+}0U?@ONkSN8g|C`^+=f
zec#XX!r`F-fpJ8D2y6j>udlD4pC5oT3UK~dPYWuR4SFpWW~kBI-Ty)
zrAvCf-e52^Ha2#4cJ}o23=R&CjEszqjy`(yXliO|W@ct?Ztm&Rr_Y~1-`w1M{ra`P
zzkftTL}X-Se0+RDLPBO{W_EUVPEL+SqbVvXDlILot*vcoY3b|h8y+6Md-v|chYzQx
zr)Otp7Z(>-R#u)pd$zv5zO}Wry}hkaD7w13`uqDQCnp;k8k(A#mX?;**48#QHr~8>
zlai8BUtizc+}zvSJ3l}F;>C+2M~>XPckkuPmqw%U)vH&B4<82pkB{?j=qTvGeqqR`
z5R2iB1Wl->t8k$(8WzAl-af1_0N4}u*W}bRgf#%9q-JH99w-MtKSV)|0SLen*ai3i
zKwLs*dgT7l1Mh@}LqbZXsptdIrmkC${_G3<>BH|s@jv$AEj=AulRJ-t~vQzbstTBdj1f9x+OI}c{HEGJTIo)-S3
zvXu@V5Ze5s?o^rjP2oAJZBgJ43EeZab1q+7T3AZ*>`$M~Ip=VyAkWdBfV0!N;IWlu
zD(gxt-qC?f-Y0OdwW^d52?XMe&uMsja#IsM*&(x|vpcV`xxBXSr!40`V8IVychwC@
z(!=(Wi*J)OEFo9!i_1H9B3S81`;tp(L9|zFZVRfT#e-Mxsdc=o%{qm6GUnDq8#@+w
z>zp9;^*C*b0a>)OpldGRYLW-}Rgrhi;mT3&%e
zb^^cg9z2rK8N!u+qrAU$JXq=Q$F%*?-T?FD#nCSJ%RJ
zM8EzX-KiKhdEPdX+W9(2!>6Tj7tGHG(@GXIHcI#ZvuG)z`cvk-VdBK*c|$UxeEHgt
zh|eHoo#Hc@pK-so^azG|S%hK;SFlf#7sO=2{OEwvn5bYJuJ)RU!t37+vAHhjqeCDD7^hxtbsYzs?)RgAac-&SQ9q*ejs5N9;>zmK
zPUNUo2`H82%N0r`1gQ%0iFCS%U#Nn#S`7$YER~j(tMN9rtZI;7tOElDR#vuErF^v%
z*JNdL`G(A{(F)h2u*1gkN>^r%0ek*
zgATbqYlGa_bGv|KZA}7qZy-^>7P2IOH6RK_p0{{FP*Z?`0Sgup2zfAw7b+2os*;)q
z+5#lPY#aSu@*Qn1b)Pw6htWZ`zgMBUpw<*kdk!
zI2X()g6*)r9wu>OjUHjg4XG}it7AJ{SYC~${GkN#!Sq}P9oXlOJoAHCyhZJk<7)Dy2%T-Q`9NtoT?
zY$ef_KCTe&F^x^D+|KF=eiSu@+>KzjBXCcw!o>=<#ex+Z!{Kbw1y5|(6?AL-F>Q@`
zuo>r&XN^`QxOtZJWT7R`yM{vkjX0hzY5o_L9GG#?(B^5qQxb*`lhBZP;sO;+aia2c
zCaZudbVWYTsS0qtA`?@uVQ$EHXcr9BK!#y*gOuzZfplYa;d_x0w1J4;p)O;uTj$;O
zv99g_E?%o3GlPCna4l!>3Kn6$TmgB^SaLxzk9U(vpJzOlL7uAtVwlUNiF4YB+lX<^
pE|2Kr%d?-r>ImN9F0EXz^8E;tU2&^Zb%igPc${)^%gY+r_aA#xUsC`8

diff --git a/docs/assets/index.html b/docs/assets/index.html
deleted file mode 100644
index 487fe15b2ad0..000000000000
--- a/docs/assets/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-    
-        Redirector
-        
-    
-    
-        Click here to redirect
-    
-
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
deleted file mode 100644
index 37aefbab980b..000000000000
--- a/docs/assets/js/api-filter.js
+++ /dev/null
@@ -1,52 +0,0 @@
-YUI.add('api-filter', function (Y) {
-
-Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-    getDisplayName: function(name) {
-
-        Y.each(Y.YUIDoc.meta.allModules, function(i) {
-            if (i.name === name && i.displayName) {
-                name = i.displayName;
-            }
-        });
-
-        return name;
-    }
-
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        // May be set to "classes" or "modules".
-        queryType: {
-            value: 'classes'
-        },
-
-        source: {
-            valueFn: function() {
-                var self = this;
-                return function(q) {
-                    var data = Y.YUIDoc.meta[self.get('queryType')],
-                        out = [];
-                    Y.each(data, function(v) {
-                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
-                            out.push(v);
-                        }
-                    });
-                    return out;
-                };
-            }
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
-]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
deleted file mode 100644
index 88905b52ea3d..000000000000
--- a/docs/assets/js/api-list.js
+++ /dev/null
@@ -1,251 +0,0 @@
-YUI.add('api-list', function (Y) {
-
-var Lang   = Y.Lang,
-    YArray = Y.Array,
-
-    APIList = Y.namespace('APIList'),
-
-    classesNode    = Y.one('#api-classes'),
-    inputNode      = Y.one('#api-filter'),
-    modulesNode    = Y.one('#api-modules'),
-    tabviewNode    = Y.one('#api-tabview'),
-
-    tabs = APIList.tabs = {},
-
-    filter = APIList.filter = new Y.APIFilter({
-        inputNode : inputNode,
-        maxResults: 1000,
-
-        on: {
-            results: onFilterResults
-        }
-    }),
-
-    search = APIList.search = new Y.APISearch({
-        inputNode : inputNode,
-        maxResults: 100,
-
-        on: {
-            clear  : onSearchClear,
-            results: onSearchResults
-        }
-    }),
-
-    tabview = APIList.tabview = new Y.TabView({
-        srcNode  : tabviewNode,
-        panelNode: '#api-tabview-panel',
-        render   : true,
-
-        on: {
-            selectionChange: onTabSelectionChange
-        }
-    }),
-
-    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
-        circular   : true,
-        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
-        keys       : {next: 'down:40', previous: 'down:38'}
-    }).focusManager,
-
-    LIST_ITEM_TEMPLATE =
-        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • ' +
-            '{displayName}' +
-        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • ';
-
-// -- Init ---------------------------------------------------------------------
-
-// Duckpunch FocusManager's key event handling to prevent it from handling key
-// events when a modifier is pressed.
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusPrevious', focusManager);
-
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusNext', focusManager);
-
-// Create a mapping of tabs in the tabview so we can refer to them easily later.
-tabview.each(function (tab, index) {
-    var name = tab.get('label').toLowerCase();
-
-    tabs[name] = {
-        index: index,
-        name : name,
-        tab  : tab
-    };
-});
-
-// Switch tabs on Ctrl/Cmd-Left/Right arrows.
-tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
-
-// Focus the filter input when the `/` key is pressed.
-Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
-
-// Keep the Focus Manager up to date.
-inputNode.on('focus', function () {
-    focusManager.set('activeDescendant', inputNode);
-});
-
-// Update all tabview links to resolved URLs.
-tabview.get('panelNode').all('a').each(function (link) {
-    link.setAttribute('href', link.get('href'));
-});
-
-// -- Private Functions --------------------------------------------------------
-function getFilterResultNode() {
-    return filter.get('queryType') === 'classes' ? classesNode : modulesNode;
-}
-
-// -- Event Handlers -----------------------------------------------------------
-function onFilterResults(e) {
-    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
-        resultNode   = getFilterResultNode(),
-        typePlural   = filter.get('queryType'),
-        typeSingular = typePlural === 'classes' ? 'class' : 'module';
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
-                rootPath    : APIList.rootPath,
-                displayName : filter.getDisplayName(result.highlighted),
-                name        : result.text,
-                typePlural  : typePlural,
-                typeSingular: typeSingular
-            }));
-        });
-    } else {
-        frag.append(
-            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • ' +
-                'No ' + typePlural + ' found.' +
-            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • '
-        );
-    }
-
-    resultNode.empty(true);
-    resultNode.append(frag);
-
-    focusManager.refresh();
-}
-
-function onSearchClear(e) {
-
-    focusManager.refresh();
-}
-
-function onSearchKey(e) {
-    var target = e.target;
-
-    if (target.test('input,select,textarea')
-            || target.get('isContentEditable')) {
-        return;
-    }
-
-    e.preventDefault();
-
-    inputNode.focus();
-    focusManager.refresh();
-}
-
-function onSearchResults(e) {
-    var frag = Y.one(Y.config.doc.createDocumentFragment());
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(result.display);
-        });
-    } else {
-        frag.append(
-            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • ' +
-                'No results found. Maybe you\'ll have better luck with a ' +
-                'different query?' +
-            '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • '
-        );
-    }
-
-
-    focusManager.refresh();
-}
-
-function onTabSelectionChange(e) {
-    var tab  = e.newVal,
-        name = tab.get('label').toLowerCase();
-
-    tabs.selected = {
-        index: tab.get('index'),
-        name : name,
-        tab  : tab
-    };
-
-    switch (name) {
-    case 'classes': // fallthru
-    case 'modules':
-        filter.setAttrs({
-            minQueryLength: 0,
-            queryType     : name
-        });
-
-        search.set('minQueryLength', -1);
-
-        // Only send a request if this isn't the initially-selected tab.
-        if (e.prevVal) {
-            filter.sendRequest(filter.get('value'));
-        }
-        break;
-
-    case 'everything':
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', 1);
-
-        if (search.get('value')) {
-            search.sendRequest(search.get('value'));
-        } else {
-            inputNode.focus();
-        }
-        break;
-
-    default:
-        // WTF? We shouldn't be here!
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', -1);
-    }
-
-    if (focusManager) {
-        setTimeout(function () {
-            focusManager.refresh();
-        }, 1);
-    }
-}
-
-function onTabSwitchKey(e) {
-    var currentTabIndex = tabs.selected.index;
-
-    if (!(e.ctrlKey || e.metaKey)) {
-        return;
-    }
-
-    e.preventDefault();
-
-    switch (e.keyCode) {
-    case 37: // left arrow
-        if (currentTabIndex > 0) {
-            tabview.selectChild(currentTabIndex - 1);
-            inputNode.focus();
-        }
-        break;
-
-    case 39: // right arrow
-        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
-            tabview.selectChild(currentTabIndex + 1);
-            inputNode.focus();
-        }
-        break;
-    }
-}
-
-}, '3.4.0', {requires: [
-    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
-]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
deleted file mode 100644
index 175f6a61791f..000000000000
--- a/docs/assets/js/api-search.js
+++ /dev/null
@@ -1,98 +0,0 @@
-YUI.add('api-search', function (Y) {
-
-var Lang   = Y.Lang,
-    Node   = Y.Node,
-    YArray = Y.Array;
-
-Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
-    // -- Public Properties ----------------------------------------------------
-    RESULT_TEMPLATE:
-        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • ' +
-            '' +
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            {name}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                '{resultType}' +
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            {description}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                '{class}' +
-            '                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-        '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • ',
-
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-
-    // -- Protected Methods ----------------------------------------------------
-    _apiResultFilter: function (query, results) {
-        // Filter components out of the results.
-        return YArray.filter(results, function (result) {
-            return result.raw.resultType === 'component' ? false : result;
-        });
-    },
-
-    _apiResultFormatter: function (query, results) {
-        return YArray.map(results, function (result) {
-            var raw  = Y.merge(result.raw), // create a copy
-                desc = raw.description || '';
-
-            // Convert description to text and truncate it if necessary.
-            desc = Node.create('
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' + desc + '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ').get('text');
-
-            if (desc.length > 65) {
-                desc = Y.Escape.html(desc.substr(0, 65)) + ' …';
-            } else {
-                desc = Y.Escape.html(desc);
-            }
-
-            raw['class'] || (raw['class'] = '');
-            raw.description = desc;
-
-            // Use the highlighted result name.
-            raw.name = result.highlighted;
-
-            return Lang.sub(this.RESULT_TEMPLATE, raw);
-        }, this);
-    },
-
-    _apiTextLocator: function (result) {
-        return result.displayName || result.name;
-    }
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultFormatter: {
-            valueFn: function () {
-                return this._apiResultFormatter;
-            }
-        },
-
-        resultFilters: {
-            valueFn: function () {
-                return this._apiResultFilter;
-            }
-        },
-
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        resultListLocator: {
-            value: 'data.results'
-        },
-
-        resultTextLocator: {
-            valueFn: function () {
-                return this._apiTextLocator;
-            }
-        },
-
-        source: {
-            value: '/api/v1/search?q={query}&count={maxResults}'
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
-    'escape'
-]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
deleted file mode 100644
index c64bb46326fb..000000000000
--- a/docs/assets/js/apidocs.js
+++ /dev/null
@@ -1,370 +0,0 @@
-YUI().use(
-    'yuidoc-meta',
-    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
-function (Y) {
-
-var win          = Y.config.win,
-    localStorage = win.localStorage,
-
-    bdNode = Y.one('#bd'),
-
-    pjax,
-    defaultRoute,
-
-    classTabView,
-    selectedTab;
-
-// Kill pjax functionality unless serving over HTTP.
-if (!Y.getLocation().protocol.match(/^https?\:/)) {
-    Y.Router.html5 = false;
-}
-
-// Create the default route with middleware which enables syntax highlighting
-// on the loaded content.
-defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
-    prettyPrint();
-    bdNode.removeClass('loading');
-
-    next();
-});
-
-pjax = new Y.Pjax({
-    container      : '#docs-main',
-    contentSelector: '#docs-main > .content',
-    linkSelector   : '#bd a',
-    titleSelector  : '#xhr-title',
-
-    navigateOnHash: true,
-    root          : '/',
-    routes        : [
-        // -- / ----------------------------------------------------------------
-        {
-            path     : '/(index.html)?',
-            callbacks: defaultRoute
-        },
-
-        // -- /classes/* -------------------------------------------------------
-        {
-            path     : '/classes/:class.html*',
-            callbacks: [defaultRoute, 'handleClasses']
-        },
-
-        // -- /files/* ---------------------------------------------------------
-        {
-            path     : '/files/*file',
-            callbacks: [defaultRoute, 'handleFiles']
-        },
-
-        // -- /modules/* -------------------------------------------------------
-        {
-            path     : '/modules/:module.html*',
-            callbacks: defaultRoute
-        }
-    ]
-});
-
-// -- Utility Functions --------------------------------------------------------
-
-pjax.checkVisibility = function (tab) {
-    tab || (tab = selectedTab);
-
-    if (!tab) { return; }
-
-    var panelNode = tab.get('panelNode'),
-        visibleItems;
-
-    // If no items are visible in the tab panel due to the current visibility
-    // settings, display a message to that effect.
-    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
-        if (itemNode.getComputedStyle('display') !== 'none') {
-            return true;
-        }
-    });
-
-    panelNode.all('.no-visible-items').remove();
-
-    if (!visibleItems) {
-        if (Y.one('#index .index-item')) {
-            panelNode.append(
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                    'Some items are not shown due to the current visibility ' +
-                    'settings. Use the checkboxes at the upper right of this ' +
-                    'page to change the visibility settings.' +
-                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            '
-            );
-        } else {
-            panelNode.append(
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                    'This class doesn\'t provide any methods, properties, ' +
-                    'attributes, or events.' +
-                    '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ' +
-                '
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            '
-            );
-        }
-    }
-
-    // Hide index sections without any visible items.
-    Y.all('.index-section').each(function (section) {
-        var items        = 0,
-            visibleItems = 0;
-
-        section.all('.index-item').each(function (itemNode) {
-            items += 1;
-
-            if (itemNode.getComputedStyle('display') !== 'none') {
-                visibleItems += 1;
-            }
-        });
-
-        section.toggleClass('hidden', !visibleItems);
-        section.toggleClass('no-columns', visibleItems < 4);
-    });
-};
-
-pjax.initClassTabView = function () {
-    if (!Y.all('#classdocs .api-class-tab').size()) {
-        return;
-    }
-
-    if (classTabView) {
-        classTabView.destroy();
-        selectedTab = null;
-    }
-
-    classTabView = new Y.TabView({
-        srcNode: '#classdocs',
-
-        on: {
-            selectionChange: pjax.onTabSelectionChange
-        }
-    });
-
-    pjax.updateTabState();
-    classTabView.render();
-};
-
-pjax.initLineNumbers = function () {
-    var hash      = win.location.hash.substring(1),
-        container = pjax.get('container'),
-        hasLines, node;
-
-    // Add ids for each line number in the file source view.
-    container.all('.linenums>li').each(function (lineNode, index) {
-        lineNode.set('id', 'l' + (index + 1));
-        lineNode.addClass('file-line');
-        hasLines = true;
-    });
-
-    // Scroll to the desired line.
-    if (hasLines && /^l\d+$/.test(hash)) {
-        if ((node = container.getById(hash))) {
-            win.scroll(0, node.getY());
-        }
-    }
-};
-
-pjax.initRoot = function () {
-    var terminators = /^(?:classes|files|modules)$/,
-        parts       = pjax._getPathRoot().split('/'),
-        root        = [],
-        i, len, part;
-
-    for (i = 0, len = parts.length; i < len; i += 1) {
-        part = parts[i];
-
-        if (part.match(terminators)) {
-            // Makes sure the path will end with a "/".
-            root.push('');
-            break;
-        }
-
-        root.push(part);
-    }
-
-    pjax.set('root', root.join('/'));
-};
-
-pjax.updateTabState = function (src) {
-    var hash = win.location.hash.substring(1),
-        defaultTab, node, tab, tabPanel;
-
-    function scrollToNode() {
-        if (node.hasClass('protected')) {
-            Y.one('#api-show-protected').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        if (node.hasClass('private')) {
-            Y.one('#api-show-private').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        setTimeout(function () {
-            // For some reason, unless we re-get the node instance here,
-            // getY() always returns 0.
-            var node = Y.one('#classdocs').getById(hash);
-            win.scrollTo(0, node.getY() - 70);
-        }, 1);
-    }
-
-    if (!classTabView) {
-        return;
-    }
-
-    if (src === 'hashchange' && !hash) {
-        defaultTab = 'index';
-    } else {
-        if (localStorage) {
-            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
-                'index';
-        } else {
-            defaultTab = 'index';
-        }
-    }
-
-    if (hash && (node = Y.one('#classdocs').getById(hash))) {
-        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
-            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
-                if (classTabView.get('rendered')) {
-                    Y.Widget.getByNode(tab).set('selected', 1);
-                } else {
-                    tab.addClass('yui3-tab-selected');
-                }
-            }
-        }
-
-        // Scroll to the desired element if this is a hash URL.
-        if (node) {
-            if (classTabView.get('rendered')) {
-                scrollToNode();
-            } else {
-                classTabView.once('renderedChange', scrollToNode);
-            }
-        }
-    } else {
-        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
-
-        // When the `defaultTab` node isn't found, `localStorage` is stale.
-        if (!tab && defaultTab !== 'index') {
-            tab = Y.one('#classdocs .api-class-tab.index');
-        }
-
-        if (classTabView.get('rendered')) {
-            Y.Widget.getByNode(tab).set('selected', 1);
-        } else {
-            tab.addClass('yui3-tab-selected');
-        }
-    }
-};
-
-pjax.updateVisibility = function () {
-    var container = pjax.get('container');
-
-    container.toggleClass('hide-inherited',
-            !Y.one('#api-show-inherited').get('checked'));
-
-    container.toggleClass('show-deprecated',
-            Y.one('#api-show-deprecated').get('checked'));
-
-    container.toggleClass('show-protected',
-            Y.one('#api-show-protected').get('checked'));
-
-    container.toggleClass('show-private',
-            Y.one('#api-show-private').get('checked'));
-
-    pjax.checkVisibility();
-};
-
-// -- Route Handlers -----------------------------------------------------------
-
-pjax.handleClasses = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (!status || (status >= 200 && status < 300)) {
-        pjax.initClassTabView();
-    }
-
-    next();
-};
-
-pjax.handleFiles = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (!status || (status >= 200 && status < 300)) {
-        pjax.initLineNumbers();
-    }
-
-    next();
-};
-
-// -- Event Handlers -----------------------------------------------------------
-
-pjax.onNavigate = function (e) {
-    var hash         = e.hash,
-        originTarget = e.originEvent && e.originEvent.target,
-        tab;
-
-    if (hash) {
-        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
-
-        if (hash === win.location.hash) {
-            pjax.updateTabState('hashchange');
-        } else if (!tab) {
-            win.location.hash = hash;
-        }
-
-        e.preventDefault();
-        return;
-    }
-
-    // Only scroll to the top of the page when the URL doesn't have a hash.
-    this.set('scrollToTop', !e.url.match(/#.+$/));
-
-    bdNode.addClass('loading');
-};
-
-pjax.onOptionClick = function (e) {
-    pjax.updateVisibility();
-};
-
-pjax.onTabSelectionChange = function (e) {
-    var tab   = e.newVal,
-        tabId = tab.get('contentBox').getAttribute('href').substring(1);
-
-    selectedTab = tab;
-
-    // If switching from a previous tab (i.e., this is not the default tab),
-    // replace the history entry with a hash URL that will cause this tab to
-    // be selected if the user navigates away and then returns using the back
-    // or forward buttons.
-    if (e.prevVal && localStorage) {
-        localStorage.setItem('tab_' + pjax.getPath(), tabId);
-    }
-
-    pjax.checkVisibility(tab);
-};
-
-// -- Init ---------------------------------------------------------------------
-
-pjax.on('navigate', pjax.onNavigate);
-
-pjax.initRoot();
-pjax.upgrade();
-pjax.initClassTabView();
-pjax.initLineNumbers();
-pjax.updateVisibility();
-
-Y.APIList.rootPath = pjax.get('root');
-
-Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
-
-Y.on('hashchange', function (e) {
-    pjax.updateTabState('hashchange');
-}, win);
-
-});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
deleted file mode 100644
index 18de8649532c..000000000000
--- a/docs/assets/js/yui-prettify.js
+++ /dev/null
@@ -1,17 +0,0 @@
-YUI().use('node', function(Y) {
-    var code = Y.all('.prettyprint.linenums');
-    if (code.size()) {
-        code.each(function(c) {
-            var lis = c.all('ol li'),
-                l = 1;
-            lis.each(function(n) {
-                n.prepend('');
-                l++;
-            });
-        });
-        var h = location.hash;
-        location.hash = '';
-        h = h.replace('LINE_', 'LINENUM_');
-        location.hash = h;
-    }
-});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
deleted file mode 100644
index b50b841499e7..000000000000
--- a/docs/assets/vendor/prettify/CHANGES.html
+++ /dev/null
@@ -1,130 +0,0 @@
-
-  
-    
-    Change Log
-  
-  
-    README
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Known Issues
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Perl formatting is really crappy.  Partly because the author is lazy and
-      partly because Perl is
-      hard to parse.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • On some browsers, <code> elements with newlines in the text
-      which use CSS to specify white-space:pre will have the newlines
-      improperly stripped if the element is not attached to the document at the time
-      the stripping is done.  Also, on IE 6, all newlines will be stripped from
-      <code> elements because of the way IE6 produces
-      innerHTML.  Workaround: use <pre> for code with
-      newlines.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Change Log
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            29 March 2007
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added tests for PHP support
-        to address 
-      issue 3.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed
-      bug: prettyPrintOne was not halting.  This was not
-        reachable through the normal entry point.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed
-      bug: recursing into a script block or PHP tag that was not properly
-        closed would not silently drop the content.
-        (test)
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed
-      bug: was eating tabs
-        (test)
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed entity handling so that the caveat
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-          
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Caveats: please properly escape less-thans.  x&lt;y
-          instead of x<y, and use " instead of 
-          &quot; for string delimiters.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-        is no longer applicable.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added noisefree's C#
-      patch
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added a distribution that has comments and
-        whitespace removed to reduce download size from 45.5kB to 12.8kB.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            4 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added language specific formatters that are triggered by the presence
-      of a lang-<language-file-extension>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed bug: python handling of '''string'''
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed bug: / in regex [charsets] should not end regex
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            5 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Defined language extensions for Lisp and Lua
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            14 Jul 2008
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Language handlers for F#, OCAML, SQL
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Support for nocode spans to allow embedding of line
-      numbers and code annotations which should not be styled or otherwise
-      affect the tokenization of prettified code.
-      See the issue 22
-      testcase.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            6 Jan 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Language handlers for Visual Basic, Haskell, CSS, and WikiText
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added .mxml extension to the markup style handler for
-        Flex MXML files.  See
-        issue 37.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added .m extension to the C style handler so that Objective
-        C source files properly highlight.  See
-        issue 58.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Changed HTML lexer to use the same embedded source mechanism as the
-        wiki language handler, and changed to use the registered
-        CSS handler for STYLE element content.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            21 May 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Rewrote to improve performance on large files.
-        See benchmarks.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed bugs with highlighting of Haskell line comments, Lisp
-        number literals, Lua strings, C preprocessor directives,
-        newlines in Wiki code on Windows, and newlines in IE6.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            14 August 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed prettifying of <code> blocks with embedded newlines.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            3 October 2009
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed prettifying of XML/HTML tags that contain uppercase letters.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            19 July 2010
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added support for line numbers.  Bug
-        22
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added YAML support.  Bug
-        123
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Added VHDL support courtesy Le Poussin.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • IE performance improvements.  Bug
-        102 courtesy jacobly.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • A variety of markup formatting fixes courtesy smain and thezbyg.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Fixed copy and paste in IE[678].
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • Changed output to use &#160; instead of
-        &nbsp; so that the output works when embedded in XML.
-        Bug
-        108.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-  
-
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
deleted file mode 100644
index d64569567334..000000000000
--- a/docs/assets/vendor/prettify/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
deleted file mode 100644
index c6fe1a32c38f..000000000000
--- a/docs/assets/vendor/prettify/README.html
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
-  
-    Javascript code prettifier
-
-    
-
-    
-
-    
-  
-
-  
-    Languages : CH
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Javascript code prettifier
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Setup
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            1. Download a distribution
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            2. Include the script and stylesheets in your document
-        (you will need to make sure the css and js file are on your server, and
-         adjust the paths in the script and link tag)
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              -<link href="prettify.css" type="text/css" rel="stylesheet" />
-<script type="text/javascript" src="prettify.js"></script>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            3. Add onload="prettyPrint()" to your
-      document's body tag.
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            4. Modify the stylesheet to get the coloring you prefer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              5. 
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Usage
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Put code snippets in
-    <pre class="prettyprint">...</pre>
-    or <code class="prettyprint">...</code>
-    and it will automatically be pretty printed.
-
-    
-      
-        
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            The original
-        Prettier
-      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded tags.
-}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded tags.
-}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            FAQ
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Which languages does it work for?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            The comments in prettify.js are authoritative but the lexer
-    should work on a number of languages including C and friends,
-    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
-    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
-    and Ruby, but, because of commenting conventions, doesn't work on
-    Smalltalk, or CAML-like languages.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            LISPy languages are supported via an extension:
-    lang-lisp.js.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            And similarly for
-    CSS,
-    Haskell,
-    Lua,
-    OCAML, SML, F#,
-    Visual Basic,
-    SQL,
-    Protocol Buffers, and
-    WikiText..
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            If you'd like to add an extension for your favorite language, please
-    look at src/lang-lisp.js and file an
-    issue including your language extension, and a testcase.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            How do I specify which language my code is in?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            You don't need to specify the language since prettyprint()
-    will guess.  You can specify a language by specifying the language extension
-    along with the prettyprint class like so:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <pre class="prettyprint lang-html">
-  The lang-* class specifies the language file extensions.
-  File extensions supported by default include
-    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
-    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
-    "xhtml", "xml", "xsl".
-</pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            It doesn't work on <obfuscated code sample>?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Yes.  Prettifying obfuscated code is like putting lipstick on a pig
-    — i.e. outside the scope of this tool.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Which browsers does it work with?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            It's been tested with IE 6, Firefox 1.5 & 2, and Safari 2.0.4.
-    Look at the test page to see if it
-    works in your browser.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            What's changed?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            See the change log
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Why doesn't Prettyprinting of strings work on WordPress?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Apparently wordpress does "smart quoting" which changes close quotes.
-    This causes end quotes to not match up with open quotes.
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            This breaks prettifying as well as copying and pasting of code samples.
-    See
-    WordPress's help center for info on how to stop smart quoting of code
-    snippets.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            How do I put line numbers in my code?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            You can use the linenums class to turn on line
-    numbering.  If your code doesn't start at line number 1, you can
-    add a colon and a line number to the end of that class as in
-    linenums:52.
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            For example
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <pre class="prettyprint linenums:4"
->// This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-<pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    produces
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            // This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            How do I prevent a portion of markup from being marked as code?
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            You can use the nocode class to identify a span of markup
-    that is not code.
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <pre class=prettyprint>
-int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
-  Continuation of comment */
-int y = bar();
-</pre>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-produces
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -int x = foo();  /* This is a comment  This is not code
-  Continuation of comment */
-int y = bar();
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            For a more complete example see the issue22
-    testcase.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            I get an error message "a is not a function" or "opt_whenDone is not a function"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            If you are calling prettyPrint via an event handler, wrap it in a function.
-    Instead of doing
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-      addEventListener('load', prettyPrint, false);
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    wrap it in a closure like
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-      addEventListener('load', function (event) { prettyPrint() }, false);
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    so that the browser does not pass an event object to prettyPrint which
-    will confuse it.
-
-    


                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-Last modified: Wed Jul 19 13:56:00 PST 2010
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-  
-
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
deleted file mode 100644
index d44b3a2282ad..000000000000
--- a/docs/assets/vendor/prettify/prettify-min.css
+++ /dev/null
@@ -1 +0,0 @@
-.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
deleted file mode 100644
index 4845d05d4b5e..000000000000
--- a/docs/assets/vendor/prettify/prettify-min.js
+++ /dev/null
@@ -1 +0,0 @@
-window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;atau[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Sequelize.html b/docs/classes/Sequelize.html
deleted file mode 100644
index c63d55e893a8..000000000000
--- a/docs/classes/Sequelize.html
+++ /dev/null
@@ -1,338 +0,0 @@
-
-
-
-    
-    Sequelize
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize Class
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
-    
-
-    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            Defined in: lib/sequelize.js:12
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
-    
-        
-            Module: sequelize
-        
-    
-
-    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Main class of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Constructor
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            (
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        database
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        username
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        [password]
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        [options]
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            )
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
-            
-                
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
-                Defined in
-                
-            
-        
-        
-        lib/sequelize.js:12
-        
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-        
-
-        
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        database
-                        String
-                    
-
-                    
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              The name of the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        username
-                        String
-                    
-
-                    
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              The username which is used to authenticate against the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        [password]
-                        String
-                        optional
-                    
-
-                    
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              The password which is used to authenticate against the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            • 
-                    
-                        [options]
-                        Object
-                        optional
-                    
-
-                    
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
-
-                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • 
-            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
-    
-
-    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Example:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            // without password and options
-var sequelize = new Sequelize('database', 'username')
-
-// without options
-var sequelize = new Sequelize('database', 'username', 'password')
-
-// without password / with blank password
-var sequelize = new Sequelize('database', 'username', null, {})
-
-// with password and options
-var sequelize = new Sequelize('my_database', 'john', 'doe', {})
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Item Index
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-            
-
-            
-
-            
-
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
-
-        
-
-        
-
-        
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/classes/index.html b/docs/classes/index.html
deleted file mode 100644
index 487fe15b2ad0..000000000000
--- a/docs/classes/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-    
-        Redirector
-        
-    
-    
-        Click here to redirect
-    
-
diff --git a/docs/data.json b/docs/data.json
deleted file mode 100644
index f9c0be7f7777..000000000000
--- a/docs/data.json
+++ /dev/null
@@ -1,301 +0,0 @@
-{
-    "project": {},
-    "files": {
-        "lib/dialects/abstract/query.js": {
-            "name": "lib/dialects/abstract/query.js",
-            "modules": {},
-            "classes": {},
-            "fors": {},
-            "namespaces": {}
-        },
-        "lib/dao-factory.js": {
-            "name": "lib/dao-factory.js",
-            "modules": {},
-            "classes": {},
-            "fors": {},
-            "namespaces": {}
-        },
-        "lib/sequelize.js": {
-            "name": "lib/sequelize.js",
-            "modules": {},
-            "classes": {
-                "Sequelize": 1
-            },
-            "fors": {},
-            "namespaces": {}
-        },
-        "index.js": {
-            "name": "index.js",
-            "modules": {
-                "sequelize": 1
-            },
-            "classes": {},
-            "fors": {},
-            "namespaces": {}
-        }
-    },
-    "modules": {
-        "sequelize": {
-            "name": "sequelize",
-            "submodules": {},
-            "classes": {
-                "Sequelize": 1
-            },
-            "fors": {},
-            "namespaces": {},
-            "tag": "module",
-            "file": "lib/sequelize.js",
-            "line": 12,
-            "description": "The entry point."
-        }
-    },
-    "classes": {
-        "Sequelize": {
-            "name": "Sequelize",
-            "shortname": "Sequelize",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "sequelize",
-            "file": "lib/sequelize.js",
-            "line": 12,
-            "description": "Main class of the project.",
-            "params": [
-                {
-                    "name": "database",
-                    "description": "The name of the database.",
-                    "type": "String"
-                },
-                {
-                    "name": "username",
-                    "description": "The username which is used to authenticate against the database.",
-                    "type": "String"
-                },
-                {
-                    "name": "password",
-                    "description": "The password which is used to authenticate against the database.",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "options",
-                    "description": "An object with options.",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "example": [
-                "\n    // without password and options\n    var sequelize = new Sequelize('database', 'username')\n\n    // without options\n    var sequelize = new Sequelize('database', 'username', 'password')\n\n    // without password / with blank password\n    var sequelize = new Sequelize('database', 'username', null, {})\n\n    // with password and options\n    var sequelize = new Sequelize('my_database', 'john', 'doe', {})"
-            ],
-            "is_constructor": 1
-        }
-    },
-    "classitems": [
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 7,
-            "description": "Inherit from CustomEventEmitter",
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 12,
-            "description": "Execute the passed sql query.\n\nExamples:\n\n    query.run('SELECT 1')",
-            "params": [
-                {
-                    "name": "sql",
-                    "description": "- The SQL query which should be executed.",
-                    "type": "String"
-                }
-            ],
-            "api": "public",
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 26,
-            "description": "Check the logging option of the instance and print deprecation warnings.",
-            "return": {
-                "description": "",
-                "type": "Void"
-            },
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 43,
-            "description": "High level function that handles the results of a query execution.\n\n\nExample:\n query.formatResults([\n   {\n     id: 1,              // this is from the main table\n     attr2: 'snafu',     // this is from the main table\n     Tasks.id: 1,        // this is from the associated table\n     Tasks.title: 'task' // this is from the associated table\n   }\n ])",
-            "params": [
-                {
-                    "name": "data",
-                    "description": "- The result of the query execution.",
-                    "type": "Array"
-                }
-            ],
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 79,
-            "description": "Shortcut methods (success, ok) for listening for success events.\n\nParams:\n  - fct: A function that gets executed once the *success* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 95,
-            "description": "Shortcut methods (failure, fail, error) for listening for error events.\n\nParams:\n  - fct: A function that gets executed once the *error* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 112,
-            "description": "This function is a wrapper for private methods.",
-            "params": [
-                {
-                    "name": "fctName",
-                    "description": "The name of the private method.",
-                    "type": "String"
-                }
-            ],
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 123,
-            "description": "Get the attributes of an insert query, which contains the just inserted id.",
-            "return": {
-                "description": "The field name.",
-                "type": "String"
-            },
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 136,
-            "description": "Iterate over all known tables and search their names inside the sql query.\nThis method will also check association aliases ('as' option).",
-            "params": [
-                {
-                    "name": "attribute",
-                    "description": "An attribute of a SQL query. (?)",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "The found tableName / alias.",
-                "type": "String"
-            },
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 318,
-            "description": "The function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dialects/abstract/query.js",
-            "line": 378,
-            "description": "This function will prepare the result of select queries with joins.",
-            "params": [
-                {
-                    "name": "data",
-                    "description": "This array contains objects.",
-                    "type": "Array"
-                }
-            ],
-            "return": {
-                "description": "The array will have the needed format for groupDataByCalleeFactory.",
-                "type": "Array"
-            },
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/dao-factory.js",
-            "line": 178,
-            "description": "Search for an instance.",
-            "params": [
-                {
-                    "name": "options",
-                    "description": "Options to describe the scope of the search.",
-                    "type": "Object"
-                },
-                {
-                    "name": "include",
-                    "description": "A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.",
-                    "type": "Array"
-                }
-            ],
-            "return": {
-                "description": "A promise which fires `success`, `error`, `complete` and `sql`.",
-                "type": "Object"
-            },
-            "class": "Sequelize"
-        },
-        {
-            "file": "lib/sequelize.js",
-            "line": 80,
-            "description": "Reference to Utils",
-            "class": "Sequelize"
-        }
-    ],
-    "warnings": [
-        {
-            "message": "unknown tag: api",
-            "line": " lib/dialects/abstract/query.js:12"
-        },
-        {
-            "message": "Missing item type\nInherit from CustomEventEmitter",
-            "line": " lib/dialects/abstract/query.js:7"
-        },
-        {
-            "message": "Missing item type\nExecute the passed sql query.\n\nExamples:\n\n    query.run('SELECT 1')",
-            "line": " lib/dialects/abstract/query.js:12"
-        },
-        {
-            "message": "Missing item type\nCheck the logging option of the instance and print deprecation warnings.",
-            "line": " lib/dialects/abstract/query.js:26"
-        },
-        {
-            "message": "Missing item type\nHigh level function that handles the results of a query execution.\n\n\nExample:\n query.formatResults([\n   {\n     id: 1,              // this is from the main table\n     attr2: 'snafu',     // this is from the main table\n     Tasks.id: 1,        // this is from the associated table\n     Tasks.title: 'task' // this is from the associated table\n   }\n ])",
-            "line": " lib/dialects/abstract/query.js:43"
-        },
-        {
-            "message": "Missing item type\nShortcut methods (success, ok) for listening for success events.\n\nParams:\n  - fct: A function that gets executed once the *success* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
-            "line": " lib/dialects/abstract/query.js:79"
-        },
-        {
-            "message": "Missing item type\nShortcut methods (failure, fail, error) for listening for error events.\n\nParams:\n  - fct: A function that gets executed once the *error* event was triggered.\n\nResult:\n  The function returns the instance of the query.",
-            "line": " lib/dialects/abstract/query.js:95"
-        },
-        {
-            "message": "Missing item type\nThis function is a wrapper for private methods.",
-            "line": " lib/dialects/abstract/query.js:112"
-        },
-        {
-            "message": "Missing item type\nGet the attributes of an insert query, which contains the just inserted id.",
-            "line": " lib/dialects/abstract/query.js:123"
-        },
-        {
-            "message": "Missing item type\nIterate over all known tables and search their names inside the sql query.\nThis method will also check association aliases ('as' option).",
-            "line": " lib/dialects/abstract/query.js:136"
-        },
-        {
-            "message": "Missing item type\nThe function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
-            "line": " lib/dialects/abstract/query.js:318"
-        },
-        {
-            "message": "Missing item type\nThis function will prepare the result of select queries with joins.",
-            "line": " lib/dialects/abstract/query.js:378"
-        },
-        {
-            "message": "Missing item type\nSearch for an instance.",
-            "line": " lib/dao-factory.js:178"
-        },
-        {
-            "message": "Missing item type\nReference to Utils",
-            "line": " lib/sequelize.js:80"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/docs/files/index.html b/docs/files/index.html
deleted file mode 100644
index 487fe15b2ad0..000000000000
--- a/docs/files/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-    
-        Redirector
-        
-    
-    
-        Click here to redirect
-    
-
diff --git a/docs/files/index.js.html b/docs/files/index.js.html
deleted file mode 100644
index c118a62cdff8..000000000000
--- a/docs/files/index.js.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-    
-    index.js
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            File: index.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -/**
-  The entry point.
-  @module sequelize
-**/
-module.exports = require("./lib/sequelize")
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/files/lib_dao-factory.js.html b/docs/files/lib_dao-factory.js.html
deleted file mode 100644
index dd99a8912239..000000000000
--- a/docs/files/lib_dao-factory.js.html
+++ /dev/null
@@ -1,523 +0,0 @@
-
-
-
-    
-    lib/dao-factory.js
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            File: lib/dao-factory.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -var Utils     = require("./utils")
-  , DAO       = require("./dao")
-  , DataTypes = require("./data-types")
-  , Util      = require('util')
-
-module.exports = (function() {
-  var DAOFactory = function(name, attributes, options) {
-    var self = this
-
-    this.options = Utils._.extend({
-      timestamps: true,
-      instanceMethods: {},
-      classMethods: {},
-      validate: {},
-      freezeTableName: false,
-      underscored: false,
-      syncOnAssociation: true,
-      paranoid: false,
-      whereCollection: null
-    }, options || {})
-
-    this.name = name
-    if (!this.options.tableName) {
-      this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name)
-    } else {
-      this.tableName = this.options.tableName
-    }
-    this.rawAttributes = attributes
-    this.daoFactoryManager = null // defined in init function
-    this.associations = {}
-
-    // extract validation
-    this.validate = this.options.validate || {}
-  }
-
-  Object.defineProperty(DAOFactory.prototype, 'attributes', {
-    get: function() {
-      return this.QueryGenerator.attributesToSQL(this.rawAttributes)
-    }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'QueryInterface', {
-    get: function() { return this.daoFactoryManager.sequelize.getQueryInterface() }
-  })
-
-  Object.defineProperty(DAOFactory.prototype, 'QueryGenerator', {
-    get: function() { return this.QueryInterface.QueryGenerator }
-  })
-
-  DAOFactory.prototype.init = function(daoFactoryManager) {
-    var self = this;
-
-    this.daoFactoryManager = daoFactoryManager
-
-    this.primaryKeys = {};
-    Utils._.each(this.attributes, function(dataTypeString, attributeName) {
-      // If you don't specify a valid data type lets help you debug it
-      if (dataTypeString === undefined) {
-        throw new Error("Unrecognized data type for field " + attributeName );
-      }
-
-      if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) {
-        self.primaryKeys[attributeName] = dataTypeString
-      }
-    })
-
-    this.primaryKeyCount = Object.keys(this.primaryKeys).length;
-    this.options.hasPrimaryKeys = this.hasPrimaryKeys = this.primaryKeyCount > 0;
-
-    addDefaultAttributes.call(this)
-    addOptionalClassMethods.call(this)
-    findAutoIncrementField.call(this)
-
-    // DAO prototype
-    this.DAO = function() {
-      DAO.apply(this, arguments);
-    };
-    Util.inherits(this.DAO, DAO);
-
-    this.DAO.prototype.rawAttributes = this.rawAttributes;
-    if (this.options.instanceMethods) {
-      Utils._.each(this.options.instanceMethods, function(fct, name) {
-        self.DAO.prototype[name] = fct
-      })
-    }
-    this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes);
-
-    this.DAO.prototype.booleanValues = [];
-    this.DAO.prototype.defaultValues = {};
-    this.DAO.prototype.validators = {};
-    Utils._.each(this.rawAttributes, function (definition, name) {
-      if (((definition === DataTypes.BOOLEAN) || (definition.type === DataTypes.BOOLEAN))) {
-        self.DAO.prototype.booleanValues.push(name);
-      }
-      if (definition.hasOwnProperty('defaultValue')) {
-        self.DAO.prototype.defaultValues[name] = function() {
-          return Utils.toDefaultValue(definition.defaultValue);
-        }
-      }
-
-      if (definition.hasOwnProperty('validate')) {
-        self.DAO.prototype.validators[name] = definition.validate;
-      }
-    });
-
-    this.DAO.prototype.__factory = this;
-    this.DAO.prototype.hasDefaultValues = !Utils._.isEmpty(this.DAO.prototype.defaultValues);
-
-    return this
-  }
-
-  DAOFactory.prototype.sync = function(options) {
-    options = Utils._.extend({}, this.options, options || {})
-
-    var self = this
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var doQuery = function() {
-        self.QueryInterface
-          .createTable(self.tableName, self.attributes, options)
-          .success(function() { emitter.emit('success', self) })
-          .error(function(err) { emitter.emit('error', err) })
-          .on('sql', function(sql) { emitter.emit('sql', sql) })
-      }
-
-      if (options.force) {
-        self.drop().success(doQuery).error(function(err) { emitter.emit('error', err) })
-      } else {
-        doQuery()
-      }
-    }).run()
-  }
-
-  DAOFactory.prototype.drop = function() {
-    return this.QueryInterface.dropTable(this.tableName)
-  }
-
-  // alias for findAll
-  DAOFactory.prototype.all = function(options) {
-    return this.findAll(options)
-  }
-
-  DAOFactory.prototype.findAll = function(options) {
-    var hasJoin = false
-    var options = Utils._.clone(options)
-
-    if (typeof options === 'object') {
-      hasJoin = true
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          return validateIncludedElement.call(this, include)
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      type:    'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  //right now, the caller (has-many-double-linked) is in charge of the where clause
-  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
-    var optcpy = Utils._.clone(options)
-    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
-
-    // whereCollection is used for non-primary key updates
-    this.options.whereCollection = optcpy.where || null;
-
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
-  }
-
- /**
-  * Search for an instance.
-  *
-  * @param  {Object} options Options to describe the scope of the search.
-  *   @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
-  * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
-  */
-  DAOFactory.prototype.find = function(options) {
-    var hasJoin = false
-
-    // no options defined?
-    // return an emitter which emits null
-    if ([null, undefined].indexOf(options) !== -1) {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        setTimeout(function() { emitter.emit('success', null) }, 10)
-      }).run()
-    }
-
-    var primaryKeys = this.primaryKeys
-
-    // options is not a hash but an id
-    if (typeof options === 'number') {
-      options = { where: options }
-    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-      var where = {}
-        , self  = this
-        , keys = Object.keys(primaryKeys)
-
-      Utils._.each(arguments, function(arg, i) {
-        var key = keys[i]
-        where[key] = arg
-      })
-
-      options = { where: where }
-    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
-      var parsedId = parseInt(options, 10)
-
-      if (!Utils._.isFinite(parsedId)) {
-        throw new Error('Invalid argument to find(). Must be an id or an options object.')
-      }
-
-      options = { where: parsedId }
-    } else if (typeof options === 'object') {
-      options = Utils._.clone(options)
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          return validateIncludedElement.call(this, include)
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    options.limit = 1
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      plain: true,
-      type: 'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  DAOFactory.prototype.count = function(options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['count(*)', 'count'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
-  }
-
-  DAOFactory.prototype.max = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['max(' + field + ')', 'max'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
-  }
-  DAOFactory.prototype.min = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['min(' + field + ')', 'min'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
-  }
-
-  DAOFactory.prototype.build = function(values, options) {
-    options = options || { isNewRecord: true }
-
-    var self     = this
-      , instance = new this.DAO(values, this.options, options.isNewRecord)
-
-    instance.isNewRecord = options.isNewRecord
-
-    return instance
-  }
-
-  DAOFactory.prototype.create = function(values, fields) {
-    return this.build(values).save(fields)
-  }
-
-  DAOFactory.prototype.findOrCreate = function (params, defaults) {
-    var self = this;
-
-    return new Utils.CustomEventEmitter(function (emitter) {
-      self.find({
-        where: params
-      }).success(function (instance) {
-        if (instance === null) {
-          for (var attrname in defaults) {
-            params[attrname] = defaults[attrname]
-          }
-
-          self.create(params)
-            .success(function (instance) {
-              emitter.emit('success', instance)
-            })
-            .error( function (error) {
-              emitter.emit('error', error)
-            })
-        } else {
-          emitter.emit('success', instance)
-        }
-      }).error(function (error) {
-        emitter.emit('error', error)
-      });
-    }).run()
-  }
-
-  // private
-
-  var query = function() {
-    var args      = Utils._.map(arguments, function(arg, _) { return arg })
-      , sequelize = this.daoFactoryManager.sequelize
-
-    // add this as the second argument
-    if (arguments.length === 1) {
-      args.push(this)
-    }
-
-    // add {} as options
-    if (args.length === 2) {
-      args.push({})
-    }
-
-    return sequelize.query.apply(sequelize, args)
-  }
-
-  var addOptionalClassMethods = function() {
-    var self = this
-    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
-  }
-
-  var addDefaultAttributes = function() {
-    var self              = this
-      , defaultAttributes = {
-        id: {
-          type: DataTypes.INTEGER,
-          allowNull: false,
-          primaryKey: true,
-          autoIncrement: true
-        }
-      }
-
-    if (this.hasPrimaryKeys) {
-      defaultAttributes = {}
-    }
-
-    if (this.options.timestamps) {
-      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-
-      if (this.options.paranoid)
-        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
-    }
-
-    Utils._.each(defaultAttributes, function(value, attr) {
-      self.rawAttributes[attr] = value
-    })
-  }
-
-  var findAutoIncrementField = function() {
-    var fields = this.QueryGenerator.findAutoIncrementField(this)
-
-    this.autoIncrementField = null
-
-    fields.forEach(function(field) {
-      if (this.autoIncrementField) {
-        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      } else {
-        this.autoIncrementField = field
-      }
-    }.bind(this))
-  }
-
-  var validateIncludedElement = function(include) {
-    if (include instanceof DAOFactory) {
-      include = { daoFactory: include, as: include.tableName }
-    }
-
-    if (typeof include === 'object') {
-      if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
-        var usesAlias   = (include.as !== include.daoFactory.tableName)
-          , association = (usesAlias ? this.getAssociationByAlias(include.as) : this.getAssociation(include.daoFactory))
-
-        // check if the current daoFactory is actually associated with the passed daoFactory
-        if (!!association && (!association.options.as || (association.options.as === include.as))) {
-          include.association = association
-
-          return include
-        } else {
-          var msg = include.daoFactory.name
-
-          if (usesAlias) {
-            msg += " (" + include.as + ")"
-          }
-
-          msg += " is not associated to " + this.name + "!"
-
-          throw new Error(msg)
-        }
-      } else {
-        throw new Error('Include malformed. Expected attributes: daoFactory, as!')
-      }
-    } else {
-      throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
-    }
-  }
-
-  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
-
-  return DAOFactory
-})()
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/files/lib_dialects_abstract_query.js.html b/docs/files/lib_dialects_abstract_query.js.html
deleted file mode 100644
index 06875686355d..000000000000
--- a/docs/files/lib_dialects_abstract_query.js.html
+++ /dev/null
@@ -1,519 +0,0 @@
-
-
-
-    
-    lib/dialects/abstract/query.js
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            File: lib/dialects/abstract/query.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -var Utils              = require('../../utils')
-  , CustomEventEmitter = require("../../emitters/custom-event-emitter")
-
-module.exports = (function() {
-  var AbstractQuery = function(database, sequelize, callee, options) {}
-
-  /**
-    Inherit from CustomEventEmitter
-  */
-  Utils.inherit(AbstractQuery, CustomEventEmitter)
-
-  /**
-   * Execute the passed sql query.
-   *
-   * Examples:
-   *
-   *     query.run('SELECT 1')
-   *
-   * @param {String} sql - The SQL query which should be executed.
-   * @api public
-   */
-  AbstractQuery.prototype.run = function(sql) {
-    throw new Error("The run method wasn't overwritten!")
-  }
-
-  /**
-   * Check the logging option of the instance and print deprecation warnings.
-   *
-   * @return {void}
-   */
-  AbstractQuery.prototype.checkLoggingOption = function() {
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging === console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
-
-  /**
-   * High level function that handles the results of a query execution.
-   *
-   *
-   * Example:
-   *  query.formatResults([
-   *    {
-   *      id: 1,              // this is from the main table
-   *      attr2: 'snafu',     // this is from the main table
-   *      Tasks.id: 1,        // this is from the associated table
-   *      Tasks.title: 'task' // this is from the associated table
-   *    }
-   *  ])
-   *
-   * @param {Array} data - The result of the query execution.
-   */
-  AbstractQuery.prototype.formatResults = function(data) {
-    var result  = this.callee
-
-    if (isInsertQuery.call(this, data)) {
-      handleInsertQuery.call(this, data)
-    }
-
-    if (isSelectQuery.call(this)) {
-      result = handleSelectQuery.call(this, data)
-    } else if (isShowTableQuery.call(this)) {
-      result = handleShowTableQuery.call(this, data)
-    } else if (isShowOrDescribeQuery.call(this)) {
-      result = data
-    } else if (isCallQuery.call(this)) {
-      result = data[0]
-    }
-
-    return result
-  }
-
-  /**
-    Shortcut methods (success, ok) for listening for success events.
-
-    Params:
-      - fct: A function that gets executed once the *success* event was triggered.
-
-    Result:
-      The function returns the instance of the query.
-  */
-  AbstractQuery.prototype.success =
-  AbstractQuery.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }
-
-  /**
-    Shortcut methods (failure, fail, error) for listening for error events.
-
-    Params:
-      - fct: A function that gets executed once the *error* event was triggered.
-
-    Result:
-      The function returns the instance of the query.
-  */
-  AbstractQuery.prototype.failure =
-  AbstractQuery.prototype.fail =
-  AbstractQuery.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
-
-  /**
-   * This function is a wrapper for private methods.
-   *
-   * @param {String} fctName The name of the private method.
-   *
-   */
-  AbstractQuery.prototype.send = function(fctName/*, arg1, arg2, arg3, ...*/) {
-    var args = Array.prototype.slice.call(arguments).slice(1)
-    return eval(fctName).apply(this, args)
-  }
-
-  /**
-   * Get the attributes of an insert query, which contains the just inserted id.
-   *
-   * @return {String} The field name.
-   */
-  AbstractQuery.prototype.getInsertIdField = function() {
-    return 'insertId'
-  }
-
-  /////////////
-  // private //
-  /////////////
-
-  /**
-   * Iterate over all known tables and search their names inside the sql query.
-   * This method will also check association aliases ('as' option).
-   *
-   * @param  {String} attribute An attribute of a SQL query. (?)
-   * @return {String}           The found tableName / alias.
-   */
-  var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
-
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
-    })
-
-    return tableName
-  }
-
-  var queryResultHasJoin = function(results) {
-    if (!!results[0]) {
-      var keys = Object.keys(results[0])
-
-      for (var i = 0; i < keys.length; i++) {
-        if (!!findTableNameInAttribute.call(this, keys[i])) {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
-  var isInsertQuery = function(results, metaData) {
-    var result = true
-
-    // is insert query if sql contains insert into
-    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
-
-    // is insert query if no results are passed or if the result has the inserted id
-    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
-
-    // is insert query if no metadata are passed or if the metadata has the inserted id
-    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
-
-    return result
-  }
-
-  var handleInsertQuery = function(results, metaData) {
-    if (this.callee) {
-      // add the inserted row id to the instance
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-        , id                 = null
-
-      id = id || (results && results[this.getInsertIdField()])
-      id = id || (metaData && metaData[this.getInsertIdField()])
-
-      this.callee[autoIncrementField] = id
-    }
-  }
-
-  var isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0)
-  }
-
-  var handleShowTableQuery = function(results) {
-    return Utils._.flatten(results.map(function(resultSet) {
-      return Utils._.values(resultSet)
-    }))
-  }
-
-  var isSelectQuery = function() {
-    return this.options.type === 'SELECT';
-  }
-
-  var isUpdateQuery = function() {
-    return (this.sql.toLowerCase().indexOf('update') === 0)
-  }
-
-  var handleSelectQuery = function(results) {
-    var result = null, self = this;
-
-    if (this.options.raw) {
-      result = results
-    } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
-    } else {
-      result = results.map(function(result) {
-        return this.callee.build(result, { isNewRecord: false })
-      }.bind(this))
-    }
-
-    // return the first real model instance if options.plain is set (e.g. Model.find)
-    if (this.options.plain) {
-      result = (result.length === 0) ? null : result[0]
-    }
-
-    return result
-  }
-
-  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association          = null
-
-    if (!!associatedDaoFactory) {
-      association = this.callee.getAssociation(associatedDaoFactory)
-    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
-
-      if (!!associatedDaoFactory) {
-        association = this.callee.getAssociation(associatedDaoFactory)
-      } else {
-        association          = this.callee.getAssociationByAlias(tableName)
-        associatedDaoFactory = association.target
-      }
-    }
-
-    var accessor = Utils._.camelize(tableName)
-
-    // downcase the first char
-    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
-
-    associationData.forEach(function(data) {
-      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
-
-      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
-        dao[accessor] = isEmpty ? null : daoInstance
-      } else {
-        dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
-          dao[accessor].push(daoInstance)
-      }
-    })
-  }
-
-  var isShowOrDescribeQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
-    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
-
-    return  result
-  }
-
-  var isCallQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
-
-    return result
-  }
-
-
-  /**
-    The function takes the result of the query execution and groups
-    the associated data by the callee.
-
-    Example:
-      groupDataByCalleeFactory([
-        {
-          callee: { some: 'data', id: 1 },
-          association: { foo: 'bar', id: 1 }
-        }, {
-          callee: { some: 'data', id: 1 },
-          association: { foo: 'bar', id: 2 }
-        }, {
-          callee: { some: 'data', id: 1 },
-          association: { foo: 'bar', id: 3 }
-        }
-      ])
-
-    Result:
-      Something like this:
-
-      [
-        {
-          callee:  { some: 'data', id: 1 },
-          association: [
-            { foo: 'bar', id: 1 },
-            { foo: 'bar', id: 2 },
-            { foo: 'bar', id: 3 }
-          ]
-        }
-      ]
-  */
-  var groupDataByCalleeFactory = function(data) {
-    var result          = []
-      , calleeTableName = this.callee.tableName
-
-    data.forEach(function(row) {
-      var calleeData    = row[calleeTableName]
-        , existingEntry = result.filter(function(groupedRow) {
-            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
-          })[0]
-
-      if (!existingEntry) {
-        existingEntry = {}
-        result.push(existingEntry)
-        existingEntry[calleeTableName] = calleeData
-      }
-
-      for (var attrName in row) {
-        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
-          existingEntry[attrName] = existingEntry[attrName] || []
-          existingEntry[attrName].push(row[attrName])
-        }
-      }
-    })
-
-    return result
-  }
-
-
-  /**
-   * This function will prepare the result of select queries with joins.
-   *
-   * @param  {Array} data This array contains objects.
-   * @return {Array}      The array will have the needed format for groupDataByCalleeFactory.
-   */
-  var prepareJoinData = function(data) {
-    var result = data.map(function(row) {
-      var nestedRow = {}
-
-      for (var key in row) {
-        if (row.hasOwnProperty(key)) {
-          var tableName = findTableNameInAttribute.call(this, key)
-
-          if (!!tableName) {
-            nestedRow[tableName] = nestedRow[tableName] || {}
-            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
-          } else {
-            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
-            nestedRow[this.callee.tableName][key] = row[key]
-          }
-        }
-      }
-
-      return nestedRow
-    }.bind(this))
-
-    return result
-  }
-
-  return AbstractQuery
-})()
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/files/lib_sequelize.js.html b/docs/files/lib_sequelize.js.html
deleted file mode 100644
index b146d5bd589d..000000000000
--- a/docs/files/lib_sequelize.js.html
+++ /dev/null
@@ -1,303 +0,0 @@
-
-
-
-    
-    lib/sequelize.js
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            File: lib/sequelize.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -var Utils             = require("./utils")
-  , DAOFactory        = require("./dao-factory")
-  , DataTypes         = require('./data-types')
-  , DAOFactoryManager = require("./dao-factory-manager")
-  , QueryInterface    = require("./query-interface")
-
-if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')) < 0.6) {
-  console.log("DEPRECATION WARNING: Support for Node.JS < v0.6 will be canceled in the next minor release.")
-}
-
-module.exports = (function() {
-  /**
-    Main class of the project.
-
-    @param {String} database The name of the database.
-    @param {String} username The username which is used to authenticate against the database.
-    @param {String} [password] The password which is used to authenticate against the database.
-    @param {Object} [options] An object with options.
-
-    @example
-        // without password and options
-        var sequelize = new Sequelize('database', 'username')
-
-        // without options
-        var sequelize = new Sequelize('database', 'username', 'password')
-
-        // without password / with blank password
-        var sequelize = new Sequelize('database', 'username', null, {})
-
-        // with password and options
-        var sequelize = new Sequelize('my_database', 'john', 'doe', {})
-
-    @class Sequelize
-    @constructor
-  */
-  var Sequelize = function(database, username, password, options) {
-    this.options = Utils._.extend({
-      dialect: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      protocol: 'tcp',
-      define: {},
-      query: {},
-      sync: {},
-      logging: console.log,
-      omitNull: false,
-      queue: true,
-      native: false,
-      replication: false,
-      pool: {}
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    this.config = {
-      database: database,
-      username: username,
-      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
-      host    : this.options.host,
-      port    : this.options.port,
-      pool    : this.options.pool,
-      protocol: this.options.protocol,
-      queue   : this.options.queue,
-      native  : this.options.native,
-      replication: this.options.replication,
-      maxConcurrentQueries: this.options.maxConcurrentQueries
-    }
-
-    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
-
-    this.daoFactoryManager = new DAOFactoryManager(this)
-    this.connectorManager  = new ConnectorManager(this, this.config)
-
-    this.importCache = {}
-  }
-
-  /**
-    Reference to Utils
-  */
-  Sequelize.Utils = Utils
-
-  for (var dataType in DataTypes) {
-    Sequelize[dataType] = DataTypes[dataType]
-  }
-
-  Sequelize.prototype.getQueryInterface = function() {
-    this.queryInterface = this.queryInterface || new QueryInterface(this)
-    return this.queryInterface
-  }
-
-  Sequelize.prototype.getMigrator = function(options, force) {
-    var Migrator = require("./migrator")
-    if (force) {
-      this.migrator = new Migrator(this, options)
-    } else {
-      this.migrator = this.migrator || new Migrator(this, options)
-    }
-
-    return this.migrator
-  }
-
-  Sequelize.prototype.define = function(daoName, attributes, options) {
-    options = options || {}
-    var globalOptions = this.options
-
-    if (globalOptions.define) {
-      options = Utils._.extend({}, globalOptions.define, options)
-      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
-        if (globalOptions.define[key]) {
-          options[key] = options[key] || {}
-          Utils._.extend(options[key], globalOptions.define[key])
-        }
-      })
-    }
-    options.omitNull = globalOptions.omitNull
-
-    var factory = new DAOFactory(daoName, attributes, options)
-    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
-    return factory
-  }
-
-  Sequelize.prototype.isDefined = function(daoName) {
-    var daos = this.daoFactoryManager.daos
-    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
-  }
-
-  Sequelize.prototype.import = function(path) {
-    if (!this.importCache[path]) {
-      var defineCall = require(path)
-      this.importCache[path] = defineCall(this, DataTypes)
-    }
-
-    return this.importCache[path]
-  }
-
-  Sequelize.prototype.migrate = function(options) {
-    this.getMigrator().migrate(options)
-  }
-
-  Sequelize.prototype.query = function(sql, callee, options) {
-    if (arguments.length === 3) {
-      options = options
-    } else if (arguments.length === 2) {
-      options = {}
-    } else {
-      options = { raw: true }
-    }
-
-    options = Utils._.extend(Utils._.clone(this.options.query), options)
-    options = Utils._.defaults(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
-      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
-    })
-
-    return this.connectorManager.query(sql, callee, options)
-  }
-
-  Sequelize.prototype.sync = function(options) {
-    options = options || {}
-
-    if (this.options.sync) {
-      options = Utils._.extend({}, this.options.sync, options)
-    }
-
-    var chainer = new Utils.QueryChainer()
-
-    this.daoFactoryManager.daos.forEach(function(dao) {
-      chainer.add(dao.sync(options))
-    })
-
-    return chainer.run()
-  }
-
-  Sequelize.prototype.drop = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer
-
-      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
-
-      chainer
-        .run()
-        .success(function() { emitter.emit('success', null) })
-        .error(function(err) { emitter.emit('error', err) })
-    }).run()
-  }
-
-  return Sequelize
-})()
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/lib/associations/belongs-to.js.html b/docs/lib/associations/belongs-to.js.html
deleted file mode 100644
index c8fe5b78362c..000000000000
--- a/docs/lib/associations/belongs-to.js.html
+++ /dev/null
@@ -1,116 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var BelongsTo = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'BelongsTo'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.source.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-  }
-
-  // the id is in the source table
-  BelongsTo.prototype.injectAttributes = function() {
-    var newAttributes  = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.source.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  BelongsTo.prototype.injectGetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(params) {
-      var id = this[self.identifier]
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: {id:id}}, params)
-        }
-      } else {
-        params = id
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  BelongsTo.prototype.injectSetter = function(obj) {
-    var self     = this
-      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-
-    obj[accessor] = function(associatedObject) {
-      this[self.identifier] = associatedObject ? associatedObject.id : null
-
-      // passes the changed field to save, so only that field get updated.
-      return this.save([ self.identifier ])
-    }
-
-    return this
-  }
-
-  return BelongsTo
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/associations/has-many-double-linked.js.html b/docs/lib/associations/has-many-double-linked.js.html
deleted file mode 100644
index 53b55bbe4101..000000000000
--- a/docs/lib/associations/has-many-double-linked.js.html
+++ /dev/null
@@ -1,188 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManyDoubleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManyDoubleLinked.prototype.injectGetter = function(options) {
-    var self = this, _options = options
-
-    var customEventEmitter = new Utils.CustomEventEmitter(function() {
-      var where = {}, options = _options || {};
-
-      //fully qualify
-      where[self.__factory.connectorDAO.tableName+"."+self.__factory.identifier] = self.instance.id
-
-      var primaryKeys = Object.keys(self.__factory.connectorDAO.rawAttributes)
-        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-
-      where[self.__factory.connectorDAO.tableName+"."+foreignKey] = {join: self.__factory.target.tableName+".id"}
-
-      if (options.where) {
-        Utils._.each(options.where, function(value, index) {
-          delete options.where[index];
-          options.where[self.__factory.target.tableName+"."+index] = value;
-        });
-
-        Utils._.extend(options.where, where)
-      } else {
-        options.where = where;
-      }
-
-      self.__factory.target.findAllJoin(self.__factory.connectorDAO.tableName, options)
-        .on('success', function(objects) { customEventEmitter.emit('success', objects) })
-        .on('error', function(err){ customEventEmitter.emit('error', err) })
-        .on('sql', function(sql) { customEventEmitter.emit('sql', sql)})
-    })
-
-    return customEventEmitter.run()
-  }
-
-  HasManyDoubleLinked.prototype.injectSetter = function(emitterProxy, oldAssociations, newAssociations) {
-    var self = this
-
-    destroyObsoleteAssociations
-      .call(this, oldAssociations, newAssociations)
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .success(function() {
-        var chainer             = new Utils.QueryChainer
-          , association         = self.__factory.target.associations[self.__factory.associationAccessor]
-          , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
-          , unassociatedObjects = newAssociations.filter(function (obj) { 
-              return !Utils._.find(oldAssociations, function (old) {
-                return obj.id === old.id
-              }) 
-            })
-
-        unassociatedObjects.forEach(function(unassociatedObject) {
-          var attributes = {}
-          attributes[self.__factory.identifier] = self.instance.id
-          attributes[foreignIdentifier] = unassociatedObject.id
-
-          chainer.add(self.__factory.connectorDAO.create(attributes))
-        })
-
-        chainer
-          .run()
-          .success(function() { emitterProxy.emit('success', newAssociations) })
-          .error(function(err) { emitterProxy.emit('error', err) })
-          .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-      })
-  }
-
-  HasManyDoubleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    var attributes = {}
-      , association         = this.__factory.target.associations[this.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
-
-    attributes[this.__factory.identifier] = this.instance.id
-    attributes[foreignIdentifier] = newAssociation.id
-
-    this.__factory.connectorDAO.create(attributes)
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  // private
-
-  var destroyObsoleteAssociations = function(oldAssociations, newAssociations) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-      var foreignIdentifier = self.__factory.target.associations[self.__factory.associationAccessor].identifier
-      var obsoleteAssociations = oldAssociations.filter(function (old) {
-        // Return only those old associations that are not found in new
-        return !Utils._.find(newAssociations, function (obj) {
-          return obj.id === old.id
-        })
-      })
-
-      if (obsoleteAssociations.length === 0) {
-        return emitter.emit('success', null)
-      }
-
-      obsoleteAssociations.forEach(function(associatedObject) {
-        var where            = {}
-          , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
-          , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
-          , notFoundEmitters = []
-
-        where[self.__factory.identifier] = self.instance.id
-        where[foreignKey] = associatedObject.id
-
-        self.__factory.connectorDAO
-          .find({ where: where })
-          .success(function(connector) {
-            if (connector === null) {
-              notFoundEmitters.push(null)
-            } else {
-              chainer.add(connector.destroy())
-            }
-
-            if ((chainer.emitters.length + notFoundEmitters.length) === obsoleteAssociations.length) {
-              // found all obsolete connectors and will delete them now
-              chainer
-                .run()
-                .success(function() { emitter.emit('success', null) })
-                .error(function(err) { emitter.emit('error', err) })
-                .on('sql', function(sql) { emitter.emit('sql', sql) })
-            }
-          })
-          .error(function(err) { emitter.emit('error', err) })
-          .on('sql', function(sql) { emitter.emit('sql', sql) })
-      })
-    }).run()
-  }
-
-  return HasManyDoubleLinked
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/associations/has-many-single-linked.js.html b/docs/lib/associations/has-many-single-linked.js.html
deleted file mode 100644
index e31294c02045..000000000000
--- a/docs/lib/associations/has-many-single-linked.js.html
+++ /dev/null
@@ -1,106 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils = require('./../utils')
-
-module.exports = (function() {
-  var HasManySingleLinked = function(definition, instance) {
-    this.__factory = definition
-    this.instance = instance
-  }
-
-  HasManySingleLinked.prototype.injectGetter = function(options) {
-    var where = {}, options = options || {}
-
-    where[this.__factory.identifier] = this.instance.id
-
-    options.where = options.where ? Utils._.extend(options.where, where) : where
-    return this.__factory.target.findAll(options)
-  }
-
-  HasManySingleLinked.prototype.injectSetter = function(emitter, oldAssociations, newAssociations) {
-    var self    = this
-      , options = this.__factory.options
-      , chainer = new Utils.QueryChainer()
-      , obsoleteAssociations = oldAssociations.filter(function (old) { 
-          return !Utils._.find(newAssociations, function (obj) {
-            return obj.id === old.id
-          }) 
-        })
-      , unassociatedObjects = newAssociations.filter(function (obj) { 
-          return !Utils._.find(oldAssociations, function (old) {
-            return obj.id === old.id
-          }) 
-        })
-
-    // clear the old associations
-    obsoleteAssociations.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = null
-      chainer.add(associatedObject.save())
-    })
-
-    // set the new associations
-    unassociatedObjects.forEach(function(associatedObject) {
-      associatedObject[self.__factory.identifier] = self.instance.id
-      chainer.add(associatedObject.save())
-    })
-
-    chainer
-      .run()
-      .success(function() { emitter.emit('success', newAssociations) })
-      .error(function(err) { emitter.emit('error', err) })
-  }
-
-  HasManySingleLinked.prototype.injectAdder = function(emitterProxy, newAssociation) {
-    newAssociation[this.__factory.identifier] = this.instance.id
-
-    newAssociation.save()
-      .success(function() { emitterProxy.emit('success', newAssociation) })
-      .error(function(err) { emitterProxy.emit('error', err) })
-      .on('sql', function(sql) { emitterProxy.emit('sql', sql) })
-  }
-
-  return HasManySingleLinked
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/associations/has-many.js.html b/docs/lib/associations/has-many.js.html
deleted file mode 100644
index f5673f11ccfe..000000000000
--- a/docs/lib/associations/has-many.js.html
+++ /dev/null
@@ -1,236 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-var HasManySingleLinked = require("./has-many-single-linked")
-  , HasManyMultiLinked  = require("./has-many-double-linked")
-
-module.exports = (function() {
-  var HasMany = function(srcDAO, targetDAO, options) {
-    this.associationType = 'HasMany'
-    this.source = srcDAO
-    this.target = targetDAO
-    this.options = options
-    this.useJunctionTable = this.options.useJunctionTable === undefined ? true : this.options.useJunctionTable
-    this.isSelfAssociation = (this.source.tableName === this.target.tableName)
-
-    var combinedTableName = Utils.combineTableNames(
-      this.source.tableName,
-      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
-    )
-    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
-
-    var as = (this.options.as || Utils.pluralize(this.target.tableName))
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + as),
-      set: Utils._.camelize('set_' + as),
-      add: Utils._.camelize(Utils.singularize('add_' + as)),
-      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
-      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
-      hasAll: Utils._.camelize('has_' + as)
-    }
-  }
-
-  // the id is in the target table
-  // or in an extra table which connects two tables
-  HasMany.prototype.injectAttributes = function() {
-    var multiAssociation = this.target.associations.hasOwnProperty(this.associationAccessor)
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-
-    // is there already a single sided association between the source and the target?
-    // or is the association on the model itself?
-    if ((this.isSelfAssociation && this.useJunctionTable) || multiAssociation) {
-      // remove the obsolete association identifier from the source
-      if (this.isSelfAssociation) {
-        this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)
-      } else {
-        this.foreignIdentifier = this.target.associations[this.associationAccessor].identifier
-        delete this.source.rawAttributes[this.foreignIdentifier]
-      }
-
-      // define a new model, which connects the models
-      var combinedTableAttributes = {}
-      combinedTableAttributes[this.identifier] = {type:DataTypes.INTEGER, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type:DataTypes.INTEGER, primaryKey: true}
-
-      this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
-
-      if (!this.isSelfAssociation) {
-        this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
-      }
-
-      if (this.options.syncOnAssociation) {
-        this.connectorDAO.sync()
-      }
-    } else {
-      var newAttributes = {}
-      newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-      Utils._.defaults(this.target.rawAttributes, newAttributes)
-    }
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-    this.source.DAO.prototype.attributes = Object.keys(this.source.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasMany.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(options) {
-      var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-      return new Class(self, this).injectGetter(options)
-    }
-
-   obj[this.accessors.hasAll] = function(objects) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.all(objects, function(o) {
-              return Utils._.any(associatedObjects, function(associatedObject) {
-                return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                  return o[identifier] == associatedObject[identifier];
-                });
-              })
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    obj[this.accessors.hasSingle] = function(o) {
-    var instance = this;
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]()
-        .error(function(err){ customEventEmitter.emit('error', err)})
-        .success(function(associatedObjects) {
-          customEventEmitter.emit('success',
-            Utils._.any(associatedObjects, function(associatedObject) {
-              return Utils._.all(associatedObject.identifiers, function(key, identifier) {
-                return o[identifier] == associatedObject[identifier];
-              });
-            })
-          )
-        })
-      })
-      return customEventEmitter.run()
-    }
-    return this
-  }
-
-  HasMany.prototype.injectSetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.set] = function(newAssociatedObjects) {
-      if (newAssociatedObjects === null) {
-        newAssociatedObjects = []
-      }
-
-      var instance = this
-
-      // define the returned customEventEmitter, which will emit the success event once everything is done
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]()
-          .success(function(oldAssociatedObjects) {
-            var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-            new Class(self, instance).injectSetter(emitter, oldAssociatedObjects, newAssociatedObjects)
-          })
-          .error(function(err) {
-            emitter.emit('error', err)
-          })
-          .on('sql', function(sql) {
-            emitter.emit('sql', sql)
-          })
-      }).run()
-    }
-
-    obj[this.accessors.add] = function(newAssociatedObject) {
-      var instance = this
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]({ where: { id: newAssociatedObject.id }})
-          .error(function(err){ emitter.emit('error', err)})
-          .success(function(currentAssociatedObjects) {
-            if (currentAssociatedObjects.length === 0) {
-              var Class = self.connectorDAO ? HasManyMultiLinked : HasManySingleLinked
-              new Class(self, instance).injectAdder(emitter, newAssociatedObject)
-            } else {
-              emitter.emit('success', newAssociatedObject);
-            }
-          })
-      }).run()
-    }
-
-    obj[this.accessors.remove] = function(oldAssociatedObject) {
-      var instance = this
-      var customEventEmitter = new Utils.CustomEventEmitter(function() {
-        instance[self.accessors.get]().success(function(currentAssociatedObjects) {
-          var newAssociations = []
-
-          currentAssociatedObjects.forEach(function(association) {
-            if (!Utils._.isEqual(oldAssociatedObject.identifiers, association.identifiers))
-              newAssociations.push(association)
-          })
-
-          instance[self.accessors.set](newAssociations)
-            .success(function() { customEventEmitter.emit('success', null) })
-            .error(function(err) { customEventEmitter.emit('error', err) })
-        })
-      })
-      return customEventEmitter.run()
-    }
-
-    return this
-  }
-
-  return HasMany
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/associations/has-one.js.html b/docs/lib/associations/has-one.js.html
deleted file mode 100644
index bb831a89a231..000000000000
--- a/docs/lib/associations/has-one.js.html
+++ /dev/null
@@ -1,139 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils     = require("./../utils")
-  , DataTypes = require('./../data-types')
-
-module.exports = (function() {
-  var HasOne = function(srcDAO, targetDAO, options) {
-    this.associationType   = 'HasOne'
-    this.source            = srcDAO
-    this.target            = targetDAO
-    this.options           = options
-    this.isSelfAssociation = (this.source.tableName == this.target.tableName)
-
-    if (this.isSelfAssociation && !this.options.foreignKey && !!this.options.as) {
-      this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as) + "Id", this.options.underscored)
-    }
-
-    this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
-      : this.options.as || this.target.tableName
-
-    this.accessors = {
-      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
-      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
-    }
-  }
-
-  // the id is in the target table
-  HasOne.prototype.injectAttributes = function() {
-    var newAttributes = {}
-
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
-    newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    Utils._.defaults(this.target.rawAttributes, newAttributes)
-
-    // Sync attributes to DAO proto each time a new assoc is added
-    this.target.DAO.prototype.attributes = Object.keys(this.target.DAO.prototype.rawAttributes);
-
-    return this
-  }
-
-  HasOne.prototype.injectGetter = function(obj) {
-    var self = this
-
-    obj[this.accessors.get] = function(params) {
-      var id    = this.id
-        , where = {}
-
-      where[self.identifier] = id
-
-      if (!Utils._.isUndefined(params)) {
-        if (!Utils._.isUndefined(params.attributes)) {
-          params = Utils._.extend({where: where}, params)
-        }
-      } else {
-        params = {where: where}
-      }
-
-      return self.target.find(params)
-    }
-
-    return this
-  }
-
-  HasOne.prototype.injectSetter = function(obj) {
-    var self    = this
-      , options = self.options || {}
-
-    obj[this.accessors.set] = function(associatedObject) {
-      var instance = this;
-      return new Utils.CustomEventEmitter(function(emitter) {
-        instance[self.accessors.get]().success(function(oldObj) {
-          if (oldObj) {
-            oldObj[self.identifier] = null
-            oldObj.save()
-          }
-
-          if (associatedObject) {
-            associatedObject[self.identifier] = instance.id
-            associatedObject
-              .save()
-              .success(function() { emitter.emit('success', associatedObject) })
-              .error(function(err) { emitter.emit('error', err) })
-          } else {
-            emitter.emit('success', null)
-          }
-
-        })
-      }).run()
-    }
-
-    return this
-  }
-
-  return HasOne
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/associations/mixin.js.html b/docs/lib/associations/mixin.js.html
deleted file mode 100644
index 6375d9c5bf22..000000000000
--- a/docs/lib/associations/mixin.js.html
+++ /dev/null
@@ -1,112 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mixin
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Defines Mixin for all models.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Mixin = module.exports = function(){}
-
-Mixin.hasOne = function(associatedDAO, options) {
-  // the id is in the foreign table
-  var association = new HasOne(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype);
-  association.injectSetter(this.DAO.prototype);
-
-  return this
-}
-
-Mixin.belongsTo = function(associatedDAO, options) {
-  // the id is in this table
-  var association = new BelongsTo(this, associatedDAO, Utils._.extend((options || {}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.hasMany = function(associatedDAO, options) {
-  // the id is in the foreign table or in a connecting table
-  var association = new HasMany(this, associatedDAO, Utils._.extend((options||{}), this.options))
-  this.associations[association.associationAccessor] = association.injectAttributes()
-
-  association.injectGetter(this.DAO.prototype)
-  association.injectSetter(this.DAO.prototype)
-
-  return this
-}
-
-Mixin.getAssociation = function(target) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-console.log(target.name, association.target.name)
-      if (!result && (association.target === target)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}
-
-Mixin.getAssociationByAlias = function(alias) {
-  var result = null
-
-  for (var associationName in this.associations) {
-    if (this.associations.hasOwnProperty(associationName)) {
-      var association = this.associations[associationName]
-
-      if (!result && (association.options.as === alias)) {
-        result = association
-      }
-    }
-  }
-
-  return result
-}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          example for instance methods:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Mixin.prototype.test = function() {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              console.log('asd')
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/dao-factory-manager.js.html b/docs/lib/dao-factory-manager.js.html
deleted file mode 100644
index 575fbf8362f4..000000000000
--- a/docs/lib/dao-factory-manager.js.html
+++ /dev/null
@@ -1,80 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports = (function() {
-  var DAOFactoryManager = function(sequelize) {
-    this.daos = []
-    this.sequelize = sequelize
-  }
-
-  DAOFactoryManager.prototype.addDAO = function(dao) {
-    this.daos.push(dao)
-
-    return dao
-  }
-
-  DAOFactoryManager.prototype.removeDAO = function(dao) {
-    this.daos = this.daos.filter(function(_dao) {
-      return _dao.name != dao.name
-    })
-  }
-
-  DAOFactoryManager.prototype.getDAO = function(daoName, options) {
-    options = options || {}
-    options.attribute = options.attribute || 'name'
-
-    var dao = this.daos.filter(function(dao) {
-      return dao[options.attribute] === daoName
-    })
-
-    return !!dao ? dao[0] : null
-  }
-
-  DAOFactoryManager.prototype.__defineGetter__('all', function() {
-    return this.daos
-  })
-
-  return DAOFactoryManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/dao-factory.js.html b/docs/lib/dao-factory.js.html
deleted file mode 100644
index 5c1b38fae016..000000000000
--- a/docs/lib/dao-factory.js.html
+++ /dev/null
@@ -1,300 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ptions.include =
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              includes.map(function(include) {
-        console.log(include instanceof DAOFactory)
-      })
-
-      includes.forEach(function(daoName) {
-        options.include[daoName] = this.daoFactoryManager.getDAO(daoName)
-
-        if (!options.include[daoName]) {
-          options.include[daoName] = this.getAssociationByAlias(daoName).target
-        }
-      }.bind(this))
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      type:    'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  //right now, the caller (has-many-double-linked) is in charge of the where clause
-  DAOFactory.prototype.findAllJoin = function(joinTableName, options) {
-    var optcpy = Utils._.clone(options)
-    optcpy.attributes = optcpy.attributes || [Utils.addTicks(this.tableName)+".*"]
-
-    // whereCollection is used for non-primary key updates
-    this.options.whereCollection = optcpy.where || null;
-
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              find
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              DAOFactory.prototype.find()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • @param:  {Object} options Options to describe the scope of the search.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • @: @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • @return:  {Object} A promise which fires `success`, `error`, `complete` and `sql`.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Search for an instance.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              DAOFactory.prototype.find = function(options) {
-    var hasJoin = false
-
-    // no options defined?
-    // return an emitter which emits null
-    if ([null, undefined].indexOf(options) !== -1) {
-      return new Utils.CustomEventEmitter(function(emitter) {
-        setTimeout(function() { emitter.emit('success', null) }, 10)
-      }).run()
-    }
-
-    var primaryKeys = this.primaryKeys
-
-    // options is not a hash but an id
-    if (typeof options === 'number') {
-      options = { where: options }
-    } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-      var where = {}
-        , self  = this
-        , keys = Object.keys(primaryKeys)
-
-      Utils._.each(arguments, function(arg, i) {
-        var key = keys[i]
-        where[key] = arg
-      })
-
-      options = { where: where }
-    } else if (typeof options === 'string' && parseInt(options, 10).toString() === options) {
-      var parsedId = parseInt(options, 10)
-
-      if (!Utils._.isFinite(parsedId)) {
-        throw new Error('Invalid argument to find(). Must be an id or an options object.')
-      }
-
-      options = { where: parsedId }
-    } else if (typeof options === 'object') {
-      var includes = null
-
-      options = Utils._.clone(options)
-
-      if (options.hasOwnProperty('include')) {
-        hasJoin = true
-
-        options.include = options.include.map(function(include) {
-          if (include instanceof DAOFactory) {
-            include = { daoFactory: include, as: include.tableName }
-          }
-
-          if (typeof include === 'object') {
-            if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
-              var usesAlias = include.as !== include.tableName
-
-              // check if the current daoFactory is actually associated with the passed daoFactory
-              if (usesAlias ? this.getAssociation(include.daoFactory) : this.getAssociationByAlias(include.as)) {
-                return include
-              } else {
-                var msg = include.daoFactory.name
-
-                if (usesAlias) {
-                  msg += " (" + include.as + ")"
-                }
-
-                msg += " is not associated to " + this.name + "!"
-
-                throw new Error(msg)
-              }
-            } else {
-              throw new Error('Include malformed. Expected attributes: daoFactory, as')
-            }
-          } else {
-            throw new Error('Include unexpected. Element has to be either an instance of DAOFactory or an object.')
-          }
-        }.bind(this))
-      }
-
-      // whereCollection is used for non-primary key updates
-      this.options.whereCollection = options.where || null
-    }
-
-    options.limit = 1
-
-    return this.QueryInterface.select(this, this.tableName, options, {
-      plain: true,
-      type: 'SELECT',
-      hasJoin: hasJoin
-    })
-  }
-
-  DAOFactory.prototype.count = function(options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['count(*)', 'count'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
-  }
-
-  DAOFactory.prototype.max = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['max(' + field + ')', 'max'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
-  }
-  DAOFactory.prototype.min = function(field, options) {
-    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['min(' + field + ')', 'min'])
-    options.parseInt = true
-
-    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
-  }
-
-  DAOFactory.prototype.build = function(values, options) {
-    options = options || {isNewRecord: true}
-
-    var self     = this
-      , instance = new this.DAO(values, this.options, options.isNewRecord)
-
-    instance.isNewRecord = options.isNewRecord
-
-    return instance
-  }
-
-  DAOFactory.prototype.create = function(values, fields) {
-    return this.build(values).save(fields)
-  }
-
-  DAOFactory.prototype.findOrCreate = function (params, defaults) {
-    var self = this;
-
-    return new Utils.CustomEventEmitter(function (emitter) {
-      self.find({
-        where: params
-      }).success(function (instance) {
-        if (instance === null) {
-          for (var attrname in defaults) {
-            params[attrname] = defaults[attrname];
-          }
-
-          self.create(params)
-	    .success(function (instance) {
-              emitter.emit('success', instance)
-            })
-	    .error( function (error) {
-              emitter.emit('error', error)
-            });
-        } else {
-          emitter.emit('success', instance)
-        }
-      }).error(function (error) {
-        emitter.emit('error', error)
-      });
-    }).run()
-  }
-
-  // private
-
-  var query = function() {
-    var args      = Utils._.map(arguments, function(arg, _) { return arg })
-      , sequelize = this.daoFactoryManager.sequelize
-
-    // add this as the second argument
-    if (arguments.length === 1) {
-      args.push(this)
-    }
-
-    // add {} as options
-    if (args.length === 2) {
-      args.push({})
-    }
-
-    return sequelize.query.apply(sequelize, args)
-  }
-
-  var addOptionalClassMethods = function() {
-    var self = this
-    Utils._.each(this.options.classMethods || {}, function(fct, name) { self[name] = fct })
-  }
-
-  var addDefaultAttributes = function() {
-    var self              = this
-      , defaultAttributes = {
-        id: {
-          type: DataTypes.INTEGER,
-          allowNull: false,
-          primaryKey: true,
-          autoIncrement: true
-        }
-      }
-
-    if (this.hasPrimaryKeys) {
-      defaultAttributes = {}
-    }
-
-    if (this.options.timestamps) {
-      defaultAttributes[Utils._.underscoredIf('createdAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-      defaultAttributes[Utils._.underscoredIf('updatedAt', this.options.underscored)] = {type: DataTypes.DATE, allowNull: false}
-
-      if (this.options.paranoid)
-        defaultAttributes[Utils._.underscoredIf('deletedAt', this.options.underscored)] = {type: DataTypes.DATE}
-    }
-
-    Utils._.each(defaultAttributes, function(value, attr) {
-      self.rawAttributes[attr] = value
-    })
-  }
-
-  var findAutoIncrementField = function() {
-    var fields = this.QueryGenerator.findAutoIncrementField(this)
-
-    this.autoIncrementField = null
-
-    fields.forEach(function(field) {
-      if (this.autoIncrementField) {
-        throw new Error('Invalid DAO definition. Only one autoincrement field allowed.')
-      } else {
-        this.autoIncrementField = field
-      }
-    }.bind(this))
-  }
-
-  Utils._.extend(DAOFactory.prototype, require("./associations/mixin"))
-
-  return DAOFactory
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/dao.js.html b/docs/lib/dao.js.html
deleted file mode 100644
index d1ad7b8131b0..000000000000
--- a/docs/lib/dao.js.html
+++ /dev/null
@@ -1,210 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              validate
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              DAO.prototype.validate()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              • @return:  {null} if and only if validation successful; otherwise an object containing { field name : [error msgs] } entries.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Validate this dao's attribute values according to validation rules set in the dao definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              DAO.prototype.validate = function() {
-    var self = this
-    var failures = {}
-
-    // for each field and value
-    Utils._.each(self.values, function(value, field) {
-
-      // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
-        // for each validator
-        Utils._.each(self.validators[field], function(details, validatorType) {
-
-          var is_custom_fn = false  // if true then it's a custom validation method
-          var fn_method = null      // the validation function to call
-          var fn_args = []          // extra arguments to pass to validation function
-          var fn_msg = ""           // the error message to return if validation fails
-
-          // is it a custom validator function?
-          if (Utils._.isFunction(details)) {
-            is_custom_fn = true
-            fn_method = Utils._.bind(details, self, value)
-          }
-          // is it a validator module function?
-          else {
-            // extra args
-            fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Array.isArray(fn_args))
-              fn_args = [fn_args]
-            // error msg
-            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
-            // check method exists
-            var v = Validator.check(value, fn_msg)
-            if (!Utils._.isFunction(v[validatorType]))
-              throw new Error("Invalid validator function: " + validatorType)
-            // bind to validator obj
-            fn_method = Utils._.bind(v[validatorType], v)
-          }
-
-          try {
-            fn_method.apply(null, fn_args)
-          } catch (err) {
-            err = err.message
-            // if we didn't provide a custom error message then augment the default one returned by the validator
-            if (!fn_msg && !is_custom_fn)
-              err += ": " + field
-            // each field can have multiple validation failures stored against it
-            if (failures.hasOwnProperty(field)) {
-              failures[field].push(err)
-            } else {
-              failures[field] = [err]
-            }
-          }
-
-        }) // for each validator for this field
-      } // if field has validator set
-    }) // for each field
-
-    return (Utils._.isEmpty(failures) ? null : failures)
-  }
-
-
-  DAO.prototype.updateAttributes = function(updates, fields) {
-    this.setAttributes(updates)
-    return this.save(fields)
-  }
-
-  DAO.prototype.setAttributes = function(updates) {
-    var self = this
-
-    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
-
-    readOnlyAttributes.push('id')
-    readOnlyAttributes.push('createdAt')
-    readOnlyAttributes.push('updatedAt')
-    readOnlyAttributes.push('deletedAt')
-
-    Utils._.each(updates, function(value, attr) {
-      var updateAllowed = (
-        (readOnlyAttributes.indexOf(attr) == -1) &&
-        (readOnlyAttributes.indexOf(Utils._.underscored(attr)) == -1) &&
-        (self.attributes.indexOf(attr) > -1)
-      )
-      updateAllowed && (self[attr] = value)
-    })
-  }
-
-  DAO.prototype.destroy = function() {
-    if (this.__options.timestamps && this.__options.paranoid) {
-      var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
-      this[attr] = new Date()
-      return this.save()
-    } else {
-      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
-    }
-  }
-
-  DAO.prototype.equals = function(other) {
-    var result = true
-      , self   = this
-
-    Utils._.each(this.values, function(value, key) {
-      result = result && (value == other[key])
-    })
-
-    return result
-  }
-
-  DAO.prototype.equalsOneOf = function(others) {
-    var result = false
-      , self   = this
-
-    others.forEach(function(other) { result = result || self.equals(other) })
-
-    return result
-  }
-
-  DAO.prototype.addAttribute = function(attribute, value) {
-    this[attribute] = value
-  }
-
-  DAO.prototype.setValidators = function(attribute, validators) {
-    this.validators[attribute] = validators
-  }
-
-  DAO.prototype.toJSON = function() {
-    return this.values;
-  }
-
-  // private
-
-  var initAttributes = function(values, isNewRecord) {
-    // add all passed values to the dao and store the attribute names in this.attributes
-    for (var key in values) {
-      if (values.hasOwnProperty(key)) {
-        this.addAttribute(key, values[key])
-      }
-    }
-
-    // set id to null if not passed as value
-    // a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
-
-    if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
-
-      if (this.__options.paranoid) {
-        defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
-      }
-    }
-
-    if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        var value = defaults[attr]
-
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
-        }
-      }
-    }
-  }
-
-  return DAO
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/data-types.js.html b/docs/lib/data-types.js.html
deleted file mode 100644
index 2c8836782536..000000000000
--- a/docs/lib/data-types.js.html
+++ /dev/null
@@ -1,56 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                module.exports = {
-  STRING: 'VARCHAR(255)',
-  TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
-  DATE: 'DATETIME',
-  BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
-  NOW: 'NOW',
-  ENUM: 'ENUM'
-}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/dialects/abstract/query.js.html b/docs/lib/dialects/abstract/query.js.html
deleted file mode 100644
index 0d59cc648345..000000000000
--- a/docs/lib/dialects/abstract/query.js.html
+++ /dev/null
@@ -1,370 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Inherit from CustomEventEmitter
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils.inherit(AbstractQuery, CustomEventEmitter)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  run
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {String} sql - The SQL query which should be executed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Execute the passed sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Examples
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query.run('SELECT 1')
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.run = function(sql) {
-    throw new Error("The run method wasn't overwritten!")
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  checkLoggingOption
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @return:  {void} 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Check the logging option of the instance and print deprecation warnings.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.checkLoggingOption = function() {
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging === console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  formatResults
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • @param:  {Array} data - The result of the query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  High level function that handles the results of a query execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Example
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query.formatResults([
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       id: 1,              // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       attr2: 'snafu',     // this is from the main table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Tasks.id: 1,        // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       Tasks.title: 'task' // this is from the associated table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   ])
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  AbstractQuery.prototype.formatResults = function(data) {
-    var result  = this.callee
-
-    if (isInsertQuery.call(this, data)) {
-      handleInsertQuery.call(this, data)
-    }
-
-    if (isSelectQuery.call(this)) {
-      result = handleSelectQuery.call(this, data)
-    } else if (isShowTableQuery.call(this)) {
-      result = handleShowTableQuery.call(this, data)
-    } else if (isShowOrDescribeQuery.call(this)) {
-      result = data
-    } else if (isCallQuery.call(this)) {
-      result = data[0]
-    }
-
-    return result
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Shortcut methods (success, ok) for listening for success events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Params:
-  - fct: A function that gets executed once the *success* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    AbstractQuery.prototype.success =
-  AbstractQuery.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Shortcut methods (failure, fail, error) for listening for error events.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Params:
-  - fct: A function that gets executed once the *error* event was triggered.
-
-Result:
-  The function returns the instance of the query.
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.failure =
-  AbstractQuery.prototype.fail =
-  AbstractQuery.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      send
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • @param:  {String} fctName The name of the private method.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      This function is a wrapper for private methods.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AbstractQuery.prototype.send = function(fctName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        arg1, arg2, arg3, ...
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        {
-    var args = Array.prototype.slice.call(arguments).slice(1)
-    return eval(fctName).apply(this, args)
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        method
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        getInsertIdField
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @return:  {String} The field name.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Get the attributes of an insert query, which contains the just inserted id.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        AbstractQuery.prototype.getInsertIdField = function() {
-    return 'insertId'
-  }
-
-  /////////////
-  // private //
-  /////////////
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        findTableNameInAttribute()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @param:  {String} attribute An attribute of a SQL query. (?)
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        • @return:  {String} The found tableName / alias.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Iterate over all known tables and search their names inside the sql query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        This method will also check association aliases ('as' option).
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
-
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
-    })
-
-    return tableName
-  }
-
-  var queryResultHasJoin = function(results) {
-    if (!!results[0]) {
-      var keys = Object.keys(results[0])
-
-      for (var i = 0; i < keys.length; i++) {
-        if (!!findTableNameInAttribute.call(this, keys[i])) {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
-  var isInsertQuery = function(results, metaData) {
-    var result = true
-
-    // is insert query if sql contains insert into
-    result = result && (this.sql.toLowerCase().indexOf('insert into') === 0)
-
-    // is insert query if no results are passed or if the result has the inserted id
-    result = result && (!results || results.hasOwnProperty(this.getInsertIdField()))
-
-    // is insert query if no metadata are passed or if the metadata has the inserted id
-    result = result && (!metaData || metaData.hasOwnProperty(this.getInsertIdField()))
-
-    return result
-  }
-
-  var handleInsertQuery = function(results, metaData) {
-    if (this.callee) {
-      // add the inserted row id to the instance
-      var autoIncrementField = this.callee.__factory.autoIncrementField
-        , id                 = null
-
-      id = id || (results && results[this.getInsertIdField()])
-      id = id || (metaData && metaData[this.getInsertIdField()])
-
-      this.callee[autoIncrementField] = id
-    }
-  }
-
-  var isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0)
-  }
-
-  var handleShowTableQuery = function(results) {
-    return Utils._.flatten(results.map(function(resultSet) {
-      return Utils._.values(resultSet)
-    }))
-  }
-
-  var isSelectQuery = function() {
-    return this.options.type === 'SELECT';
-  }
-
-  var isUpdateQuery = function() {
-    return (this.sql.toLowerCase().indexOf('update') === 0)
-  }
-
-  var handleSelectQuery = function(results) {
-    var result = null, self = this;
-
-    if (this.options.raw) {
-      result = results
-    } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
-    } else {
-      result = results.map(function(result) {
-        return this.callee.build(result, { isNewRecord: false })
-      }.bind(this))
-    }
-
-    // return the first real model instance if options.plain is set (e.g. Model.find)
-    if (this.options.plain) {
-      result = (result.length === 0) ? null : result[0]
-    }
-
-    return result
-  }
-
-  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
-    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
-      , association          = null
-
-    if (!!associatedDaoFactory) {
-      association = this.callee.getAssociation(associatedDaoFactory)
-    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
-
-      if (!!associatedDaoFactory) {
-        association = this.callee.getAssociation(associatedDaoFactory)
-      } else {
-        association          = this.callee.getAssociationByAlias(tableName)
-        associatedDaoFactory = association.target
-      }
-    }
-
-    var accessor = Utils._.camelize(tableName)
-
-    // downcase the first char
-    accessor = accessor.slice(0,1).toLowerCase() + accessor.slice(1)
-
-    associationData.forEach(function(data) {
-      var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
-
-      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
-        dao[accessor] = isEmpty ? null : daoInstance
-      } else {
-        dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
-          dao[accessor].push(daoInstance)
-      }
-    })
-  }
-
-  var isShowOrDescribeQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('show') === 0)
-    result = result || (this.sql.toLowerCase().indexOf('describe') === 0)
-
-    return  result
-  }
-
-  var isCallQuery = function() {
-    var result = false
-
-    result = result || (this.sql.toLowerCase().indexOf('call') === 0)
-
-    return result
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        groupDataByCalleeFactory()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          The function takes the result of the query execution and groups
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              the associated data by the callee.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Example:
-  groupDataByCalleeFactory([
-    {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 1 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 2 }
-    }, {
-      callee: { some: 'data', id: 1 },
-      association: { foo: 'bar', id: 3 }
-    }
-  ])
-
-Result:
-  Something like this:
-
-  [
-    {
-      callee:  { some: 'data', id: 1 },
-      association: [
-        { foo: 'bar', id: 1 },
-        { foo: 'bar', id: 2 },
-        { foo: 'bar', id: 3 }
-      ]
-    }
-  ]
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var groupDataByCalleeFactory = function(data) {
-    var result          = []
-      , calleeTableName = this.callee.tableName
-
-    data.forEach(function(row) {
-      var calleeData    = row[calleeTableName]
-        , existingEntry = result.filter(function(groupedRow) {
-            return Utils._.isEqual(groupedRow[calleeTableName], calleeData)
-          })[0]
-
-      if (!existingEntry) {
-        existingEntry = {}
-        result.push(existingEntry)
-        existingEntry[calleeTableName] = calleeData
-      }
-
-      for (var attrName in row) {
-        if (row.hasOwnProperty(attrName) && (attrName !== calleeTableName)) {
-          existingEntry[attrName] = existingEntry[attrName] || []
-          existingEntry[attrName].push(row[attrName])
-        }
-      }
-    })
-
-    return result
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          prepareJoinData
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          prepareJoinData()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @param:  {Array} data This array contains objects.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          • @return:  {Array} The array will have the needed format for groupDataByCalleeFactory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          This function will prepare the result of select queries with joins.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var prepareJoinData = function(data) {
-    var result = data.map(function(row) {
-      var nestedRow = {}
-
-      for (var key in row) {
-        if (row.hasOwnProperty(key)) {
-          var tableName = findTableNameInAttribute.call(this, key)
-
-          if (!!tableName) {
-            nestedRow[tableName] = nestedRow[tableName] || {}
-            nestedRow[tableName][key.replace(tableName + '.', '')] = row[key]
-          } else {
-            nestedRow[this.callee.tableName] = nestedRow[this.callee.tableName] || {}
-            nestedRow[this.callee.tableName][key] = row[key]
-          }
-        }
-      }
-
-      return nestedRow
-    }.bind(this))
-
-    return result
-  }
-
-  return AbstractQuery
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/dialects/connector-manager.js.html b/docs/lib/dialects/connector-manager.js.html
deleted file mode 100644
index f4df4ed4c7c7..000000000000
--- a/docs/lib/dialects/connector-manager.js.html
+++ /dev/null
@@ -1,69 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          module.exports
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            module.exports = (function(){
-  var ConnectorManager = function(sequelize, config) {
-    throw new Error('Define the constructor!')
-  }
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    throw new Error('Define the query method!')
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    throw new Error('Define the connect method!')
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    throw new Error('Define the disconnect method!')
-  }
-
-  ConnectorManager.prototype.reconnect = function() {
-    this.disconnect()
-    this.connect()
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/connector-manager.js.html b/docs/lib/dialects/mysql/connector-manager.js.html
deleted file mode 100644
index d2c59be8c783..000000000000
--- a/docs/lib/dialects/mysql/connector-manager.js.html
+++ /dev/null
@@ -1,379 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var mysql   = require("mysql")
-  , Pooling = require('generic-pool')
-  , Query   = require("./query")
-  , Utils   = require("../../utils")
-  , without = function(arr, elem) { return arr.filter(function(e) { return e != elem }) }
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client = null
-    this.config = config || {}
-    this.disconnectTimeoutId = null
-    this.queue = []
-    this.activeQueue = []
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-    this.poolCfg = Utils._.defaults(this.config.pool, {
-      maxConnections: 10,
-      minConnections: 0,
-      maxIdleTime: 1000
-    });
-    this.pendingQueries = 0;
-    this.useReplicaton = !!config.replication;
-    this.useQueue = config.queue !== undefined ? config.queue : true;
-
-    var self = this
-
-    if (this.useReplicaton) {
-      var reads = 0,
-        writes = 0;
-
-      // Init configs with options from config if not present
-      for (var i in config.replication.read) {
-        config.replication.read[i] = Utils._.defaults(config.replication.read[i], {
-          host: this.config.host,
-          port: this.config.port,
-          username: this.config.username,
-          password: this.config.password,
-          database: this.config.database
-        });
-      }
-      config.replication.write = Utils._.defaults(config.replication.write, {
-        host: this.config.host,
-        port: this.config.port,
-        username: this.config.username,
-        password: this.config.password,
-        database: this.config.database
-      });
-
-      // I'll make my own pool, with blackjack and hookers!
-      this.pool = {
-        release: function (client) {
-          if (client.queryType == 'read') {
-            return this.read.release(client);
-          } else {
-            return this.write.release(client);
-          }
-        },
-        acquire: function (callback, priority, queryType) {
-          if (queryType == 'SELECT') {
-            this.read.acquire(callback, priority);
-          } else {
-            this.write.acquire(callback, priority);
-          }
-        },
-        drain: function () {
-          this.read.drain();
-          this.write.drain();
-        },
-        read: Pooling.Pool({
-          name: 'sequelize-read',
-          create: function (done) {
-            if (reads >= self.config.replication.read.length) reads = 0;
-            var config = self.config.replication.read[reads++];
-
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'read'
-              done(null, connection)
-            }, config);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        }),
-        write: Pooling.Pool({
-          name: 'sequelize-write',
-          create: function (done) {
-            connect.call(self, function (err, connection) {
-              connection.queryType = 'write'
-              done(null, connection)
-            }, self.config.replication.write);
-          },
-          destroy: function(client) {
-            disconnect.call(self, client)
-          },
-          max: self.poolCfg.maxConnections,
-          min: self.poolCfg.minConnections,
-          idleTimeoutMillis: self.poolCfg.maxIdleTime
-        })
-      };
-    } else if (this.poolCfg) {
-      //the user has requested pooling, so create our connection pool
-      this.pool = Pooling.Pool({
-        name: 'sequelize-mysql',
-        create: function (done) {
-          connect.call(self, done)
-        },
-        destroy: function(client) {
-          disconnect.call(self, client)
-        },
-        max: self.poolCfg.maxConnections,
-        min: self.poolCfg.minConnections,
-        idleTimeoutMillis: self.poolCfg.maxIdleTime
-      })
-    }
-
-    process.on('exit', function () {
-      //be nice & close our connections on exit
-      if (self.pool) {
-        self.pool.drain()
-      } else if (self.client) {
-        disconnect(self.client)
-      }
-
-      return
-    })
-  }
-
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype);
-
-  var isConnecting = false;
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    if (!this.isConnected && !this.pool) {
-      this.connect()
-    }
-
-    if (this.useQueue) {
-      var queueItem = {
-        query: new Query(this.client, this.sequelize, callee, options || {}),
-        sql: sql
-      };
-
-      enqueue.call(this, queueItem, options);
-      return queueItem.query;
-    }
-
-    var self = this, query = new Query(this.client, this.sequelize, callee, options || {});
-    this.pendingQueries++;
-
-    query.done(function() {
-      self.pendingQueries--;
-      if (self.pool) self.pool.release(query.client);
-      else {
-        if (self.pendingQueries === 0) {
-          setTimeout(function() {
-            self.pendingQueries === 0 && self.disconnect.call(self);
-          }, 100);
-        }
-      }
-    });
-
-    if (!this.pool) {
-      query.run(sql);
-    }
-
-    else {
-      this.pool.acquire(function(err, client) {
-        if (err) return query.emit('error', err);
-
-        query.client = client;
-        query.run(sql);
-        return;
-      }, undefined, options.type);
-    }
-
-    return query;
-  };
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this;
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting || this.pool) {
-      return;
-    }
-    connect.call(self, function(err, client) {
-      self.client = client;
-      return;
-    });
-    return;
-  };
-
-  ConnectorManager.prototype.disconnect = function() {
-    if (this.client) disconnect.call(this, this.client);
-    return;
-  };
-
-
-  // private
-
-  var disconnect = function(client) {
-    var self = this;
-    if (!this.useQueue) {
-      this.client = null;
-    }
-
-    client.end(function() {
-      if (!self.useQueue) {
-        return client.destroy();
-      }
-
-      var intervalObj = null
-      var cleanup = function () {
-        var retryCt = 0
-        // make sure to let client finish before calling destroy
-        if (self && self.hasQueuedItems) {
-          return
-        }
-        // needed to prevent mysql connection leak
-        client.destroy()
-        if (self && self.client) {
-          self.client = null
-        }
-        clearInterval(intervalObj)
-      }
-      intervalObj = setInterval(cleanup, 10)
-      cleanup()
-      return
-    })
-  }
-
-  var connect = function(done, config) {
-    config = config || this.config
-    var connection = mysql.createConnection({
-      host: config.host,
-      port: config.port,
-      user: config.username,
-      password: config.password,
-      database: config.database
-    })
-    // client.setMaxListeners(self.maxConcurrentQueries)
-    this.isConnecting = false
-
-    done(null, connection)
-  }
-
-  var enqueue = function(queueItem, options) {
-    options = options || {}
-    if (this.activeQueue.length < this.maxConcurrentQueries) {
-      this.activeQueue.push(queueItem)
-      if (this.pool) {
-        var self = this
-        this.pool.acquire(function(err, client) {
-          if (err) {
-            queueItem.query.emit('error', err)
-            return
-          }
-          //we set the client here, asynchronously, when getting a pooled connection
-          //allowing the ConnectorManager.query method to remain synchronous
-          queueItem.query.client = client
-          queueItem.client = client
-          execQueueItem.call(self, queueItem)
-          return
-        }, undefined, options.type)
-      } else {
-        execQueueItem.call(this, queueItem)
-      }
-    } else {
-      this.queue.push(queueItem)
-    }
-  }
-
-  var dequeue = function(queueItem) {
-    //return the item's connection to the pool
-    if (this.pool) {
-      this.pool.release(queueItem.client)
-    }
-    this.activeQueue = without(this.activeQueue, queueItem)
-  }
-
-  var transferQueuedItems = function(count) {
-    for(var i = 0; i < count; i++) {
-      var queueItem = this.queue.shift();
-      if (queueItem) {
-        enqueue.call(this, queueItem)
-      }
-    }
-  }
-
-  var afterQuery = function(queueItem) {
-    var self = this
-
-    dequeue.call(this, queueItem)
-    transferQueuedItems.call(this, this.maxConcurrentQueries - this.activeQueue.length)
-    disconnectIfNoConnections.call(this)
-  }
-
-
-  var execQueueItem = function(queueItem) {
-    var self = this
-
-    queueItem.query
-      .success(function(){ afterQuery.call(self, queueItem) })
-      .error(function(){ afterQuery.call(self, queueItem) })
-
-    queueItem.query.run(queueItem.sql, queueItem.client)
-  }
-
-  ConnectorManager.prototype.__defineGetter__('hasQueuedItems', function() {
-    return (this.queue.length > 0) || (this.activeQueue.length > 0) || (this.client && this.client._queue && (this.client._queue.length > 0))
-  })
-
-  // legacy
-  ConnectorManager.prototype.__defineGetter__('hasNoConnections', function() {
-    return !this.hasQueuedItems
-  })
-
-  ConnectorManager.prototype.__defineGetter__('isConnected', function() {
-    return this.client != null
-  })
-
-  var disconnectIfNoConnections = function() {
-    var self = this
-
-    this.disconnectTimeoutId && clearTimeout(this.disconnectTimeoutId)
-    this.disconnectTimeoutId = setTimeout(function() {
-      self.isConnected && !self.hasQueuedItems && self.disconnect()
-    }, 100)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/query-generator.js.html b/docs/lib/dialects/mysql/query-generator.js.html
deleted file mode 100644
index 37a073b4bafd..000000000000
--- a/docs/lib/dialects/mysql/query-generator.js.html
+++ /dev/null
@@ -1,483 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils     = require("../../utils")
-  , DataTypes = require("../../data-types")
-  , util      = require("util")
-
-module.exports = (function() {
-  var QueryGenerator = {
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-        engine: 'InnoDB',
-        charset: null
-      }, options || {})
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
-        , primaryKeys = []
-        , attrStr = []
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        engine: options.engine,
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-
-      return Utils._.template(query)({table: Utils.addTicks(tableName)})
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "RENAME TABLE `<%= before %>` TO `<%= after %>`;"
-      return Utils._.template(query)({ before: before, after: after })
-    },
-
-    showTablesQuery: function() {
-      return 'SHOW TABLES;'
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` ADD <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE `<%= tableName %>` DROP `<%= attributeName %>`;"
-      return Utils._.template(query)({ tableName: tableName, attributeName: attributeName })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
-          attrName: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
-      var attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('`<%= before %>` `<%= after %>` <%= definition %>')({
-          before: attrBefore,
-          after: attrName,
-          definition: definition
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr){
-        if(Array.isArray(attr) && attr.length == 2) {
-          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
-        } else {
-          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = Utils.addTicks(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(association.connectorDAO.tableName) + ' ON '
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.'
-              query += Utils.addTicks(foreignIdentifier) + '='
-              query += Utils.addTicks(table) + '.' + Utils.addTicks('id')
-
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(dao.tableName) + '.'
-              query += Utils.addTicks('id') + '='
-              query += Utils.addTicks(association.connectorDAO.tableName) + '.' + Utils.addTicks(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + Utils.addTicks(dao.tableName) + ' ON '
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += Utils.addTicks(association.identifier) + '='
-              query += Utils.addTicks(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + Utils.addTicks('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? Utils.addTicks(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, Utils.addTicks(attr)].join('.') +
-                  ' AS ' +
-                  Utils.addTicks([aliasName, attr].join('.'))
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if (options.where) {
-        options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
-      }
-
-      if (options.group) {
-        options.group = Utils.addTicks(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
-
-      if (options.limit && !(options.include && (options.limit === 1))) {
-        if (options.offset) {
-          query += " LIMIT <%= offset %>, <%= limit %>"
-        } else {
-          query += " LIMIT <%= limit %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
-
-        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if(typeof attribute === 'string') {
-          return attribute
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += attribute.attribute
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === 'string') ? attribute : attribute.attribute
-      })
-
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(tableName + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", options.indexName,
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", tableName, '(' + transformedAttributes.join(', ') + ')',
-        (options.parser ? "WITH PARSER " + options.parser : undefined)
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var sql = "SHOW INDEX FROM <%= tableName %><%= options %>"
-      return Utils._.template(sql)({
-        tableName: tableName,
-        options: (options || {}).database ? ' FROM ' + options.database : ''
-      })
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX <%= indexName %> ON <%= tableName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== 'string') {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: tableName, indexName: indexName })
-    },
-
-    getWhereConditions: function(smth, tableName) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === 'number') {
-        smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = this.hashToWhereConditions(smth)
-      } else if (typeof smth === "string") {
-        result = smth
-      } else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-         //handle qualified key names
-        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          // is value an array?
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return Utils.escape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        } else if ((value) && (typeof value == 'object')) {
-          // is value an object?
-
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = Utils.escape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(" AND ")
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template += " auto_increment"
-          }
-
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('auto_increment') > -1)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/dialects/mysql/query.js.html b/docs/lib/dialects/mysql/query.js.html
deleted file mode 100644
index 887013c4c7fd..000000000000
--- a/docs/lib/dialects/mysql/query.js.html
+++ /dev/null
@@ -1,84 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client    = client
-    this.callee    = callee
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-
-  Utils.inherit(Query, AbstractQuery)
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    this.client.query(this.sql, function(err, results, fields) {
-      this.emit('sql', this.sql)
-
-      if (err) {
-        this.emit('error', err, this.callee)
-      } else {
-        this.emit('success', this.formatResults(results))
-      }
-    }.bind(this)).setMaxListeners(100)
-    return this
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/connector-manager.js.html b/docs/lib/dialects/postgres/connector-manager.js.html
deleted file mode 100644
index 34fdeea94af3..000000000000
--- a/docs/lib/dialects/postgres/connector-manager.js.html
+++ /dev/null
@@ -1,146 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Query
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Query   = require("./query")
-  , Utils   = require("../../utils")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize, config) {
-    this.sequelize = sequelize
-    this.client    = null
-    this.config    = config || {}
-    this.pooling   = (!!this.config.poolCfg && (this.config.poolCfg.maxConnections > 0))
-    this.pg        = this.config.native ? require('pg').native : require('pg')
-
-    // set pooling parameters if specified
-    if (this.pooling) {
-      this.pg.defaults.poolSize        = this.config.poolCfg.maxConnections
-      this.pg.defaults.poolIdleTimeout = this.config.poolCfg.maxIdleTime
-    }
-
-    this.disconnectTimeoutId = null
-    this.pendingQueries = 0
-    this.maxConcurrentQueries = (this.config.maxConcurrentQueries || 50)
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  var isConnecting = false
-  var isConnected  = false
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    var self = this
-    if (this.client == null) {
-      this.connect()
-    }
-
-    var query = new Query(this.client, this.sequelize, callee, options || {})
-    self.pendingQueries += 1
-    return query.run(sql)
-      .success(function() { self.endQuery.call(self) })
-      .error(function() { self.endQuery.call(self) })
-  }
-
-  ConnectorManager.prototype.endQuery = function() {
-    var self = this
-    self.pendingQueries -= 1
-    if (self.pendingQueries == 0) {
-      setTimeout(function() {
-        self.pendingQueries == 0 && self.disconnect.call(self)
-      }, 100)
-    }
-  }
-
-  ConnectorManager.prototype.connect = function() {
-    var self = this
-    var emitter = new (require('events').EventEmitter)()
-
-    // in case database is slow to connect, prevent orphaning the client
-    if (this.isConnecting) {
-      return
-    }
-
-    this.isConnecting = true
-    this.isConnected  = false
-
-    var uri = this.sequelize.getQueryInterface().QueryGenerator.databaseConnectionUri(this.config)
-
-    var connectCallback = function(err, client) {
-      self.isConnecting = false
-
-      if (!!err) {
-        emitter.emit('error', err)
-      } else if (client) {
-        client.query("SET TIME ZONE 'UTC'")
-          .on('end', function() {
-            self.isConnected = true
-            this.client = client
-          });
-      } else {
-        this.client = null
-      }
-    }
-
-    if (this.pooling) {
-      // acquire client from pool
-      this.pg.connect(uri, connectCallback)
-    } else {
-      //create one-off client
-      this.client = new this.pg.Client(uri)
-      this.client.connect(connectCallback)
-    }
-
-    return emitter
-  }
-
-  ConnectorManager.prototype.disconnect = function() {
-    var self = this
-    if (this.client) this.client.end()
-    this.client = null
-    this.isConnecting = false
-    this.isConnected  = false
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/query-generator.js.html b/docs/lib/dialects/postgres/query-generator.js.html
deleted file mode 100644
index 9fa2f4993154..000000000000
--- a/docs/lib/dialects/postgres/query-generator.js.html
+++ /dev/null
@@ -1,624 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var Utils = require("../../utils")
-  , util  = require("util")
-  , DataTypes = require("../../data-types")
-  , tables = {}
-  , primaryKeys = {};
-
-function removeQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return s.replace(new RegExp(quoteChar, 'g'), '')
-}
-
-function addQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return removeQuotes(s, quoteChar)
-    .split('.')
-    .map(function(e) { return quoteChar + String(e) + quoteChar })
-    .join('.')
-}
-
-function pgEscape(val) {
-  if (val === undefined || val === null) {
-    return 'NULL';
-  }
-
-  switch (typeof val) {
-    case 'boolean': return (val) ? 'true' : 'false';
-    case 'number': return val+'';
-  }
-
-  if (val instanceof Date) {
-    val = pgSqlDate(val);
-  }
-
-  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-  val = val.replace(/'/g, "''");
-  return "'"+val+"'";
-}
-
-function pgEscapeAndQuote(val) {
-  return addQuotes(removeQuotes(pgEscape(val), "'"))
-}
-
-function pgEnum(tableName, attr, dataType) {
-  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
-  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
-}
-
-function padInt(i) {
-  return (i < 10) ? '0' + i.toString() : i.toString()
-}
-function pgSqlDate(dt) {
-  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
-  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
-  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000)
-}
-
-function pgDataTypeMapping(tableName, attr, dataType) {
-  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-    primaryKeys[tableName].push(attr)
-    dataType = dataType.replace(/PRIMARY KEY/, '')
-  }
-
-  if (Utils._.includes(dataType, 'TINYINT(1)')) {
-    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
-  }
-
-  if (Utils._.includes(dataType, 'DATETIME')) {
-    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP')
-  }
-
-  if (Utils._.includes(dataType, 'SERIAL')) {
-    dataType = dataType.replace(/INTEGER/, '')
-    dataType = dataType.replace(/NOT NULL/, '')
-    tables[tableName][attr] = 'serial'
-  }
-
-  if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
-  }
-
-  return dataType
-}
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = Utils._.extend({
-      }, options || {})
-
-      primaryKeys[tableName] = []
-      tables[tableName] = {}
-
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , attrStr = []
-
-      for (var attr in attributes) {
-        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
-        attrStr.push(addQuotes(attr) + " " + dataType)
-
-        if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr]) + query;
-        }
-      }
-
-      var values  = {
-        table: addQuotes(tableName),
-        attributes: attrStr.join(", "),
-      }
-
-      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
-      if (pks.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pks + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    dropTableQuery: function(tableName, options) {
-      options = options || {}
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
-      return Utils._.template(query)({ table: addQuotes(tableName) })
-    },
-
-    renameTableQuery: function(before, after) {
-      var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
-      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
-    },
-
-    showTablesQuery: function() {
-      return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public';"
-    },
-
-    describeTableQuery: function(tableName) {
-      var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
-      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
-    },
-
-    addColumnQuery: function(tableName, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> ADD COLUMN <%= attributes %>;"
-        , attrString = []
-
-      for (var attrName in attributes) {
-        var definition = attributes[attrName]
-
-        attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
-          attrName: addQuotes(attrName),
-          definition: pgDataTypeMapping(tableName, attrName, definition)
-        }))
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attrName, definition) + query
-        }
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    removeColumnQuery: function(tableName, attributeName) {
-      var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
-    },
-
-    changeColumnQuery: function(tableName, attributes) {
-      var query = "ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;"
-        , sql   = []
-
-      for (var attributeName in attributes) {
-        var definition = attributes[attributeName]
-        var attrSql = ''
-
-        if (definition.indexOf('NOT NULL') > 0) {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' SET NOT NULL'
-          })
-          definition = definition.replace('NOT NULL', '').trim()
-        } else {
-          attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' DROP NOT NULL'
-          })
-        }
-
-        if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attributeName, definition) + query
-          definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
-        }
-
-        attrSql += Utils._.template(query)({
-          tableName: addQuotes(tableName),
-          query: addQuotes(attributeName) + ' TYPE ' + definition
-        })
-
-        sql.push(attrSql)
-      }
-
-      return sql.join('')
-    },
-
-    renameColumnQuery: function(tableName, attrBefore, attributes) {
-      var query      = "ALTER TABLE <%= tableName %> RENAME COLUMN <%= attributes %>;"
-      var attrString = []
-
-      for (var attributeName in attributes) {
-        attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
-          before: addQuotes(attrBefore),
-          after: addQuotes(attributeName),
-        }))
-      }
-
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
-    },
-
-    selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
-
-      options = options || {}
-      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
-      options.attributes = options.attributes && options.attributes.map(function(attr) {
-        if (Array.isArray(attr) && attr.length === 2) {
-          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
-        } else if (attr.indexOf('`') >= 0) {
-          return attr.replace(/`/g, '"')
-        } else {
-          return addQuotes(attr)
-        }
-      }).join(", ")
-      options.attributes = options.attributes || '*'
-
-      if (options.include) {
-        var optAttributes = [options.table + '.*']
-
-        for (var daoName in options.include) {
-          if (options.include.hasOwnProperty(daoName)) {
-            var dao         = options.include[daoName]
-              , daoFactory  = dao.daoFactoryManager.getDAO(tableName, {
-                  attribute: 'tableName'
-                })
-              , _tableName  = addQuotes(dao.tableName)
-              , association = dao.getAssociation(daoFactory)
-
-            if (association.connectorDAO) {
-              var foreignIdentifier = Object.keys(association.connectorDAO.rawAttributes).filter(function(attrName) {
-                return (!!attrName.match(/.+Id$/) || !!attrName.match(/.+_id$/)) && (attrName !== association.identifier)
-              })[0]
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(association.connectorDAO.tableName) + ' ON '
-              query += addQuotes(association.connectorDAO.tableName) + '.'
-              query += addQuotes(foreignIdentifier) + '='
-              query += addQuotes(table) + '.' + addQuotes('id')
-
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(dao.tableName) + '.'
-              query += addQuotes('id') + '='
-              query += addQuotes(association.connectorDAO.tableName) + '.' + addQuotes(association.identifier)
-            } else {
-              query += ' LEFT OUTER JOIN ' + addQuotes(dao.tableName) + ' ON '
-              query += addQuotes(association.associationType === 'BelongsTo' ? dao.tableName : tableName) + '.'
-              query += addQuotes(association.identifier) + '='
-              query += addQuotes(association.associationType === 'BelongsTo' ? tableName : dao.tableName) + '.' + addQuotes('id')
-            }
-
-            var aliasAssoc = daoFactory.getAssociationByAlias(daoName)
-              , aliasName  = !!aliasAssoc ? addQuotes(daoName) : _tableName
-
-            optAttributes = optAttributes.concat(
-              Object.keys(dao.attributes).map(function(attr) {
-                return '' +
-                  [_tableName, addQuotes(attr)].join('.') +
-                  ' AS "' +
-                  removeQuotes([aliasName, attr].join('.')) + '"'
-              })
-            )
-          }
-        }
-
-        options.attributes = optAttributes.join(', ')
-      }
-
-      if(options.where) {
-        options.where = QueryGenerator.getWhereConditions(options.where)
-        query += " WHERE <%= where %>"
-      }
-
-      if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
-        query += " ORDER BY <%= order %>"
-      }
-
-      if(options.group) {
-        options.group = addQuotes(options.group)
-        query += " GROUP BY <%= group %>"
-      }
-
-      if (!(options.include && (options.limit === 1))) {
-        if (options.limit) {
-          query += " LIMIT <%= limit %>"
-        }
-
-        if (options.offset) {
-          query += " OFFSET <%= offset %>"
-        }
-      }
-
-      query += ";"
-
-      return Utils._.template(query)(options)
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
-        , returning = []
-
-      Utils._.forEach(attrValueHash, function(value, key, hash) {
-        if (tables[tableName] && tables[tableName][key]) {
-          switch (tables[tableName][key]) {
-            case 'serial':
-              delete hash[key]
-              returning.push(key)
-              break
-          }
-        }
-      });
-
-      var replacements  = {
-        table: addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape(value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + pgEscape(value))
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-      options.limit = options.limit || 1
-
-      primaryKeys[tableName] = primaryKeys[tableName] || [];
-
-      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
-
-      var pks;
-      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
-        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
-      } else {
-        pks = addQuotes('id')
-      }
-
-      var replacements = {
-        table: addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: pgEscape(options.limit),
-        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
-        primaryKeysSelection: pks
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    addIndexQuery: function(tableName, attributes, options) {
-      var transformedAttributes = attributes.map(function(attribute) {
-        if (typeof attribute === 'string') {
-          return addQuotes(attribute)
-        } else {
-          var result = ""
-
-          if (!attribute.attribute) {
-            throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
-          }
-
-          result += addQuotes(attribute.attribute)
-
-          if (attribute.length) {
-            result += '(' + attribute.length + ')'
-          }
-
-          if (attribute.order) {
-            result += ' ' + attribute.order
-          }
-
-          return result
-        }
-      })
-
-      var onlyAttributeNames = attributes.map(function(attribute) {
-        return (typeof attribute === "string") ? attribute : attribute.attribute
-      })
-
-      var indexTable = tableName.split('.')
-      options = Utils._.extend({
-        indicesType: null,
-        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
-        parser: null
-      }, options || {})
-
-      return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
-        (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
-      ]).join(' ')
-    },
-
-    showIndexQuery: function(tableName, options) {
-      var query = "SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname='<%= tableName %>' AND pg_class.oid=pg_index.indrelid);"
-      return Utils._.template(query)({ tableName: tableName });
-    },
-
-    removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      var sql       = "DROP INDEX IF EXISTS <%= indexName %>"
-        , indexName = indexNameOrAttributes
-
-      if (typeof indexName !== "string") {
-        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
-      }
-
-      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
-    },
-
-    getWhereConditions: function(smth) {
-      var result = null
-
-      if (Utils.isHash(smth)) {
-        result = QueryGenerator.hashToWhereConditions(smth)
-      }
-      else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + pgEscape(smth)
-      }
-      else if (typeof smth === "string") {
-        result = smth
-      }
-      else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
-      }
-
-      return result
-    },
-
-    hashToWhereConditions: function(hash) {
-      var result = []
-
-      for (var key in hash) {
-        var value = hash[key]
-
-        //handle qualified key names
-        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
-          , _value = null
-
-        if (Array.isArray(value)) {
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return pgEscape(subValue);
-          }).join(',') + ")"
-
-          result.push([_key, _value].join(" IN "))
-        }
-        else if ((value) && (typeof value === "object")) {
-          //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
-          result.push([_key, _value].join("="))
-        } else {
-          _value = pgEscape(value)
-          result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
-        }
-      }
-
-      return result.join(' AND ')
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if(Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM && Array.isArray(dataType.values) && dataType.values.length > 0) {
-            replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
-              return Utils.escape(value)
-            }).join(", ") + ")"
-          }
-
-          if (dataType.type === "TINYINT(1)") {
-            dataType.type = 'BOOLEAN'
-          }
-
-          if (dataType.type === "DATETIME") {
-            dataType.type = 'TIMESTAMP'
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.autoIncrement) {
-            template +=" SERIAL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = pgEscape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
-
-        if (definition && (definition.indexOf('SERIAL') > -1)) {
-          fields.push(name)
-        }
-      }
-
-      return fields
-    },
-
-    databaseConnectionUri: function(config) {
-      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
-
-      return Utils._.template(template)({
-        user: encodeURIComponent(config.username),
-        password: encodeURIComponent(config.password),
-        database: config.database,
-        host: config.host,
-        port: config.port,
-        protocol: config.protocol
-      })
-    }
-  }
-
-  return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/dialects/postgres/query.js.html b/docs/lib/dialects/postgres/query.js.html
deleted file mode 100644
index 7cc35de3456d..000000000000
--- a/docs/lib/dialects/postgres/query.js.html
+++ /dev/null
@@ -1,136 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(client, sequelize, callee, options) {
-    this.client = client
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.run = function(sql) {
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var receivedError = false
-      , query         = this.client.query(sql)
-      , rows          = []
-
-    query.on('row', function(row) {
-      rows.push(row)
-    })
-
-    query.on('error', function(err) {
-      receivedError = true
-      this.emit('error', err, this.callee)
-    }.bind(this))
-
-    query.on('end', function() {
-      this.emit('sql', this.sql)
-
-      if (receivedError) {
-        return
-      }
-
-      onSuccess.call(this, rows)
-    }.bind(this))
-
-    return this
-  }
-
-  Query.prototype.getInsertIdField = function() {
-    return 'id'
-  }
-
-  var onSuccess = function(rows) {
-    var results          = []
-      , isTableNameQuery = (this.sql.indexOf('SELECT table_name FROM information_schema.tables') === 0)
-      , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
-
-    if (isTableNameQuery || isRelNameQuery) {
-      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
-    }
-
-    if (this.send('isSelectQuery')) {
-      this.emit('success', this.send('handleSelectQuery', rows))
-    } else if (this.send('isShowOrDescribeQuery')) {
-      this.emit('success', results)
-    } else if (this.send('isInsertQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else if (this.send('isUpdateQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
-        }
-      }
-
-      this.emit('success', this.callee)
-    } else {
-      this.emit('success', results)
-    }
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/dialects/query-generator.js.html b/docs/lib/dialects/query-generator.js.html
deleted file mode 100644
index 5756467cb969..000000000000
--- a/docs/lib/dialects/query-generator.js.html
+++ /dev/null
@@ -1,92 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns a query for creating a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - tableName: Name of the new table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - attributes: An object with containing attribute-attributeType-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Attributes should have the format:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                {attributeName: type, attr2: type2}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                --> e.g. {title: 'VARCHAR(255)'}
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - options: An object with options.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             Defaults: { engine: 'InnoDB', charset: null }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          createTableQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('createTableQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Returns a query for dropping a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            dropTableQuery: function(tableName, options) {
-      throwMethodUndefined('dropTableQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns a rename table query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - originalTableName: Name of the table before execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - futureTableName: Name of the table after execution.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              renameTableQuery: function(originalTableName, futureTableName) {
-      throwMethodUndefined('renameTableQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns a query, which gets all available table names in the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                showTablesQuery: function() {
-      throwMethodUndefined('showTablesQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns a query, which adds an attribute to an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  addColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('addColumnQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns a query, which removes an attribute from an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - tableName: Name of the existing table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - attributeName: Name of the obsolete attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    removeColumnQuery: function(tableName, attributeName) {
-      throwMethodUndefined('removeColumnQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns a query, which modifies an existing attribute from a table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - tableName: Name of the existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - attributes: A hash with attribute-attributeOptions-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - key: attributeName
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - value: A hash with attribute specific options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - type: DataType
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - defaultValue: A String with the default value
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - allowNull: Boolean
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      changeColumnQuery: function(tableName, attributes) {
-      throwMethodUndefined('changeColumnQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Returns a query, which renames an existing attribute.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - attrNameBefore: The name of the attribute, which shall be renamed.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - attrNameAfter: The name of the attribute, after renaming.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        renameColumnQuery: function(tableName, attrNameBefore, attrNameAfter) {
-      throwMethodUndefined('renameColumnQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Returns a query for selecting elements in the table .
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - attributes -> An array of attributes (e.g. ['name', 'birthday']). Default: *
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - order -> e.g. 'id DESC'
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - group
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - limit -> The maximum count you want to get.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - offset -> An offset value to start from. Only useable with limit!
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          selectQuery: function(tableName, options) {
-      throwMethodUndefined('selectQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Returns an insert into command. Parameters: table name + hash of attribute-value-pairs.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            insertQuery: function(tableName, attrValueHash) {
-      throwMethodUndefined('insertQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns an update query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - values -> A hash with attribute-value-pairs
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              updateQuery: function(tableName, values, where) {
-      throwMethodUndefined('updateQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Returns a deletion query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - tableName -> Name of the table
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - where -> A hash with conditions (e.g. {name: 'foo'})
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   OR an ID as integer
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   OR a string with conditions (e.g. 'name="foo"').
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   If you use a string, you have to escape it on your own.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        - limit -> Maximaum count of lines to delete
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                deleteQuery: function(tableName, where, options) {
-      throwMethodUndefined('deleteQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Returns an add index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - tableName -> Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - attributes:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              An array of attributes as string or as hash.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              If the attribute is a hash, it must have the following content:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - attribute: The name of the attribute/column
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - length: An integer. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                - order: 'ASC' or 'DESC'. Optional
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - indicesType: UNIQUE|FULLTEXT|SPATIAL
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - indexName: The name of the index. Default is 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - parser
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  addIndexQuery: function(tableName, attributes, options) {
-      throwMethodUndefined('addIndexQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns an show index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            - options:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - database: Name of the database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    showIndexQuery: function(tableName, options) {
-      throwMethodUndefined('showIndexQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Returns a remove index query.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - tableName: Name of an existing table.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - indexNameOrAttributes: The name of the index as string or an array of attribute names.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      removeIndexQuery: function(tableName, indexNameOrAttributes) {
-      throwMethodUndefined('removeIndexQuery')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Takes something and transforms it into values of a where condition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        getWhereConditions: function(smth) {
-      throwMethodUndefined('getWhereConditions')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Takes a hash and transforms it into a mysql where condition: {key: value, key2: value2} ==> key=value AND key2=value2
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                The values are transformed by the relevant datatype.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          hashToWhereConditions: function(hash) {
-      throwMethodUndefined('hashToWhereConditions')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            This method transforms an array of attribute hashes into equivalent
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  sql attribute definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            attributesToSQL: function(attributes) {
-      throwMethodUndefined('attributesToSQL')
-    },
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Returns all auto increment fields of a factory.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              findAutoIncrementField: function(factory) {
-      throwMethodUndefined('findAutoIncrementField')
-    }
-  }
-
-  var throwMethodUndefined = function(methodName) {
-    throw new Error('The method "' + methodName + '" is not defined! Please add it to your sql dialect.')
-  }
-
-  return QueryGenerator
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/connector-manager.js.html b/docs/lib/dialects/sqlite/connector-manager.js.html
deleted file mode 100644
index a9c529724116..000000000000
--- a/docs/lib/dialects/sqlite/connector-manager.js.html
+++ /dev/null
@@ -1,62 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Utils   = require("../../utils")
-  , sqlite3 = require('sqlite3').verbose()
-  , Query   = require("./query")
-
-module.exports = (function() {
-  var ConnectorManager = function(sequelize) {
-    this.sequelize = sequelize
-    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
-  }
-  Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
-
-  ConnectorManager.prototype.query = function(sql, callee, options) {
-    return new Query(this.database, this.sequelize, callee, options).run(sql)
-  }
-
-  return ConnectorManager
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/query-generator.js.html b/docs/lib/dialects/sqlite/query-generator.js.html
deleted file mode 100644
index 22fab71dfb54..000000000000
--- a/docs/lib/dialects/sqlite/query-generator.js.html
+++ /dev/null
@@ -1,240 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  var Utils = require("../../utils")
-  , DataTypes = require("../../data-types")
-var MySqlQueryGenerator = Utils._.extend(
-  Utils._.clone(require("../query-generator")),
-  Utils._.clone(require("../mysql/query-generator"))
-)
-
-var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
-
-var escape = function(str) {
-  if (typeof str === 'string') {
-    return "'" + str.replace(/'/g, "''") + "'";
-  } else if (typeof str === 'boolean') {
-    return str ? 1 : 0; // SQLite has no type boolean
-  } else if (str === null || str === undefined) {
-    return 'NULL';
-  } else {
-    return str;
-  }
-};
-
-module.exports = (function() {
-  var QueryGenerator = {
-    options: {},
-
-    createTableQuery: function(tableName, attributes, options) {
-      options = options || {}
-
-      var query       = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)"
-        , primaryKeys = []
-        , needsMultiplePrimaryKeys = (Utils._.values(attributes).filter(function(definition) {
-                    return Utils._.includes(definition, 'PRIMARY KEY')
-                  }).length > 1)
-        , attrStr     = []
-
-
-      for (var attr in attributes) {
-        if (attributes.hasOwnProperty(attr)) {
-          var dataType = attributes[attr]
-
-          if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
-            primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
-          } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
-          }
-        }
-      }
-
-      var values = {
-        table: Utils.addTicks(tableName),
-        attributes: attrStr.join(", "),
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
-      }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
-
-      if (pkString.length > 0) {
-        values.attributes += ", PRIMARY KEY (" + pkString + ")"
-      }
-
-      return Utils._.template(query)(values).trim() + ";"
-    },
-
-    showTablesQuery: function() {
-      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
-    },
-
-    insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
-
-      var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    updateQuery: function(tableName, attrValueHash, where) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
-
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
-
-      for (var key in attrValueHash) {
-        var value = attrValueHash[key]
-        values.push(Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value))
-      }
-
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        values: values.join(","),
-        where: MySqlQueryGenerator.getWhereConditions(where)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    deleteQuery: function(tableName, where, options) {
-      options = options || {}
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: this.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    attributesToSQL: function(attributes) {
-      var result = {}
-
-      for (var name in attributes) {
-        var dataType = attributes[name]
-
-        if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
-
-          if (dataType.type === DataTypes.ENUM) {
-	          replacements.type = "INTEGER"
-          }
-
-          if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
-            template += " NOT NULL"
-          }
-
-          if (dataType.defaultValue !== undefined) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
-          }
-
-          if (dataType.unique) {
-            template += " UNIQUE"
-          }
-
-          if (dataType.primaryKey) {
-            template += " PRIMARY KEY"
-
-            if (dataType.autoIncrement) {
-              template += ' AUTOINCREMENT'
-            }
-          }
-
-          result[name] = Utils._.template(template)(replacements)
-        } else {
-          result[name] = dataType
-        }
-      }
-
-      return result
-    },
-
-    findAutoIncrementField: function(factory) {
-      var fields = []
-
-      for (var name in factory.attributes) {
-        if (factory.attributes.hasOwnProperty(name)) {
-          var definition = factory.attributes[name]
-
-          if (definition && (definition.indexOf('INTEGER PRIMARY KEY AUTOINCREMENT') === 0)) {
-            fields.push(name)
-          }
-        }
-      }
-
-      return fields
-    },
-
-    hashToWhereConditions: function(hash) {
-      for (var key in hash) {
-        if (hash.hasOwnProperty(key)) {
-          var value = hash[key]
-
-          if (typeof value === 'boolean') {
-            value = !!value ? 1 : 0
-          }
-
-          hash[key] = value
-        }
-      }
-
-      return hashToWhereConditions(hash).replace(/\\'/g, "''");
-    }
-  }
-
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/dialects/sqlite/query.js.html b/docs/lib/dialects/sqlite/query.js.html
deleted file mode 100644
index 009ae88f2f7f..000000000000
--- a/docs/lib/dialects/sqlite/query.js.html
+++ /dev/null
@@ -1,160 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var Utils         = require("../../utils")
-  , AbstractQuery = require('../abstract/query')
-
-module.exports = (function() {
-  var Query = function(database, sequelize, callee, options) {
-    this.database = database
-    this.sequelize = sequelize
-    this.callee = callee
-    this.options = Utils._.extend({
-      logging: console.log,
-      plain: false,
-      raw: false
-    }, options || {})
-
-    this.checkLoggingOption()
-  }
-  Utils.inherit(Query, AbstractQuery)
-
-  Query.prototype.getInsertIdField = function() {
-    return 'lastID'
-  }
-
-  Query.prototype.run = function(sql) {
-    var self = this
-
-    this.sql = sql
-
-    if (this.options.logging !== false) {
-      this.options.logging('Executing: ' + this.sql)
-    }
-
-    var columnTypes = {};
-    this.database.serialize(function() {
-      var executeSql = function() {
-        self.database[getDatabaseMethod.call(self)](self.sql, function(err, results) {
-          // allow clients to listen to sql to do their own logging or whatnot
-          self.emit('sql', self.sql)
-          this.columnTypes = columnTypes;
-          err ? onFailure.call(self, err) : onSuccess.call(self, results, this)
-        })
-      };
-
-      if ((getDatabaseMethod.call(self) === 'all') && /select\s.*?\sfrom\s+([^ ;]+)/i.test(self.sql)) {
-        var tableName = RegExp.$1;
-
-        if (tableName !== 'sqlite_master') {
-          // get the column types
-          self.database.all("PRAGMA table_info(" + tableName + ")", function(err, results) {
-            if (!err) {
-              for (var i=0, l=results.length; i<l; i++) {
-                columnTypes[results[i].name] = results[i].type;
-              }
-            }
-            executeSql();
-          });
-        } else {
-          executeSql();
-        }
-      } else {
-        executeSql();
-      }
-    })
-
-    return this
-  }
-
-  //private
-
-  var getDatabaseMethod = function() {
-    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
-      return 'run'
-    } else {
-      return 'all'
-    }
-  }
-
-  var onSuccess = function(results, metaData) {
-    var result = this.callee
-      , self   = this
-
-    // add the inserted row id to the instance
-    if (this.send('isInsertQuery', results, metaData)) {
-      this.send('handleInsertQuery', results, metaData)
-    }
-
-    if (this.sql.indexOf('sqlite_master') !== -1) {
-      result = results.map(function(resultSet) { return resultSet.name })
-    } else if (this.send('isSelectQuery')) {
-      // we need to convert the timestamps into actual date objects
-
-      if(!this.options.raw) {
-        results = results.map(function(result) {
-          for (var name in result) {
-            if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
-              result[name] = new Date(result[name]);
-            }
-          }
-          return result
-        })
-      }
-
-      result = this.send('handleSelectQuery', results)
-    } else if (this.send('isShowOrDescribeQuery')) {
-      result = results
-    }
-
-    this.emit('success', result)
-  }
-
-  var onFailure = function(err) {
-    this.emit('error', err, this.callee)
-  }
-
-  return Query
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/lib/emitters/custom-event-emitter.js.html b/docs/lib/emitters/custom-event-emitter.js.html
deleted file mode 100644
index 20612915a3d6..000000000000
--- a/docs/lib/emitters/custom-event-emitter.js.html
+++ /dev/null
@@ -1,91 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    util
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      var util         = require("util")
-  , EventEmitter = require("events").EventEmitter
-
-module.exports = (function() {
-  var CustomEventEmitter = function(fct) {
-    this.fct = fct
-  }
-  util.inherits(CustomEventEmitter, EventEmitter)
-
-  CustomEventEmitter.prototype.run = function() {
-    var self = this
-
-    // delay the function call and return the emitter
-    setTimeout(function(){
-      self.fct.call(self, self)
-    }, 1)
-
-    return this
-  }
-
-  CustomEventEmitter.prototype.success =
-  CustomEventEmitter.prototype.ok =
-  function(fct) {
-    this.on('success', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.failure =
-  CustomEventEmitter.prototype.fail =
-  CustomEventEmitter.prototype.error =
-  function(fct) {
-    this.on('error', fct)
-    return this
-  }
-
-  CustomEventEmitter.prototype.done =
-  CustomEventEmitter.prototype.complete =
-  function(fct) {
-    this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
-    return this
-  }
-
-
-  return CustomEventEmitter
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
\ No newline at end of file
diff --git a/docs/lib/migration.js.html b/docs/lib/migration.js.html
deleted file mode 100644
index 7e103cf9a4d7..000000000000
--- a/docs/lib/migration.js.html
+++ /dev/null
@@ -1,177 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      moment
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        var moment         = require("moment")
-  , Utils          = require("./utils")
-  , DataTypes      = require("./data-types")
-  , QueryInterface = require("./query-interface")
-
-module.exports = (function() {
-  var Migration = function(migrator, path) {
-    var split = path.split('/')
-
-    this.migrator       = migrator
-    this.path           = path
-    this.filename       = Utils._.last(this.path.split('/'))
-
-    var parsed          = Migration.parseFilename(this.filename)
-
-    this.migrationId    = parsed.id
-    this.date           = parsed.date;
-    this.queryInterface = this.migrator.queryInterface
-    this.undoneMethods  = 0
-  }
-
-  ///////////////
-  // static /////
-  ///////////////
-
-  Migration.parseFilename = function(s) {
-    var matches = s.match(/^((\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2}))[-_].+/)
-
-    if (matches === null) {
-      throw new Error(s + ' is not a valid migration name! Use YYYYMMDDHHmmss-migration-name format.')
-    }
-
-    return {
-      id: parseInt(matches[1]),
-      date: moment(matches.slice(2, 8).join('-'), 'YYYYMMDDHHmmss')
-    }
-  }
-
-  Migration.migrationHasInterfaceCalls = function(func) {
-    var functionString = Utils.removeCommentsFromFunctionString(func.toString())
-      , hasCalls       = false
-
-    for(var method in QueryInterface.prototype) {
-      var regex = new RegExp('[\\s\\n\\r]*\\.[\\s\\n\\r]*' + method)
-      hasCalls = hasCalls || regex.test(functionString)
-    }
-
-    return hasCalls
-  }
-
-  ///////////////
-  // member /////
-  ///////////////
-
-  Object.defineProperty(Migration.prototype, 'migration', {
-    get: function() {
-      return require(this.path)
-    }
-  })
-
-  Migration.prototype.execute = function(options) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      options = Utils._.extend({
-        method: 'up'
-      }, options || {})
-
-      var onSuccess = function() { emitter.emit('success', null) }
-        , func      = self.migration[options.method]
-
-      extendMigrationWithQueryInterfaceMethods.call(self, onSuccess)
-      func.call(null, self, DataTypes)
-
-      if (!Migration.migrationHasInterfaceCalls(func))
-        onSuccess()
-    }).run()
-  }
-
-  Migration.prototype.isBefore = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date > this.date) : (date >= this.date)
-  }
-
-  Migration.prototype.isAfter = function(dateString, options) {
-    options = Utils._.extend({
-      withoutEquals: false
-    }, options || {})
-
-    var date = Migration.parseFilename(dateString.toString() + '-foo.js').date
-
-    return options.withoutEqual ? (date < this.date) : (date <= this.date)
-  }
-
-  // extends the Migration prototype with all methods of QueryInterface.prototype
-  // with additional tracking of start and finish. this is done in order to minimize
-  // asynchronous handling in migrations
-  var extendMigrationWithQueryInterfaceMethods = function(callback) {
-    var self = this
-
-    for(var method in QueryInterface.prototype) {
-      (function(_method) {
-        self[_method] = function() {
-          var emitter = self.QueryInterface
-            , args    = Utils._.map(arguments, function(arg, _) { return arg })
-
-          self.undoneMethods++
-
-          // bind listeners to the query interface
-          // the event will have the same name like the method
-          self.queryInterface.on(_method, function(err) {
-            self.undoneMethods--
-            if (err) {
-              throw new Error(err)
-            } else {
-              (self.undoneMethods == 0) && callback && callback()
-            }
-          })
-
-          return self.queryInterface[_method].apply(self.queryInterface, args)
-        }
-      })(method)
-    }
-  }
-
-  return Migration
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
\ No newline at end of file
diff --git a/docs/lib/migrator.js.html b/docs/lib/migrator.js.html
deleted file mode 100644
index bd080fb8c64e..000000000000
--- a/docs/lib/migrator.js.html
+++ /dev/null
@@ -1,282 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          const fs     = require("fs")
-    , path   = require("path")
-    , moment = require("moment")
-
-var Utils          = require("./utils")
-  , Migration      = require("./migration")
-  , DataTypes      = require("./data-types")
-
-module.exports = (function() {
-  var Migrator = function(sequelize, options) {
-    this.sequelize = sequelize
-    this.options   = Utils._.extend({
-      path: __dirname + '/../migrations',
-      from: null,
-      to: null,
-      logging: console.log
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    if (this.options.logging == console.log) {
-      // using just console.log will break in node < 0.6
-      this.options.logging = function(s) { console.log(s) }
-    }
-  }
-
-  Object.defineProperty(Migrator.prototype, "queryInterface", {
-    get: function() {
-      return this.sequelize.getQueryInterface()
-    }
-  })
-
-  Migrator.prototype.migrate = function(options) {
-    var self = this
-
-    options = Utils._.extend({
-      method: 'up'
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.getUndoneMigrations(function(err, migrations) {
-        if (err) {
-          emitter.emit('error', err)
-        } else {
-          var chainer = new Utils.QueryChainer
-            , from    = migrations[0]
-
-          if (options.method === 'down') {
-            from = migrations[0]
-            migrations.reverse()
-          }
-
-          migrations.forEach(function(migration) {
-            chainer.add(migration, 'execute', [options], {
-              before: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executing migration: ' + migration.filename)
-                }
-              },
-              after: function(migration) {
-                if (self.options.logging !== false) {
-                  self.options.logging('Executed migration: ' + migration.filename)
-                }
-              },
-              success: function(migration, callback) {
-                if (options.method === 'down') {
-                  deleteUndoneMigration.call(self, from, migration, callback)
-                } else {
-                  saveSuccessfulMigration.call(self, from, migration, callback)
-                }
-              }
-            })
-          })
-
-          chainer
-            .runSerially({ skipOnError: true })
-            .success(function() { emitter.emit('success', null) })
-            .error(function(err) { emitter.emit('error', err) })
-        }
-      })
-    }).run()
-  }
-
-  Migrator.prototype.getUndoneMigrations = function(callback)  {
-    var self = this
-
-    var filterFrom = function(migrations, from, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
-      callback && callback(null, result)
-    }
-    var filterTo = function(migrations, to, callback, options) {
-      var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
-      callback && callback(null, result)
-    }
-
-    var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      return /\.js$/.test(file)
-    })
-
-    var migrations = migrationFiles.map(function(file) {
-      return new Migration(self, self.options.path + '/' + file)
-    })
-
-    migrations = migrations.sort(function(a,b){
-      return parseInt(a.filename.split('-')[0]) - parseInt(b.filename.split('-')[0])
-    })
-
-    if (this.options.from) {
-      filterFrom(migrations, this.options.from, function(err, migrations) {
-        if (self.options.to) {
-          filterTo(migrations, self.options.to, callback)
-        } else {
-          callback && callback(null, migrations)
-        }
-      })
-    } else {
-      getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
-        if (lastMigrationId) {
-          filterFrom(migrations, lastMigrationId, function(err, migrations) {
-            if (self.options.to) {
-              filterTo(migrations, self.options.to, callback)
-            } else {
-              callback && callback(null, migrations)
-            }
-          }, { withoutEqual: true })
-        } else {
-          if (self.options.to) {
-            filterTo(migrations, self.options.to, callback)
-          } else {
-            callback && callback(null, migrations)
-          }
-        }
-      }).error(function(err) {
-        callback && callback(err, null)
-      })
-    }
-  }
-
-  Migrator.prototype.findOrCreateSequelizeMetaDAO = function(syncOptions) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var storedDAO   = self.sequelize.daoFactoryManager.getDAO('SequelizeMeta')
-        , SequelizeMeta = storedDAO
-
-      if (!storedDAO) {
-        SequelizeMeta = self.sequelize.define('SequelizeMeta', {
-          from: DataTypes.STRING,
-          to:   DataTypes.STRING
-        }, {
-          timestamps: false
-        })
-      }
-
-      // force sync when model has newly created or if syncOptions are passed
-      if (!storedDAO || syncOptions) {
-        SequelizeMeta
-          .sync(syncOptions || {})
-          .success(function() { emitter.emit('success', SequelizeMeta) })
-          .error(function(err) { emitter.emit('error', err) })
-      } else {
-        emitter.emit('success', SequelizeMeta)
-      }
-    }).run()
-  }
-
-  // private
-
-  var getLastMigrationFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-        SequelizeMeta.find({ order: 'id DESC' }).success(function(meta) {
-          emitter.emit('success', meta ? meta : null)
-        }).error(function(err) { emitter.emit('error', err) })
-      }).error(function(err) { emitter.emit(err) })
-    }).run()
-  }
-
-  var getLastMigrationIdFromDatabase = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      getLastMigrationFromDatabase.call(self)
-        .success(function(meta) {
-          emitter.emit('success', meta ? meta.to : null)
-        })
-        .error(function(err) {
-          emitter.emit('error', err)
-        })
-    }).run()
-  }
-
-  var getFormattedDateString = function(s) {
-    var result = null
-
-    try {
-      result = s.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/).slice(1, 6).join('-')
-    } catch(e) {
-      throw new Error(s + ' is no valid migration timestamp format! Use YYYYMMDDHHmmss!')
-    }
-
-    return result
-  }
-
-  var stringToDate = function(s) {
-    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
-  }
-
-  var saveSuccessfulMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .create({ from: from.migrationId, to: to.migrationId })
-        .success(callback)
-    })
-  }
-
-  var deleteUndoneMigration = function(from, to, callback) {
-    var self = this
-
-    self.findOrCreateSequelizeMetaDAO().success(function(SequelizeMeta) {
-      SequelizeMeta
-        .find({ where: { from: from.migrationId.toString(), to: to.migrationId.toString() } })
-        .success(function(meta) {
-          meta.destroy().success(callback)
-        })
-    })
-  }
-
-  return Migrator
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/docs/lib/query-chainer.js.html b/docs/lib/query-chainer.js.html
deleted file mode 100644
index 2b39bd8beafe..000000000000
--- a/docs/lib/query-chainer.js.html
+++ /dev/null
@@ -1,188 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            var Utils = require("./utils")
-
-module.exports = (function() {
-  var QueryChainer = function(emitters) {
-    var self = this
-
-    this.finishedEmits  = 0
-    this.emitters       = []
-    this.serials        = []
-    this.fails          = []
-    this.serialResults  = []
-    this.emitterResults = []
-    this.finished       = false
-    this.wasRunning     = false
-    this.eventEmitter   = null
-
-    emitters = emitters || []
-    emitters.forEach(function(emitter) {
-      if (Array.isArray(emitter)) {
-        self.add.apply(self, emitter)
-      } else {
-        self.add(emitter)
-      }
-    })
-  }
-
-  QueryChainer.prototype.add = function(emitterOrKlass, method, params, options) {
-    if (!!method) {
-      this.serials.push({ klass: emitterOrKlass, method: method, params: params, options: options })
-    } else {
-      observeEmitter.call(this, emitterOrKlass)
-      this.emitters.push(emitterOrKlass)
-    }
-
-    return this
-  }
-
-  QueryChainer.prototype.run = function() {
-    var self = this
-    this.eventEmitter = new Utils.CustomEventEmitter(function() {
-      self.wasRunning = true
-      finish.call(self, 'emitterResults')
-    })
-    return this.eventEmitter.run()
-  }
-
-  QueryChainer.prototype.runSerially = function(options) {
-    var self       = this
-      , serialCopy = Utils._.clone(this.serials)
-
-    options = Utils._.extend({
-      skipOnError: false
-    }, options)
-
-    var exec = function() {
-      var serial = self.serials.pop()
-
-      if (serial) {
-        serial.options = serial.options || {}
-        serial.options.before && serial.options.before(serial.klass)
-
-        var onSuccess = function() {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          exec()
-        }
-
-        var onError = function(err) {
-          serial.options.after && serial.options.after(serial.klass)
-          self.finishedEmits++
-          self.fails.push(err)
-          exec()
-        }
-
-        if (options.skipOnError && (self.fails.length > 0)) {
-          onError('Skipped due to earlier error!')
-        } else {
-          var emitter = serial.klass[serial.method].apply(serial.klass, serial.params)
-
-          emitter.success(function(result) {
-            self.serialResults[serialCopy.indexOf(serial)] = result
-
-            if (serial.options.success) {
-              serial.options.success(serial.klass, onSuccess)
-            } else {
-              onSuccess()
-            }
-          }).error(onError)
-        }
-      } else {
-        self.wasRunning = true
-        finish.call(self, 'serialResults')
-      }
-    }
-
-    this.serials.reverse()
-    this.eventEmitter = new Utils.CustomEventEmitter(exec)
-    return this.eventEmitter.run()
-  }
-
-  // private
-
-  var observeEmitter = function(emitter) {
-    var self = this
-
-    emitter
-      .success(function(result) {
-        self.emitterResults[self.emitters.indexOf(emitter)] = result
-        self.finishedEmits++
-        finish.call(self, 'emitterResults')
-      })
-      .error(function(err) {
-        self.finishedEmits++
-        self.fails.push(err)
-        finish.call(self, 'emitterResults')
-      })
-      .on('sql', function(sql) {
-        if (self.eventEmitter) {
-          self.eventEmitter.emit('sql', sql)
-        }
-      })
-  }
-
-  var finish = function(resultsName) {
-    this.finished = true
-
-    if (this.emitters.length > 0) {
-      this.finished = (this.finishedEmits == this.emitters.length)
-    }
-    else if (this.serials.length > 0) {
-      this.finished = (this.finishedEmits == this.serials.length)
-    }
-
-    if (this.finished && this.wasRunning) {
-      var status = (this.fails.length == 0 ? 'success' : 'error')
-        , result = (this.fails.length == 0 ? this[resultsName] : this.fails)
-
-      this.eventEmitter.emit.apply(this.eventEmitter, [status, result].concat(result))
-    }
-  }
-
-  return QueryChainer
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
\ No newline at end of file
diff --git a/docs/lib/query-interface.js.html b/docs/lib/query-interface.js.html
deleted file mode 100644
index 950173235ccd..000000000000
--- a/docs/lib/query-interface.js.html
+++ /dev/null
@@ -1,329 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              var Utils     = require('./utils')
-  , DataTypes = require('./data-types')
-
-module.exports = (function() {
-  var QueryInterface = function(sequelize) {
-    this.sequelize = sequelize
-    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-   this.QueryGenerator.options = this.sequelize.options;
-  }
-  Utils.addEventEmitter(QueryInterface)
-
-  QueryInterface.prototype.createTable = function(tableName, attributes, options) {
-    var attributeHashes = {}
-
-    Utils._.each(attributes, function(dataTypeOrOptions, attributeName) {
-      if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-        attributeHashes[attributeName] = { type: dataTypeOrOptions }
-      } else {
-        attributeHashes[attributeName] = dataTypeOrOptions
-      }
-    })
-
-    attributes = this.QueryGenerator.attributesToSQL(attributeHashes)
-
-    var sql = this.QueryGenerator.createTableQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'createTable')
-  }
-
-  QueryInterface.prototype.dropTable = function(tableName) {
-    var sql = this.QueryGenerator.dropTableQuery(tableName)
-    return queryAndEmit.call(this, sql, 'dropTable')
-  }
-
-  QueryInterface.prototype.dropAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer()
-
-      self.showAllTables().success(function(tableNames) {
-        tableNames.forEach(function(tableName) {
-          chainer.add(self.dropTable(tableName))
-        })
-        chainer
-          .run()
-          .success(function() {
-            self.emit('dropAllTables', null)
-            emitter.emit('success', null)
-          })
-          .error(function(err) {
-            self.emit('dropAllTables', err)
-            emitter.emit('error', err)
-          })
-      }).error(function(err) {
-        self.emit('dropAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.renameTable = function(before, after) {
-    var sql = this.QueryGenerator.renameTableQuery(before, after)
-    return queryAndEmit.call(this, sql, 'renameTable')
-  }
-
-  QueryInterface.prototype.showAllTables = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var showTablesSql = self.QueryGenerator.showTablesQuery()
-      self.sequelize.query(showTablesSql, null, { raw: true }).success(function(tableNames) {
-        self.emit('showAllTables', null)
-        emitter.emit('success', Utils._.flatten(tableNames))
-      }).error(function(err) {
-        self.emit('showAllTables', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.describeTable = function(tableName) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql;
-      if (self.QueryGenerator.describeTableQuery) {
-        sql = self.QueryGenerator.describeTableQuery(tableName)
-      } else {
-        sql = 'DESCRIBE `' + tableName + '`;'
-      }
-      self.sequelize.query(sql, null, { raw: true }).success(function(data) {
-        emitter.emit('success', data)
-      }).error(function(err) {
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.addColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'addColumn')
-  }
-
-  QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
-    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
-    return queryAndEmit.call(this, sql, 'removeColumn')
-  }
-
-  QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
-    var attributes = {}
-
-    if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
-    } else {
-      attributes[attributeName] = dataTypeOrOptions
-    }
-
-    var options = this.QueryGenerator.attributesToSQL(attributes)
-      , sql     = this.QueryGenerator.changeColumnQuery(tableName, options)
-
-    return queryAndEmit.call(this, sql, 'changeColumn')
-  }
-
-  QueryInterface.prototype.renameColumn = function(tableName, attrNameBefore, attrNameAfter) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
-
-        var options =  {}
-
-        options[attrNameAfter] = {
-          type: data.Type,
-          allowNull: data.Null == 'YES',
-          defaultValue: data.Default
-        }
-
-        var sql = self.QueryGenerator.renameColumnQuery(tableName,
-          attrNameBefore,
-          self.QueryGenerator.attributesToSQL(options)
-        )
-
-        self.sequelize.query(sql, null, {}).success(function() {
-          self.emit('renameColumn', null)
-          emitter.emit('success', null)
-        }).error(function(err) {
-          self.emit('renameColumn', err)
-          emitter.emit('error', err)
-        })
-      }).error(function(err) {
-        self.emit('renameColumn', err)
-        emitter.emit('error', err)
-      })
-    }).run()
-  }
-
-  QueryInterface.prototype.addIndex = function(tableName, attributes, options) {
-    var sql = this.QueryGenerator.addIndexQuery(tableName, attributes, options)
-    return queryAndEmit.call(this, sql, 'addIndex')
-  }
-
-  QueryInterface.prototype.showIndex = function(tableName, options) {
-    var sql = this.QueryGenerator.showIndexQuery(tableName, options)
-    return queryAndEmit.call(this, sql, 'showIndex')
-  }
-
-  QueryInterface.prototype.removeIndex = function(tableName, indexNameOrAttributes) {
-    var sql = this.QueryGenerator.removeIndexQuery(tableName, indexNameOrAttributes)
-    return queryAndEmit.call(this, sql, "removeIndex")
-  }
-
-  QueryInterface.prototype.insert = function(dao, tableName, values) {
-    var sql = this.QueryGenerator.insertQuery(tableName, values)
-    return queryAndEmit.call(this, [sql, dao], 'insert', {
-      success: function(obj) { obj.isNewRecord = false }
-    })
-  }
-
-  QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
-    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'update')
-  }
-
-  QueryInterface.prototype.delete = function(dao, tableName, identifier) {
-    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
-    return queryAndEmit.call(this, [sql, dao], 'delete')
-  }
-
-  QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
-    var sql = this.QueryGenerator.selectQuery(tableName, options)
-    queryOptions = Utils._.extend({}, queryOptions, { include: options.include })
-    return queryAndEmit.call(this, [sql, factory, queryOptions], 'select')
-  }
-
-  QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
-    var self = this
-
-    if (attributeSelector === undefined) {
-      throw new Error('Please pass an attribute selector!')
-    }
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, options)
-        , qry = self.sequelize.query(sql, null, { plain: true, raw: true, type: 'SELECT' })
-
-      qry
-        .success(function(data) {
-          var result = data[attributeSelector]
-
-          if (options && options.parseInt) {
-            result = parseInt(result)
-          }
-
-          self.emit('rawSelect', null)
-          emitter.emit('success', result)
-        })
-        .error(function(err) {
-          self.emit('rawSelect', err)
-          emitter.emit('error', err)
-        })
-        .on('sql', function(sql) {
-          emitter.emit('sql', sql)
-        })
-    }).run()
-  }
-
-  // private
-
-  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
-    var self = this
-
-    options = Utils._.extend({
-      success: function(){},
-      error: function(){}
-    }, options || {})
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var query = null
-
-      if (Array.isArray(sqlOrQueryParams)) {
-        if (sqlOrQueryParams.length === 1) {
-          sqlOrQueryParams.push(null)
-        }
-
-        if (sqlOrQueryParams.length === 2) {
-          sqlOrQueryParams.push({})
-        }
-
-        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
-      } else {
-        query = self.sequelize.query(sqlOrQueryParams, null, {})
-      }
-
-      // append the query for better testing
-      emitter.query = query
-
-      query.success(function(obj) {
-        options.success && options.success(obj)
-        self.emit(methodName, null)
-        emitter.emit('success', obj)
-      }).error(function(err) {
-        options.error && options.error(err)
-        self.emit(methodName, err)
-        emitter.emit('error', err)
-      })
-      query.on('sql', function(sql) {
-        emitter.emit('sql', sql)
-      });
-    }).run()
-  }
-
-  return QueryInterface
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
\ No newline at end of file
diff --git a/docs/lib/sequelize.js.html b/docs/lib/sequelize.js.html
deleted file mode 100644
index 44a5a046b894..000000000000
--- a/docs/lib/sequelize.js.html
+++ /dev/null
@@ -1,210 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              function
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sequelize()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Main constructor of the project.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Params:
-
-  - `database`
-  - `username`
-  - `password`, optional, default: null
-  - `options`, optional, default: {}
-
-Examples:
-
-    mymodule.write('foo')
-    mymodule.write('foo', { stream: process.stderr })
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                var Sequelize = function(database, username, password, options) {
-    this.options = Utils._.extend({
-      dialect: 'mysql',
-      host: 'localhost',
-      port: 3306,
-      protocol: 'tcp',
-      define: {},
-      query: {},
-      sync: {},
-      logging: console.log,
-      omitNull: false,
-      queue: true,
-      native: false,
-      replication: false,
-      pool: {}
-    }, options || {})
-
-    if (this.options.logging === true) {
-      console.log('DEPRECATION WARNING: The logging-option should be either a function or false. Default: console.log')
-      this.options.logging = console.log
-    }
-
-    this.config = {
-      database: database,
-      username: username,
-      password: (( (["", null, false].indexOf(password) > -1) || (typeof password == 'undefined')) ? null : password),
-      host    : this.options.host,
-      port    : this.options.port,
-      pool    : this.options.pool,
-      protocol: this.options.protocol,
-      queue   : this.options.queue,
-      native  : this.options.native,
-      replication: this.options.replication,
-      maxConcurrentQueries: this.options.maxConcurrentQueries
-    }
-
-    var ConnectorManager = require("./dialects/" + this.options.dialect + "/connector-manager")
-
-    this.daoFactoryManager = new DAOFactoryManager(this)
-    this.connectorManager  = new ConnectorManager(this, this.config)
-
-    this.importCache = {}
-  }
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                property
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sequelize.Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Reference to Utils
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize.Utils = Utils
-
-  for (var dataType in DataTypes) {
-    Sequelize[dataType] = DataTypes[dataType]
-  }
-
-  Sequelize.prototype.getQueryInterface = function() {
-    this.queryInterface = this.queryInterface || new QueryInterface(this)
-    return this.queryInterface
-  }
-
-  Sequelize.prototype.getMigrator = function(options, force) {
-    if (force) {
-      this.migrator = new Migrator(this, options)
-    } else {
-      this.migrator = this.migrator || new Migrator(this, options)
-    }
-
-    return this.migrator
-  }
-
-  Sequelize.prototype.define = function(daoName, attributes, options) {
-    options = options || {}
-    var globalOptions = this.options
-
-    if (globalOptions.define) {
-      options = Utils._.extend({}, globalOptions.define, options)
-      Utils._(['classMethods', 'instanceMethods']).each(function(key) {
-        if (globalOptions.define[key]) {
-          options[key] = options[key] || {}
-          Utils._.extend(options[key], globalOptions.define[key])
-        }
-      })
-    }
-    options.omitNull = globalOptions.omitNull
-
-    var factory = new DAOFactory(daoName, attributes, options)
-    this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
-    return factory
-  }
-
-  Sequelize.prototype.isDefined = function(daoName) {
-    var daos = this.daoFactoryManager.daos
-    return (daos.filter(function(dao) { return dao.name === daoName }).length !== 0)
-  }
-
-  Sequelize.prototype.import = function(path) {
-    if (!this.importCache[path]) {
-      var defineCall = require(path)
-      this.importCache[path] = defineCall(this, DataTypes)
-    }
-
-    return this.importCache[path]
-  }
-
-  Sequelize.prototype.migrate = function(options) {
-    this.getMigrator().migrate(options)
-  }
-
-  Sequelize.prototype.query = function(sql, callee, options) {
-    if (arguments.length === 3) {
-      options = options
-    } else if (arguments.length === 2) {
-      options = {}
-    } else {
-      options = { raw: true }
-    }
-
-    options = Utils._.extend(Utils._.clone(this.options.query), options)
-    options = Utils._.defaults(options, {
-      logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
-      type: (sql.toLowerCase().indexOf('select') === 0) ? 'SELECT' : false
-    })
-
-    return this.connectorManager.query(sql, callee, options)
-  }
-
-  Sequelize.prototype.sync = function(options) {
-    options = options || {}
-
-    if (this.options.sync) {
-      options = Utils._.extend({}, this.options.sync, options)
-    }
-
-    var chainer = new Utils.QueryChainer()
-
-    this.daoFactoryManager.daos.forEach(function(dao) {
-      chainer.add(dao.sync(options))
-    })
-
-    return chainer.run()
-  }
-
-  Sequelize.prototype.drop = function() {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var chainer = new Utils.QueryChainer
-
-      self.daoFactoryManager.daos.forEach(function(dao) { chainer.add(dao.drop()) })
-
-      chainer
-        .run()
-        .success(function() { emitter.emit('success', null) })
-        .error(function(err) { emitter.emit('error', err) })
-    }).run()
-  }
-
-  return Sequelize
-})()
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
\ No newline at end of file
diff --git a/docs/lib/utils.js.html b/docs/lib/utils.js.html
deleted file mode 100644
index ea21c0b3a1b8..000000000000
--- a/docs/lib/utils.js.html
+++ /dev/null
@@ -1,225 +0,0 @@
-Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sequelize
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  declaration
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  mysql
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    var mysql      = require("mysql")
-  , connection = mysql.createConnection({})
-  , util       = require("util")
-  , DataTypes  = require("./data-types")
-
-var Utils = module.exports = {
-  _: (function() {
-    var _  = require("underscore")
-      , _s = require('underscore.string')
-
-    _.mixin(_s.exports())
-    _.mixin({
-      includes: _s.include,
-      camelizeIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.camelize(string)
-        }
-
-        return result
-      },
-      underscoredIf: function(string, condition) {
-        var result = string
-
-        if (condition) {
-          result = _.underscored(string)
-        }
-
-        return result
-      }
-    })
-
-    return _
-  })(),
-  addEventEmitter: function(_class) {
-    util.inherits(_class, require('events').EventEmitter)
-  },
-  TICK_CHAR: '`',
-  addTicks: function(s) {
-    return Utils.TICK_CHAR + Utils.removeTicks(s) + Utils.TICK_CHAR
-  },
-  removeTicks: function(s) {
-    return s.replace(new RegExp(Utils.TICK_CHAR, 'g'), "")
-  },
-  escape: function(s) {
-    return connection.escape(s).replace(/\\"/g, '"')
-  },
-  format: function(arr) {
-    return connection.format.apply(connection, [arr.shift(), arr])
-  },
-  isHash: function(obj) {
-    return Utils._.isObject(obj) && !Array.isArray(obj);
-  },
-  toSqlDate: function(date) {
-    return [
-      [
-        date.getFullYear(),
-        ((date.getMonth() < 9 ? '0' : '') + (date.getMonth()+1)),
-        ((date.getDate() < 10 ? '0' : '') + date.getDate())
-      ].join("-"),
-      date.toLocaleTimeString()
-    ].join(" ")
-  },
-  argsArePrimaryKeys: function(args, primaryKeys) {
-    var result = (args.length == Object.keys(primaryKeys).length)
-    if (result) {
-      Utils._.each(args, function(arg) {
-        if (result) {
-          if (['number', 'string'].indexOf(typeof arg) !== -1) {
-            result = true
-          } else {
-            result = (arg instanceof Date)
-          }
-        }
-      })
-    }
-    return result
-  },
-  combineTableNames: function(tableName1, tableName2) {
-    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
-  },
-
-  singularize: function(s) {
-    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
-  },
-
-  pluralize: function(s) {
-    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
-  },
-
-  removeCommentsFromFunctionString: function(s) {
-    s = s.replace(/\s*(\/\/.*)/g, '')
-    s = s.replace(/(\/\*[\n\r\s\S]*?\*\/)/mg, '')
-
-    return s
-  },
-
-  toDefaultValue: function(value) {
-    return (value == DataTypes.NOW) ? new Date() : value
-  },
-
-  setAttributes: function(hash, identifier, instance, prefix) {
-    prefix = prefix || ''
-    if (this.isHash(identifier)) {
-      this._.each(identifier, function(elem, key) {
-        hash[prefix + key] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance[elem.key || elem] : null
-      })
-    } else {
-      hash[prefix + identifier] = Utils._.isString(instance) ? instance : Utils._.isObject(instance) ? instance.id : null
-    }
-
-    return hash
-  },
-
-  removeNullValuesFromHash: function(hash, omitNull) {
-    var result = hash
-
-    if (omitNull) {
-      var _hash = {}
-
-      Utils._.each(hash, function(val, key) {
-        if (key.match(/Id$/) || ((val !== null) && (val !== undefined))) {
-          _hash[key] = val;
-        }
-      })
-
-      result = _hash
-    }
-
-    return result
-  },
-
-  prependTableNameToHash: function(tableName, hash) {
-    if (tableName) {
-      var _hash = {}
-
-      for (var key in hash) {
-        if (key.indexOf('.') === -1) {
-          _hash[tableName + '.' + key] = hash[key]
-        } else {
-          _hash[key] = hash[key]
-        }
-      }
-
-      return _hash
-    } else {
-      return hash
-    }
-  },
-
-  firstValueOfHash: function(obj) {
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key))
-        return obj[key]
-    }
-    return null
-  },
-
-  inherit: function(subClass, superClass) {
-    if (superClass.constructor == Function) {
-      // Normal Inheritance
-      subClass.prototype = new superClass();
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass.prototype;
-    } else {
-      // Pure Virtual Inheritance
-      subClass.prototype = superClass;
-      subClass.prototype.constructor = subClass;
-      subClass.prototype.parent = superClass;
-    }
-
-    return subClass;
-  }
-
-}
-
-Utils.CustomEventEmitter = require("./emitters/custom-event-emitter")
-Utils.QueryChainer = require("./query-chainer")
-Utils.Lingo = require("lingo")
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/docs/modules/index.html b/docs/modules/index.html
deleted file mode 100644
index 487fe15b2ad0..000000000000
--- a/docs/modules/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-    
-        Redirector
-        
-    
-    
-        Click here to redirect
-    
-
diff --git a/docs/modules/sequelize.html b/docs/modules/sequelize.html
deleted file mode 100644
index e0d3e122fdbd..000000000000
--- a/docs/modules/sequelize.html
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-    
-    sequelize
-    
-    
-    
-    
-    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            API Docs for: 
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        Show:
-        
-
-        
-
-        
-        
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    sequelize Module
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
-
-    
-
-    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            Defined in: lib/sequelize.js:12
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
-
-    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    The entry point.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-
-
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    This module provides the following classes:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-            
-        
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-
-
-
-
-
-
-
-
-
-

From c1fc91655ca8ea5e1b8aaf8be2f765896ab69332 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:39:06 +0100
Subject: [PATCH 135/360] added some stuff

---
 changelog.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index d98e83e6c652..c6bbd98c703c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,8 +3,9 @@
 
 # v1.6.0 #
 - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3
+- [DEPENDENCIES] mysql is now an optional dependency. #355 (thanks to clkao)
 - [REFACTORING] separated tests for dialects
-- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association #449 (thanks to innofluence/janmeier)
+- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association. #449 (thanks to innofluence/janmeier)
 - [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango)
 - [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling)
 - [BUG] fixed wrong version in sequelize binary
@@ -31,7 +32,7 @@
 - [FEATURE] allow definition of a models table name (thanks to slamkajs)
 - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
 - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)
-- [DEPENDENCIES] mysql is now an optional dependency
+- [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From 08122ca4f0c085157d6978b46bc1ef27f9d751f2 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:40:31 +0100
Subject: [PATCH 136/360] added PR in the changelog

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index c6bbd98c703c..35cd7ee37ddc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -14,7 +14,7 @@
 - [BUG] fixed updateAttributes for models/tables without primary key (thanks to durango)
 - [BUG] fixed the location of the foreign key when using belongsTo (thanks to ricardograca)
 - [BUG] don't return timestamps if only specific attributes have been seleceted (thanks to ricardograca)
-- [FEATURE] added association prefetching for find and findAll
+- [FEATURE] added association prefetching /eager loading for find and findAll. #465
 - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot)
 - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result
 - [FEATURE] Migrations now understand NODE_ENV (thanks to gavri)

From 6c06ac2a380e215beed4401e7218dbe73b589df9 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 17:42:25 +0100
Subject: [PATCH 137/360] utc

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 2cc8b66d9674..35990ad116e5 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,12 @@
 
 The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databases by mapping database entries to objects and vice versa. To put it in a nutshell... it's an ORM (Object-Relational-Mapper). The library is written entirely in JavaScript and can be used in the Node.JS environment.
 
+## Important Notes ##
+
+### 1.6.0 ###
+
+- We changed the way timestamps are handled. From v1.6.0 on timestamps are stored and loaded as UTC.
+
 ## Blogposts/Changes ##
 - [v1.4.1](http://blog.sequelizejs.com/post/24403298792/changes-in-sequelize-1-4-1): deprecation of node < 0.6, logging customization, ...
 - [v1.4.0](http://blog.sequelizejs.com/post/24345409723/changes-in-sequelize-1-4-0): postgresql, connection pooling, ...

From b0eecfa8d53d15eb1ad7502f5358f91b53061457 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 26 Feb 2013 20:41:55 +0100
Subject: [PATCH 138/360] fixed eager loading of 2 associations with the same
 origin but different alias

---
 lib/dialects/mysql/query-generator.js    | 15 ++--
 lib/dialects/postgres/query-generator.js | 15 ++--
 spec/dao-factory.spec.js                 | 90 ++++++++++++++++--------
 3 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index da06ff5b0458..2733c4295a2e 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -133,22 +133,19 @@ module.exports = (function() {
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
-            var template = Utils._.template("`<%= table %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`")
-            return template({
-              table: include.daoFactory.tableName,
-              as:    include.as,
-              attr:  attr
-            })
+            var template = Utils._.template("`<%= as %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`")
+            return template({ as: include.as, attr: attr })
           })
 
           optAttributes = optAttributes.concat(attributes)
 
-          var joinQuery = " LEFT OUTER JOIN `<%= table %>` ON `<%= tableLeft %>`.`<%= attrLeft %>` = `<%= tableRight %>`.`<%= attrRight %>`"
+          var joinQuery = " LEFT OUTER JOIN `<%= table %>` AS `<%= as %>` ON `<%= tableLeft %>`.`<%= attrLeft %>` = `<%= tableRight %>`.`<%= attrRight %>`"
           query += Utils._.template(joinQuery)({
             table:      include.daoFactory.tableName,
-            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.daoFactory.tableName : tableName),
+            as:         include.as,
+            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.as : tableName),
             attrLeft:   'id',
-            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.daoFactory.tableName),
+            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.as),
             attrRight:  include.association.identifier
           })
         })
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index b24f881f2d20..8a4df0d76e29 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -235,22 +235,19 @@ module.exports = (function() {
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
-            var template = Utils._.template('"<%= table %>"."<%= attr %>" AS "<%= as %>.<%= attr %>"')
-            return template({
-              table: include.daoFactory.tableName,
-              as:    include.as,
-              attr:  attr
-            })
+            var template = Utils._.template('"<%= as %>"."<%= attr %>" AS "<%= as %>.<%= attr %>"')
+            return template({ as: include.as, attr:  attr })
           })
 
           optAttributes = optAttributes.concat(attributes)
 
-          var joinQuery = ' LEFT OUTER JOIN "<%= table %>" ON "<%= tableLeft %>"."<%= attrLeft %>" = "<%= tableRight %>"."<%= attrRight %>"'
+          var joinQuery = ' LEFT OUTER JOIN "<%= table %>" AS "<%= as %>" ON "<%= tableLeft %>"."<%= attrLeft %>" = "<%= tableRight %>"."<%= attrRight %>"'
           query += Utils._.template(joinQuery)({
             table:      include.daoFactory.tableName,
-            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.daoFactory.tableName : tableName),
+            as:         include.as,
+            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.as : tableName),
             attrLeft:   'id',
-            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.daoFactory.tableName),
+            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.as),
             attrRight:  include.association.identifier
           })
         })
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 944e34d4103d..a750fb4a15ab 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -52,18 +52,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
     })
 
     it("throws an error if 2 autoIncrements are passed", function() {
-      try {
-        var User = this.sequelize.define('UserWithTwoAutoIncrements', {
+      Helpers.assertException(function() {
+        this.sequelize.define('UserWithTwoAutoIncrements', {
           userid:    { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true },
           userscore: { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true }
         })
-        // the parse shouldn't execute the following line
-        // this tests needs to be refactored...
-        // we need to use expect.toThrow when a later version than 0.6 was released
-        expect(1).toEqual(2)
-      } catch(e) {
-        expect(e.message).toEqual('Invalid DAO definition. Only one autoincrement field allowed.')
-      }
+      }.bind(this), 'Invalid DAO definition. Only one autoincrement field allowed.')
     })
   })
 
@@ -205,18 +199,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
 
-    it('raises an error if you mess up the datatype', function(done)  {
-
-      try {
-        var User = this.sequelize.define('UserBadDataType', {
+    it('raises an error if you mess up the datatype', function() {
+      Helpers.assertException(function() {
+        this.sequelize.define('UserBadDataType', {
           activity_date: Sequelize.DATe
-        });
-        done()
-      }
-      catch( e ) {
-        expect(e.message).toEqual('Unrecognized data type for field activity_date')
-        done()
-      }
+        })
+      }.bind(this), 'Unrecognized data type for field activity_date')
     })
 
     it('sets a 64 bit int in bigint', function(done) {
@@ -468,24 +456,29 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
     describe('eager loading', function() {
       before(function() {
-        this.Task     = this.sequelize.define('Task', { title: Sequelize.STRING })
-        this.Worker   = this.sequelize.define('Worker', { name: Sequelize.STRING })
-      })
-
-      describe('belongsTo', function() {
-        before(function(done) {
-          this.Task.belongsTo(this.Worker)
+        this.Task        = this.sequelize.define('Task', { title: Sequelize.STRING })
+        this.Worker      = this.sequelize.define('Worker', { name: Sequelize.STRING })
 
+        this.init = function(callback) {
           this.sequelize.sync({ force: true }).complete(function() {
             this.Worker.create({ name: 'worker' }).success(function(worker) {
               this.Task.create({ title: 'homework' }).success(function(task) {
-                this.worker  = worker
-                this.task    = task
+                this.worker    = worker
+                this.task      = task
 
-                this.task.setWorker(this.worker).success(done)
+                callback()
               }.bind(this))
             }.bind(this))
           }.bind(this))
+        }.bind(this)
+      })
+
+      describe('belongsTo', function() {
+        before(function(done) {
+          this.Task.belongsTo(this.Worker)
+          this.init(function() {
+            this.task.setWorker(this.worker).success(done)
+          }.bind(this))
         })
 
         it('throws an error about unexpected input if include contains a non-object', function() {
@@ -518,6 +511,43 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             done()
           }.bind(this))
         })
+
+        it('returns the private and public ip', function(done) {
+          var Domain      = this.sequelize.define('Domain', { ip: Sequelize.STRING })
+          var Environment = this.sequelize.define('Environment', { name: Sequelize.STRING })
+
+          Environment
+            .belongsTo(Domain, { as: 'PrivateDomain', foreignKey: 'privateDomainId' })
+            .belongsTo(Domain, { as: 'PublicDomain', foreignKey: 'publicDomainId' })
+
+          this.sequelize.sync({ force: true }).complete(function() {
+            Domain.create({ ip: '192.168.0.1' }).success(function(privateIp) {
+              Domain.create({ ip: '91.65.189.19' }).success(function(publicIp) {
+                Environment.create({ name: 'environment' }).success(function(env) {
+                  env.setPrivateDomain(privateIp).success(function() {
+                    env.setPublicDomain(publicIp).success(function() {
+                      Environment.find({
+                        where:   { name: 'environment' },
+                        include: [
+                          { daoFactory: Domain, as: 'PrivateDomain' },
+                          { daoFactory: 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()
+                      })
+                    })
+                  })
+                })
+              })
+            })
+          })
+        })
       })
 
       describe('hasOne', function() {

From f72fefe8240ffb11be7fa3305b7e4957557e1a52 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 07:09:33 +0100
Subject: [PATCH 139/360] run travis run

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27c775b3864f..dcc67ecfce1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,5 @@ env:
 language: node_js
 
 node_js:
-  # - 0.6
   - 0.8
-  # - 0.9
 

From 8c0693cd702a8248ea3c36997d479e4198065be1 Mon Sep 17 00:00:00 2001
From: Konstantinos Vaggelakos 
Date: Wed, 27 Feb 2013 08:00:29 +0100
Subject: [PATCH 140/360] Added support for raw queries to handle parameters

---
 lib/sequelize.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index b7b355925025..845394c10c09 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -133,7 +133,10 @@ module.exports = (function() {
   }
 
   Sequelize.prototype.query = function(sql, callee, options) {
-    if (arguments.length === 3) {
+    if (arguments.length === 4) {
+      values.unshift(sql)
+      sql = Utils.format(values)
+    } else if (arguments.length === 3) {
       options = options
     } else if (arguments.length === 2) {
       options = {}

From b62c925f17d7c8042b7e869599194765ea0b81e6 Mon Sep 17 00:00:00 2001
From: Konstantinos Vaggelakos 
Date: Wed, 27 Feb 2013 08:57:08 +0100
Subject: [PATCH 141/360] Added parsing of dot noted results using dottie lib

---
 lib/dialects/abstract/query.js |  3 ++-
 package.json                   |  3 ++-
 spec/sequelize.spec.js         | 20 +++++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index b1a48dff7a0d..d7525e15db0a 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -1,5 +1,6 @@
 var Utils              = require('../../utils')
   , CustomEventEmitter = require("../../emitters/custom-event-emitter")
+  , Dot                = require('dottie')
 
 module.exports = (function() {
   var AbstractQuery = function(database, sequelize, callee, options) {}
@@ -230,7 +231,7 @@ module.exports = (function() {
     var result = null, self = this;
 
     if (this.options.raw) {
-      result = results
+      result = results.map(Dot.transform)
     } else if (this.options.hasJoin === true) {
       result = prepareJoinData.call(this, results)
       result = groupDataByCalleeFactory.call(this, result).map(function(result) {
diff --git a/package.json b/package.json
index ed48789059a6..72248d6a861e 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "validator": "0.4.x",
     "moment": "~1.7.0",
     "commander": "~0.6.0",
-    "generic-pool": "1.0.9"
+    "generic-pool": "1.0.9",
+	"dottie": "0.0.6-1"
   },
   "devDependencies": {
     "jasmine-node": "1.0.17",
diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js
index c7a88686e6fb..abe995409ce3 100644
--- a/spec/sequelize.spec.js
+++ b/spec/sequelize.spec.js
@@ -6,8 +6,10 @@ if(typeof require === 'function') {
 }
 
 var qq = function(str) {
-  if (dialect == 'postgres') {
+  if (dialect == 'postgres' || dialect == 'sqlite') {
     return '"' + str + '"'
+  } else if (dialect == 'mysql') {
+    return '`' + str + '`'
   } else {
     return str
   }
@@ -91,6 +93,22 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
       }.bind(this))
     })
 
+    it('executes select query and parses dot notation results', function(done) {
+      this.sequelize.query(this.insertQuery).success(function() {
+        this.sequelize
+          .query("select username as " + qq("user.username") + " from " + qq(this.User.tableName) + "")          
+          .success(function(users) {
+            expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}])
+            done()
+          })
+          .error(function(err) {
+            console.log(err)
+            expect(err).not.toBeDefined()
+            done()
+          })
+      }.bind(this))
+    })
+
     if (dialect == 'mysql')
      it('executes stored procedures', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {

From 7412958b2d35d19fed4494a9ef9e27aaceda1d32 Mon Sep 17 00:00:00 2001
From: Konstantinos Vaggelakos 
Date: Wed, 27 Feb 2013 14:38:10 +0100
Subject: [PATCH 142/360] Updated the tests to use complete()

---
 spec/sequelize.spec.js | 48 ++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js
index abe995409ce3..e8920a2656e7 100644
--- a/spec/sequelize.spec.js
+++ b/spec/sequelize.spec.js
@@ -54,58 +54,56 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
     })
 
     it('executes a query the internal way', function(done) {
-      this.sequelize.query(this.insertQuery, null, { raw: true }).success(function(result) {
+      this.sequelize.query(this.insertQuery, null, { raw: true })
+      .complete(function(err, result) {
+        if (err) {
+          console.log(err)
+        }
+        expect(err).toBeNull()
         expect(result).toBeNull()
         done()
       })
-      .error(function(err) {
-        console.log(err)
-        expect(err).not.toBeDefined()
-        done()
-      })
     })
 
     it('executes a query if only the sql is passed', function(done) {
-      this.sequelize.query(this.insertQuery).success(function(result) {
+      this.sequelize.query(this.insertQuery)
+      .complete(function(err, result) {
+        if (err) {
+          console.log(err)
+        }
+        expect(err).toBeNull()
         expect(result).not.toBeDefined()
         done()
       })
-      .error(function(err) {
-        console.log(err)
-        expect(err).not.toBeDefined()
-        done()
-      })
     })
 
     it('executes select queries correctly', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize
           .query("select * from " + qq(this.User.tableName) + "")
-          .success(function(users) {
+          .complete(function(err, users) {
+            if (err) {
+              console.log(err)
+            }
+            expect(err).toBeNull()
             expect(users.map(function(u){ return u.username })).toEqual(['john'])
             done()
           })
-          .error(function(err) {
-            console.log(err)
-            expect(err).not.toBeDefined()
-            done()
-          })
       }.bind(this))
     })
 
     it('executes select query and parses dot notation results', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize
-          .query("select username as " + qq("user.username") + " from " + qq(this.User.tableName) + "")          
-          .success(function(users) {
+          .query("select username as " + qq("user.username") + " from " + qq(this.User.tableName) + "")
+          .complete(function(err, users) {
+            if (err) {
+              console.log(err)
+            }
+            expect(err).toBeNull()
             expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}])
             done()
           })
-          .error(function(err) {
-            console.log(err)
-            expect(err).not.toBeDefined()
-            done()
-          })
       }.bind(this))
     })
 

From 7ef6a12d4b46cd12e6625600f532b88a686d870f Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 21:27:55 +0100
Subject: [PATCH 143/360] dramatically reduced the lookup time of the
 daoFactory

---
 lib/dialects/abstract/query.js | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index b1a48dff7a0d..c21abfb97050 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -141,29 +141,21 @@ module.exports = (function() {
    * @return {String}           The found tableName / alias.
    */
   var findTableNameInAttribute = function(attribute) {
-    var tableName = null
-
-    this.sequelize.daoFactoryManager.daos.forEach(function(daoFactory) {
-      if (!!tableName) {
-        return
-      } else if (attribute.indexOf(daoFactory.tableName + ".") === 0) {
-        tableName = daoFactory.tableName
-      } else if (attribute.indexOf(Utils.singularize(daoFactory.tableName) + ".") === 0) {
-        tableName = Utils.singularize(daoFactory.tableName)
-      } else {
-        for (var associationName in daoFactory.associations) {
-          if (daoFactory.associations.hasOwnProperty(associationName)) {
-            var association = daoFactory.associations[associationName]
+    if (!this.options.include) {
+      return null
+    }
 
-            if (attribute.indexOf(association.options.as + ".") === 0) {
-              tableName = association.options.as
-            }
-          }
-        }
-      }
+    var tableNames = this.options.include.map(function(include) {
+      return include.as
+    }).filter(function(include) {
+      return attribute.indexOf(include + '.') === 0
     })
 
-    return tableName
+    if (tableNames.length === 1) {
+      return tableNames[0]
+    } else {
+      return null
+    }
   }
 
   var queryResultHasJoin = function(results) {
@@ -251,7 +243,7 @@ module.exports = (function() {
         return this.callee.build(result, { isNewRecord: false })
       }.bind(this))
     }
-    
+
     // return the first real model instance if options.plain is set (e.g. Model.find)
     if (this.options.plain) {
       result = (result.length === 0) ? null : result[0]

From 582de025ee517b57738daa8c593c34db1e6e5508 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 22:03:13 +0100
Subject: [PATCH 144/360] parsing of raw queries

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 35cd7ee37ddc..09c165409a47 100644
--- a/changelog.md
+++ b/changelog.md
@@ -33,6 +33,7 @@
 - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
 - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)
 - [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
+- [FEATURE] results of raw queries are parsed with dottie. (thanks to kozze89)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From 9ed515692b05c30d5cede0eb85c97539cf487413 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 22:08:40 +0100
Subject: [PATCH 145/360] array support

---
 changelog.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 09c165409a47..2be7f0043470 100644
--- a/changelog.md
+++ b/changelog.md
@@ -33,7 +33,8 @@
 - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
 - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)
 - [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
-- [FEATURE] results of raw queries are parsed with dottie. (thanks to kozze89)
+- [FEATURE] results of raw queries are parsed with dottie. #468 (thanks to kozze89)
+- [FEATURE] support for array serialization. pg only. #443 (thanks to clkao)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From 437e40593bfdc924c2ca79d56cbf43445c059622 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 22:18:26 +0100
Subject: [PATCH 146/360] deleted sqlite db

---
 spec-jasmine/sqlite/test.sqlite | Bin 4096 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 spec-jasmine/sqlite/test.sqlite

diff --git a/spec-jasmine/sqlite/test.sqlite b/spec-jasmine/sqlite/test.sqlite
deleted file mode 100644
index 673a4ac4e790a394cdd19fa599d002e76ec3dcf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmeH|K}*9h6vvaM>Opqy!OO$b#@w(QQ*jro1}$!N)=u1Mty`P}-P~I7?kDlfh*v*?
zc=H2z_oY_QQo)0WU;=59|9egPeo6Wc4;sTr!0C8;5kycWI-!(o01%Rk2*DvC468=S
z+#|LW>wEdwf7eni&QW@T9IF$mJrnJj)wRWxiyHoM0=Rki#=-)<=|;iHxoC-LI39&b
zqi?y~@;G?bW`l#Ds6OQVQE(xAII`TWUCYf^YPG@=_-8@b4X=ZN51#FGY{$!+QXckw
zzyaUkF0@>`X}KNP;~lWt-oEYN5>4)S=+~QyAQF8m@?jfS_3S1GXWs*--Dsfs>azc(
zxzN&Pjbf2@;vmAwIiC7%C?;28)Dx+p_9>{8F)ssK!Z!=JZ+C`a(3@U7XFEhP@goH#
z)+CZ(fJBlw@pCf?oeakahabyue*;TSo<6+g>?OYEfBY<}&r<{xfuA5SPv3r3$y_p*
z%UrLDBA^KTBLXu2>uiIt2X@OYv7?G2pa^`MKv|!YxwBfGsVtk-(sHF_u7bI;UNP5e
eYZ+3RCH{JbF+(bAi9gFQW=Lh4_-h%)4Cxj2&BX%%


From 2d5e69d8dd81f3e82a3c4fd17605bea4d6f0152c Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Feb 2013 22:19:31 +0100
Subject: [PATCH 147/360] added issue number

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index d468a67495c3..8cc3534afc2e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -35,7 +35,7 @@
 - [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
 - [FEATURE] results of raw queries are parsed with dottie. #468 (thanks to kozze89)
 - [FEATURE] support for array serialization. pg only. #443 (thanks to clkao)
-- [FEATURE] add increment and decrement methods on dao (thanks to janmeier/innofluence)
+- [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From e893107e3e14f6ea73330ad3b5e7da25f1eb32e3 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Fri, 1 Mar 2013 19:05:12 +0100
Subject: [PATCH 148/360] moved query-interface specs to buster

---
 lib/dialects/mysql/query-generator.js  |  2 +-
 lib/dialects/sqlite/query-generator.js | 21 ++++++
 lib/dialects/sqlite/query.js           |  7 +-
 lib/query-interface.js                 |  2 +
 package.json                           |  2 +-
 spec-jasmine/query-interface.spec.js   | 99 --------------------------
 spec/query-interface.spec.js           | 95 ++++++++++++++++++++++++
 7 files changed, 126 insertions(+), 102 deletions(-)
 delete mode 100644 spec-jasmine/query-interface.spec.js
 create mode 100644 spec/query-interface.spec.js

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 3f2e42e39a0e..05d09813dbd2 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -252,7 +252,7 @@ module.exports = (function() {
         where: QueryGenerator.getWhereConditions(where)
       }
 
-      return Utils._.template(query)(replacements)      
+      return Utils._.template(query)(replacements)
     },
 
     addIndexQuery: function(tableName, attributes, options) {
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 156ff8676c1c..d45caec4456c 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -208,6 +208,27 @@ module.exports = (function() {
       }
 
       return hashToWhereConditions(hash).replace(/\\'/g, "''");
+    },
+
+    showIndexQuery: function(tableName) {
+      var sql = "PRAGMA INDEX_LIST('<%= tableName %>')"
+      return Utils._.template(sql, { tableName: tableName })
+    },
+
+    removeIndexQuery: function(tableName, indexNameOrAttributes) {
+      var sql       = "DROP INDEX <%= indexName %>"
+        , indexName = indexNameOrAttributes
+
+      if (typeof indexName !== 'string') {
+        indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
+      }
+
+      return Utils._.template(sql, { tableName: tableName, indexName: indexName })
+    },
+
+    describeTableQuery: function(tableName) {
+      var sql = "PRAGMA TABLE_INFO('<%= tableName %>')"
+      return Utils._.template(sql, { tableName: tableName })
     }
   }
 
diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js
index 071c232e0e2c..3152c65f5aa0 100644
--- a/lib/dialects/sqlite/query.js
+++ b/lib/dialects/sqlite/query.js
@@ -76,7 +76,6 @@ module.exports = (function() {
 
   var onSuccess = function(results, metaData) {
     var result = this.callee
-      , self   = this
 
     // add the inserted row id to the instance
     if (this.send('isInsertQuery', results, metaData)) {
@@ -102,6 +101,12 @@ module.exports = (function() {
       result = this.send('handleSelectQuery', results)
     } else if (this.send('isShowOrDescribeQuery')) {
       result = results
+    } else if (this.sql.indexOf('PRAGMA INDEX_LIST') !== -1) {
+      // this is the sqlite way of getting the indexes of a table
+      result = results.map(function(result) { return { Key_name: result.name } })
+    } else if (this.sql.indexOf('PRAGMA TABLE_INFO') !== -1) {
+      // this is the sqlite way of getting the metadata of a table
+      console.log(results)
     }
 
     this.emit('success', result)
diff --git a/lib/query-interface.js b/lib/query-interface.js
index e936df0f28b6..c77f980e3847 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -83,11 +83,13 @@ module.exports = (function() {
 
     return new Utils.CustomEventEmitter(function(emitter) {
       var sql;
+
       if (self.QueryGenerator.describeTableQuery) {
         sql = self.QueryGenerator.describeTableQuery(tableName)
       } else {
         sql = 'DESCRIBE `' + tableName + '`;'
       }
+
       self.sequelize.query(sql, null, { raw: true }).success(function(data) {
         emitter.emit('success', data)
       }).error(function(err) {
diff --git a/package.json b/package.json
index e298af91f12e..826e046a9a47 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "moment": "~1.7.0",
     "commander": "~0.6.0",
     "generic-pool": "1.0.9",
-	"dottie": "0.0.6-1"
+    "dottie": "0.0.6-1"
   },
   "devDependencies": {
     "jasmine-node": "1.0.17",
diff --git a/spec-jasmine/query-interface.spec.js b/spec-jasmine/query-interface.spec.js
deleted file mode 100644
index 4039cc0f4026..000000000000
--- a/spec-jasmine/query-interface.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-var config         = require("./config/config")
-  , Sequelize      = require("../index")
-  , sequelize      = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false })
-  , Helpers        = new (require("./config/helpers"))(sequelize)
-  , QueryInterface = require("../lib/query-interface")
-
-describe('QueryInterface', function() {
-  var interface = null
-
-  beforeEach(function() {
-    interface = sequelize.getQueryInterface()
-    Helpers.dropAllTables()
-  })
-
-  afterEach(function() {
-    interface = null
-    Helpers.dropAllTables()
-  })
-
-  describe('dropAllTables', function() {
-    it("should drop all tables", function() {
-      Helpers.async(function(done) {
-        interface.dropAllTables().success(done).error(function(err) { console.log(err) })
-      })
-
-      Helpers.async(function(done) {
-        interface.showAllTables().success(function(tableNames) {
-          expect(tableNames.length).toEqual(0)
-          done()
-        })
-      })
-
-      Helpers.async(function(done) {
-        interface.createTable('table', { name: Sequelize.STRING })
-          .success(done)
-          .error(function(err){ console.log(err)})
-      })
-
-      Helpers.async(function(done) {
-        interface.showAllTables().success(function(tableNames) {
-          expect(tableNames.length).toEqual(1)
-          done()
-        })
-      })
-
-      Helpers.async(function(done) {
-        interface.dropAllTables().success(done).error(function(err) { console.log(err) })
-      })
-
-      Helpers.async(function(done) {
-        interface.showAllTables().success(function(tableNames) {
-          expect(tableNames.length).toEqual(0)
-          done()
-        })
-      })
-    })
-  })
-
-  describe('indexes', function() {
-    beforeEach(function(){
-      Helpers.async(function(done) {
-        interface.createTable('User', {
-          username: Sequelize.STRING,
-          isAdmin: Sequelize.BOOLEAN
-        }).success(done)
-      })
-    })
-
-    it('adds, reads and removes an index to the table', function() {
-      Helpers.async(function(done) {
-        interface.addIndex('User', ['username', 'isAdmin']).success(done).error(function(err) {
-          console.log(err)
-        })
-      })
-
-      Helpers.async(function(done) {
-        interface.showIndex('User').success(function(indexes) {
-          var indexColumns = indexes.map(function(index) { return index.Column_name }).sort()
-          expect(indexColumns).toEqual(['isAdmin', 'username'])
-          done()
-        }).error(function(err) { console.log(err) })
-      })
-
-      Helpers.async(function(done) {
-        interface.removeIndex('User', ['username', 'isAdmin']).success(done).error(function(err) {
-          console.log(err)
-        })
-      })
-
-      Helpers.async(function(done) {
-        interface.showIndex('User').success(function(indexes) {
-          var indexColumns = indexes.map(function(index) { return index.Column_name }).sort()
-          expect(indexColumns).toEqual([])
-          done()
-        }).error(function(err) { console.log(err) })
-      })
-    })
-  })
-})
diff --git a/spec/query-interface.spec.js b/spec/query-interface.spec.js
new file mode 100644
index 000000000000..9e4293eede7b
--- /dev/null
+++ b/spec/query-interface.spec.js
@@ -0,0 +1,95 @@
+if(typeof require === 'function') {
+  const buster             = require("buster")
+      , CustomEventEmitter = require("../lib/emitters/custom-event-emitter")
+      , Helpers            = require('./buster-helpers')
+      , dialect            = Helpers.getTestDialect()
+}
+
+buster.spec.expose()
+buster.testRunner.timeout = 1000
+
+describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
+  before(function(done) {
+    Helpers.initTests({
+      dialect: dialect,
+      beforeComplete: function(sequelize) {
+        this.sequelize = sequelize
+      }.bind(this),
+      onComplete: function() {
+        this.interface = this.sequelize.getQueryInterface()
+        done()
+      }.bind(this)
+    })
+  })
+
+  describe('dropAllTables', function() {
+    it("should drop all tables", function(done) {
+      this.interface.dropAllTables().complete(function(err) {
+        expect(err).toBeNull()
+
+        this.interface.showAllTables().complete(function(err, tableNames) {
+          expect(err).toBeNull()
+          expect(tableNames.length).toEqual(0)
+
+          this.interface.createTable('table', { name: Helpers.Sequelize.STRING }).complete(function(err) {
+            expect(err).toBeNull()
+
+            this.interface.showAllTables().complete(function(err, tableNames) {
+              expect(err).toBeNull()
+              expect(tableNames.length).toEqual(1)
+
+              this.interface.dropAllTables().complete(function(err) {
+                expect(err).toBeNull()
+
+                this.interface.showAllTables().complete(function(err, tableNames) {
+                  expect(err).toBeNull()
+                  expect(tableNames.length).toEqual(0)
+                  done()
+                })
+              }.bind(this))
+            }.bind(this))
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+  })
+
+  describe('=>indexes', function() {
+    before(function(done) {
+      this.interface.createTable('User', {
+        username: Helpers.Sequelize.STRING,
+        isAdmin: Helpers.Sequelize.BOOLEAN
+      }).success(done)
+    })
+
+    it('adds, reads and removes an index to the table', function(done) {
+      this.interface.addIndex('User', ['username', 'isAdmin']).complete(function(err) {
+        expect(err).toBeNull()
+
+        this.interface.showIndex('User').complete(function(err, indexes) {
+          expect(err).toBeNull()
+
+          var indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.Key_name }))
+          expect(indexColumns).toEqual(['user_username_is_admin'])
+
+          this.interface.removeIndex('User', ['username', 'isAdmin']).complete(function(err) {
+            expect(err).toBeNull()
+
+            this.interface.showIndex('User').complete(function(err, indexes) {
+              expect(err).toBeNull()
+
+              indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.Key_name }))
+              expect(indexColumns).toEqual([])
+
+              done()
+            })
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+  })
+
+  describe('describeTable', function() {
+
+  })
+})

From 27c447c011ad5c032771e94bcd7f7467557d80af Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Fri, 1 Mar 2013 20:43:13 +0100
Subject: [PATCH 149/360] unified metadata receival

---
 lib/dialects/abstract/query.js | 21 ++++++++++++++++++++
 lib/dialects/postgres/query.js | 27 ++++++++++++++++++++++++--
 lib/dialects/sqlite/query.js   | 17 +++++++++++++++--
 lib/query-interface.js         |  9 +++++----
 spec/migrator.spec.js          | 35 +++++++++++++++++-----------------
 spec/query-interface.spec.js   | 32 ++++++++++++++++++++++++++++---
 6 files changed, 112 insertions(+), 29 deletions(-)

diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index e1b509703d07..d8c6273110e2 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -70,6 +70,27 @@ module.exports = (function() {
       result = handleShowTableQuery.call(this, data)
     } else if (isShowOrDescribeQuery.call(this)) {
       result = data
+
+      if (this.sql.toLowerCase().indexOf('describe') === 0) {
+        result = result.map(function(result) {
+          return {
+            attribute:    result.Field,
+            type:         result.Type.toUpperCase(),
+            allowNull:    (result.Null === 'YES'),
+            defaultValue: result.Default
+          }
+        })
+      } else if (this.sql.toLowerCase().indexOf('show index from') === 0) {
+        result = Utils._.uniq(result.map(function(result) {
+          return {
+            name:       result.Key_name,
+            tableName:  result.Table,
+            unique:     (result.Non_unique !== 1)
+          }
+        }), false, function(row) {
+          return row.name
+        })
+      }
     } else if (isCallQuery.call(this)) {
       result = data[0]
     }
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index eb030c0f5d8f..5462e11e7b68 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -59,11 +59,34 @@ module.exports = (function() {
       , isRelNameQuery   = (this.sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0)
 
     if (isTableNameQuery || isRelNameQuery) {
-      return this.emit('success', rows.map(function(row) { return Utils._.values(row) }))
+      if (isRelNameQuery) {
+        results = rows.map(function(row) {
+          return {
+            name:       row.relname,
+            tableName:  row.relname.split('_')[0]
+          }
+        })
+      } else {
+         results = rows.map(function(row) { return Utils._.values(row) })
+      }
+      return this.emit('success', results)
     }
 
     if (this.send('isSelectQuery')) {
-      this.emit('success', this.send('handleSelectQuery', rows))
+      if (this.sql.toLowerCase().indexOf('select column_name') === 0) {
+        rows = rows.map(function(result) {
+          return {
+            attribute:    result.Field,
+            type:         result.Type.toUpperCase(),
+            allowNull:    (result.Null === 'YES'),
+            defaultValue: result.Default
+          }
+        })
+
+        this.emit('success', rows)
+      } else {
+        this.emit('success', this.send('handleSelectQuery', rows))
+      }
     } else if (this.send('isShowOrDescribeQuery')) {
       this.emit('success', results)
     } else if (this.send('isInsertQuery')) {
diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js
index 3152c65f5aa0..262dbcff5f9d 100644
--- a/lib/dialects/sqlite/query.js
+++ b/lib/dialects/sqlite/query.js
@@ -103,10 +103,23 @@ module.exports = (function() {
       result = results
     } else if (this.sql.indexOf('PRAGMA INDEX_LIST') !== -1) {
       // this is the sqlite way of getting the indexes of a table
-      result = results.map(function(result) { return { Key_name: result.name } })
+      result = results.map(function(result) {
+        return {
+          name:       result.name,
+          tableName:  result.name.split('_')[0],
+          unique:     (result.unique === 0)
+        }
+      })
     } else if (this.sql.indexOf('PRAGMA TABLE_INFO') !== -1) {
       // this is the sqlite way of getting the metadata of a table
-      console.log(results)
+      result = results.map(function(result) {
+        return {
+          attribute:    result.name,
+          type:         result.type,
+          allowNull:    (result.notnull === 0),
+          defaultValue: result.dflt_value
+        }
+      })
     }
 
     this.emit('success', result)
diff --git a/lib/query-interface.js b/lib/query-interface.js
index c77f980e3847..d1b62b9a4bb2 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -138,14 +138,15 @@ module.exports = (function() {
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.Field == attrNameBefore })[0] || {}
+        data = data.filter(function(h) { return h.attribute == attrNameBefore })[0] || {}
 
         var options =  {}
 
         options[attrNameAfter] = {
-          type: data.Type,
-          allowNull: data.Null == 'YES',
-          defaultValue: data.Default
+          attribute: data.attribute,
+          type: data.type,
+          allowNull: data.allowNull,
+          defaultValue: data.defaultValue
         }
 
         var sql = self.QueryGenerator.renameColumnQuery(tableName,
diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js
index 6c4098501d78..6d7c9b0c0d1b 100644
--- a/spec/migrator.spec.js
+++ b/spec/migrator.spec.js
@@ -121,9 +121,9 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         })
       })
 
-      ;(dialect === 'sqlite' ? itEventually : it)("executes migration #20111117063700 and correctly adds isBetaMember", function(done) {
+      it("executes migration #20111117063700 and correctly adds isBetaMember", function(done) {
         this.sequelize.getQueryInterface().describeTable('Person').success(function(data) {
-          var fields = data.map(function(d) { return d.Field }).sort()
+          var fields = data.map(function(d) { return d.attribute }).sort()
           expect(fields).toEqual([ 'isBetaMember', 'name' ])
           done()
         })
@@ -190,7 +190,6 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         this.init({ from: 20111117063700, to: 20111205162700 }, function(migrator) {
           migrator.migrate().success(function() {
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              console.log(data)
               var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0]
                 , isAdmin   = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0]
                 , shopId    = data.filter(function(hash){ return hash.Field == 'shopId' })[0]
@@ -217,16 +216,16 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         this.init({ to: 20111206061400 }, function(migrator) {
           migrator.migrate().success(function(){
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0]
-                , isAdmin   = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0]
-                , shopId    = data.filter(function(hash){ return hash.Field == 'shopId' })[0]
+              var signature = data.filter(function(hash){ return hash.attribute == 'signature' })[0]
+                , isAdmin   = data.filter(function(hash){ return hash.attribute == 'isAdmin' })[0]
+                , shopId    = data.filter(function(hash){ return hash.attribute == 'shopId' })[0]
 
-              expect(signature.Field).toEqual('signature')
-              expect(signature.Null).toEqual('NO')
+              expect(signature.attribute).toEqual('signature')
+              expect(signature.allowNull).toEqual(false)
 
-              expect(isAdmin.Field).toEqual('isAdmin')
-              expect(isAdmin.Null).toEqual('NO')
-              expect(isAdmin.Default).toEqual('0')
+              expect(isAdmin.attribute).toEqual('isAdmin')
+              expect(isAdmin.allowNull).toEqual(false)
+              expect(isAdmin.defaultValue).toEqual('0')
 
               expect(shopId).toBeFalsy()
 
@@ -242,12 +241,12 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         this.init({ to: 20111206063000 }, function(migrator) {
           migrator.migrate().success(function() {
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0]
+              var signature = data.filter(function(hash){ return hash.attribute == 'signature' })[0]
 
-              expect(signature.Field).toEqual('signature')
-              expect(signature.Type).toEqual('varchar(255)')
-              expect(signature.Null).toEqual('NO')
-              expect(signature.Default).toEqual('Signature')
+              expect(signature.attribute).toEqual('signature')
+              expect(signature.type).toEqual('VARCHAR(255)')
+              expect(signature.allowNull).toEqual(false)
+              expect(signature.defaultValue).toEqual('Signature')
 
               done()
             })
@@ -262,8 +261,8 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
       this.init({ to: 20111206163300 }, function(migrator) {
         migrator.migrate().success(function(){
           this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-            var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0]
-              , sig       = data.filter(function(hash){ return hash.Field == 'sig' })[0]
+            var signature = data.filter(function(hash){ return hash.attribute === 'signature' })[0]
+              , sig       = data.filter(function(hash){ return hash.attribute === 'sig' })[0]
 
             expect(signature).toBeFalsy()
             expect(sig).toBeTruthy()
diff --git a/spec/query-interface.spec.js b/spec/query-interface.spec.js
index 9e4293eede7b..d5570aea3969 100644
--- a/spec/query-interface.spec.js
+++ b/spec/query-interface.spec.js
@@ -54,7 +54,7 @@ describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
     })
   })
 
-  describe('=>indexes', function() {
+  describe('indexes', function() {
     before(function(done) {
       this.interface.createTable('User', {
         username: Helpers.Sequelize.STRING,
@@ -69,7 +69,7 @@ describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
         this.interface.showIndex('User').complete(function(err, indexes) {
           expect(err).toBeNull()
 
-          var indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.Key_name }))
+          var indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.name }))
           expect(indexColumns).toEqual(['user_username_is_admin'])
 
           this.interface.removeIndex('User', ['username', 'isAdmin']).complete(function(err) {
@@ -78,7 +78,7 @@ describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
             this.interface.showIndex('User').complete(function(err, indexes) {
               expect(err).toBeNull()
 
-              indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.Key_name }))
+              indexColumns = Helpers.Sequelize.Utils._.uniq(indexes.map(function(index) { return index.name }))
               expect(indexColumns).toEqual([])
 
               done()
@@ -90,6 +90,32 @@ describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
   })
 
   describe('describeTable', function() {
+    before(function(done) {
+      this.interface.createTable('User', {
+        username: Helpers.Sequelize.STRING,
+        isAdmin: Helpers.Sequelize.BOOLEAN
+      }).success(done)
+    })
 
+    it('reads the metadata of the table', function(done) {
+      this.interface.describeTable('User').complete(function(err, metadata) {
+        expect(err).toBeNull()
+
+        var username = metadata.filter(function(m) { return m.attribute === 'username' })[0]
+        var isAdmin  = metadata.filter(function(m) { return m.attribute === 'isAdmin' })[0]
+
+        expect(username.attribute).toEqual('username')
+        expect(username.type).toEqual(dialect === 'postgres' ? 'CHARACTER VARYING' : 'VARCHAR(255)')
+        expect(username.allowNull).toBeTrue()
+        expect(username.defaultValue).toBeNull()
+
+        expect(isAdmin.attribute).toEqual('isAdmin')
+        expect(isAdmin.type).toEqual(dialect === 'postgres' ? 'BOOLEAN' : 'TINYINT(1)')
+        expect(isAdmin.allowNull).toBeTrue()
+        expect(isAdmin.defaultValue).toBeNull()
+
+        done()
+      })
+    })
   })
 })

From b3ff055bb8c305f481b4efb2c8bdf21fd2364e25 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 07:40:47 +0100
Subject: [PATCH 150/360] travis ...

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bc6b96c4e098..dcc67ecfce1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,4 @@ language: node_js
 
 node_js:
   - 0.8
+

From c541ddc98b05e791f4a90e331e0faa8eca897942 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 07:48:36 +0100
Subject: [PATCH 151/360] renameTable is working for sqlite

---
 lib/dialects/sqlite/query-generator.js | 5 +++++
 spec/migrator.spec.js                  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index d45caec4456c..ecfc7db23784 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -229,6 +229,11 @@ module.exports = (function() {
     describeTableQuery: function(tableName) {
       var sql = "PRAGMA TABLE_INFO('<%= tableName %>')"
       return Utils._.template(sql, { tableName: tableName })
+    },
+
+    renameTableQuery: function(before, after) {
+      var query = "ALTER TABLE `<%= before %>` RENAME TO `<%= after %>`;"
+      return Utils._.template(query, { before: before, after: after })
     }
   }
 
diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js
index 6d7c9b0c0d1b..5c9f3e09d9fb 100644
--- a/spec/migrator.spec.js
+++ b/spec/migrator.spec.js
@@ -167,7 +167,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         }.bind(this))
       })
 
-      ;(dialect === 'sqlite' ? itEventually : it)("executes migration #20111205064000 and renames a table", function(done) {
+      it("executes migration #20111205064000 and renames a table", function(done) {
         this.sequelize.getQueryInterface().showAllTables().success(function(tableNames) {
           tableNames = tableNames.filter(function(e){ return e != 'SequelizeMeta' })
           expect(tableNames).toEqual([ 'Person' ])

From c8d4966261dcc5a621885625bc7fcd53e588ef4e Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 18:20:30 +0100
Subject: [PATCH 152/360] removeColum is working for sqlite + describeTable was
 unified

---
 lib/dialects/abstract/query.js         | 13 +++--
 lib/dialects/postgres/query.js         | 23 +++++---
 lib/dialects/sqlite/query-generator.js | 37 +++++++++++--
 lib/dialects/sqlite/query.js           | 23 +++++---
 lib/query-interface.js                 | 77 +++++++++++++++++++-------
 spec/migrator.spec.js                  | 30 +++++-----
 spec/query-interface.spec.js           |  6 +-
 7 files changed, 144 insertions(+), 65 deletions(-)

diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index d8c6273110e2..39d12516058e 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -72,12 +72,13 @@ module.exports = (function() {
       result = data
 
       if (this.sql.toLowerCase().indexOf('describe') === 0) {
-        result = result.map(function(result) {
-          return {
-            attribute:    result.Field,
-            type:         result.Type.toUpperCase(),
-            allowNull:    (result.Null === 'YES'),
-            defaultValue: result.Default
+        result = {}
+
+        data.forEach(function(_result) {
+          result[_result.Field] = {
+            type:         _result.Type.toUpperCase(),
+            allowNull:    (_result.Null === 'YES'),
+            defaultValue: _result.Default
           }
         })
       } else if (this.sql.toLowerCase().indexOf('show index from') === 0) {
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 5462e11e7b68..637d955c16dd 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -74,16 +74,25 @@ module.exports = (function() {
 
     if (this.send('isSelectQuery')) {
       if (this.sql.toLowerCase().indexOf('select column_name') === 0) {
-        rows = rows.map(function(result) {
-          return {
-            attribute:    result.Field,
-            type:         result.Type.toUpperCase(),
-            allowNull:    (result.Null === 'YES'),
-            defaultValue: result.Default
+        var result = {}
+
+        rows.forEach(function(_result) {
+          result[_result.Field] = {
+            type:         _result.Type.toUpperCase(),
+            allowNull:    (_result.Null === 'YES'),
+            defaultValue: _result.Default
+          }
+
+          if (result[_result.Field].type === 'BOOLEAN') {
+            result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue]
+
+            if (result[_result.Field].defaultValue === undefined) {
+              result[_result.Field].defaultValue = null
+            }
           }
         })
 
-        this.emit('success', rows)
+        this.emit('success', result)
       } else {
         this.emit('success', this.send('handleSelectQuery', rows))
       }
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index ecfc7db23784..bf292ec0a6fe 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -58,7 +58,13 @@ module.exports = (function() {
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
       }
 
-      return Utils._.template(query)(values).trim() + ";"
+      var sql = Utils._.template(query, values).trim() + ";"
+      return QueryGenerator.replaceBooleanDefaults(sql)
+    },
+
+    addColumnQuery: function() {
+      var sql = MySqlQueryGenerator.addColumnQuery.apply(null, arguments)
+      return QueryGenerator.replaceBooleanDefaults(sql)
     },
 
     showTablesQuery: function() {
@@ -145,7 +151,7 @@ module.exports = (function() {
             , replacements = { type: dataType.type }
 
           if (dataType.type === DataTypes.ENUM) {
-	          replacements.type = "INTEGER"
+            replacements.type = "INTEGER"
           }
 
           if (dataType.hasOwnProperty('allowNull') && !dataType.allowNull && !dataType.primaryKey) {
@@ -227,15 +233,38 @@ module.exports = (function() {
     },
 
     describeTableQuery: function(tableName) {
-      var sql = "PRAGMA TABLE_INFO('<%= tableName %>')"
+      var sql = "PRAGMA TABLE_INFO('<%= tableName %>');"
       return Utils._.template(sql, { tableName: tableName })
     },
 
     renameTableQuery: function(before, after) {
       var query = "ALTER TABLE `<%= before %>` RENAME TO `<%= after %>`;"
       return Utils._.template(query, { before: before, after: after })
+    },
+
+    removeColumnQuery: function(tableName, attributes) {
+      attributes = QueryGenerator.attributesToSQL(attributes)
+
+      var backupTableName = tableName + "_backup"
+      var query = [
+        QueryGenerator.createTableQuery(backupTableName, attributes).replace('CREATE TABLE', 'CREATE TEMPORARY TABLE'),
+        "INSERT INTO <%= tableName %>_backup SELECT <%= attributeNames %> FROM <%= tableName %>;",
+        "DROP TABLE <%= tableName %>;",
+        QueryGenerator.createTableQuery(tableName, attributes),
+        "INSERT INTO <%= tableName %> SELECT <%= attributeNames %> FROM <%= tableName %>_backup;",
+        "DROP TABLE <%= tableName %>_backup;",
+      ].join("")
+
+      return Utils._.template(query, {
+        tableName: tableName,
+        attributeNames: Utils._.keys(attributes)
+      })
+    },
+
+    replaceBooleanDefaults: function(sql) {
+      return sql.replace(/DEFAULT '?false'?/g, "DEFAULT 0").replace(/DEFAULT '?true'?/g, "DEFAULT 1")
     }
   }
 
-  return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
+  return Utils._.extend({}, MySqlQueryGenerator, QueryGenerator)
 })()
diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js
index 262dbcff5f9d..507490a7d532 100644
--- a/lib/dialects/sqlite/query.js
+++ b/lib/dialects/sqlite/query.js
@@ -67,7 +67,7 @@ module.exports = (function() {
   //private
 
   var getDatabaseMethod = function() {
-    if (this.send('isInsertQuery') || this.send('isUpdateQuery')) {
+    if (this.send('isInsertQuery') || this.send('isUpdateQuery') || (this.sql.toLowerCase().indexOf('CREATE TEMPORARY TABLE'.toLowerCase()) !== -1)) {
       return 'run'
     } else {
       return 'all'
@@ -112,12 +112,21 @@ module.exports = (function() {
       })
     } else if (this.sql.indexOf('PRAGMA TABLE_INFO') !== -1) {
       // this is the sqlite way of getting the metadata of a table
-      result = results.map(function(result) {
-        return {
-          attribute:    result.name,
-          type:         result.type,
-          allowNull:    (result.notnull === 0),
-          defaultValue: result.dflt_value
+      result = {}
+
+      results.forEach(function(_result) {
+        result[_result.name] = {
+          type:         _result.type,
+          allowNull:    (_result.notnull === 0),
+          defaultValue: _result.dflt_value
+        }
+
+        if (result[_result.name].type === 'TINYINT(1)') {
+          result[_result.name].defaultValue = { '0': false, '1': true }[result[_result.name].defaultValue]
+        }
+
+        if (result[_result.name].defaultValue === undefined) {
+          result[_result.name].defaultValue = null
         }
       })
     }
diff --git a/lib/query-interface.js b/lib/query-interface.js
index d1b62b9a4bb2..19677ceab9b5 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -3,9 +3,9 @@ var Utils     = require('./utils')
 
 module.exports = (function() {
   var QueryInterface = function(sequelize) {
-    this.sequelize = sequelize
-    this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
-   this.QueryGenerator.options = this.sequelize.options;
+    this.sequelize              = sequelize
+    this.QueryGenerator         = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+    this.QueryGenerator.options = this.sequelize.options;
   }
   Utils.addEventEmitter(QueryInterface)
 
@@ -102,7 +102,7 @@ module.exports = (function() {
     var attributes = {}
 
     if (Utils._.values(DataTypes).indexOf(dataTypeOrOptions) > -1) {
-      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: false }
+      attributes[attributeName] = { type: dataTypeOrOptions, allowNull: true }
     } else {
       attributes[attributeName] = dataTypeOrOptions
     }
@@ -114,8 +114,40 @@ module.exports = (function() {
   }
 
   QueryInterface.prototype.removeColumn = function(tableName, attributeName) {
-    var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
-    return queryAndEmit.call(this, sql, 'removeColumn')
+    if (this.sequelize.options.dialect === 'sqlite') {
+      // sqlite needs some special treatment as it cannot drop a column
+      return new Utils.CustomEventEmitter(function(emitter) {
+        this.describeTable(tableName).complete(function(err, fields) {
+          if (err) {
+            emitter.emit('error', err)
+          } else {
+            delete fields[attributeName]
+
+            var sql        = this.QueryGenerator.removeColumnQuery(tableName, fields)
+              , chainer    = new Utils.QueryChainer()
+              , subQueries = sql.split(';').filter(function(q) { return q !== '' })
+
+            subQueries.splice(0, subQueries.length - 1).forEach(function(subQuery) {
+              chainer.add(this.sequelize, 'query', [subQuery + ";", null, { raw: true }])
+            }.bind(this))
+
+            chainer
+              .runSerially()
+              .complete(function(err) {
+                if (err) {
+                  emitter.emit('removeColumn', err)
+                  emitter.emit('error', err)
+                } else {
+                  queryAndEmit.call(this, subQueries.splice(subQueries.length - 1)[0], 'removeColumn')
+                }
+              }.bind(this))
+          }
+        }.bind(this))
+      }.bind(this)).run()
+    } else {
+      var sql = this.QueryGenerator.removeColumnQuery(tableName, attributeName)
+      return queryAndEmit.call(this, sql, 'removeColumn')
+    }
   }
 
   QueryInterface.prototype.changeColumn = function(tableName, attributeName, dataTypeOrOptions) {
@@ -138,12 +170,12 @@ module.exports = (function() {
 
     return new Utils.CustomEventEmitter(function(emitter) {
       self.describeTable(tableName).success(function(data) {
-        data = data.filter(function(h) { return h.attribute == attrNameBefore })[0] || {}
+        data = data[attrNameBefore] || {}
 
         var options =  {}
 
         options[attrNameAfter] = {
-          attribute: data.attribute,
+          attribute: attrNameAfter,
           type: data.type,
           allowNull: data.allowNull,
           defaultValue: data.defaultValue
@@ -247,15 +279,13 @@ module.exports = (function() {
 
   // private
 
-  var queryAndEmit = function(sqlOrQueryParams, methodName, options) {
-    var self = this
-
+  var queryAndEmit = function(sqlOrQueryParams, methodName, options, emitter) {
     options = Utils._.extend({
       success: function(){},
       error: function(){}
     }, options || {})
 
-    return new Utils.CustomEventEmitter(function(emitter) {
+    var execQuery = function(emitter) {
       var query = null
 
       if (Array.isArray(sqlOrQueryParams)) {
@@ -267,9 +297,9 @@ module.exports = (function() {
           sqlOrQueryParams.push({})
         }
 
-        query = self.sequelize.query.apply(self.sequelize, sqlOrQueryParams)
+        query = this.sequelize.query.apply(this.sequelize, sqlOrQueryParams)
       } else {
-        query = self.sequelize.query(sqlOrQueryParams, null, {})
+        query = this.sequelize.query(sqlOrQueryParams, null, {})
       }
 
       // append the query for better testing
@@ -277,17 +307,24 @@ module.exports = (function() {
 
       query.success(function(obj) {
         options.success && options.success(obj)
-        self.emit(methodName, null)
+        this.emit(methodName, null)
         emitter.emit('success', obj)
-      }).error(function(err) {
+      }.bind(this)).error(function(err) {
         options.error && options.error(err)
-        self.emit(methodName, err)
+        this.emit(methodName, err)
         emitter.emit('error', err)
-      })
+      }.bind(this))
+
       query.on('sql', function(sql) {
         emitter.emit('sql', sql)
-      });
-    }).run()
+      })
+    }.bind(this)
+
+    if (!!emitter) {
+      execQuery(emitter)
+    } else {
+      return new Utils.CustomEventEmitter(execQuery).run()
+    }
   }
 
   return QueryInterface
diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js
index 5c9f3e09d9fb..24ff8e6cbcc3 100644
--- a/spec/migrator.spec.js
+++ b/spec/migrator.spec.js
@@ -123,7 +123,7 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
 
       it("executes migration #20111117063700 and correctly adds isBetaMember", function(done) {
         this.sequelize.getQueryInterface().describeTable('Person').success(function(data) {
-          var fields = data.map(function(d) { return d.attribute }).sort()
+          var fields = Helpers.Sequelize.Utils._.keys(data).sort()
           expect(fields).toEqual([ 'isBetaMember', 'name' ])
           done()
         })
@@ -190,9 +190,9 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         this.init({ from: 20111117063700, to: 20111205162700 }, function(migrator) {
           migrator.migrate().success(function() {
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              var signature = data.filter(function(hash){ return hash.Field == 'signature' })[0]
-                , isAdmin   = data.filter(function(hash){ return hash.Field == 'isAdmin' })[0]
-                , shopId    = data.filter(function(hash){ return hash.Field == 'shopId' })[0]
+              var signature = data.signature
+                , isAdmin   = data.isAdmin
+                , shopId    = data.shopId
 
               expect(signature.Field).toEqual('signature')
               expect(signature.Null).toEqual('NO')
@@ -212,20 +212,17 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
     })
 
     describe('removeColumn', function() {
-      (dialect === 'mysql' ? it : itEventually)('removes the shopId column from user', function(done) {
+      it('removes the shopId column from user', function(done) {
         this.init({ to: 20111206061400 }, function(migrator) {
           migrator.migrate().success(function(){
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              var signature = data.filter(function(hash){ return hash.attribute == 'signature' })[0]
-                , isAdmin   = data.filter(function(hash){ return hash.attribute == 'isAdmin' })[0]
-                , shopId    = data.filter(function(hash){ return hash.attribute == 'shopId' })[0]
+              var signature = data.signature
+                , isAdmin   = data.isAdmin
+                , shopId    = data.shopId
 
-              expect(signature.attribute).toEqual('signature')
-              expect(signature.allowNull).toEqual(false)
-
-              expect(isAdmin.attribute).toEqual('isAdmin')
+              expect(signature.allowNull).toEqual(true)
               expect(isAdmin.allowNull).toEqual(false)
-              expect(isAdmin.defaultValue).toEqual('0')
+              expect(isAdmin.defaultValue).toEqual(false)
 
               expect(shopId).toBeFalsy()
 
@@ -241,9 +238,8 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
         this.init({ to: 20111206063000 }, function(migrator) {
           migrator.migrate().success(function() {
             this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-              var signature = data.filter(function(hash){ return hash.attribute == 'signature' })[0]
+              var signature = data.signature
 
-              expect(signature.attribute).toEqual('signature')
               expect(signature.type).toEqual('VARCHAR(255)')
               expect(signature.allowNull).toEqual(false)
               expect(signature.defaultValue).toEqual('Signature')
@@ -261,8 +257,8 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
       this.init({ to: 20111206163300 }, function(migrator) {
         migrator.migrate().success(function(){
           this.sequelize.getQueryInterface().describeTable('User').success(function(data) {
-            var signature = data.filter(function(hash){ return hash.attribute === 'signature' })[0]
-              , sig       = data.filter(function(hash){ return hash.attribute === 'sig' })[0]
+            var signature = data.signature
+              , sig       = data.sig
 
             expect(signature).toBeFalsy()
             expect(sig).toBeTruthy()
diff --git a/spec/query-interface.spec.js b/spec/query-interface.spec.js
index d5570aea3969..1889142cef7a 100644
--- a/spec/query-interface.spec.js
+++ b/spec/query-interface.spec.js
@@ -101,15 +101,13 @@ describe(Helpers.getTestDialectTeaser("QueryInterface"), function() {
       this.interface.describeTable('User').complete(function(err, metadata) {
         expect(err).toBeNull()
 
-        var username = metadata.filter(function(m) { return m.attribute === 'username' })[0]
-        var isAdmin  = metadata.filter(function(m) { return m.attribute === 'isAdmin' })[0]
+        var username = metadata.username
+        var isAdmin  = metadata.isAdmin
 
-        expect(username.attribute).toEqual('username')
         expect(username.type).toEqual(dialect === 'postgres' ? 'CHARACTER VARYING' : 'VARCHAR(255)')
         expect(username.allowNull).toBeTrue()
         expect(username.defaultValue).toBeNull()
 
-        expect(isAdmin.attribute).toEqual('isAdmin')
         expect(isAdmin.type).toEqual(dialect === 'postgres' ? 'BOOLEAN' : 'TINYINT(1)')
         expect(isAdmin.allowNull).toBeTrue()
         expect(isAdmin.defaultValue).toBeNull()

From a3d14e0b678caaab83f4786b8477afa72f254b12 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 18:30:27 +0100
Subject: [PATCH 153/360] fixed removeColumn in sqlite + unified result of
 describeTable

---
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.md b/changelog.md
index 8cc3534afc2e..964dd28fe31c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -14,6 +14,7 @@
 - [BUG] fixed updateAttributes for models/tables without primary key (thanks to durango)
 - [BUG] fixed the location of the foreign key when using belongsTo (thanks to ricardograca)
 - [BUG] don't return timestamps if only specific attributes have been seleceted (thanks to ricardograca)
+- [BUG] fixed removeColumn for sqlite
 - [FEATURE] added association prefetching /eager loading for find and findAll. #465
 - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot)
 - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result
@@ -36,6 +37,7 @@
 - [FEATURE] results of raw queries are parsed with dottie. #468 (thanks to kozze89)
 - [FEATURE] support for array serialization. pg only. #443 (thanks to clkao)
 - [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
+- [FEATURE] unified the result of describeTable
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From 720b025dea4888e62227a179ea89f1f940cf48f8 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 18:55:11 +0100
Subject: [PATCH 154/360] twitter test

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dcc67ecfce1e..36dd47a48a4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,3 +21,4 @@ language: node_js
 node_js:
   - 0.8
 
+

From 2984b494e7a792dde39609e274e708af9eabb038 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 2 Mar 2013 21:25:32 +0100
Subject: [PATCH 155/360] generated the yuidocs

---
 docs/api.js                                   |  18 +
 docs/assets/css/external-small.png            | Bin 0 -> 491 bytes
 docs/assets/css/logo.png                      | Bin 0 -> 6308 bytes
 docs/assets/css/main.css                      | 782 ++++++++++++++++++
 docs/assets/favicon.png                       | Bin 0 -> 740 bytes
 docs/assets/img/spinner.gif                   | Bin 0 -> 2685 bytes
 docs/assets/index.html                        |  10 +
 docs/assets/js/api-filter.js                  |  52 ++
 docs/assets/js/api-list.js                    | 251 ++++++
 docs/assets/js/api-search.js                  |  98 +++
 docs/assets/js/apidocs.js                     | 370 +++++++++
 docs/assets/js/yui-prettify.js                |  17 +
 docs/assets/vendor/prettify/CHANGES.html      | 130 +++
 docs/assets/vendor/prettify/COPYING           | 202 +++++
 docs/assets/vendor/prettify/README.html       | 203 +++++
 docs/assets/vendor/prettify/prettify-min.css  |   1 +
 docs/assets/vendor/prettify/prettify-min.js   |   1 +
 docs/associations/belongs-to.js.html          | 188 -----
 .../has-many-double-linked.js.html            | 250 ------
 .../has-many-single-linked.js.html            | 172 ----
 docs/associations/has-many.js.html            | 316 -------
 docs/associations/has-one.js.html             | 211 -----
 docs/associations/mixin.js.html               | 166 ----
 docs/classes/QueryInterface.html              | 686 +++++++++++++++
 docs/classes/Sequelize.html                   | 340 ++++++++
 docs/classes/index.html                       |  10 +
 docs/dao-factory-manager.js.html              | 165 ----
 docs/dao-factory.js.html                      | 409 ---------
 docs/dao.js.html                              | 294 -------
 docs/data-types.js.html                       | 139 ----
 docs/data.json                                | 425 ++++++++++
 docs/dialects/abstract/query.js.html          | 336 --------
 docs/dialects/connector-manager.js.html       | 154 ----
 docs/dialects/mysql/connector-manager.js.html | 343 --------
 docs/dialects/mysql/query-generator.js.html   | 512 ------------
 docs/dialects/mysql/query.js.html             | 212 -----
 .../postgres/connector-manager.js.html        | 219 -----
 .../dialects/postgres/query-generator.js.html | 576 -------------
 docs/dialects/postgres/query.js.html          | 227 -----
 docs/dialects/query-generator.js.html         | 177 ----
 docs/dialects/query.js.html                   | 216 -----
 .../dialects/sqlite/connector-manager.js.html | 147 ----
 docs/dialects/sqlite/query-generator.js.html  | 279 -------
 docs/dialects/sqlite/query.js.html            | 248 ------
 docs/emitters/custom-event-emitter.js.html    | 176 ----
 docs/files/index.html                         |  10 +
 docs/files/index.js.html                      | 117 +++
 docs/files/lib_dao-factory.js.html            | 530 ++++++++++++
 .../files/lib_dialects_abstract_query.js.html | 536 ++++++++++++
 ...ib_dialects_sqlite_query-interface.js.html | 234 ++++++
 docs/files/lib_sequelize.js.html              | 305 +++++++
 docs/index.html                               | 319 +++----
 docs/migration.js.html                        | 261 ------
 docs/migrator.js.html                         | 359 --------
 docs/modules/Sequelize.html                   | 155 ++++
 docs/modules/index.html                       |  10 +
 docs/query-chainer.js.html                    | 272 ------
 docs/query-interface.js.html                  | 402 ---------
 docs/sequelize.js.html                        | 270 ------
 docs/utils.js.html                            | 309 -------
 60 files changed, 5619 insertions(+), 8198 deletions(-)
 create mode 100644 docs/api.js
 create mode 100644 docs/assets/css/external-small.png
 create mode 100644 docs/assets/css/logo.png
 create mode 100644 docs/assets/css/main.css
 create mode 100644 docs/assets/favicon.png
 create mode 100644 docs/assets/img/spinner.gif
 create mode 100644 docs/assets/index.html
 create mode 100644 docs/assets/js/api-filter.js
 create mode 100644 docs/assets/js/api-list.js
 create mode 100644 docs/assets/js/api-search.js
 create mode 100644 docs/assets/js/apidocs.js
 create mode 100644 docs/assets/js/yui-prettify.js
 create mode 100644 docs/assets/vendor/prettify/CHANGES.html
 create mode 100644 docs/assets/vendor/prettify/COPYING
 create mode 100644 docs/assets/vendor/prettify/README.html
 create mode 100644 docs/assets/vendor/prettify/prettify-min.css
 create mode 100644 docs/assets/vendor/prettify/prettify-min.js
 delete mode 100644 docs/associations/belongs-to.js.html
 delete mode 100644 docs/associations/has-many-double-linked.js.html
 delete mode 100644 docs/associations/has-many-single-linked.js.html
 delete mode 100644 docs/associations/has-many.js.html
 delete mode 100644 docs/associations/has-one.js.html
 delete mode 100644 docs/associations/mixin.js.html
 create mode 100644 docs/classes/QueryInterface.html
 create mode 100644 docs/classes/Sequelize.html
 create mode 100644 docs/classes/index.html
 delete mode 100644 docs/dao-factory-manager.js.html
 delete mode 100644 docs/dao-factory.js.html
 delete mode 100644 docs/dao.js.html
 delete mode 100644 docs/data-types.js.html
 create mode 100644 docs/data.json
 delete mode 100644 docs/dialects/abstract/query.js.html
 delete mode 100644 docs/dialects/connector-manager.js.html
 delete mode 100644 docs/dialects/mysql/connector-manager.js.html
 delete mode 100644 docs/dialects/mysql/query-generator.js.html
 delete mode 100644 docs/dialects/mysql/query.js.html
 delete mode 100644 docs/dialects/postgres/connector-manager.js.html
 delete mode 100644 docs/dialects/postgres/query-generator.js.html
 delete mode 100644 docs/dialects/postgres/query.js.html
 delete mode 100644 docs/dialects/query-generator.js.html
 delete mode 100644 docs/dialects/query.js.html
 delete mode 100644 docs/dialects/sqlite/connector-manager.js.html
 delete mode 100644 docs/dialects/sqlite/query-generator.js.html
 delete mode 100644 docs/dialects/sqlite/query.js.html
 delete mode 100644 docs/emitters/custom-event-emitter.js.html
 create mode 100644 docs/files/index.html
 create mode 100644 docs/files/index.js.html
 create mode 100644 docs/files/lib_dao-factory.js.html
 create mode 100644 docs/files/lib_dialects_abstract_query.js.html
 create mode 100644 docs/files/lib_dialects_sqlite_query-interface.js.html
 create mode 100644 docs/files/lib_sequelize.js.html
 delete mode 100644 docs/migration.js.html
 delete mode 100644 docs/migrator.js.html
 create mode 100644 docs/modules/Sequelize.html
 create mode 100644 docs/modules/index.html
 delete mode 100644 docs/query-chainer.js.html
 delete mode 100644 docs/query-interface.js.html
 delete mode 100644 docs/sequelize.js.html
 delete mode 100644 docs/utils.js.html

diff --git a/docs/api.js b/docs/api.js
new file mode 100644
index 000000000000..607ecd6f9334
--- /dev/null
+++ b/docs/api.js
@@ -0,0 +1,18 @@
+YUI.add("yuidoc-meta", function(Y) {
+   Y.YUIDoc = { meta: {
+    "classes": [
+        "QueryInterface",
+        "Sequelize"
+    ],
+    "modules": [
+        "Sequelize"
+    ],
+    "allModules": [
+        {
+            "displayName": "Sequelize",
+            "name": "Sequelize",
+            "description": "The entry point."
+        }
+    ]
+} };
+});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..759a1cdcb5b1697e5be290d98b830e279cd71f3c
GIT binary patch
literal 491
zcmVDs{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce)^8hM>B_8

literal 0
HcmV?d00001

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..609b336c7cc5ef0c787a0068d221d9b8d69b1241
GIT binary patch
literal 6308
zcmV;V7+dFwP)EI3}K
zJAc0RviDlMYT7$`hje!Kj@LB3B$v~Qd;9X^3|$AqFu>69Z0KMbrezvAWa@n&$tpT|
zTCH{cyjdVi(gp+w@V^dOksB0A>WW6xhIlO6Tv?HM0X_i}I#y60{PpGwx9vPMtFtRN
zzNw#+=Tj2u`-uL(#+a*U!Mhu
zc*G(+@nj+A1708rA$uKO;<-VVr3MVYxhNW0pGl{-r;6j7{t5L6rgfY5PJ8CL9kUwu
zbudgU8eg2Ex&np2&cRTd`wY)J^i1Ra5;fuU*mdm4tUfgDMK5-q{|m=*>K
zmt0VX&YeBdQ=)fa$R^1smi%+SgBQrVaGN@ES(A;8iY#qZRr%H8m*V6T)hnK*O
z|1pC?@pvK+BT#UNUrSjdWbFT{Dzm@;L_uBh$8ED$
zuiJfPTW9`aY$8*RdjnUUrlU^R+`03|hDm_i5Luwnq7j
z3E6ba0VDwiwDHfNDd`afqMg
z;ri!g_m!HW5oK|Cwq!YmyzwIm^+yk_|MHs+Eq9xyRnxCJok*4f#gVLpK`K!hOA`m7
zrXArDhy&z@@Nn!4VdiZ&EK2}
z!>Wpb{OnM$1DNA}{p_I4v2VIXKZ_VEfRJY;Iuu1&R+5T8o=vA-I4+<*_iE$hMa%1N
z?C8v0J+L~7s%)S@Ol>?uPErsk33`wuLuSY*+7vE48>%1a67ze?luG!wOC|%)EeI?C
zwx8(O`zi;pKd^^yj)74>4y=|X<3)=q%hS&sGpIj(bkp1oZ|%Pi=bIBl)oF$l5s2@M
zMR71BQ;7WmRiZH{$yVb?Qlg!quu66K@%K)LY$gGSZT&zB6I6^-H+0k^z+_eD?rXV0
z5L1qV!A8eorwW24lZ?>%SS-4rYDo5p4;AW7cfWM)yL&qBv%JW5V0Dtllaoax+#e8V
zB$k8}28x_x5pbFwuF@G(hQL=Zo$NO}umKO_6oH2kR4wxSrWK}m#G&)Saemf6U$B$#
zrk6{FSmir^W1qZLRh7qwRhQrMfkT~l``>=_UTe?oZtBgd(=tsiMRB8Ch$x^WV>B2V
z2&ft>#tNPJ}C{6fYwxz@4|uh6E0@Tu_z>Hq6&SP$9h8q(!7amKNbU6FeVQ}e16NTW!wW&xj$800_2i8@Oqgl}(
zBSw)>zyh$kWustb6XGlYV~&}Q<#hu4I2f+-v+5yb_Z=xziTz{6OS|eQ&>jY;WnVK<
zC-H4sK93taZ#RBkqo1YXxB%3K83r_hfuO2dE_W1xNt
zM0PXiOoA)J`RvVj-Ko>7p*$P6lX{8PUSW6R0a&^20BmcNVdIuIyv<@%guE030oxG(
zo?N~Tw)_KN*^1o|jTX^uTeiLne_Xi>wrta2?JLbpT^KQ7kpLFMd+=F!t3ij~|9Kbg
z?DqNBz4A8v^@Y9gWXeu*Dj4zq2_$oi{Sn_&7~dqZ!8iyBqiKY1-HN?Zbxp
z%=7P#eQfF0WjMl}6i_FHX+zXqpqdRdnk@lERXCvF0o8ev8*_ky@1qUVbX2O_VCif!
zOA{`dJI)8?n7Q8GJgo=&{!!u@9x-4gSFN;#Wx7XCFDZ2R-^B-`>$|$O;BgpV=&2U}
z-Q8pFvun>G@B2G;?!_leayJd!-|j}>eA>jQmQBmt-)qs>p$50j1G}3J?B0K%?el|%
zx@g(fW!SGx;?$}8e$6$vE>IHb7L}!O&LszcA`fWZ1BxUClIbB{7o-bn0SpGFZEjhm
zo_0zNl$XUR7}31)&e3Uf$=!|^VBqa9R+|tCDKB!$WE+_&GKBtskbs5t>4?=n8%zm6
zT_c8sC>^X}`MkEYvAJbUOKbb5`h`00w$<0;#+>ZJ^wb$URR>Z?Vx4f)LgW^bpmC?862+
zeD`4UR^}Rb;~wIXya
zx}t0;$f`{JW*AUX!*zWr@rlJ{c42`nT#(?%bnnhM{!~QV~&KNRZ#a{m5J7Kckw5%_+cXV&s
z_uio&gqq*8PN}*Irw$#QI-SpXVs7&`+!!{wYCH6phTRT*q+&i
zpen_P7awo-tl@TG#Be~I=>}f$d>RxuQqc6W0UN7Y
z2%dwDv>`;fo++^0j!d_f;1u&G`}QAv`A}Qe6b|ZjS4`VDW<>GTE>JzsE0w4>l1e}n
zr!I(zZbhK>-4+{Y0{c)>G4k?Ua8+t@zLb8}-E}t5Y-tgkb=pWH1T>gdk
z4zzuPOKI+#f8NrHZ0ttjKdCwypmI?Z66I+ds8IkYGYmy7NCzAsGDz@>fAhQV0prFVph_Hz=*3y7?lo;8z0y7vcglvC70-
z79pQygD(HHCAbZLffYNMD?Tjw`NcmQT9LTPg-K=-g{6j;4+zvAxsa#nL8@Z7N7Em(
zXZa8rmHIGEFL*lVj8TsNl5Q-Ld#=|Q#%%}FJ
zRJOwbmnK0dM8uU9fv;gBKDQ*^|7Tj
zL+oDe0X2g_b=U0bP*OpBp$v$tn}nHN=Wk{`39L?;S_PHmNk3|Jf+JC}T;mBUMj+;^
zq2Z|=fQjqGT-O64g{DA-{49H`&X0T@Ul@Sx`{m&6L&O&-z=4Q`*WH`LId=}bO8wbX
zDlv6Oc
zF|f-^0Gr;}1G;fCsH$-9l*<-Fz$V5m`SIaEc4OfiB(Ie4sfB*2uYJSgA}MUn0uJF5E5f`SZN`Q@Aca6eYyMD{kC2-IMJ
zD$zJZyTd+E%wI!*LgKd5E$g^gQgQu3i20i%lzrX4Azr%{ZY=-)GG_Pp?wJT@gfTbI92Oa;8JDdj#9Gc;WI2NX9I$xmh(wh8>uPK67)(Jw6zcMYm(2a*x1N5aqpkZI8))7Ks`Ef&
zC1s$fMgGoQ!M;GmOP411_he#vy^FI=u>Eig_!n*YV9A#*|J*cq@(-I~*MT@a=ihg>
z!}cAxg^dQg$77RbNqC#AdI}XMvNjfrz^&i;3_Sju*I~!*JY8SEy#?yG?ZuxMQJ^^W
zrSW(KzVd~WVA6y%KCBsDHgwv+4R|c?dVEV^Im3dGW10NIg5`h(VtG~$t<2nr1EKmO
zx=GHZHVZDfcHGGHJk!uRIG|ddQLPT?$`PR|^^5d+fpVb1r8Fl@EO&1ASzi0oo@-go
zpbN{3q@7_HP(3sY-@Nh+xbVypNW|Qe<46bxP~MEE@nb6B*6YuPx{-1SQv3hm!^+{N
z>rRKyoSlKvlBjbm)dA_uPPF@jo6doA&LU&j4Idt!5^=JhDUxM=JM$U*>oJ}6berXk
zA8Jg-V_%$9H)8JL0PQzWBGZC9KKrXxFKv6}!AGC_c1ugo)gsVDX*np7B0nb;Ml<+D
z1vb(({RodytZjN-^W=PTYuJpRMa)e|qS|OQ3g?|Q5$2qQ;J_gZE3E^%dUSe>qNoIQ
zqtZ|_G>*@e!ySg0L)p)>EZ+o@kBMXgzIf?raPj9%IM8aqtFJYY@Qi-FvLXTF#$@m^
zj(@*Kuf>HUIlt}X>Eqz(KWxKkRvbnSE3w@Nt5oN=dlrc`$Bsq98#*G2{Mf|0kw-M@
z;jjjC|JS1D&V1tOHTQINbHOc-B&*w6MTiu`molOp4j)*Q{iGik72{Q6bry!7Iq=Fd89#@Nf_
zMao|#?58}SLgmQ4Ps$b-OrglYsfhqUZ?FFTsznFe`>qTh&7g-A9D>CL+Z1DeI;kQMSlA}X2`)^_Q>|!@#k7am
zF$>th3Ouvk+S*AT?r_d!Ispk2j4>k%+4F!CpxH1aH(=$W@nBGA@go`N`TRRS^tVe=
zVhj$J+ZnXK6*pY;Nz!2VR4E-ivgI_5N(FkF)X8|G&RN_)V4
z^8;SC9PEJBHiKUA@M>%sOoNFuc_40YuzXX%6a!2re+-FUo#?{itQUI++@fKWgrp{%
za{YYL_>p&i5RY9P5!9DAHBZqrV*+2Ww}R=5DXNn#;@bh!n9&(Vp>AI0r#8qjscvIi
zZq7Hzw8yf02CRO5Grn5;WgpY0)X-qZZFN6|KwjX($e)3WJd5BxpydTYY~YI6z{mS-
zy+bVDweuVGUc&3TN%pbtIi&fOe4g(2(6d5JH*?bg`^pZNrCl)NzP
zqd?lzy!RkHvSbY$?2u?(m{ydWi1Xhsp9wRkW$hFT|3LIL$0hB+3%
zlAJISiP2|l=xwp1s6vIAV;uN&MpR{4CR4J!Zp`rG?p;d9!FTw&p&s>
z6`4$o1K1x}=DlUX*WZX`JA{s+ycjgcc-a|IlvVLWY}H98j(Z4>k}&_nY<%rV8byJt0*nyoo@3wI~{SwW6$a{pgX^&%sA5cF)n9#9&GxwgR
z{Zs0xV^FE`UP%o^P=X8QK;aQ!TAjwSMDZdq=Skc3kWr9qOVj$|TMUy@2RjU7Gg
zIrtb)=y-bFI+?cA|6}%{w$5tu%FgzVo|%5E5)Kw8`kl#Syxx^LPA%$(R%SQBCwTgQ
a0R{k+kX}`<%LV)Z0000
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 
                     
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [dialect='mysql']
+                                    String
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      The dialect of the relational database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [host='localhost']
+                                    String
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      The host of the relational database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [port=3306]
+                                    Integer
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      The port of the relational database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [protocol='tcp']
+                                    String
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      The protocol of the relational database.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [define={}]
+                                    Object
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Options, which shall be default for every model definition.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [query={}]
+                                    Object
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      I have absolutely no idea.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [sync={}]
+                                    Object
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Options, which shall be default for every sync call.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [logging=console.log]
+                                    Function
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      A function that gets executed everytime Sequelize would log something.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [omitNull=false]
+                                    Boolean
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      A flag that defines if null values should be passed to SQL queries or not.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [queue=true]
+                                    Boolean
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      I have absolutely no idea.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [native=false]
+                                    Boolean
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      A flag that defines if native library shall be used or not.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [replication=false]
+                                    Boolean
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      I have absolutely no idea.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                                
+                                    [pool={}]
+                                    Object
+                                    optional
+                                
+
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Something.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+
+                                
+                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+                            
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                 
             
             
@@ -294,6 +480,8 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
         
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Index
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
 
         
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  • Methods
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+        
         
         
         
@@ -304,14 +492,240 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Example:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
             
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Item Index
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 
             
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Methods
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
+
+            
+
+            
+
+            
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+        
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Methods
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    getMigrator
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            (
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                    
+                        [options={}]
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                    
+                        [force=false]
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
+            
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    )
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
+
+    
+        
+            Migrator
+        
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+            
+                
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
+                Defined in
+                
+            
+        
+        
+        lib/sequelize.js:113
+        
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+
+        
+
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns an instance (singleton) of Migrator.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Parameters:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+            
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                    
+                        [options={}]
+                        Object
+                        optional
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Some options
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
             
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    • 
+                    
+                        [force=false]
+                        Boolean
+                        optional
+                    
+
+                    
+
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      A flag that defines if the migrator should get instantiated or not.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
 
+                    
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      • 
             
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
+                    
+                        Migrator:
+                    
+                    An instance of Migrator.
+                
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
+
+    
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                
+                    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    getQueryInterface
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
+        ()
+    
+
+    
+        
+            QueryInterface
+        
+    
+
+    
+
+    
+
+    
 
+    
+
+    
+
+    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+            
+                
+                
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
+                Defined in
+                
             
+        
+        
+        lib/sequelize.js:102
+        
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+
+        
+
+        
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns an instance of QueryInterface.
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+    
+
+    
+        
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Returns:
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                
+                    
+                        QueryInterface:
+                    
+                    An instance (singleton) of QueryInterface.
+                
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
         
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
 
+    
+
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+                
+            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
         
 
         
diff --git a/docs/data.json b/docs/data.json
index 8f39a9d935aa..3eb2216e685f 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -103,13 +103,108 @@
                     "name": "password",
                     "description": "The password which is used to authenticate against the database.",
                     "type": "String",
-                    "optional": true
+                    "optional": true,
+                    "optdefault": "null"
                 },
                 {
                     "name": "options",
                     "description": "An object with options.",
                     "type": "Object",
-                    "optional": true
+                    "optional": true,
+                    "optdefault": "{}",
+                    "props": [
+                        {
+                            "name": "dialect",
+                            "description": "The dialect of the relational database.",
+                            "type": "String",
+                            "optional": true,
+                            "optdefault": "'mysql'"
+                        },
+                        {
+                            "name": "host",
+                            "description": "The host of the relational database.",
+                            "type": "String",
+                            "optional": true,
+                            "optdefault": "'localhost'"
+                        },
+                        {
+                            "name": "port",
+                            "description": "The port of the relational database.",
+                            "type": "Integer",
+                            "optional": true,
+                            "optdefault": "3306"
+                        },
+                        {
+                            "name": "protocol",
+                            "description": "The protocol of the relational database.",
+                            "type": "String",
+                            "optional": true,
+                            "optdefault": "'tcp'"
+                        },
+                        {
+                            "name": "define",
+                            "description": "Options, which shall be default for every model definition.",
+                            "type": "Object",
+                            "optional": true,
+                            "optdefault": "{}"
+                        },
+                        {
+                            "name": "query",
+                            "description": "I have absolutely no idea.",
+                            "type": "Object",
+                            "optional": true,
+                            "optdefault": "{}"
+                        },
+                        {
+                            "name": "sync",
+                            "description": "Options, which shall be default for every `sync` call.",
+                            "type": "Object",
+                            "optional": true,
+                            "optdefault": "{}"
+                        },
+                        {
+                            "name": "logging",
+                            "description": "A function that gets executed everytime Sequelize would log something.",
+                            "type": "Function",
+                            "optional": true,
+                            "optdefault": "console.log"
+                        },
+                        {
+                            "name": "omitNull",
+                            "description": "A flag that defines if null values should be passed to SQL queries or not.",
+                            "type": "Boolean",
+                            "optional": true,
+                            "optdefault": "false"
+                        },
+                        {
+                            "name": "queue",
+                            "description": "I have absolutely no idea.",
+                            "type": "Boolean",
+                            "optional": true,
+                            "optdefault": "true"
+                        },
+                        {
+                            "name": "native",
+                            "description": "A flag that defines if native library shall be used or not.",
+                            "type": "Boolean",
+                            "optional": true,
+                            "optdefault": "false"
+                        },
+                        {
+                            "name": "replication",
+                            "description": "I have absolutely no idea.",
+                            "type": "Boolean",
+                            "optional": true,
+                            "optdefault": "false"
+                        },
+                        {
+                            "name": "pool",
+                            "description": "Something.",
+                            "type": "Object",
+                            "optional": true,
+                            "optdefault": "{}"
+                        }
+                    ]
                 }
             ],
             "example": [
@@ -359,9 +454,49 @@
         },
         {
             "file": "lib/sequelize.js",
-            "line": 80,
+            "line": 93,
             "description": "Reference to Utils",
             "class": "Sequelize"
+        },
+        {
+            "file": "lib/sequelize.js",
+            "line": 102,
+            "description": "Returns an instance of QueryInterface.",
+            "itemtype": "method",
+            "name": "getQueryInterface",
+            "return": {
+                "description": "An instance (singleton) of QueryInterface.",
+                "type": "QueryInterface"
+            },
+            "class": "Sequelize"
+        },
+        {
+            "file": "lib/sequelize.js",
+            "line": 113,
+            "description": "Returns an instance (singleton) of Migrator.",
+            "itemtype": "method",
+            "name": "getMigrator",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "Some options",
+                    "type": "Object",
+                    "optional": true,
+                    "optdefault": "{}"
+                },
+                {
+                    "name": "force",
+                    "description": "A flag that defines if the migrator should get instantiated or not.",
+                    "type": "Boolean",
+                    "optional": true,
+                    "optdefault": "false"
+                }
+            ],
+            "return": {
+                "description": "An instance of Migrator.",
+                "type": "Migrator"
+            },
+            "class": "Sequelize"
         }
     ],
     "warnings": [
@@ -419,7 +554,7 @@
         },
         {
             "message": "Missing item type\nReference to Utils",
-            "line": " lib/sequelize.js:80"
+            "line": " lib/sequelize.js:93"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/lib_sequelize.js.html b/docs/files/lib_sequelize.js.html
index bce6e6e03cb5..2f5d5cc3b276 100644
--- a/docs/files/lib_sequelize.js.html
+++ b/docs/files/lib_sequelize.js.html
@@ -106,8 +106,21 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    File: lib/sequelize.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
 
     @param {String} database The name of the database.
     @param {String} username The username which is used to authenticate against the database.
-    @param {String} [password] The password which is used to authenticate against the database.
-    @param {Object} [options] An object with options.
+    @param {String} [password=null] The password which is used to authenticate against the database.
+    @param {Object} [options={}] An object with options.
+      @param {String} [options.dialect='mysql'] The dialect of the relational database.
+      @param {String} [options.host='localhost'] The host of the relational database.
+      @param {Integer} [options.port=3306] The port of the relational database.
+      @param {String} [options.protocol='tcp'] The protocol of the relational database.
+      @param {Object} [options.define={}] Options, which shall be default for every model definition.
+      @param {Object} [options.query={}] I have absolutely no idea.
+      @param {Object} [options.sync={}] Options, which shall be default for every `sync` call.
+      @param {Function} [options.logging=console.log] A function that gets executed everytime Sequelize would log something.
+      @param {Boolean} [options.omitNull=false] A flag that defines if null values should be passed to SQL queries or not.
+      @param {Boolean} [options.queue=true] I have absolutely no idea.
+      @param {Boolean} [options.native=false] A flag that defines if native library shall be used or not.
+      @param {Boolean} [options.replication=false] I have absolutely no idea.
+      @param {Object} [options.pool={}] Something.
 
     @example
         // without password and options
@@ -178,13 +191,28 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    File: lib/sequelize.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
     Sequelize[dataType] = DataTypes[dataType]
   }
 
+  /**
+   Returns an instance of QueryInterface.
+
+   @method getQueryInterface
+   @return {QueryInterface} An instance (singleton) of QueryInterface.
+   */
   Sequelize.prototype.getQueryInterface = function() {
     this.queryInterface = this.queryInterface || new QueryInterface(this)
     return this.queryInterface
   }
 
+  /**
+   Returns an instance (singleton) of Migrator.
+
+   @method getMigrator
+   @param {Object} [options={}] Some options
+   @param {Boolean} [force=false] A flag that defines if the migrator should get instantiated or not.
+   @return {Migrator} An instance of Migrator.
+   */
   Sequelize.prototype.getMigrator = function(options, force) {
     var Migrator = require("./migrator")
+
     if (force) {
       this.migrator = new Migrator(this, options)
     } else {
@@ -232,10 +260,9 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    File: lib/sequelize.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
     this.getMigrator().migrate(options)
   }
 
-  Sequelize.prototype.query = function(sql, callee, options) {
+  Sequelize.prototype.query = function(sql, callee, options, replacements) {
     if (arguments.length === 4) {
-      values.unshift(sql)
-      sql = Utils.format(values)
+      sql = Utils.format([sql].concat(replacements))
     } else if (arguments.length === 3) {
       options = options
     } else if (arguments.length === 2) {
diff --git a/lib/sequelize.js b/lib/sequelize.js
index 9d30772df135..534748472eec 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -14,8 +14,21 @@ module.exports = (function() {
 
     @param {String} database The name of the database.
     @param {String} username The username which is used to authenticate against the database.
-    @param {String} [password] The password which is used to authenticate against the database.
-    @param {Object} [options] An object with options.
+    @param {String} [password=null] The password which is used to authenticate against the database.
+    @param {Object} [options={}] An object with options.
+      @param {String} [options.dialect='mysql'] The dialect of the relational database.
+      @param {String} [options.host='localhost'] The host of the relational database.
+      @param {Integer} [options.port=3306] The port of the relational database.
+      @param {String} [options.protocol='tcp'] The protocol of the relational database.
+      @param {Object} [options.define={}] Options, which shall be default for every model definition.
+      @param {Object} [options.query={}] I have absolutely no idea.
+      @param {Object} [options.sync={}] Options, which shall be default for every `sync` call.
+      @param {Function} [options.logging=console.log] A function that gets executed everytime Sequelize would log something.
+      @param {Boolean} [options.omitNull=false] A flag that defines if null values should be passed to SQL queries or not.
+      @param {Boolean} [options.queue=true] I have absolutely no idea.
+      @param {Boolean} [options.native=false] A flag that defines if native library shall be used or not.
+      @param {Boolean} [options.replication=false] I have absolutely no idea.
+      @param {Object} [options.pool={}] Something.
 
     @example
         // without password and options
@@ -86,13 +99,28 @@ module.exports = (function() {
     Sequelize[dataType] = DataTypes[dataType]
   }
 
+  /**
+   Returns an instance of QueryInterface.
+
+   @method getQueryInterface
+   @return {QueryInterface} An instance (singleton) of QueryInterface.
+   */
   Sequelize.prototype.getQueryInterface = function() {
     this.queryInterface = this.queryInterface || new QueryInterface(this)
     return this.queryInterface
   }
 
+  /**
+   Returns an instance (singleton) of Migrator.
+
+   @method getMigrator
+   @param {Object} [options={}] Some options
+   @param {Boolean} [force=false] A flag that defines if the migrator should get instantiated or not.
+   @return {Migrator} An instance of Migrator.
+   */
   Sequelize.prototype.getMigrator = function(options, force) {
     var Migrator = require("./migrator")
+
     if (force) {
       this.migrator = new Migrator(this, options)
     } else {

From 69110093bb340c1c1109904df13cfa029d52111c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 4 Mar 2013 16:34:42 +0100
Subject: [PATCH 171/360] Closes #470

---
 lib/dialects/sqlite/query-interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/sqlite/query-interface.js b/lib/dialects/sqlite/query-interface.js
index d12ef2087b41..5b185046c49a 100644
--- a/lib/dialects/sqlite/query-interface.js
+++ b/lib/dialects/sqlite/query-interface.js
@@ -1,4 +1,4 @@
-Utils = require("../../utils")
+var Utils = require("../../utils")
 
 /**
  Returns an object that treats SQLite's inabilities to do certain queries.

From 37879440485b2d303d528f5bbc11eaebf4a8ad94 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 4 Mar 2013 21:00:12 +0100
Subject: [PATCH 172/360] lodash?

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b94ebc9d447d..4c591ef9427d 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - ~~Find out why Person.belongsTo(House) would add person_id to house. It should add house_id to person~~
 
 ### 1.7.0
+- Check if lodash is a proper alternative to current underscore usage.
 - Transactions
 - Support for update of tables without primary key
 - MariaDB support

From d259cec7496e3a77b1c390c35522bd8916fab15b Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 4 Mar 2013 21:03:17 +0100
Subject: [PATCH 173/360] docs

---
 docs/data.json                                         | 8 ++++----
 docs/files/lib_dialects_abstract_query.js.html         | 7 ++++++-
 docs/files/lib_dialects_sqlite_query-interface.js.html | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/data.json b/docs/data.json
index 3eb2216e685f..f915bd267df6 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -311,13 +311,13 @@
         },
         {
             "file": "lib/dialects/abstract/query.js",
-            "line": 345,
+            "line": 350,
             "description": "The function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
             "class": "QueryInterface"
         },
         {
             "file": "lib/dialects/abstract/query.js",
-            "line": 405,
+            "line": 410,
             "description": "This function will prepare the result of select queries with joins.",
             "params": [
                 {
@@ -542,11 +542,11 @@
         },
         {
             "message": "Missing item type\nThe function takes the result of the query execution and groups\nthe associated data by the callee.\n\nExample:\n  groupDataByCalleeFactory([\n    {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 1 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 2 }\n    }, {\n      callee: { some: 'data', id: 1 },\n      association: { foo: 'bar', id: 3 }\n    }\n  ])\n\nResult:\n  Something like this:\n\n  [\n    {\n      callee:  { some: 'data', id: 1 },\n      association: [\n        { foo: 'bar', id: 1 },\n        { foo: 'bar', id: 2 },\n        { foo: 'bar', id: 3 }\n      ]\n    }\n  ]",
-            "line": " lib/dialects/abstract/query.js:345"
+            "line": " lib/dialects/abstract/query.js:350"
         },
         {
             "message": "Missing item type\nThis function will prepare the result of select queries with joins.",
-            "line": " lib/dialects/abstract/query.js:405"
+            "line": " lib/dialects/abstract/query.js:410"
         },
         {
             "message": "Missing item type\nSearch for an instance.",
diff --git a/docs/files/lib_dialects_abstract_query.js.html b/docs/files/lib_dialects_abstract_query.js.html
index 515c4f261a12..d71fe6e0a67c 100644
--- a/docs/files/lib_dialects_abstract_query.js.html
+++ b/docs/files/lib_dialects_abstract_query.js.html
@@ -410,9 +410,14 @@ 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    File: lib/dialects/abstract/query.js
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    File: lib/dialects/sqlite/query-interfac
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
     
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    -Utils = require("../../utils")
+var Utils = require("../../utils")
 
 /**
  Returns an object that treats SQLite's inabilities to do certain queries.

From 9fdc0b800ddbf00ee98afa996ea757fee702f60d Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 4 Mar 2013 21:04:08 +0100
Subject: [PATCH 174/360] add the eagerly loaded data to the toJSON and values
 method

---
 lib/dao.js                     | 12 +++++++-----
 lib/dialects/abstract/query.js |  7 ++++++-
 spec-jasmine/dao.spec.js       |  1 -
 spec/dao.spec.js               | 36 +++++++++++++++++++++++++++++-----
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 4caa9d5e5e0e..59b31ecb934a 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -5,10 +5,12 @@ var Utils     = require("./utils")
 
 module.exports = (function() {
   var DAO = function(values, options, isNewRecord) {
-    var self = this;
-    this.__options = options;
-    this.hasPrimaryKeys = options.hasPrimaryKeys;
-    this.selectedValues = values;
+    var self = this
+
+    this.__options                   = options
+    this.hasPrimaryKeys              = options.hasPrimaryKeys
+    this.selectedValues              = values
+    this.__eagerlyLoadedAssociations = []
 
     initAttributes.call(this, values, isNewRecord)
 
@@ -51,7 +53,7 @@ module.exports = (function() {
       var result = {}
         , self   = this
 
-      this.attributes.forEach(function(attr) {
+      this.attributes.concat(this.__eagerlyLoadedAssociations).forEach(function(attr) {
         result[attr] = self[attr]
       })
 
diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index f547b9a258a8..5419594adf06 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -318,9 +318,14 @@ module.exports = (function() {
         dao[accessor] = isEmpty ? null : daoInstance
       } else {
         dao[accessor] = dao[accessor] || []
-        if (! isEmpty)
+
+        if (!isEmpty) {
           dao[accessor].push(daoInstance)
+        }
       }
+
+      // add the accessor to the eagerly loaded associations array
+      dao.__eagerlyLoadedAssociations = Utils._.uniq(dao.__eagerlyLoadedAssociations.concat([accessor]))
     })
   }
 
diff --git a/spec-jasmine/dao.spec.js b/spec-jasmine/dao.spec.js
index c7a9b726bedb..ea4527dbda69 100644
--- a/spec-jasmine/dao.spec.js
+++ b/spec-jasmine/dao.spec.js
@@ -334,7 +334,6 @@ describe('DAO', function() {
           })
         })
       })
-
     })
   })
 })
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 122b21186a62..a7ee2b19ac4d 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -274,12 +274,14 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
         username: Helpers.Sequelize.STRING,
         age:      Helpers.Sequelize.INTEGER,
         isAdmin:  Helpers.Sequelize.BOOLEAN
-      }, {
-        timestamps: false,
-        logging: true
-      })
+      }, { timestamps: false })
+
+      this.Project = this.sequelize.define('NiceProject', { title: Helpers.Sequelize.STRING }, { timestamps: false })
+
+      this.User.hasMany(this.Project, { as: 'Projects' })
+      this.Project.belongsTo(this.User, { as: 'LovelyUser' })
 
-      this.User.sync({ force: true }).success(done)
+      this.sequelize.sync({ force: true }).success(done)
     })
 
     it('returns an object containing all values', function() {
@@ -296,6 +298,30 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       var user = this.User.build({ username: 'test.user', age: 99, isAdmin: true })
       expect(JSON.parse(JSON.stringify(user))).toEqual({ username: 'test.user', age: 99, isAdmin: true, id: null })
     })
+
+    it('includes the eagerly loaded associations', function(done) {
+      this.User.create({ username: 'fnord', age: 1, isAdmin: true }).success(function(user) {
+        this.Project.create({ title: 'fnord' }).success(function(project) {
+          user.setProjects([ project ]).success(function() {
+            this.User.findAll({include: [ { model: this.Project, as: 'Projects' } ]}).success(function(users) {
+              var _user = users[0]
+
+              expect(_user.projects).toBeDefined()
+              expect(JSON.parse(JSON.stringify(_user)).projects).toBeDefined()
+
+              this.Project.findAll({include: [ { model: this.User, as: 'LovelyUser' } ]}).success(function(projects) {
+                var _project = projects[0]
+
+                expect(_project.lovelyUser).toBeDefined()
+                expect(JSON.parse(JSON.stringify(_project)).lovelyUser).toBeDefined()
+
+                done()
+              })
+            }.bind(this))
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
   })
 
   describe('findAll', function findAll() {

From ef1ab8cb68b1e0a66e299790f729a1dff7a0a40e Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 4 Mar 2013 21:04:29 +0100
Subject: [PATCH 175/360] fix reference to Utils (which is broken due to the
 removal of global Utils)

---
 spec/sequelize.spec.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js
index 48c78b747012..f1f448494650 100644
--- a/spec/sequelize.spec.js
+++ b/spec/sequelize.spec.js
@@ -2,7 +2,6 @@ if(typeof require === 'function') {
   const buster  = require("buster")
       , Helpers = require('./buster-helpers')
       , dialect = Helpers.getTestDialect()
-
 }
 
 var qq = function(str) {
@@ -137,7 +136,7 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
 
     it('destructs dot separated attributes when doing a raw query', function(done) {
       var tickChar = (dialect === 'postgres') ? '"' : '`'
-        , sql      = "select 1 as " + Utils.addTicks('foo.bar.baz', tickChar)
+        , sql      = "select 1 as " + Helpers.Sequelize.Utils.addTicks('foo.bar.baz', tickChar)
 
       this.sequelize.query(sql, null, { raw: true }).success(function(result) {
         expect(result).toEqual([ { foo: { bar: { baz: 1 } } } ])

From 427a2576866c4f7bb981b0ffaf0d9312524ea109 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 4 Mar 2013 21:08:40 +0100
Subject: [PATCH 176/360] just a test for IRC

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36dd47a48a4c..bc6b96c4e098 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,3 @@ language: node_js
 
 node_js:
   - 0.8
-
-

From 27124e954abe199a3ae66bc36bab0e050cfe5d59 Mon Sep 17 00:00:00 2001
From: Rob Raux 
Date: Mon, 4 Mar 2013 22:35:30 +0000
Subject: [PATCH 177/360] Mutiple calls to define with the same daoName would
 add duplicate entries into the factory system.

- added test to check factory size
---
 lib/sequelize.js         |  5 +++++
 spec/dao-factory.spec.js | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 534748472eec..4eb672452d1f 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -145,6 +145,11 @@ module.exports = (function() {
     }
     options.omitNull = globalOptions.omitNull
 
+    // if you call "define" multiple times for the same daoName, do not clutter the factory
+    if(this.isDefined(daoName)) {
+        this.daoFactoryManager.removeDAO(this.daoFactoryManager.getDAO(daoName))
+    }
+
     var factory = new DAOFactory(daoName, attributes, options)
     this.daoFactoryManager.addDAO(factory.init(this.daoFactoryManager))
     return factory
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 47d4f277fcac..2296651e0ff0 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -36,6 +36,16 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       expect(User.tableName).toEqual('SuperUsers')
     })
 
+    it("uses checks to make sure dao factory isnt leaking on multiple define", function() {
+      var User = this.sequelize.define('SuperUser', {}, { freezeTableName: false })
+      var factorySize = this.sequelize.daoFactoryManager.all.length
+
+      var User2 = this.sequelize.define('SuperUser', {}, { freezeTableName: false })   
+      var factorySize2 = this.sequelize.daoFactoryManager.all.length
+
+      expect(factorySize).toEqual(factorySize2)
+    })
+
     it("attaches class and instance methods", function() {
       var User = this.sequelize.define('UserWithClassAndInstanceMethods', {}, {
         classMethods: { doSmth: function(){ return 1 } },

From 197a0fb002fa9972e5066a011c71d10369bf3383 Mon Sep 17 00:00:00 2001
From: Alex Young 
Date: Tue, 5 Mar 2013 16:12:14 +0000
Subject: [PATCH 178/360] Adds repository and issue tracking properties to
 package.json

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index 826e046a9a47..2130d191c630 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,13 @@
       "email": "jam@innofluence.com"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sdepold/sequelize.git"
+  },
+  "bugs": {
+    "url": "https://github.com/sdepold/sequelize/issues"
+  },
   "dependencies": {
     "underscore": "~1.4.0",
     "underscore.string": "~2.3.0",

From 784a941cd9ff1a786f2bc6f39c3ce029719784c7 Mon Sep 17 00:00:00 2001
From: Ivan Popovski 
Date: Mon, 4 Mar 2013 12:06:44 +0100
Subject: [PATCH 179/360] group by + array

---
 lib/dialects/mysql/query-generator.js    | 2 +-
 lib/dialects/postgres/query-generator.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index d77256bb4fa9..e8d34399d237 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -159,7 +159,7 @@ module.exports = (function() {
       }
 
       if (options.group) {
-        options.group = Utils.addTicks(options.group)
+        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return Utils.addTicks(grp)}).join(', ') : Utils.addTicks(options.group)
         query += " GROUP BY <%= group %>"
       }
 
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 84e7abd621e9..9b3f7783b2d8 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -285,7 +285,7 @@ module.exports = (function() {
       }
 
       if(options.group) {
-        options.group = addQuotes(options.group)
+        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return addQuotes(grp)}).join(', ') : addQuotes(options.group)
         query += " GROUP BY <%= group %>"
       }
 

From 6bc272bf7b3bdf7129fbf4dd0a79595c35c6e458 Mon Sep 17 00:00:00 2001
From: Ivan Popovski 
Date: Tue, 5 Mar 2013 20:31:42 +0100
Subject: [PATCH 180/360] group by + array tests

---
 spec-jasmine/mysql/query-generator.spec.js    | 8 ++++++++
 spec-jasmine/postgres/query-generator.spec.js | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 319cbc9b6eff..014f9c4d3cac 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -77,6 +77,14 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {group: "name"}],
         expectation: "SELECT * FROM `myTable` GROUP BY `name`;",
         context: QueryGenerator
+      }, {
+        arguments: ['myTable', {group: ["name"]}],
+        expectation: "SELECT * FROM `myTable` GROUP BY `name`;",
+        context: QueryGenerator
+      }, {
+        arguments: ['myTable', {group: ["name", "title"]}],
+        expectation: "SELECT * FROM `myTable` GROUP BY `name`, `title`;",
+        context: QueryGenerator
       }, {
         arguments: ['myTable', {group: "name", order: "id DESC"}],
         expectation: "SELECT * FROM `myTable` GROUP BY `name` ORDER BY id DESC;",
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index 2440ae78712e..e8e0598113e4 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -71,6 +71,12 @@ describe('QueryGenerator', function() {
       }, {
         arguments: ['myTable', {group: "name"}],
         expectation: "SELECT * FROM \"myTable\" GROUP BY \"name\";"
+      }, {
+        arguments: ['myTable', {group: ["name"]}],
+        expectation: "SELECT * FROM \"myTable\" GROUP BY \"name\";"
+      }, {
+        arguments: ['myTable', {group: ["name","title"]}],
+        expectation: "SELECT * FROM \"myTable\" GROUP BY \"name\", \"title\";"
       }, {
         arguments: ['myTable', {limit: 10}],
         expectation: "SELECT * FROM \"myTable\" LIMIT 10;"

From d05004ef9bb5173da073c60ea4bae978d53afa1f Mon Sep 17 00:00:00 2001
From: Alex Young 
Date: Wed, 6 Mar 2013 15:02:21 +0000
Subject: [PATCH 181/360] Adds support for Sequelize.DECIMAL, which takes
 optional arguments for precision and scale.  Fixes #232

---
 lib/data-types.js       |  7 +++++++
 spec/data-types.spec.js | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 spec/data-types.spec.js

diff --git a/lib/data-types.js b/lib/data-types.js
index 2e542beb1d1a..4e6db4124345 100644
--- a/lib/data-types.js
+++ b/lib/data-types.js
@@ -8,5 +8,12 @@ module.exports = {
   FLOAT: 'FLOAT',
   NOW: 'NOW',
   ENUM: 'ENUM',
+  get DECIMAL() {
+    var ret = function(precision, scale) {
+      return 'DECIMAL(' + precision + ',' + scale + ')';
+    };
+    ret.toString = ret.valueOf = function() { return 'DECIMAL'; };
+    return ret;
+  },
   ARRAY: function(type) { return type + '[]' }
 }
diff --git a/spec/data-types.spec.js b/spec/data-types.spec.js
new file mode 100644
index 000000000000..1b0d2d584cc0
--- /dev/null
+++ b/spec/data-types.spec.js
@@ -0,0 +1,20 @@
+if(typeof require === 'function') {
+  const buster    = require("buster")
+      , Sequelize = require("../index")
+      , Helpers   = require('./buster-helpers')
+      , dialect   = Helpers.getTestDialect()
+}
+
+buster.spec.expose()
+
+describe(Helpers.getTestDialectTeaser('Data types'), function() {
+  if (dialect == 'mysql') {
+    it('should return DECIMAL for the default decimal type', function() {
+      expect(Sequelize.DECIMAL).toEqual('DECIMAL');
+    });
+
+    it('should return DECIMAL(10,2) for the default decimal type with arguments', function() {
+      expect(Sequelize.DECIMAL(10, 2)).toEqual('DECIMAL(10,2)');
+    });
+  }
+});

From 757da44f610c851ffdba38ead6e24990a35d5a95 Mon Sep 17 00:00:00 2001
From: Alex Young 
Date: Wed, 6 Mar 2013 15:18:22 +0000
Subject: [PATCH 182/360] Removes MySQL dialect condition in the data types
 test

---
 spec/data-types.spec.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/spec/data-types.spec.js b/spec/data-types.spec.js
index 1b0d2d584cc0..373f9e686c59 100644
--- a/spec/data-types.spec.js
+++ b/spec/data-types.spec.js
@@ -8,13 +8,11 @@ if(typeof require === 'function') {
 buster.spec.expose()
 
 describe(Helpers.getTestDialectTeaser('Data types'), function() {
-  if (dialect == 'mysql') {
-    it('should return DECIMAL for the default decimal type', function() {
-      expect(Sequelize.DECIMAL).toEqual('DECIMAL');
-    });
+  it('should return DECIMAL for the default decimal type', function() {
+    expect(Sequelize.DECIMAL).toEqual('DECIMAL');
+  });
 
-    it('should return DECIMAL(10,2) for the default decimal type with arguments', function() {
-      expect(Sequelize.DECIMAL(10, 2)).toEqual('DECIMAL(10,2)');
-    });
-  }
+  it('should return DECIMAL(10,2) for the default decimal type with arguments', function() {
+    expect(Sequelize.DECIMAL(10, 2)).toEqual('DECIMAL(10,2)');
+  });
 });

From 7357b7cc5052fcae92dfc0b263f0a1a1f86fb5fc Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Wed, 6 Mar 2013 16:47:35 +0100
Subject: [PATCH 183/360] Update changelog.md

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 687cbbf838db..f0ba53615df1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -39,6 +39,7 @@
 - [FEATURE] support for array serialization. pg only. #443 (thanks to clkao)
 - [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
 - [FEATURE] unified the result of describeTable
+- [FEATURE] add support for decimals (thanks to alexyoung)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

From 7f3c7a98be94f5de592f690cd3957a16be3a94f6 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Thu, 7 Mar 2013 07:13:47 +0100
Subject: [PATCH 184/360] encapsulate attributes

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c591ef9427d..c15b7e9da152 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,8 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - attributes / values of a dao instance should be scoped
 
 ### 2.0.0
-- save datetimes in UTC
+- ~~save datetimes in UTC~~
+- encapsulate attributes if a dao inside the attributes property + add getters and setters
 
 ## Collaboration 2.0 ##
 

From 1eb42c4c1b044896dbc1a941664db3e96c99b2ad Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 09:34:56 +0100
Subject: [PATCH 185/360] .

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bc6b96c4e098..dcc67ecfce1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,4 @@ language: node_js
 
 node_js:
   - 0.8
+

From a9a7ed75347fe0d4a20a0add6c21cbe3e02186de Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 09:34:56 +0100
Subject: [PATCH 186/360] .

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bc6b96c4e098..dcc67ecfce1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,4 @@ language: node_js
 
 node_js:
   - 0.8
+

From 7361930c6c07c09fba7db1738dbd021026699ec3 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 11:03:34 +0100
Subject: [PATCH 187/360] Initial impl.

---
 changelog.md           |  5 ++--
 lib/dao.js             | 11 ++++++++
 lib/query-interface.js | 30 ++++++++++++++++++++++
 spec/dao.spec.js       | 57 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index f0ba53615df1..b14dd30fc448 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,5 @@
-# v2.0.0 #
-- [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
-
 # v1.6.0 #
+- [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
 - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3
 - [DEPENDENCIES] mysql is now an optional dependency. #355 (thanks to clkao)
 - [REFACTORING] separated tests for dialects
@@ -40,6 +38,7 @@
 - [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
 - [FEATURE] unified the result of describeTable
 - [FEATURE] add support for decimals (thanks to alexyoung)
+- [FEATURE] added DAO.refresh(), which updates the attributes of the DAO in-place (as opposed to doing having to do a find() and returning a new model)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)
diff --git a/lib/dao.js b/lib/dao.js
index 59b31ecb934a..f7783db1493c 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -151,6 +151,17 @@ module.exports = (function() {
     }
   }
 
+ /*
+  * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same object.
+  * This is different from doing a `find(DAO.id)`, because that would create and return a new object. With this method,
+  * all references to the DAO are updated with the new data and no new objects are created.
+  *
+  * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
+  */
+  DAO.prototype.reload = function() {
+    return this.QueryInterface.reload(this, this.__factory.tableName);
+  }
+
   /*
    * Validate this dao's attribute values according to validation rules set in the dao definition.
    *
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 4e3da2ccdde7..8850f5c320f9 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -225,6 +225,36 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, dao], 'increment');
   }
 
+  QueryInterface.prototype.reload = function(dao, tableName) {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var sql = self.QueryGenerator.selectQuery(tableName, { id : dao.id, limit: 1 })
+        , calleeStub = { 
+          build: function (values) {
+            // We cannot use setAttributes here, since a refresh might also update the read only attributes
+            Utils._.each(values, function(value, attr) {
+              (dao.attributes.indexOf(attr) > -1) && (dao[attr] = value)
+            })
+          }
+        }
+        , qry = self.sequelize.query(sql, calleeStub, { plain: true, raw: false, type: 'SELECT' })
+
+      qry
+        .success(function () {
+          self.emit('refresh', null)
+          emitter.emit('success', dao)
+        })
+        .error(function(err) {
+          self.emit('refresh', err)
+          emitter.emit('error', err)
+        })
+        .on('sql', function(sql) {
+          emitter.emit('sql', sql)
+        })
+    }).run()
+  }
+
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
 
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index a7ee2b19ac4d..39a15dc6ccad 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -216,6 +216,63 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
     });
   });
 
+  describe('refresh', function () {
+    it("should return a refrence to the same DAO instead of creating a new one", function (done) {
+      this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
+
+        originalUser.updateAttributes({ username: 'Doe John' }).done(function () {
+          originalUser.reload().done(function (err, updatedUser) {
+            expect(originalUser === updatedUser).toBeTrue()
+            done();
+          })
+        })
+      })
+    })
+
+    it("should update the values on all references to the DAO", function (done) {
+      var self = this
+
+      this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
+        self.User.find(originalUser.id).done(function (err, updater) {
+          updater.updateAttributes({ username: 'Doe John' }).done(function () {
+            // We used a different refernce when calling updateAttributes, so originalUser is now out of sync
+            expect(originalUser.username).toEqual('John Doe')
+
+            originalUser.reload().done(function (err, updatedUser) {
+              expect(originalUser.username).toEqual('Doe John')
+              expect(updatedUser.username).toEqual('Doe John')
+
+              done();
+            })
+          })
+        })        
+      })
+    })
+
+    it("should update read only attributes as well (updatedAt)", function (done) {
+      var self = this
+      this.timeout = 2000;
+
+      this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
+        var originallyUpdatedAt = originalUser.updatedAt
+
+        // Wait for a second, so updatedAt will actually be different
+        setTimeout(function () {
+          self.User.find(originalUser.id).done(function (err, updater) {
+            updater.updateAttributes({ username: 'Doe John' }).done(function () {
+              originalUser.reload().done(function (err, updatedUser) {
+                expect(originalUser.updatedAt).toBeGreaterThan(originallyUpdatedAt)
+                expect(updatedUser.updatedAt).toBeGreaterThan(originallyUpdatedAt)
+
+                done();
+              })
+            })
+          })
+        }, 1000)
+      })
+    })
+  });
+
   describe('default values', function() {
     describe('current date', function() {
       it('should store a date in touchedAt', function() {

From 144a7d07b8a1f85f29146b4ec8cb75b0fcb119fb Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 11:08:06 +0100
Subject: [PATCH 188/360] spelling

---
 changelog.md     | 2 +-
 spec/dao.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index b14dd30fc448..3f26fccde971 100644
--- a/changelog.md
+++ b/changelog.md
@@ -38,7 +38,7 @@
 - [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
 - [FEATURE] unified the result of describeTable
 - [FEATURE] add support for decimals (thanks to alexyoung)
-- [FEATURE] added DAO.refresh(), which updates the attributes of the DAO in-place (as opposed to doing having to do a find() and returning a new model)
+- [FEATURE] added DAO.reload(), which updates the attributes of the DAO in-place (as opposed to doing having to do a find() and returning a new model)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 39a15dc6ccad..c2bc75c3ab29 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -235,7 +235,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
         self.User.find(originalUser.id).done(function (err, updater) {
           updater.updateAttributes({ username: 'Doe John' }).done(function () {
-            // We used a different refernce when calling updateAttributes, so originalUser is now out of sync
+            // We used a different reference when calling updateAttributes, so originalUser is now out of sync
             expect(originalUser.username).toEqual('John Doe')
 
             originalUser.reload().done(function (err, updatedUser) {

From 8939902f0c3a30a5201479b7ad314b57fbb3b8c2 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 11:09:02 +0100
Subject: [PATCH 189/360] spelling

---
 spec/dao.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index c2bc75c3ab29..2ab7e8d2f4bc 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -217,7 +217,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
   });
 
   describe('refresh', function () {
-    it("should return a refrence to the same DAO instead of creating a new one", function (done) {
+    it("should return a reference to the same DAO instead of creating a new one", function (done) {
       this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
 
         originalUser.updateAttributes({ username: 'Doe John' }).done(function () {

From 22817a0940199bed6e4844034c003a9c5f8e2c4d Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 11 Mar 2013 11:34:33 +0100
Subject: [PATCH 190/360] woops

---
 lib/query-interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/query-interface.js b/lib/query-interface.js
index 8850f5c320f9..fc0b489783c5 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -229,7 +229,7 @@ module.exports = (function() {
     var self = this
 
     return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, { id : dao.id, limit: 1 })
+      var sql = self.QueryGenerator.selectQuery(tableName, { where: { id : dao.id }, limit: 1 })
         , calleeStub = { 
           build: function (values) {
             // We cannot use setAttributes here, since a refresh might also update the read only attributes

From 05bcc45cca43fa948ac42e56a6824779c55fe27b Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 12 Mar 2013 20:41:11 +0100
Subject: [PATCH 191/360] added foreign key support to roadmap

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c15b7e9da152..7da65d0b51b7 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - Model#delete
 - Validate a model before it gets saved. (Move validation of enum attribute value to validate method)
 - BLOB [#99](https://github.com/sdepold/sequelize/issues/99)
+- Support for foreign keys
 
 ### 1.7.x
 - Complete support for non-id primary keys

From 99f5c1471eb025935ca1659d2c9cdccbf43e45bb Mon Sep 17 00:00:00 2001
From: Alex Young 
Date: Fri, 15 Mar 2013 11:52:58 +0000
Subject: [PATCH 192/360] Adds support for URL connection strings, with a test
 to ensure Sequelize gets instantiated correctly

---
 lib/sequelize.js           | 29 +++++++++++++--
 spec/configuration.spec.js | 74 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 spec/configuration.spec.js

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 534748472eec..d8a55e5322a6 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -1,4 +1,5 @@
-var Utils             = require("./utils")
+var url               = require("url")
+  , Utils             = require("./utils")
   , DAOFactory        = require("./dao-factory")
   , DataTypes         = require('./data-types')
   , DAOFactoryManager = require("./dao-factory-manager")
@@ -46,7 +47,31 @@ module.exports = (function() {
     @class Sequelize
     @constructor
   */
-  var Sequelize = function(database, username, password, options) {
+  var Sequelize = function() {
+    var database, username, password, options = {}, urlParts
+
+    if (arguments.length === 1) {
+      urlParts = url.parse(arguments[0])
+      database = urlParts.path.replace(/^\//,  '')
+      dialect = urlParts.protocol
+      options.dialect = urlParts.protocol.replace(/:$/, '')
+      options.host = urlParts.hostname
+
+      if (urlParts.port) {
+        options.port = urlParts.port
+      }
+
+      if (urlParts.auth) {
+        username = urlParts.auth.split(':')[0]
+        password = urlParts.auth.split(':')[1]
+      }
+    } else {
+      database = arguments[0]
+      username = arguments[1]
+      password = arguments[2]
+      options = arguments[3]
+    }
+
     this.options = Utils._.extend({
       dialect: 'mysql',
       host: 'localhost',
diff --git a/spec/configuration.spec.js b/spec/configuration.spec.js
new file mode 100644
index 000000000000..7e676d694669
--- /dev/null
+++ b/spec/configuration.spec.js
@@ -0,0 +1,74 @@
+if(typeof require === 'function') {
+  const buster             = require("buster")
+      , CustomEventEmitter = require("../lib/emitters/custom-event-emitter")
+      , Helpers            = require('./buster-helpers')
+      , dialect            = Helpers.getTestDialect()
+}
+
+buster.spec.expose()
+buster.testRunner.timeout = 1000
+
+var Sequelize = require(__dirname + '/../index')
+
+describe(Helpers.getTestDialectTeaser("Configuration"), function() {
+  describe('Instantiation with a URL string', function() {
+    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
+
+      expect(options.dialect).toEqual('mysql')
+
+      expect(config.database).toEqual('dbname')
+      expect(config.host).toEqual('example.com')
+      expect(config.username).toEqual('user')
+      expect(config.password).toEqual('pass')
+      expect(config.port).toEqual(9821)
+    })
+
+    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)
+    })
+
+    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)
+    })
+  })
+
+  describe('Intantiation with arguments', function() {
+    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')
+    })
+
+    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')
+    })
+
+    it('should accept four parameters (database, username, password, options)', function() {
+      var sequelize = new Sequelize('dbname', 'root', 'pass', { port: 999 })
+      var config = sequelize.config
+
+      expect(config.database).toEqual('dbname')
+      expect(config.username).toEqual('root')
+      expect(config.password).toEqual('pass')
+      expect(config.port).toEqual(999)
+    })
+  })
+})

From 5788e91ab95849cb54bd85b92c8e733be32ec544 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sat, 16 Mar 2013 19:34:41 +0100
Subject: [PATCH 193/360] Remove deprecation warning for node < 0.6 (closes
 #486)

---
 lib/sequelize.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 534748472eec..313564396827 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -4,10 +4,6 @@ var Utils             = require("./utils")
   , DAOFactoryManager = require("./dao-factory-manager")
   , QueryInterface    = require("./query-interface")
 
-if (typeof process != 'undefined' && parseFloat(process.version.replace('v', '')) < 0.6) {
-  console.log("DEPRECATION WARNING: Support for Node.JS < v0.6 will be canceled in the next minor release.")
-}
-
 module.exports = (function() {
   /**
     Main class of the project.

From e9113f359c3eaf1586d3c40999aac77f9c3c1200 Mon Sep 17 00:00:00 2001
From: solotimes 
Date: Thu, 21 Mar 2013 13:58:37 +0800
Subject: [PATCH 194/360] fixes #494

---
 lib/dao.js       |  5 ++++-
 spec/dao.spec.js | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/dao.js b/lib/dao.js
index 59b31ecb934a..56e6fc6154a1 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -287,7 +287,10 @@ module.exports = (function() {
       , self   = this
 
     Utils._.each(this.values, function(value, key) {
-      result = result && (value == other[key])
+      if(Utils._.isDate(value) && Utils._.isDate(other[key]))
+        result = result && (value.getTime() == other[key].getTime())
+      else
+        result = result && (value == other[key])
     })
 
     return result
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index a7ee2b19ac4d..2fbd3bf889c1 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -409,4 +409,17 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       }.bind(this))
     })
   })
+
+  describe('equals', function find() {
+    it("can compare records with Date field", function(done) {
+      this.User.create({ username: 'fnord' }).success(function(user1) {
+        var query = { where: { username: 'fnord' }}
+
+        this.User.find(query).success(function(user2) {
+          expect(user1.equals(user2)).toEqual(true)
+          done()
+        }.bind(this))
+      }.bind(this))
+    })
+  })
 })

From fa0167d949b0f7cb01465ac407868e12cd94019c Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 23 Mar 2013 08:45:52 +0100
Subject: [PATCH 195/360] Update changelog.md

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index f0ba53615df1..eb2a0772674e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -30,7 +30,7 @@
 - [FEATURE] added findOrCreate, which returns a the already existing instance or creates one (thanks to eveiga)
 - [FEATURE] minConnections option for MySQL pooling (thanks to dominiklessel)
 - [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1)
-- [FEATURE] https://github.com/sdepold/sequelize/pull/345
+- [FEATURE] experimental support for read replication for mysql (thanks to Janzeh)
 - [FEATURE] allow definition of a models table name (thanks to slamkajs)
 - [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
 - [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)

From ecd3de33910118ceca6ce31a19f450026b96a729 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sat, 23 Mar 2013 14:30:42 +0100
Subject: [PATCH 196/360] enum can now be defined with Sequelize.ENUM('asd1',
 'asd2', 'asd3')

---
 lib/dao.js                               |  2 +-
 lib/data-types.js                        | 29 ++++++++---
 lib/dialects/mysql/query-generator.js    |  2 +-
 lib/dialects/postgres/query-generator.js |  2 +-
 lib/dialects/sqlite/query-generator.js   |  2 +-
 spec/sequelize.spec.js                   | 62 ++++++++++++------------
 6 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 59b31ecb934a..8641aaf25a32 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -121,7 +121,7 @@ module.exports = (function() {
     for (var attrName in this.daoFactory.rawAttributes) {
       if (this.daoFactory.rawAttributes.hasOwnProperty(attrName)) {
         var definition      = this.daoFactory.rawAttributes[attrName]
-          , isEnum          = (definition.type === 'ENUM')
+          , isEnum          = (definition.type && (definition.type.toString() === DataTypes.ENUM.toString()))
           , hasValue        = (typeof values[attrName] !== 'undefined')
           , valueOutOfScope = ((definition.values || []).indexOf(values[attrName]) === -1)
 
diff --git a/lib/data-types.js b/lib/data-types.js
index 4e6db4124345..18fc006737c2 100644
--- a/lib/data-types.js
+++ b/lib/data-types.js
@@ -7,13 +7,30 @@ module.exports = {
   BOOLEAN: 'TINYINT(1)',
   FLOAT: 'FLOAT',
   NOW: 'NOW',
-  ENUM: 'ENUM',
+
+  get ENUM() {
+    var result = function() {
+      return {
+        type:   'ENUM',
+        values: Array.prototype.slice.call(arguments).reduce(function(result, element) {
+          return result.concat(Array.isArray(element) ? element : [ element ])
+        }, [])
+      }
+    }
+
+    result.toString = result.valueOf = function() { return 'ENUM' }
+
+    return result
+  },
+
   get DECIMAL() {
-    var ret = function(precision, scale) {
-      return 'DECIMAL(' + precision + ',' + scale + ')';
-    };
-    ret.toString = ret.valueOf = function() { return 'DECIMAL'; };
-    return ret;
+    var result = function(precision, scale) {
+      return 'DECIMAL(' + precision + ',' + scale + ')'
+    }
+
+    result.toString = result.valueOf = function() { return 'DECIMAL' }
+
+    return result
   },
   ARRAY: function(type) { return type + '[]' }
 }
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index e8d34399d237..05820a71a54b 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -378,7 +378,7 @@ module.exports = (function() {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if (dataType.type === DataTypes.ENUM) {
+          if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
               replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
                 return Utils.escape(value)
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 9b3f7783b2d8..e266dae7cab0 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -518,7 +518,7 @@ module.exports = (function() {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if (dataType.type === DataTypes.ENUM) {
+          if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
               replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
                 return Utils.escape(value)
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index d8cc12a20519..7ebe0c325f6d 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -151,7 +151,7 @@ module.exports = (function() {
           var template     = "<%= type %>"
             , replacements = { type: dataType.type }
 
-          if (dataType.type === DataTypes.ENUM) {
+          if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             replacements.type = "TEXT"
 
             if (!(Array.isArray(dataType.values) && (dataType.values.length > 0))) {
diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js
index f1f448494650..074096daa33f 100644
--- a/spec/sequelize.spec.js
+++ b/spec/sequelize.spec.js
@@ -153,43 +153,45 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
   })
 
   describe('define', function() {
-    describe('enum', function() {
-      before(function(done) {
-        this.Review = this.sequelize.define('review', {
-          status: { type: Helpers.Sequelize.ENUM, values: ['scheduled', 'active', 'finished']}
+    [
+      { type: Helpers.Sequelize.ENUM, values: ['scheduled', 'active', 'finished']},
+      Helpers.Sequelize.ENUM('scheduled', 'active', 'finished')
+    ].forEach(function(status) {
+      describe('enum', function() {
+        before(function(done) {
+          this.Review = this.sequelize.define('review', { status: status })
+          this.Review.sync({ force: true }).success(done)
         })
 
-        this.Review.sync({ force: true }).success(done)
-      })
-
-      it('raises an error if no values are defined', function() {
-        Helpers.assertException(function() {
-          this.sequelize.define('omnomnom', {
-            bla: { type: Helpers.Sequelize.ENUM }
-          })
-        }.bind(this), 'Values for ENUM haven\'t been defined.')
-      })
-
-      it('correctly stores values', function(done) {
-        this.Review.create({ status: 'active' }).success(function(review) {
-          expect(review.status).toEqual('active')
-          done()
+        it('raises an error if no values are defined', function() {
+          Helpers.assertException(function() {
+            this.sequelize.define('omnomnom', {
+              bla: { type: Helpers.Sequelize.ENUM }
+            })
+          }.bind(this), 'Values for ENUM haven\'t been defined.')
         })
-      })
 
-      it('correctly loads values', function(done) {
-        this.Review.create({ status: 'active' }).success(function() {
-          this.Review.findAll().success(function(reviews) {
-            expect(reviews[0].status).toEqual('active')
+        it('correctly stores values', function(done) {
+          this.Review.create({ status: 'active' }).success(function(review) {
+            expect(review.status).toEqual('active')
             done()
           })
-        }.bind(this))
-      })
+        })
 
-      it("doesn't save an instance if value is not in the range of enums", function() {
-        Helpers.assertException(function() {
-          this.Review.create({ status: 'fnord' })
-        }.bind(this), 'Value "fnord" for ENUM status is out of allowed scope. Allowed values: scheduled, active, finished')
+        it('correctly loads values', function(done) {
+          this.Review.create({ status: 'active' }).success(function() {
+            this.Review.findAll().success(function(reviews) {
+              expect(reviews[0].status).toEqual('active')
+              done()
+            })
+          }.bind(this))
+        })
+
+        it("doesn't save an instance if value is not in the range of enums", function() {
+          Helpers.assertException(function() {
+            this.Review.create({ status: 'fnord' })
+          }.bind(this), 'Value "fnord" for ENUM status is out of allowed scope. Allowed values: scheduled, active, finished')
+        })
       })
     })
   })

From dafcf1da22b071bb7b676fb6c3727223fff692be Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sun, 24 Mar 2013 14:02:56 +0100
Subject: [PATCH 197/360] dates do not have precision of milliseconds anymore

---
 lib/dao.js       | 12 ++++++------
 lib/utils.js     |  8 +++++++-
 spec/dao.spec.js |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index fda04e439ed0..a940ffe8d46d 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -132,7 +132,7 @@ module.exports = (function() {
     }
 
     if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
-      this[updatedAtAttr] = values[updatedAtAttr] = new Date()
+      this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
     if (this.isNewRecord) {
@@ -284,13 +284,13 @@ module.exports = (function() {
 
   DAO.prototype.equals = function(other) {
     var result = true
-      , self   = this
 
     Utils._.each(this.values, function(value, key) {
-      if(Utils._.isDate(value) && Utils._.isDate(other[key]))
+      if(Utils._.isDate(value) && Utils._.isDate(other[key])) {
         result = result && (value.getTime() == other[key].getTime())
-      else
+      } else {
         result = result && (value == other[key])
+      }
     })
 
     return result
@@ -332,8 +332,8 @@ module.exports = (function() {
     var defaults = this.hasPrimaryKeys ? {} : { id: null }
 
     if (this.__options.timestamps && isNewRecord) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
 
       if (this.__options.paranoid) {
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
diff --git a/lib/utils.js b/lib/utils.js
index 59324d2a345c..72acf9ee23b8 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -99,7 +99,7 @@ var Utils = module.exports = {
   },
 
   toDefaultValue: function(value) {
-    return (value == DataTypes.NOW) ? new Date() : value
+    return (value === DataTypes.NOW) ? Utils.now() : value
   },
 
   setAttributes: function(hash, identifier, instance, prefix) {
@@ -173,6 +173,12 @@ var Utils = module.exports = {
     }
 
     return subClass;
+  },
+
+  now: function() {
+    var now = new Date()
+    now.setMilliseconds(0)
+    return now
   }
 }
 
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 2fbd3bf889c1..442d68f66dd8 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -416,7 +416,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
         var query = { where: { username: 'fnord' }}
 
         this.User.find(query).success(function(user2) {
-          expect(user1.equals(user2)).toEqual(true)
+          expect(user1.equals(user2)).toBeTrue()
           done()
         }.bind(this))
       }.bind(this))

From 125143bb6c4e535ba7887c96f6e7ae5333e276c9 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sun, 24 Mar 2013 14:12:40 +0100
Subject: [PATCH 198/360] fixed tests

---
 spec-jasmine/dao.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec-jasmine/dao.spec.js b/spec-jasmine/dao.spec.js
index ea4527dbda69..d246d6d4fb90 100644
--- a/spec-jasmine/dao.spec.js
+++ b/spec-jasmine/dao.spec.js
@@ -199,7 +199,7 @@ describe('DAO', function() {
               updatedAt = user.updatedAt
               expect(updatedAt.getTime()).toBeGreaterThan(now)
               done()
-            }, 10)
+            }, 1000)
           })
 
           Helpers.async(function(done) {
@@ -208,7 +208,7 @@ describe('DAO', function() {
                 expect(updatedAt.getTime()).toBeLessThan(user.updatedAt.getTime())
                 done()
               })
-            }, 10)
+            }, 1000)
           })
         })
 

From 999bafff1f6c07a767216af8b9cb727a92633b4a Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sun, 24 Mar 2013 14:12:56 +0100
Subject: [PATCH 199/360] added equals change

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index eb2a0772674e..3ddc49b218e8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,7 @@
 - [BUG] fixed the location of the foreign key when using belongsTo (thanks to ricardograca)
 - [BUG] don't return timestamps if only specific attributes have been seleceted (thanks to ricardograca)
 - [BUG] fixed removeColumn for sqlite
+- [BUG] fixed date equality check for instances. (thanks to solotimes)
 - [FEATURE] added association prefetching /eager loading for find and findAll. #465
 - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot)
 - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result

From 6a21270ffad79e8d0142a48df9dcb761b3d0a0ca Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Sun, 24 Mar 2013 14:14:59 +0100
Subject: [PATCH 200/360] merged #473

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 3ddc49b218e8..fb7093748312 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@
 - [REFACTORING] dropped support for synchronous migrations. added third parameter which needs to get called once the migration has been finished. also this adds support for asynchronous actions in migrations.
 - [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango)
 - [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling)
+- [OTHERS] Overwrite existing daoFactoryDefinition if there already has been one. (thanks to robraux)
 - [BUG] fixed wrong version in sequelize binary
 - [BUG] local options have higher priority than global options (thanks to guersam)
 - [BUG] fixed where clause when passing an empty array (thanks to kbackowski)

From 27b88487ade2d338d9beb660e710df3afe6d22ad Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Mar 2013 22:00:33 +0100
Subject: [PATCH 201/360] use Model.find to reload a model instance

---
 lib/dao.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/dao.js b/lib/dao.js
index f93e71d06639..2a9f0c84c148 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -159,7 +159,28 @@ module.exports = (function() {
   * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
   */
   DAO.prototype.reload = function() {
-    return this.QueryInterface.reload(this, this.__factory.tableName);
+    var where = [
+      this.QueryInterface.QueryGenerator.addQuotes(this.__factory.tableName) + '.' + this.QueryInterface.QueryGenerator.addQuotes('id')+'=?',
+      this.id
+    ]
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      this.__factory.find({
+        where:   where,
+        limit:   1,
+        include: this.__eagerlyLoadedOptions || []
+      })
+      .on('sql', function(sql) { emitter.emit('sql', sql) })
+      .on('error', function(error) { emitter.emit('error', error) })
+      .on('success', function(obj) {
+        for (var valueName in obj.values) {
+          if (obj.values.hasOwnProperty(valueName)) {
+            this[valueName] = obj.values[valueName]
+          }
+        }
+        emitter.emit('success', this)
+      }.bind(this))
+    }.bind(this)).run()
   }
 
   /*

From 7139a630bbf871a9d12ed5943904c2b95519e60b Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Mar 2013 22:01:06 +0100
Subject: [PATCH 202/360] extracted log in order to be able to use it somewhere
 else

---
 lib/dialects/abstract/query.js | 45 ++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/lib/dialects/abstract/query.js b/lib/dialects/abstract/query.js
index 5419594adf06..0ac71f1fa6ce 100644
--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -259,20 +259,7 @@ module.exports = (function() {
 
       result = result.map(Dot.transform)
     } else if (this.options.hasJoin === true) {
-      result = prepareJoinData.call(this, results)
-      result = groupDataByCalleeFactory.call(this, result).map(function(result) {
-        // let's build the actual dao instance first...
-        var dao = this.callee.build(result[this.callee.tableName], { isNewRecord: false })
-
-        // ... and afterwards the prefetched associations
-        for (var tableName in result) {
-          if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
-            buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
-          }
-        }
-
-        return dao
-      }.bind(this))
+      result = transformRowsWithEagerLoadingIntoDaos.call(this, results)
     } else {
       result = results.map(function(result) {
         return this.callee.build(result, { isNewRecord: false })
@@ -287,6 +274,31 @@ module.exports = (function() {
     return result
   }
 
+  var transformRowsWithEagerLoadingIntoDaos = function(results) {
+    var result = []
+
+    result = prepareJoinData.call(this, results)
+    result = groupDataByCalleeFactory.call(this, result).map(function(result) {
+      return transformRowWithEagerLoadingIntoDao.call(this, result)
+    }.bind(this))
+
+    return result
+  }
+
+  var transformRowWithEagerLoadingIntoDao = function(result, dao) {
+    // let's build the actual dao instance first...
+    dao = dao || this.callee.build(result[this.callee.tableName], { isNewRecord: false })
+
+    // ... and afterwards the prefetched associations
+    for (var tableName in result) {
+      if (result.hasOwnProperty(tableName) && (tableName !== this.callee.tableName)) {
+        buildAssociatedDaoInstances.call(this, tableName, result[tableName], dao)
+      }
+    }
+
+    return dao
+  }
+
   var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
     var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
       , association          = null
@@ -311,7 +323,7 @@ module.exports = (function() {
 
     associationData.forEach(function(data) {
       var daoInstance = associatedDaoFactory.build(data, { isNewRecord: false })
-        , isEmpty = ! Utils.firstValueOfHash(daoInstance.identifiers)
+        , isEmpty     = !Utils.firstValueOfHash(daoInstance.identifiers)
 
       if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
         accessor = Utils.singularize(accessor)
@@ -326,7 +338,8 @@ module.exports = (function() {
 
       // add the accessor to the eagerly loaded associations array
       dao.__eagerlyLoadedAssociations = Utils._.uniq(dao.__eagerlyLoadedAssociations.concat([accessor]))
-    })
+      dao.__eagerlyLoadedOptions      = (this.options && this.options.include) ? this.options.include : []
+    }.bind(this))
   }
 
   var isShowOrDescribeQuery = function() {

From a8efaea4cc1f01bf6879c8d5f22a23e08a5bf13c Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Mar 2013 22:01:29 +0100
Subject: [PATCH 203/360] made addQuotes and removeQuotes parts of the
 QueryGenerator

---
 lib/dialects/mysql/query-generator.js    |  46 +--
 lib/dialects/postgres/query-generator.js | 346 +++++++++++++----------
 2 files changed, 225 insertions(+), 167 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 05820a71a54b..42e121a4572e 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -20,20 +20,20 @@ module.exports = (function() {
 
           if (Utils._.includes(dataType, 'PRIMARY KEY')) {
             primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+            attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
           } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+            attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType)
           }
         }
       }
 
       var values = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         attributes: attrStr.join(", "),
         engine: options.engine,
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+      , pkString = primaryKeys.map(function(pk) { return QueryGenerator.addQuotes(pk) }).join(", ")
 
       if (pkString.length > 0) {
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
@@ -47,7 +47,9 @@ module.exports = (function() {
 
       var query = "DROP TABLE IF EXISTS <%= table %>;"
 
-      return Utils._.template(query)({table: Utils.addTicks(tableName)})
+      return Utils._.template(query)({
+        table: QueryGenerator.addQuotes(tableName)
+      })
     },
 
     renameTableQuery: function(before, after) {
@@ -118,12 +120,12 @@ module.exports = (function() {
         , table = null
 
       options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return QueryGenerator.addQuotes(tbl) }).join(", ") : QueryGenerator.addQuotes(tableName)
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
-          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
+          return [attr[0], QueryGenerator.addQuotes(attr[1])].join(' as ')
         } else {
-          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? QueryGenerator.addQuotes(attr) : attr
         }
       }).join(", ")
       options.attributes = options.attributes || '*'
@@ -159,7 +161,7 @@ module.exports = (function() {
       }
 
       if (options.group) {
-        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return Utils.addTicks(grp)}).join(', ') : Utils.addTicks(options.group)
+        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return QueryGenerator.addQuotes(grp)}).join(', ') : QueryGenerator.addQuotes(options.group)
         query += " GROUP BY <%= group %>"
       }
 
@@ -187,8 +189,8 @@ module.exports = (function() {
       var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
 
       var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        table: QueryGenerator.addQuotes(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
@@ -207,11 +209,11 @@ module.exports = (function() {
         var value  = attrValueHash[key]
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
 
-        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
       }
 
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         values: values.join(","),
         where: QueryGenerator.getWhereConditions(where)
       }
@@ -225,7 +227,7 @@ module.exports = (function() {
 
       var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         where: QueryGenerator.getWhereConditions(where),
         limit: Utils.escape(options.limit)
       }
@@ -243,11 +245,11 @@ module.exports = (function() {
         var value  = attrValueHash[key]
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
 
-        values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + " + " +Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
 
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         values: values.join(","),
         where: QueryGenerator.getWhereConditions(where)
       }
@@ -342,7 +344,7 @@ module.exports = (function() {
         var value = hash[key]
 
          //handle qualified key names
-        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
+        var _key   = key.split('.').map(function(col){return QueryGenerator.addQuotes(col)}).join(".")
           , _value = null
 
         if (Array.isArray(value)) {
@@ -357,7 +359,7 @@ module.exports = (function() {
           // is value an object?
 
           //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
+          _value = value.join.split('.').map(function(col){ return QueryGenerator.addQuotes(col) }).join(".")
           result.push([_key, _value].join("="))
         } else {
           _value = Utils.escape(value)
@@ -432,6 +434,14 @@ module.exports = (function() {
       }
 
       return fields
+    },
+
+    addQuotes: function(s, quoteChar) {
+      return Utils.addTicks(s, quoteChar)
+    },
+
+    removeQuotes: function(s, quoteChar) {
+      return Utils.removeTicks(s, quoteChar)
     }
   }
 
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index e266dae7cab0..f55dd503860e 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -1,89 +1,8 @@
-var Utils = require("../../utils")
-  , util  = require("util")
-  , DataTypes = require("../../data-types")
-  , tables = {}
-  , primaryKeys = {};
-
-function removeQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return s.replace(new RegExp(quoteChar, 'g'), '')
-}
-
-function addQuotes(s, quoteChar) {
-  quoteChar = quoteChar || '"'
-  return removeQuotes(s, quoteChar)
-    .split('.')
-    .map(function(e) { return quoteChar + String(e) + quoteChar })
-    .join('.')
-}
-
-function pgEscape(val) {
-  if (val === undefined || val === null) {
-    return 'NULL';
-  }
-
-  switch (typeof val) {
-    case 'boolean': return (val) ? 'true' : 'false';
-    case 'number': return val+'';
-    case 'object':
-      if (Array.isArray(val)) {
-        return 'ARRAY['+ val.map(function(it) { return pgEscape(it) }).join(',') +']';
-      }
-  }
-
-  if (val instanceof Date) {
-    val = pgSqlDate(val);
-  }
-
-  // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-  val = val.replace(/'/g, "''");
-  return "'"+val+"'";
-}
-
-function pgEscapeAndQuote(val) {
-  return addQuotes(removeQuotes(pgEscape(val), "'"))
-}
-
-function pgEnum(tableName, attr, dataType) {
-  var enumName = pgEscapeAndQuote("enum_" + tableName + "_" + attr)
-  return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
-}
-
-function padInt(i) {
-  return (i < 10) ? '0' + i.toString() : i.toString()
-}
-function pgSqlDate(dt) {
-  var date = [ dt.getUTCFullYear(), padInt(dt.getUTCMonth()+1), padInt(dt.getUTCDate()) ].join('-')
-  var time = [ dt.getUTCHours(), padInt(dt.getUTCMinutes()), padInt(dt.getUTCSeconds())].join(':')
-  return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000) + 'Z'
-}
-
-function pgDataTypeMapping(tableName, attr, dataType) {
-  if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-    primaryKeys[tableName].push(attr)
-    dataType = dataType.replace(/PRIMARY KEY/, '')
-  }
-
-  if (Utils._.includes(dataType, 'TINYINT(1)')) {
-    dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
-  }
-
-  if (Utils._.includes(dataType, 'DATETIME')) {
-    dataType = dataType.replace(/DATETIME/, 'TIMESTAMP WITH TIME ZONE')
-  }
-
-  if (Utils._.includes(dataType, 'SERIAL')) {
-    dataType = dataType.replace(/INTEGER/, '')
-    dataType = dataType.replace(/NOT NULL/, '')
-    tables[tableName][attr] = 'serial'
-  }
-
-  if (dataType.match(/^ENUM\(/)) {
-    dataType = dataType.replace(/^ENUM\(.+\)/, pgEscapeAndQuote("enum_" + tableName + "_" + attr))
-  }
-
-  return dataType
-}
+var Utils       = require("../../utils")
+  , util        = require("util")
+  , DataTypes   = require("../../data-types")
+  , tables      = {}
+  , primaryKeys = {}
 
 module.exports = (function() {
   var QueryGenerator = {
@@ -100,20 +19,23 @@ module.exports = (function() {
         , attrStr = []
 
       for (var attr in attributes) {
-        var dataType = pgDataTypeMapping(tableName, attr, attributes[attr])
-        attrStr.push(addQuotes(attr) + " " + dataType)
+        var dataType = QueryGenerator.pgDataTypeMapping(tableName, attr, attributes[attr])
+        attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType)
 
         if (attributes[attr].match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attr, attributes[attr]) + query;
+          query = QueryGenerator.pgEnum(tableName, attr, attributes[attr]) + query
         }
       }
 
       var values  = {
-        table: addQuotes(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         attributes: attrStr.join(", "),
       }
 
-      var pks = primaryKeys[tableName].map(function(pk){ return addQuotes(pk) }).join(",")
+      var pks = primaryKeys[tableName].map(function(pk){
+        return QueryGenerator.addQuotes(pk)
+      }).join(",")
+
       if (pks.length > 0) {
         values.attributes += ", PRIMARY KEY (" + pks + ")"
       }
@@ -124,12 +46,17 @@ module.exports = (function() {
     dropTableQuery: function(tableName, options) {
       options = options || {}
       var query = "DROP TABLE IF EXISTS <%= table %>;"
-      return Utils._.template(query)({ table: addQuotes(tableName) })
+      return Utils._.template(query)({
+        table: QueryGenerator.addQuotes(tableName)
+      })
     },
 
     renameTableQuery: function(before, after) {
       var query = "ALTER TABLE <%= before %> RENAME TO <%= after %>;"
-      return Utils._.template(query)({ before: addQuotes(before), after: addQuotes(after) })
+      return Utils._.template(query)({
+        before: QueryGenerator.addQuotes(before),
+        after: QueryGenerator.addQuotes(after)
+      })
     },
 
     showTablesQuery: function() {
@@ -138,7 +65,9 @@ module.exports = (function() {
 
     describeTableQuery: function(tableName) {
       var query = 'SELECT column_name as "Field", column_default as "Default", is_nullable as "Null", data_type as "Type" FROM information_schema.columns WHERE table_name = <%= table %>;'
-      return Utils._.template(query)({ table: addQuotes(tableName, "'") })
+      return Utils._.template(query)({
+        table: QueryGenerator.addQuotes(tableName, "'")
+      })
     },
 
     addColumnQuery: function(tableName, attributes) {
@@ -149,21 +78,26 @@ module.exports = (function() {
         var definition = attributes[attrName]
 
         attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
-          attrName: addQuotes(attrName),
-          definition: pgDataTypeMapping(tableName, attrName, definition)
+          attrName:   QueryGenerator.addQuotes(attrName),
+          definition: QueryGenerator.pgDataTypeMapping(tableName, attrName, definition)
         }))
 
         if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attrName, definition) + query
+          query = QueryGenerator.pgEnum(tableName, attrName, definition) + query
         }
       }
 
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+      return Utils._.template(query)({
+        tableName:  QueryGenerator.addQuotes(tableName),
+        attributes: attrString.join(', ') })
     },
 
     removeColumnQuery: function(tableName, attributeName) {
       var query = "ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;"
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributeName: addQuotes(attributeName) })
+      return Utils._.template(query)({
+        tableName:     QueryGenerator.addQuotes(tableName),
+        attributeName: QueryGenerator.addQuotes(attributeName)
+      })
     },
 
     changeColumnQuery: function(tableName, attributes) {
@@ -176,40 +110,40 @@ module.exports = (function() {
 
         if (definition.indexOf('NOT NULL') > 0) {
           attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' SET NOT NULL'
+            tableName: QueryGenerator.addQuotes(tableName),
+            query:     QueryGenerator.addQuotes(attributeName) + ' SET NOT NULL'
           })
 
           definition = definition.replace('NOT NULL', '').trim()
         } else {
           attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' DROP NOT NULL'
+            tableName: QueryGenerator.addQuotes(tableName),
+            query:     QueryGenerator.addQuotes(attributeName) + ' DROP NOT NULL'
           })
         }
 
         if (definition.indexOf('DEFAULT') > 0) {
           attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' SET DEFAULT' + definition.match(/DEFAULT ([^;]+)/)[1]
+            tableName: QueryGenerator.addQuotes(tableName),
+            query:     QueryGenerator.addQuotes(attributeName) + ' SET DEFAULT' + definition.match(/DEFAULT ([^;]+)/)[1]
           })
 
           definition = definition.replace(/(DEFAULT[^;]+)/, '').trim()
         } else {
           attrSql += Utils._.template(query)({
-            tableName: addQuotes(tableName),
-            query: addQuotes(attributeName) + ' DROP DEFAULT'
+            tableName: QueryGenerator.addQuotes(tableName),
+            query:     QueryGenerator.addQuotes(attributeName) + ' DROP DEFAULT'
           })
         }
 
         if (definition.match(/^ENUM\(/)) {
-          query = pgEnum(tableName, attributeName, definition) + query
+          query      = QueryGenerator.pgEnum(tableName, attributeName, definition) + query
           definition = definition.replace(/^ENUM\(.+\)/, Utils.escape("enum_" + tableName + "_" + attributeName))
         }
 
         attrSql += Utils._.template(query)({
-          tableName: addQuotes(tableName),
-          query: addQuotes(attributeName) + ' TYPE ' + definition
+          tableName: QueryGenerator.addQuotes(tableName),
+          query:     QueryGenerator.addQuotes(attributeName) + ' TYPE ' + definition
         })
 
         sql.push(attrSql)
@@ -224,12 +158,15 @@ module.exports = (function() {
 
       for (var attributeName in attributes) {
         attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
-          before: addQuotes(attrBefore),
-          after: addQuotes(attributeName),
+          before: QueryGenerator.addQuotes(attrBefore),
+          after:  QueryGenerator.addQuotes(attributeName),
         }))
       }
 
-      return Utils._.template(query)({ tableName: addQuotes(tableName), attributes: attrString.join(', ') })
+      return Utils._.template(query)({
+        tableName:  QueryGenerator.addQuotes(tableName),
+        attributes: attrString.join(', ')
+      })
     },
 
     selectQuery: function(tableName, options) {
@@ -237,16 +174,28 @@ module.exports = (function() {
         , table = null
 
       options = options || {}
-      options.table = table = Array.isArray(tableName) ? tableName.map(function(t){return addQuotes(t);}).join(", ") : addQuotes(tableName)
+
+      if (Array.isArray(tableName)) {
+        options.table = table = tableName.map(function(t){
+          return QueryGenerator.addQuotes(t)
+        }).join(", ")
+      } else {
+        options.table = table = QueryGenerator.addQuotes(tableName)
+      }
+
       options.attributes = options.attributes && options.attributes.map(function(attr) {
         if (Array.isArray(attr) && attr.length === 2) {
-          return [attr[0], addQuotes(removeQuotes(attr[1], '`'))].join(' as ')
+          return [
+            attr[0],
+            QueryGenerator.addQuotes(QueryGenerator.removeQuotes(attr[1], '`'))
+          ].join(' as ')
         } else if (attr.indexOf('`') >= 0) {
           return attr.replace(/`/g, '"')
         } else {
-          return addQuotes(attr)
+          return QueryGenerator.addQuotes(attr)
         }
       }).join(", ")
+
       options.attributes = options.attributes || '*'
 
       if (options.include) {
@@ -261,6 +210,7 @@ module.exports = (function() {
           optAttributes = optAttributes.concat(attributes)
 
           var joinQuery = ' LEFT OUTER JOIN "<%= table %>" AS "<%= as %>" ON "<%= tableLeft %>"."<%= attrLeft %>" = "<%= tableRight %>"."<%= attrRight %>"'
+
           query += Utils._.template(joinQuery)({
             table:      include.daoFactory.tableName,
             as:         include.as,
@@ -280,12 +230,21 @@ module.exports = (function() {
       }
 
       if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) { return addQuotes(g1)+g2 })
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) {
+          return QueryGenerator.addQuotes(g1) + g2
+        })
         query += " ORDER BY <%= order %>"
       }
 
       if(options.group) {
-        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return addQuotes(grp)}).join(', ') : addQuotes(options.group)
+        if (Array.isArray(options.group)) {
+          options.group = options.group.map(function(grp){
+            return QueryGenerator.addQuotes(grp)
+          }).join(', ')
+        } else {
+          options.group = QueryGenerator.addQuotes(options.group)
+        }
+
         query += " GROUP BY <%= group %>"
       }
 
@@ -322,11 +281,13 @@ module.exports = (function() {
       });
 
       var replacements  = {
-        table: addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
-          return pgEscape(value)
-        }).join(",")
+        table:      QueryGenerator.addQuotes(tableName)
+      , attributes: Object.keys(attrValueHash).map(function(attr){
+                      return QueryGenerator.addQuotes(attr)
+                    }).join(",")
+      , values:     Utils._.values(attrValueHash).map(function(value){
+                      return QueryGenerator.pgEscape(value)
+                    }).join(",")
       }
 
       return Utils._.template(query)(replacements)
@@ -340,13 +301,13 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + pgEscape(value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.pgEscape(value))
       }
 
       var replacements = {
-        table: addQuotes(tableName),
+        table:  QueryGenerator.addQuotes(tableName),
         values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
+        where:  QueryGenerator.getWhereConditions(where)
       }
 
       return Utils._.template(query)(replacements)
@@ -362,15 +323,17 @@ module.exports = (function() {
 
       var pks;
       if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
-        pks = primaryKeys[tableName].map(function(pk) { return addQuotes(pk) }).join(',')
+        pks = primaryKeys[tableName].map(function(pk) {
+          return QueryGenerator.addQuotes(pk)
+        }).join(',')
       } else {
-        pks = addQuotes('id')
+        pks = QueryGenerator.addQuotes('id')
       }
 
       var replacements = {
-        table: addQuotes(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         where: QueryGenerator.getWhereConditions(where),
-        limit: pgEscape(options.limit),
+        limit: QueryGenerator.pgEscape(options.limit),
         primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
         primaryKeysSelection: pks
       }
@@ -386,13 +349,13 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
-        values.push(addQuotes(key) + "=" + addQuotes(key) + " + " + pgEscape(value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " + QueryGenerator.pgEscape(value))
       }
 
       var replacements = {
-        table: addQuotes(tableName),
+        table:  QueryGenerator.addQuotes(tableName),
         values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
+        where:  QueryGenerator.getWhereConditions(where)
       }
 
       return Utils._.template(query)(replacements)
@@ -402,7 +365,7 @@ module.exports = (function() {
     addIndexQuery: function(tableName, attributes, options) {
       var transformedAttributes = attributes.map(function(attribute) {
         if (typeof attribute === 'string') {
-          return addQuotes(attribute)
+          return QueryGenerator.addQuotes(attribute)
         } else {
           var result = ""
 
@@ -410,7 +373,7 @@ module.exports = (function() {
             throw new Error('The following index attribute has no attribute: ' + util.inspect(attribute))
           }
 
-          result += addQuotes(attribute.attribute)
+          result += QueryGenerator.addQuotes(attribute.attribute)
 
           if (attribute.length) {
             result += '(' + attribute.length + ')'
@@ -431,14 +394,14 @@ module.exports = (function() {
       var indexTable = tableName.split('.')
       options = Utils._.extend({
         indicesType: null,
-        indexName: Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
-        parser: null
+        indexName:   Utils._.underscored(indexTable[indexTable.length-1] + '_' + onlyAttributeNames.join('_')),
+        parser:      null
       }, options || {})
 
       return Utils._.compact([
-        "CREATE", options.indicesType, "INDEX", addQuotes(options.indexName),
+        "CREATE", options.indicesType, "INDEX", QueryGenerator.addQuotes(options.indexName),
         (options.indexType ? ('USING ' + options.indexType) : undefined),
-        "ON", addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
+        "ON", QueryGenerator.addQuotes(tableName), '(' + transformedAttributes.join(', ') + ')'
       ]).join(' ')
     },
 
@@ -455,7 +418,10 @@ module.exports = (function() {
         indexName = Utils._.underscored(tableName + '_' + indexNameOrAttributes.join('_'))
       }
 
-      return Utils._.template(sql)({ tableName: addQuotes(tableName), indexName: addQuotes(indexName) })
+      return Utils._.template(sql)({
+        tableName: QueryGenerator.addQuotes(tableName),
+        indexName: QueryGenerator.addQuotes(indexName)
+      })
     },
 
     getWhereConditions: function(smth) {
@@ -465,7 +431,7 @@ module.exports = (function() {
         result = QueryGenerator.hashToWhereConditions(smth)
       }
       else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + pgEscape(smth)
+        result = '\"id\"' + "=" + QueryGenerator.pgEscape(smth)
       }
       else if (typeof smth === "string") {
         result = smth
@@ -484,23 +450,23 @@ module.exports = (function() {
         var value = hash[key]
 
         //handle qualified key names
-        var _key   = key.split('.').map(function(col){return addQuotes(col)}).join(".")
+        var _key   = key.split('.').map(function(col){return QueryGenerator.addQuotes(col)}).join(".")
           , _value = null
 
         if (Array.isArray(value)) {
           if (value.length == 0) { value = [null] }
           _value = "(" + value.map(function(subValue) {
-            return pgEscape(subValue);
+            return QueryGenerator.pgEscape(subValue);
           }).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
         }
         else if ((value) && (typeof value === "object")) {
           //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){return addQuotes(col)}).join(".")
+          _value = value.join.split('.').map(function(col){return QueryGenerator.addQuotes(col)}).join(".")
           result.push([_key, _value].join("="))
         } else {
-          _value = pgEscape(value)
+          _value = QueryGenerator.pgEscape(value)
           result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
         }
       }
@@ -546,7 +512,7 @@ module.exports = (function() {
 
           if (dataType.defaultValue !== undefined) {
             template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = pgEscape(dataType.defaultValue)
+            replacements.defaultValue = QueryGenerator.pgEscape(dataType.defaultValue)
           }
 
           if (dataType.unique) {
@@ -584,13 +550,95 @@ module.exports = (function() {
       var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
 
       return Utils._.template(template)({
-        user: encodeURIComponent(config.username),
+        user:     encodeURIComponent(config.username),
         password: encodeURIComponent(config.password),
         database: config.database,
-        host: config.host,
-        port: config.port,
+        host:     config.host,
+        port:     config.port,
         protocol: config.protocol
       })
+    },
+
+    removeQuotes: function (s, quoteChar) {
+      quoteChar = quoteChar || '"'
+      return s.replace(new RegExp(quoteChar, 'g'), '')
+    },
+
+    addQuotes: function (s, quoteChar) {
+      quoteChar = quoteChar || '"'
+      return QueryGenerator.removeQuotes(s, quoteChar)
+        .split('.')
+        .map(function(e) { return quoteChar + String(e) + quoteChar })
+        .join('.')
+    },
+
+    pgEscape: function (val) {
+      if (val === undefined || val === null) {
+        return 'NULL';
+      }
+
+      switch (typeof val) {
+        case 'boolean': return (val) ? 'true' : 'false';
+        case 'number': return val+'';
+        case 'object':
+          if (Array.isArray(val)) {
+            return 'ARRAY['+ val.map(function(it) { return QueryGenerator.pgEscape(it) }).join(',') +']';
+          }
+      }
+
+      if (val instanceof Date) {
+        val = QueryGenerator.pgSqlDate(val);
+      }
+
+      // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+      val = val.replace(/'/g, "''");
+      return "'"+val+"'";
+    },
+
+    pgEscapeAndQuote: function (val) {
+      return QueryGenerator.addQuotes(QueryGenerator.removeQuotes(QueryGenerator.pgEscape(val), "'"))
+    },
+
+    pgEnum: function (tableName, attr, dataType) {
+      var enumName = QueryGenerator.pgEscapeAndQuote("enum_" + tableName + "_" + attr)
+      return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
+    },
+
+    padInt: function (i) {
+      return (i < 10) ? '0' + i.toString() : i.toString()
+    },
+
+    pgSqlDate: function (dt) {
+      var date = [ dt.getUTCFullYear(), QueryGenerator.padInt(dt.getUTCMonth()+1), QueryGenerator.padInt(dt.getUTCDate()) ].join('-')
+      var time = [ dt.getUTCHours(), QueryGenerator.padInt(dt.getUTCMinutes()), QueryGenerator.padInt(dt.getUTCSeconds())].join(':')
+      return date + ' ' + time + '.' + ((dt.getTime() % 1000) * 1000) + 'Z'
+    },
+
+    pgDataTypeMapping: function (tableName, attr, dataType) {
+      if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+        primaryKeys[tableName].push(attr)
+        dataType = dataType.replace(/PRIMARY KEY/, '')
+      }
+
+      if (Utils._.includes(dataType, 'TINYINT(1)')) {
+        dataType = dataType.replace(/TINYINT\(1\)/, 'BOOLEAN')
+      }
+
+      if (Utils._.includes(dataType, 'DATETIME')) {
+        dataType = dataType.replace(/DATETIME/, 'TIMESTAMP WITH TIME ZONE')
+      }
+
+      if (Utils._.includes(dataType, 'SERIAL')) {
+        dataType = dataType.replace(/INTEGER/, '')
+        dataType = dataType.replace(/NOT NULL/, '')
+        tables[tableName][attr] = 'serial'
+      }
+
+      if (dataType.match(/^ENUM\(/)) {
+        dataType = dataType.replace(/^ENUM\(.+\)/, QueryGenerator.pgEscapeAndQuote("enum_" + tableName + "_" + attr))
+      }
+
+      return dataType
     }
   }
 

From f178b9efcad921e535582f40ef92f4e4ab141512 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Mar 2013 22:01:37 +0100
Subject: [PATCH 204/360] removed old code

---
 lib/query-interface.js | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/lib/query-interface.js b/lib/query-interface.js
index fc0b489783c5..4e3da2ccdde7 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -225,36 +225,6 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, dao], 'increment');
   }
 
-  QueryInterface.prototype.reload = function(dao, tableName) {
-    var self = this
-
-    return new Utils.CustomEventEmitter(function(emitter) {
-      var sql = self.QueryGenerator.selectQuery(tableName, { where: { id : dao.id }, limit: 1 })
-        , calleeStub = { 
-          build: function (values) {
-            // We cannot use setAttributes here, since a refresh might also update the read only attributes
-            Utils._.each(values, function(value, attr) {
-              (dao.attributes.indexOf(attr) > -1) && (dao[attr] = value)
-            })
-          }
-        }
-        , qry = self.sequelize.query(sql, calleeStub, { plain: true, raw: false, type: 'SELECT' })
-
-      qry
-        .success(function () {
-          self.emit('refresh', null)
-          emitter.emit('success', dao)
-        })
-        .error(function(err) {
-          self.emit('refresh', err)
-          emitter.emit('error', err)
-        })
-        .on('sql', function(sql) {
-          emitter.emit('sql', sql)
-        })
-    }).run()
-  }
-
   QueryInterface.prototype.rawSelect = function(tableName, options, attributeSelector) {
     var self = this
 

From 0ce92678a56acdb59ae1f87ad86f22a838ecbc8c Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 27 Mar 2013 22:01:58 +0100
Subject: [PATCH 205/360] added tests for reloading associations

---
 spec/dao.spec.js | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 3680081d10e6..be61512c4591 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -216,7 +216,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
     });
   });
 
-  describe('refresh', function () {
+  describe('reload', function () {
     it("should return a reference to the same DAO instead of creating a new one", function (done) {
       this.User.create({ username: 'John Doe' }).done(function (err, originalUser) {
 
@@ -245,7 +245,7 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
               done();
             })
           })
-        })        
+        })
       })
     })
 
@@ -271,6 +271,39 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
         }, 1000)
       })
     })
+
+    it("should update the associations as well", function(done) {
+      var Book = this.sequelize.define('Book', { title:   Helpers.Sequelize.STRING })
+        , Page = this.sequelize.define('Page', { content: Helpers.Sequelize.TEXT })
+
+      Book.hasMany(Page)
+      Page.belongsTo(Book)
+
+      this.sequelize.sync({ force: true }).success(function() {
+        Book.create({ title: 'A very old book' }).success(function(book) {
+          Page.create({ content: 'om nom nom' }).success(function(page) {
+            book.setPages([ page ]).success(function() {
+              Book.find({
+                where: (dialect === 'postgres' ? '"Books"."id"=' : '`Books`.`id`=') + book.id,
+                include: [Page]
+              }).success(function(leBook) {
+                page.updateAttributes({ content: 'something totally different' }).success(function(page) {
+                  expect(leBook.pages[0].content).toEqual('om nom nom')
+                  expect(page.content).toEqual('something totally different')
+
+                  leBook.reload().success(function(leBook) {
+                    expect(leBook.pages[0].content).toEqual('something totally different')
+                    expect(page.content).toEqual('something totally different')
+
+                    done()
+                  })
+                })
+              })
+            })
+          })
+        }.bind(this))
+      }.bind(this))
+    })
   });
 
   describe('default values', function() {

From 68b9b83241a2a4f5256a72353404a5e0e38b95db Mon Sep 17 00:00:00 2001
From: Alex Young 
Date: Mon, 1 Apr 2013 18:47:02 +0100
Subject: [PATCH 206/360] Adds back arguments to Sequelize constructor for
 clarity (suggested by janmeier)

---
 lib/sequelize.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index d8a55e5322a6..f4f6b4a0f3d9 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -47,8 +47,9 @@ module.exports = (function() {
     @class Sequelize
     @constructor
   */
-  var Sequelize = function() {
-    var database, username, password, options = {}, urlParts
+  var Sequelize = function(database, username, password, options) {
+    var urlParts
+    options = options || {}
 
     if (arguments.length === 1) {
       urlParts = url.parse(arguments[0])

From 85ad02ef32793a951cf7e3ba2575da236c0d3d6a Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 2 Apr 2013 12:20:48 +0200
Subject: [PATCH 207/360] v1.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2130d191c630..d00291769858 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sequelize",
   "description": "Multi dialect ORM for Node.JS",
-  "version": "1.6.0-beta4",
+  "version": "1.6.0",
   "author": "Sascha Depold ",
   "contributors": [
     {

From 477289e6ae9c5af8d54469e11d652588fac78f63 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 2 Apr 2013 21:53:51 +0300
Subject: [PATCH 208/360] added link to 1.6.0

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7da65d0b51b7..97a1a19eb2fb 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa
 - Support for synchronous migrations has been dropped. `up` and `down` methods in migrations do have a third parameter which is the callback parameter. Pass an error or an error message as first parameter to the callback if something went wrong in the migration.
 
 ## Blogposts/Changes ##
+- [v1.6.0](http://blog.sequelizejs.com/post/46949108134/v1-6-0-eager-loading-support-for-enums-decimals-and) Eager loading, support for enums, decimals and bigint, performance improvements …
 - [v1.4.1](http://blog.sequelizejs.com/post/24403298792/changes-in-sequelize-1-4-1): deprecation of node < 0.6, logging customization, ...
 - [v1.4.0](http://blog.sequelizejs.com/post/24345409723/changes-in-sequelize-1-4-0): postgresql, connection pooling, ...
 - [v1.3.0](http://blog.depold.com/post/15283366633/changes-in-sequelize-1-3-0): migrations, cross-database, validations, new listener notation, ...

From 3d8bce570b62e02cce5f9826c79984ca95ff2b24 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Wed, 3 Apr 2013 14:35:49 +0300
Subject: [PATCH 209/360] Remove setTimeout in favor of process.nextTick()

According to [process.nextTick() documentation](http://nodejs.org/api/process.html#process_process_nexttick_callback), using setTimeout is not recommended:

    On the next loop around the event loop call this callback. This is not a simple alias to setTimeout(fn, 0), it's much more efficient.

I'm not sure why you didn't use `nextTick()` yet, so if it was intended, please close :)
I'm currently testing this change and it seems to work better than with setTimeout.

What I'm unsure is the run function - it's not needed anymore imho.
---
 lib/emitters/custom-event-emitter.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index dc22722fc83d..c0d379504a70 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -3,18 +3,18 @@ var util         = require("util")
 
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
-    this.fct = fct
+    this.fct = fct;
+    var self = this;
+    process.nextTick(function() {
+      if (self.fct) {
+        self.fct.call(self, self)
+      }
+    }.bind(this));
   }
   util.inherits(CustomEventEmitter, EventEmitter)
 
   CustomEventEmitter.prototype.run = function() {
     var self = this
-
-    // delay the function call and return the emitter
-    setTimeout(function(){
-      self.fct.call(self, self)
-    }, 1)
-
     return this
   }
 

From dca436ecfd25d400ecd6760ba8aeeefc067b4687 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Wed, 3 Apr 2013 16:27:08 +0300
Subject: [PATCH 210/360] Move process.nextTick() to run() method

Hope this fixes the tests. Thanks @janmeier
---
 lib/emitters/custom-event-emitter.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index c0d379504a70..aee48ed3d91d 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -5,17 +5,19 @@ module.exports = (function() {
   var CustomEventEmitter = function(fct) {
     this.fct = fct;
     var self = this;
+  }
+  util.inherits(CustomEventEmitter, EventEmitter)
+
+  CustomEventEmitter.prototype.run = function() {
+    var self = this;
+    
     process.nextTick(function() {
       if (self.fct) {
         self.fct.call(self, self)
       }
     }.bind(this));
-  }
-  util.inherits(CustomEventEmitter, EventEmitter)
-
-  CustomEventEmitter.prototype.run = function() {
-    var self = this
-    return this
+    
+    return this;
   }
 
   CustomEventEmitter.prototype.success =

From 48fe9864d5db5c95016a1837285d963acbdf5fd8 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Wed, 3 Apr 2013 16:37:07 +0300
Subject: [PATCH 211/360] Make travis happy & make my need for semicolons happy
 ;)

---
 lib/emitters/custom-event-emitter.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index aee48ed3d91d..461da0d5e122 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -1,12 +1,12 @@
 var util         = require("util")
-  , EventEmitter = require("events").EventEmitter
+  , EventEmitter = require("events").EventEmitter;
 
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
     this.fct = fct;
     var self = this;
   }
-  util.inherits(CustomEventEmitter, EventEmitter)
+  util.inherits(CustomEventEmitter, EventEmitter);
 
   CustomEventEmitter.prototype.run = function() {
     var self = this;
@@ -23,26 +23,26 @@ module.exports = (function() {
   CustomEventEmitter.prototype.success =
   CustomEventEmitter.prototype.ok =
   function(fct) {
-    this.on('success', fct)
-    return this
+    this.on('success', fct);
+    return this;
   }
 
   CustomEventEmitter.prototype.failure =
   CustomEventEmitter.prototype.fail =
   CustomEventEmitter.prototype.error =
   function(fct) {
-    this.on('error', fct)
-    return this
+    this.on('error', fct);
+    return this;
   }
 
   CustomEventEmitter.prototype.done =
   CustomEventEmitter.prototype.complete =
   function(fct) {
     this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) })
-    return this
+        .on('success', function(result) { fct(null, result) });
+    return this;
   }
 
 
-  return CustomEventEmitter
-})()
+  return CustomEventEmitter;
+})();

From 4caf1090abcc9868243d1ba9d002bc610e7450be Mon Sep 17 00:00:00 2001
From: zanamixx 
Date: Fri, 5 Apr 2013 12:18:16 +0200
Subject: [PATCH 212/360] Add string escape for postgresql in custom query

---
 .gitignore                    |  2 ++
 lib/sequelize.js              |  2 +-
 lib/sql-string.js             | 33 +++++++++++++++++++--------------
 lib/utils.js                  |  5 +++--
 spec-jasmine/config/config.js |  3 ++-
 spec/config/config.js         |  3 ++-
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdf53afc5ef9..6d3e9c44eba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ test*.js
 .DS_STORE
 node_modules
 npm-debug.log
+spec/config/config.js
+spec-jasmine/config/config.js
 *~
diff --git a/lib/sequelize.js b/lib/sequelize.js
index 29810d78dc90..0954ccf40eff 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -171,7 +171,7 @@ module.exports = (function() {
 
   Sequelize.prototype.query = function(sql, callee, options, replacements) {
     if (arguments.length === 4) {
-      sql = Utils.format([sql].concat(replacements))
+      sql = Utils.format([sql].concat(replacements), this.options.dialect)
     } else if (arguments.length === 3) {
       options = options
     } else if (arguments.length === 2) {
diff --git a/lib/sql-string.js b/lib/sql-string.js
index 5dfa3bebb1a5..96be2c7e6ae4 100644
--- a/lib/sql-string.js
+++ b/lib/sql-string.js
@@ -7,7 +7,7 @@ SqlString.escapeId = function (val, forbidQualified) {
   return '`' + val.replace(/`/g, '``').replace(/\./g, '`.`') + '`';
 };
 
-SqlString.escape = function(val, stringifyObjects, timeZone) {
+SqlString.escape = function(val, stringifyObjects, timeZone, dialect) {
   if (val === undefined || val === null) {
     return 'NULL';
   }
@@ -37,17 +37,22 @@ SqlString.escape = function(val, stringifyObjects, timeZone) {
     }
   }
 
-  val = val.replace(/[\0\n\r\b\t\\\'\"\x1a]/g, function(s) {
-    switch(s) {
-      case "\0": return "\\0";
-      case "\n": return "\\n";
-      case "\r": return "\\r";
-      case "\b": return "\\b";
-      case "\t": return "\\t";
-      case "\x1a": return "\\Z";
-      default: return "\\"+s;
-    }
-  });
+  if (dialect == "postgres") {
+    // http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
+    val = val.replace(/'/g, "''");
+  } else {
+    val = val.replace(/[\0\n\r\b\t\\\'\"\x1a]/g, function(s) {
+      switch(s) {
+        case "\0": return "\\0";
+        case "\n": return "\\n";
+        case "\r": return "\\r";
+        case "\b": return "\\b";
+        case "\t": return "\\t";
+        case "\x1a": return "\\Z";
+        default: return "\\"+s;
+      }
+    });
+  }
   return "'"+val+"'";
 };
 
@@ -58,7 +63,7 @@ SqlString.arrayToList = function(array, timeZone) {
   }).join(', ');
 };
 
-SqlString.format = function(sql, values, timeZone) {
+SqlString.format = function(sql, values, timeZone, dialect) {
   values = [].concat(values);
 
   return sql.replace(/\?/g, function(match) {
@@ -66,7 +71,7 @@ SqlString.format = function(sql, values, timeZone) {
       return match;
     }
 
-    return SqlString.escape(values.shift(), false, timeZone);
+    return SqlString.escape(values.shift(), false, timeZone, dialect);
   });
 };
 
diff --git a/lib/utils.js b/lib/utils.js
index 72acf9ee23b8..7f7357b823e5 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -47,8 +47,9 @@ var Utils = module.exports = {
   escape: function(s) {
     return SqlString.escape(s, true, "local").replace(/\\"/g, '"')
   },
-  format: function(arr) {
-    return SqlString.format(arr.shift(), arr)
+  format: function(arr, dialect) {
+    var timeZone = null;
+    return SqlString.format(arr.shift(), arr, timeZone, dialect)
   },
   isHash: function(obj) {
     return Utils._.isObject(obj) && !Array.isArray(obj);
diff --git a/spec-jasmine/config/config.js b/spec-jasmine/config/config.js
index 6c5f5f90916c..07ad6b1543d7 100644
--- a/spec-jasmine/config/config.js
+++ b/spec-jasmine/config/config.js
@@ -18,7 +18,8 @@ module.exports = {
 
   postgres: {
     database: 'sequelize_test',
-    username: "postgres",
+    username: "root",
+    password: "toor",
     port: 5432,
     pool: { maxConnections: 5, maxIdleTime: 30}
   }
diff --git a/spec/config/config.js b/spec/config/config.js
index 5a557282f0b7..045f38dee3c5 100644
--- a/spec/config/config.js
+++ b/spec/config/config.js
@@ -24,7 +24,8 @@ module.exports = {
 
   postgres: {
     database: 'sequelize_test',
-    username: "postgres",
+    username: "root",
+    password: "toor",
     port: 5432,
     pool: { maxConnections: 5, maxIdleTime: 30}
   }

From 773b2b6cd3b83f3faee1f052ec070961d1a7d519 Mon Sep 17 00:00:00 2001
From: zanamixx 
Date: Fri, 5 Apr 2013 14:58:30 +0200
Subject: [PATCH 213/360] Ajust Test config with default value

---
 .gitignore                    | 2 --
 spec-jasmine/config/config.js | 3 +--
 spec/config/config.js         | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d3e9c44eba2..bdf53afc5ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,4 @@ test*.js
 .DS_STORE
 node_modules
 npm-debug.log
-spec/config/config.js
-spec-jasmine/config/config.js
 *~
diff --git a/spec-jasmine/config/config.js b/spec-jasmine/config/config.js
index 07ad6b1543d7..6c5f5f90916c 100644
--- a/spec-jasmine/config/config.js
+++ b/spec-jasmine/config/config.js
@@ -18,8 +18,7 @@ module.exports = {
 
   postgres: {
     database: 'sequelize_test',
-    username: "root",
-    password: "toor",
+    username: "postgres",
     port: 5432,
     pool: { maxConnections: 5, maxIdleTime: 30}
   }
diff --git a/spec/config/config.js b/spec/config/config.js
index 045f38dee3c5..5a557282f0b7 100644
--- a/spec/config/config.js
+++ b/spec/config/config.js
@@ -24,8 +24,7 @@ module.exports = {
 
   postgres: {
     database: 'sequelize_test',
-    username: "root",
-    password: "toor",
+    username: "postgres",
     port: 5432,
     pool: { maxConnections: 5, maxIdleTime: 30}
   }

From fe77d52d5c877d54e0b380c61d7d39bca5ba7d7c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 8 Apr 2013 11:14:52 +0300
Subject: [PATCH 214/360] Rm those pesky semi-colons - shame on you @mweibel

---
 lib/emitters/custom-event-emitter.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index 461da0d5e122..6f38af861833 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -1,37 +1,37 @@
 var util         = require("util")
-  , EventEmitter = require("events").EventEmitter;
+  , EventEmitter = require("events").EventEmitter
 
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
-    this.fct = fct;
-    var self = this;
+    this.fct = fct
+    var self = this
   }
-  util.inherits(CustomEventEmitter, EventEmitter);
+  util.inherits(CustomEventEmitter, EventEmitter)
 
   CustomEventEmitter.prototype.run = function() {
-    var self = this;
+    var self = this
     
     process.nextTick(function() {
       if (self.fct) {
         self.fct.call(self, self)
       }
-    }.bind(this));
+    }.bind(this))
     
-    return this;
+    return this
   }
 
   CustomEventEmitter.prototype.success =
   CustomEventEmitter.prototype.ok =
   function(fct) {
-    this.on('success', fct);
-    return this;
+    this.on('success', fct)
+    return this
   }
 
   CustomEventEmitter.prototype.failure =
   CustomEventEmitter.prototype.fail =
   CustomEventEmitter.prototype.error =
   function(fct) {
-    this.on('error', fct);
+    this.on('error', fct)
     return this;
   }
 
@@ -39,10 +39,10 @@ module.exports = (function() {
   CustomEventEmitter.prototype.complete =
   function(fct) {
     this.on('error', function(err) { fct(err, null) })
-        .on('success', function(result) { fct(null, result) });
-    return this;
+        .on('success', function(result) { fct(null, result) })
+    return this
   }
 
 
   return CustomEventEmitter;
-})();
+})()

From f54644e6a51c23920e03cc7c494ad24b93466440 Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Mon, 8 Apr 2013 11:18:57 +0300
Subject: [PATCH 215/360] Why use self when we have bind?

---
 lib/emitters/custom-event-emitter.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index 6f38af861833..ecd98674271f 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -4,16 +4,13 @@ var util         = require("util")
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
     this.fct = fct
-    var self = this
   }
   util.inherits(CustomEventEmitter, EventEmitter)
 
   CustomEventEmitter.prototype.run = function() {
-    var self = this
-    
     process.nextTick(function() {
-      if (self.fct) {
-        self.fct.call(self, self)
+      if (this.fct) {
+        this.fct.call(this, this)
       }
     }.bind(this))
     

From 39290016e5f4384caa4667089c2e4a623fac8527 Mon Sep 17 00:00:00 2001
From: Mason Blier 
Date: Mon, 8 Apr 2013 21:10:57 -0600
Subject: [PATCH 216/360] option to change filesFiltes on Migrator

---
 lib/migrator.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/migrator.js b/lib/migrator.js
index fb5e89519f65..f9768b85fb5d 100644
--- a/lib/migrator.js
+++ b/lib/migrator.js
@@ -12,7 +12,8 @@ module.exports = (function() {
       path: __dirname + '/../migrations',
       from: null,
       to: null,
-      logging: console.log
+      logging: console.log,
+      filesFilter: /\.js$/
     }, options || {})
 
     if (this.options.logging === true) {
@@ -96,7 +97,7 @@ module.exports = (function() {
     }
 
     var migrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      return /\.js$/.test(file)
+      return self.options.filesFilter.test(file)
     })
 
     var migrations = migrationFiles.map(function(file) {

From 8244acc23bb1b87368d0a4f655df7b83b692ed69 Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 13:55:31 +0300
Subject: [PATCH 217/360] Remove else section from pull #490

---
 lib/sequelize.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 75351ad738c9..559c2c5eaa28 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -62,11 +62,6 @@ module.exports = (function() {
         username = urlParts.auth.split(':')[0]
         password = urlParts.auth.split(':')[1]
       }
-    } else {
-      database = arguments[0]
-      username = arguments[1]
-      password = arguments[2]
-      options = arguments[3]
     }
 
     this.options = Utils._.extend({

From b2e92af995bb8ebd6b681cc5524c5838698fbfb8 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Tue, 9 Apr 2013 14:07:04 +0300
Subject: [PATCH 218/360] Add a missing docs section to roadmap

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 97a1a19eb2fb..eeb1a8e33443 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,10 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - ~~save datetimes in UTC~~
 - encapsulate attributes if a dao inside the attributes property + add getters and setters
 
+### Missing documentation
+- File type regex in migrator [#525](https://github.com/sequelize/sequelize/pull/525)
+- Support for URL connection strings [#490](https://github.com/sequelize/sequelize/pull/490)
+
 ## Collaboration 2.0 ##
 
 I'm glad to get pull request if any functionality is missing or something is buggy. But _please_ ... run the tests before you send me the pull request.

From 4a340ef33f18b91570156d3daa1e037e38d15b26 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Tue, 9 Apr 2013 14:42:54 +0300
Subject: [PATCH 219/360] Update jasmine node dependency to 1.5.0 and update
 path to test scripts

./node_modules/.bin is already in the path when you do npm run and npm test. Without the /.bin path the tests now work on windows as well
---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d00291769858..b30589be96bd 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "dottie": "0.0.6-1"
   },
   "devDependencies": {
-    "jasmine-node": "1.0.17",
+    "jasmine-node": "1.5.0",
     "sqlite3": "~2.1.5",
     "mysql": "~2.0.0-alpha7",
     "pg": "~0.10.2",
@@ -56,13 +56,13 @@
   "main": "index",
   "scripts": {
     "test": "npm run test-jasmine && npm run test-buster",
-    "test-jasmine": "./node_modules/.bin/jasmine-node spec-jasmine/",
+    "test-jasmine": "jasmine-node spec-jasmine/",
     "test-buster": "npm run test-buster-mysql && npm run test-buster-postgres && npm run test-buster-postgres-native && npm run test-buster-sqlite",
-    "test-buster-travis": "./node_modules/.bin/buster-test",
-    "test-buster-mysql": "DIALECT=mysql ./node_modules/.bin/buster-test",
-    "test-buster-postgres": "DIALECT=postgres ./node_modules/.bin/buster-test",
-    "test-buster-postgres-native": "DIALECT=postgres-native ./node_modules/.bin/buster-test",
-    "test-buster-sqlite": "DIALECT=sqlite ./node_modules/.bin/buster-test",
+    "test-buster-travis": "buster-test",
+    "test-buster-mysql": "DIALECT=mysql buster-test",
+    "test-buster-postgres": "DIALECT=postgres buster-test",
+    "test-buster-postgres-native": "DIALECT=postgres-native buster-test",
+    "test-buster-sqlite": "DIALECT=sqlite buster-test",
     "docs": "node_modules/.bin/yuidoc . -o docs"
   },
   "bin": {

From b92165ec63f9b9b5b8d6e2ef7bf881d862f1f66c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Tue, 9 Apr 2013 14:45:38 +0300
Subject: [PATCH 220/360] Update build-status to link to sequelize org, not
 sdepold

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eeb1a8e33443..bbbd11064b62 100644
--- a/README.md
+++ b/README.md
@@ -238,4 +238,4 @@ for (var key in obj) {
 The automated tests we talk about just so much are running on
 [Travis public CI](http://travis-ci.org), here is its status:
 
-[![Build Status](https://secure.travis-ci.org/sdepold/sequelize.png)](http://travis-ci.org/sdepold/sequelize)
+[![Build Status](https://secure.travis-ci.org/sequelize/sequelize.png)](http://travis-ci.org/sequelize/sequelize)

From bccce1d45a47c7cf7c81ab8057992c1f2ec1fcb8 Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 17:08:38 +0200
Subject: [PATCH 221/360] CustomEventEmitter.proxy method, proxies events from
 one emitter to another

---
 .gitignore                           | 1 +
 lib/emitters/custom-event-emitter.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index bdf53afc5ef9..167f4203be8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ test*.js
 node_modules
 npm-debug.log
 *~
+.jshintrc
\ No newline at end of file
diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index ecd98674271f..b18356907a1e 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -40,6 +40,15 @@ module.exports = (function() {
     return this
   }
 
+  CustomEventEmitter.prototype.proxy = function(emitter) {
+    this.on('error', function (err) {
+      emitter.emit('error', err)
+    })
+    this.on('success', function (result) {
+      emitter.emit('success', result)
+    })
+  }
+
 
   return CustomEventEmitter;
 })()

From 2e093af9b6e2251e269f7b37ac9bb74face8ffba Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 17:39:43 +0200
Subject: [PATCH 222/360] adding tests for good measure

---
 spec/emitters/custom-event-emitter.js | 66 +++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 spec/emitters/custom-event-emitter.js

diff --git a/spec/emitters/custom-event-emitter.js b/spec/emitters/custom-event-emitter.js
new file mode 100644
index 000000000000..89f985c98c50
--- /dev/null
+++ b/spec/emitters/custom-event-emitter.js
@@ -0,0 +1,66 @@
+if(typeof require === 'function') {
+  const buster             = require("buster")
+      , CustomEventEmitter = require("../../lib/emitters/custom-event-emitter")
+      , Helpers            = require('../buster-helpers')
+      , dialect            = Helpers.getTestDialect()
+}
+
+buster.spec.expose()
+buster.testRunner.timeout = 1000
+
+describe(Helpers.getTestDialectTeaser("CustomEventEmitter"), function() {
+	describe("proxy", function () {
+		/* Tests could _probably_ be run synchronously, but for future proofing we're basing it on the events */
+
+		it("should correctly work with success listeners", function (done) {
+			var emitter = new CustomEventEmitter()
+				, proxy = new CustomEventEmitter()
+				, success = this.spy()
+
+			emitter.success(success)
+			proxy.success(function () {
+				process.nextTick(function () {
+					expect(success.called).toEqual(true)
+					done();
+				})
+			})
+
+			proxy.proxy(emitter)
+			proxy.emit('success')
+		})
+
+		it("should correctly work with error listeners", function (done) {
+			var emitter = new CustomEventEmitter()
+				, proxy = new CustomEventEmitter()
+				, error = this.spy()
+
+			emitter.error(error)
+			proxy.error(function () {
+				process.nextTick(function () {
+					expect(error.called).toEqual(true)
+					done();
+				})
+			})
+
+			proxy.proxy(emitter)
+			proxy.emit('error')
+		})
+
+		it("should correctly work with complete/done listeners", function (done) {
+			var emitter = new CustomEventEmitter()
+				, proxy = new CustomEventEmitter()
+				, complete = this.spy()
+
+			emitter.complete(complete)
+			proxy.complete(function () {
+				process.nextTick(function () {
+					expect(complete.called).toEqual(true)
+					done();
+				})
+			})
+
+			proxy.proxy(emitter)
+			proxy.emit('success')
+		})
+	});
+});
\ No newline at end of file

From 55e214373f8904dde25bf59e070ab15f3be18918 Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 18:28:41 +0200
Subject: [PATCH 223/360] add .jshintrc file

---
 .gitignore |  3 +--
 .jshintrc  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 .jshintrc

diff --git a/.gitignore b/.gitignore
index 167f4203be8d..1cc9f561916a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,4 @@ test*.js
 .DS_STORE
 node_modules
 npm-debug.log
-*~
-.jshintrc
\ No newline at end of file
+*~
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000000000000..e723c4c1c1ff
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,22 @@
+{
+    "globals": {
+        "jasmine": false,
+        "spyOn": false,
+        "it": false,
+        "console": false,
+        "describe": false,
+        "expect": false,
+        "beforeEach": false,
+        "waits": false,
+        "waitsFor": false,
+        "runs": false
+    },
+    "camelcase": true,
+    "curly": true,
+    "forin": true,
+    "indent": 2,
+    "unused": true,
+    "asi": true,
+    "evil": false,
+    "laxcomma": true
+}
\ No newline at end of file

From f5ac5084d65badba2504c2a6185670483399d57c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Tue, 9 Apr 2013 19:51:14 +0300
Subject: [PATCH 224/360] Remove missing docs part from roadmap. Features
 missing documentation are now issues is sequelize-doc

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index bbbd11064b62..d9617004143c 100644
--- a/README.md
+++ b/README.md
@@ -72,9 +72,6 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - ~~save datetimes in UTC~~
 - encapsulate attributes if a dao inside the attributes property + add getters and setters
 
-### Missing documentation
-- File type regex in migrator [#525](https://github.com/sequelize/sequelize/pull/525)
-- Support for URL connection strings [#490](https://github.com/sequelize/sequelize/pull/490)
 
 ## Collaboration 2.0 ##
 

From b095535e9a2f935ee3f218607e4c2bfc0a7173bd Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 20:41:45 +0200
Subject: [PATCH 225/360] Handle sql event aswell

---
 lib/emitters/custom-event-emitter.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index b18356907a1e..83f7b1e0d199 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -41,12 +41,11 @@ module.exports = (function() {
   }
 
   CustomEventEmitter.prototype.proxy = function(emitter) {
-    this.on('error', function (err) {
-      emitter.emit('error', err)
-    })
-    this.on('success', function (result) {
-      emitter.emit('success', result)
-    })
+    ['success', 'error', 'sql'].each(function (eventKey) {
+      this.on(eventKey, function (result) {
+        emitter.emit(eventKey, result)
+      })
+    }.bind(this))
   }
 
 

From 0a41a8f4bb93bb183f19060cd365ae71b8c7e54a Mon Sep 17 00:00:00 2001
From: Mick Hansen 
Date: Tue, 9 Apr 2013 20:43:23 +0200
Subject: [PATCH 226/360] each -> foreaceh

---
 lib/emitters/custom-event-emitter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index 83f7b1e0d199..946185ed3c00 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -1,5 +1,6 @@
 var util         = require("util")
   , EventEmitter = require("events").EventEmitter
+  , proxyEventKeys = ['success', 'error', 'sql']
 
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
@@ -41,7 +42,7 @@ module.exports = (function() {
   }
 
   CustomEventEmitter.prototype.proxy = function(emitter) {
-    ['success', 'error', 'sql'].each(function (eventKey) {
+    proxyEventKeys.forEach(function (eventKey) {
       this.on(eventKey, function (result) {
         emitter.emit(eventKey, result)
       })

From 3354c93023ca1b2a9a821450cd70183901320b21 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 9 Apr 2013 22:00:23 +0300
Subject: [PATCH 227/360] formatting

---
 lib/emitters/custom-event-emitter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index 946185ed3c00..aad8231e9c79 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -1,5 +1,5 @@
-var util         = require("util")
-  , EventEmitter = require("events").EventEmitter
+var util           = require("util")
+  , EventEmitter   = require("events").EventEmitter
   , proxyEventKeys = ['success', 'error', 'sql']
 
 module.exports = (function() {

From edef62940a5672ac6e65287a7612cf4c0935cff2 Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Wed, 10 Apr 2013 19:54:30 +0200
Subject: [PATCH 228/360] WIP

---
 lib/dao.js | 58 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 2a9f0c84c148..1c919f2e5bb9 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -7,6 +7,7 @@ module.exports = (function() {
   var DAO = function(values, options, isNewRecord) {
     var self = this
 
+    this.dataValues                  = []
     this.__options                   = options
     this.hasPrimaryKeys              = options.hasPrimaryKeys
     this.selectedValues              = values
@@ -16,18 +17,9 @@ module.exports = (function() {
 
     if (this.hasDefaultValues) {
       Utils._.each(this.defaultValues, function (value, name) {
-        if (typeof self[name] === 'undefined') {
-          self.addAttribute(name, value());
-        }
+        self.addAttribute(name, value());
       })
     }
-
-    if (this.booleanValues.length) {
-      this.booleanValues.forEach(function (name) {
-        //transform integer 0,1 into boolean
-        self[name] = !!self[name];
-      });
-    }
   }
   Utils._.extend(DAO.prototype, Mixin.prototype)
 
@@ -42,7 +34,7 @@ module.exports = (function() {
   Object.defineProperty(DAO.prototype, 'isDeleted', {
     get: function() {
       var result = this.__options.timestamps && this.__options.paranoid
-      result = result && this[this.__options.underscored ? 'deleted_at' : 'deletedAt'] !== null
+      result = result && this.dataValues[this.__options.underscored ? 'deleted_at' : 'deletedAt'] !== null
 
       return result
     }
@@ -54,7 +46,7 @@ module.exports = (function() {
         , self   = this
 
       this.attributes.concat(this.__eagerlyLoadedAssociations).forEach(function(attr) {
-        result[attr] = self[attr]
+        result[attr] = self.dataValues[attr]
       })
 
       return result
@@ -67,7 +59,7 @@ module.exports = (function() {
         , self   = this
 
       Utils._.each(this.__factory.primaryKeys, function(_, attr) {
-        result[attr] = self[attr]
+        result[attr] = self.dataValues[attr]
       })
 
       return result
@@ -85,7 +77,7 @@ module.exports = (function() {
       }
 
       primaryKeys.forEach(function(identifier) {
-        result[identifier] = self[identifier]
+        result[identifier] = self.dataValues[identifier]
       })
 
       return result
@@ -111,9 +103,11 @@ module.exports = (function() {
         }
       }
 
+      var tmpVals = self.values
+
       fields.forEach(function(field) {
-        if (self.values[field] !== undefined) {
-          values[field] = self.values[field]
+        if (tmpVals[field] !== undefined) {
+          values[field] = tmpVals[field]
         }
       })
     }
@@ -132,7 +126,7 @@ module.exports = (function() {
     }
 
     if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
-      this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
+      this.dataValues[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
     if (this.isNewRecord) {
@@ -277,7 +271,7 @@ module.exports = (function() {
   DAO.prototype.destroy = function() {
     if (this.__options.timestamps && this.__options.paranoid) {
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
-      this[attr] = new Date()
+      this.dataValues[attr] = new Date()
       return this.save()
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
@@ -338,7 +332,27 @@ module.exports = (function() {
   }
 
   DAO.prototype.addAttribute = function(attribute, value) {
-    this[attribute] = value
+    if (typeof this.dataValues[attribute] !== 'undefined')
+      return;
+
+    var def    = {},
+        predef = Object.getOwnPropertyDescriptor(this, attribute),
+        isBool = this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1;
+
+    if (isBool) // transform integer 0,1 into boolean
+      value = !!value;
+
+    var hasnot = function(which) {
+      return !predef || (!predef.hasOwnProperty('value') && !predef.hasOwnProperty(which));
+    };
+
+    if (hasnot('get')) def.get = function()  { return this.dataValues[attribute]; };
+    if (hasnot('set')) def.set = function(v) { this.dataValues[attribute] = v;    };
+
+    if (Utils._.size(def))
+      Object.defineProperty(this, attribute, def);
+
+    this.dataValues[attribute] = value;
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -374,11 +388,7 @@ module.exports = (function() {
 
     if (Utils._.size(defaults)) {
       for (var attr in defaults) {
-        var value = defaults[attr]
-
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
-        }
+        this.addAttribute(attr, Utils.toDefaultValue(defaults[attr]))
       }
     }
   }

From 63f8a1b1a11497a849cd66f242aa572073238d2f Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Wed, 10 Apr 2013 21:41:05 +0200
Subject: [PATCH 229/360] allow running of [jasmine] tests against MySQL
 instance that is either not local or requires connection via a socket

---
 spec-jasmine/associations/belongs-to.spec.js     |  2 +-
 spec-jasmine/associations/has-many.spec.js       |  4 ++--
 spec-jasmine/associations/has-one.spec.js        |  2 +-
 spec-jasmine/dao.spec.js                         |  3 ++-
 spec-jasmine/mysql/associations.has-many.spec.js |  2 +-
 spec-jasmine/mysql/associations.spec.js          |  2 +-
 spec-jasmine/mysql/connector-manager.spec.js     |  2 +-
 spec-jasmine/mysql/dao-factory.spec.js           |  2 +-
 spec-jasmine/mysql/query-generator.spec.js       |  2 +-
 spec-jasmine/sequelize.spec.js                   | 12 +++++++++++-
 10 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/spec-jasmine/associations/belongs-to.spec.js b/spec-jasmine/associations/belongs-to.spec.js
index 39fa2ed27b53..80522a09d544 100644
--- a/spec-jasmine/associations/belongs-to.spec.js
+++ b/spec-jasmine/associations/belongs-to.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('BelongsTo', function() {
diff --git a/spec-jasmine/associations/has-many.spec.js b/spec-jasmine/associations/has-many.spec.js
index 673b03325019..86a2cbd3361d 100644
--- a/spec-jasmine/associations/has-many.spec.js
+++ b/spec-jasmine/associations/has-many.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('HasMany', function() {
@@ -10,7 +10,7 @@ describe('HasMany', function() {
     , Helpers   = null
 
   var setup = function() {
-    sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false })
+    sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
     Helpers   = new (require("../config/helpers"))(sequelize)
 
     Helpers.dropAllTables()
diff --git a/spec-jasmine/associations/has-one.spec.js b/spec-jasmine/associations/has-one.spec.js
index f02507048a7d..7d0eca2cdc4c 100644
--- a/spec-jasmine/associations/has-one.spec.js
+++ b/spec-jasmine/associations/has-one.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('HasOne', function() {
diff --git a/spec-jasmine/dao.spec.js b/spec-jasmine/dao.spec.js
index d246d6d4fb90..418a93682e08 100644
--- a/spec-jasmine/dao.spec.js
+++ b/spec-jasmine/dao.spec.js
@@ -13,7 +13,8 @@ describe('DAO', function() {
             {
               logging: false,
               dialect: dialect,
-              port: config[dialect].port
+              port: config[dialect].port,
+              host: config[dialect].host
             }
           )
         , Helpers   = new (require("./config/helpers"))(sequelize)
diff --git a/spec-jasmine/mysql/associations.has-many.spec.js b/spec-jasmine/mysql/associations.has-many.spec.js
index f5c229df2f11..d8fda75bcea1 100644
--- a/spec-jasmine/mysql/associations.has-many.spec.js
+++ b/spec-jasmine/mysql/associations.has-many.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('HasMany', function() {
diff --git a/spec-jasmine/mysql/associations.spec.js b/spec-jasmine/mysql/associations.spec.js
index cd76eb342395..21bad8354731 100644
--- a/spec-jasmine/mysql/associations.spec.js
+++ b/spec-jasmine/mysql/associations.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('Associations', function() {
diff --git a/spec-jasmine/mysql/connector-manager.spec.js b/spec-jasmine/mysql/connector-manager.spec.js
index bb52e96065d0..fd6c97e15f36 100644
--- a/spec-jasmine/mysql/connector-manager.spec.js
+++ b/spec-jasmine/mysql/connector-manager.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('ConnectorManager', function() {
diff --git a/spec-jasmine/mysql/dao-factory.spec.js b/spec-jasmine/mysql/dao-factory.spec.js
index c49721505c13..d171d160829f 100644
--- a/spec-jasmine/mysql/dao-factory.spec.js
+++ b/spec-jasmine/mysql/dao-factory.spec.js
@@ -1,6 +1,6 @@
 var config    = require("../config/config")
   , Sequelize = require("../../index")
-  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false })
+  , sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers   = new (require("../config/helpers"))(sequelize)
 
 describe('DAOFactory', function() {
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 014f9c4d3cac..a2a4e78580e9 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -1,6 +1,6 @@
 var config         = require("../config/config")
   , Sequelize      = require("../../index")
-  , sequelize      = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false })
+  , sequelize      = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, { pool: config.mysql.pool, logging: false, host: config.mysql.host, port: config.mysql.port })
   , Helpers        = new (require("../config/helpers"))(sequelize)
   , QueryGenerator = require("../../lib/dialects/mysql/query-generator")
   , util           = require("util")
diff --git a/spec-jasmine/sequelize.spec.js b/spec-jasmine/sequelize.spec.js
index 4124742fb098..3ea0d5f404f0 100644
--- a/spec-jasmine/sequelize.spec.js
+++ b/spec-jasmine/sequelize.spec.js
@@ -8,7 +8,17 @@ describe('Sequelize', function() {
 
 
   var setup = function(options) {
-    options   = options || {logging: false}
+    options   = options || {}
+
+    if (!options.hasOwnProperty('pool'))
+      options.pool = config.mysql.pool
+    if (!options.hasOwnProperty('logging'))
+      options.logging = false
+    if (!options.hasOwnProperty('host'))
+      options.host = config.mysql.host
+    if (!options.hasOwnProperty('port'))
+      options.port = config.mysql.port
+
     sequelize = new Sequelize(config.mysql.database, config.mysql.username, config.mysql.password, options)
     Helpers   = new (require("./config/helpers"))(sequelize)
 

From 770c10c9f2afda1e65e816278750e16b65f3ca49 Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Wed, 10 Apr 2013 22:25:29 +0200
Subject: [PATCH 230/360] implement object "attribute" (aka fields) property
 getters/setters on DAOs such that custom object property getter/setter
 functions can be applied to a DAO instance (not yet implemented, but I
 suspect in to be defined along-side "instanceMethods"), all attribute values
 ar enow stored in a "dataValues" property and transparently made available
 for setting and getting via object property get/set functions

---
 lib/dao.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 1c919f2e5bb9..3ffe5fd213ba 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -7,7 +7,7 @@ module.exports = (function() {
   var DAO = function(values, options, isNewRecord) {
     var self = this
 
-    this.dataValues                  = []
+    this.dataValues                  = {}
     this.__options                   = options
     this.hasPrimaryKeys              = options.hasPrimaryKeys
     this.selectedValues              = values
@@ -46,7 +46,10 @@ module.exports = (function() {
         , self   = this
 
       this.attributes.concat(this.__eagerlyLoadedAssociations).forEach(function(attr) {
-        result[attr] = self.dataValues[attr]
+        result[attr] = self.dataValues.hasOwnProperty(attr)
+                     ? self.dataValues[attr]
+                     : self[attr]
+                     ;
       })
 
       return result

From 2d298a3c9fca0a342251c665728cff04fc595a9b Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Thu, 11 Apr 2013 12:12:00 +0200
Subject: [PATCH 231/360] add tests for getters/setters, bugfix, refactor - its
 WIP

---
 lib/dao-factory.js       |  18 +++++++
 lib/dao.js               | 103 ++++++++++++++++++++++++++-------------
 spec/dao-factory.spec.js |  33 ++++++++++++-
 3 files changed, 119 insertions(+), 35 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 54bcfb511956..6b2f1a634581 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -78,11 +78,29 @@ module.exports = (function() {
     Util.inherits(this.DAO, DAO);
 
     this.DAO.prototype.rawAttributes = this.rawAttributes;
+
     if (this.options.instanceMethods) {
       Utils._.each(this.options.instanceMethods, function(fct, name) {
         self.DAO.prototype[name] = fct
       })
     }
+
+    Utils._.each(['Get', 'Set'], function(type) {
+      var opt  = type.toLowerCase() + 'terMethods',
+          meth = '__define' + type + 'ter__';
+
+      if (self.options[opt]) {
+        Utils._.each(self.options[opt], function(fct, name) {
+          //var def = {};
+
+          if (!Utils._.isFunction(fct))
+            throw new Error(type + 'ter for "' + name + '" is not a function.')
+
+          self.DAO.prototype[meth](name, fct);
+        })
+      }
+    })
+
     this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes);
 
     this.DAO.prototype.booleanValues = [];
diff --git a/lib/dao.js b/lib/dao.js
index 3ffe5fd213ba..1dab97872a22 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -14,13 +14,8 @@ module.exports = (function() {
     this.__eagerlyLoadedAssociations = []
 
     initAttributes.call(this, values, isNewRecord)
-
-    if (this.hasDefaultValues) {
-      Utils._.each(this.defaultValues, function (value, name) {
-        self.addAttribute(name, value());
-      })
-    }
   }
+
   Utils._.extend(DAO.prototype, Mixin.prototype)
 
   Object.defineProperty(DAO.prototype, 'sequelize', {
@@ -87,6 +82,17 @@ module.exports = (function() {
     }
   })
 
+  DAO.prototype.getDataValue = function(name) {
+    return this.dataValues && this.dataValues.hasOwnProperty(name) ? this.dataValues[name] : this[name]
+  }
+
+  DAO.prototype.setDataValue = function(name, value) {
+    if (this.dataValues && this.dataValues.hasOwnProperty(name))
+      this.dataValues[name] = value
+    else
+      this[name]            = value
+  }
+
   // if an array with field names is passed to save()
   // only those fields will be updated
   DAO.prototype.save = function(fields) {
@@ -128,7 +134,7 @@ module.exports = (function() {
       }
     }
 
-    if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
+    if (this.__options.timestamps && this.dataValues.hasOwnProperty(updatedAtAttr)) {
       this.dataValues[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
@@ -338,24 +344,34 @@ module.exports = (function() {
     if (typeof this.dataValues[attribute] !== 'undefined')
       return;
 
-    var def    = {},
-        predef = Object.getOwnPropertyDescriptor(this, attribute),
-        isBool = this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1;
-
-    if (isBool) // transform integer 0,1 into boolean
+    if (this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1) // transform integer 0,1 into boolean
       value = !!value;
 
-    var hasnot = function(which) {
-      return !predef || (!predef.hasOwnProperty('value') && !predef.hasOwnProperty(which));
-    };
-
-    if (hasnot('get')) def.get = function()  { return this.dataValues[attribute]; };
-    if (hasnot('set')) def.set = function(v) { this.dataValues[attribute] = v;    };
-
-    if (Utils._.size(def))
-      Object.defineProperty(this, attribute, def);
+    var has = (function(o) {
+      var predef = Object.getOwnPropertyDescriptor(o, attribute);
+
+      if (predef && predef.hasOwnProperty('value'))
+        return true; // true here means 'this property exist as a simple value property, do not place setters or getters at all'
+
+        return {
+          get: (predef && predef.hasOwnProperty('get') ? predef.get : null) || o.__lookupGetter__(attribute),
+          set: (predef && predef.hasOwnProperty('set') ? predef.set : null) || o.__lookupSetter__(attribute)
+        };
+    })(this);
+
+    // node-v0.8.19:
+    //    calling either __defineGetter__ any previously defined setters for the attribute in
+    //    question *if* that property setter was defined on the object's prototype (which is what
+    //    we do in dao-factory) ... therefore we need to [re]define both the setter and getter
+    //    here with either the function that already existed OR the default/automatic definition
+    //
+    //    (the same is true for __defineSetter and 'prototype' getters)
+    if (has !== true) {
+      this.__defineGetter__(attribute, has.get || function()  { return this.dataValues[attribute]; });
+      this.__defineSetter__(attribute, has.set || function(v) { this.dataValues[attribute] = v;    });
+    }
 
-    this.dataValues[attribute] = value;
+    this[attribute] = value;
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -369,16 +385,10 @@ module.exports = (function() {
   // private
 
   var initAttributes = function(values, isNewRecord) {
-    // add all passed values to the dao and store the attribute names in this.attributes
-    for (var key in values) {
-      if (values.hasOwnProperty(key)) {
-        this.addAttribute(key, values[key])
-      }
-    }
-
-    // set id to null if not passed as value
-    // a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
+    // set id to null if not passed as value, a newly created dao has no id
+    var defaults = this.hasPrimaryKeys ? {} : { id: null },
+        attrs    = {},
+        key;
 
     if (this.__options.timestamps && isNewRecord) {
       defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
@@ -387,12 +397,37 @@ module.exports = (function() {
       if (this.__options.paranoid) {
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
+
+      if (this.hasDefaultValues) {
+        Utils._.each(this.defaultValues, function(valueFn, key) {
+          if (!defaults.hasOwnProperty(key))
+            defaults[key] = valueFn()
+        })
+      }
     }
 
     if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        this.addAttribute(attr, Utils.toDefaultValue(defaults[attr]))
+      for (key in defaults) {
+        attrs[key] = Utils.toDefaultValue(defaults[key])
+      }
+    }
+
+    Utils._.each(this.attributes, function(key) {
+      if (!attrs.hasOwnProperty(key)) {
+        attrs[key] = undefined
       }
+    })
+
+    if (values) {
+      for (key in values) {
+        if (values.hasOwnProperty(key)) {
+          attrs[key] = values[key]
+        }
+      }
+    }
+
+    for (key in attrs) {
+      this.addAttribute(key, attrs[key])
     }
   }
 
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 2296651e0ff0..8ecaaee78ba4 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -40,7 +40,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       var User = this.sequelize.define('SuperUser', {}, { freezeTableName: false })
       var factorySize = this.sequelize.daoFactoryManager.all.length
 
-      var User2 = this.sequelize.define('SuperUser', {}, { freezeTableName: false })   
+      var User2 = this.sequelize.define('SuperUser', {}, { freezeTableName: false })
       var factorySize2 = this.sequelize.daoFactoryManager.all.length
 
       expect(factorySize).toEqual(factorySize2)
@@ -99,6 +99,37 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       var user = this.User.build({ username: 'John Wayne' })
       expect(user.selectedValues).toEqual({ username: 'John Wayne' })
     })
+
+    it("attaches getter and setter methods", function() {
+      var Product = this.sequelize.define('ProductWithSettersAndGetters', {
+        priceInCents: {
+          type: Sequelize.INTEGER
+        }
+      },{
+        instanceMethods: {
+          foo: function() {
+            console.log('woot')
+          }
+        },
+        setterMethods: {
+          price: function(value) {
+            this.dataValues.priceInCents = value * 100;
+          }
+        },
+        getterMethods: {
+          price: function() {
+            return '$' + (this.getDataValue('priceInCents') / 100);
+          },
+
+          priceInCents: function() {
+            return this.dataValues.priceInCents;
+          }
+        }
+      });
+
+      expect(Product.build({price: 20}).priceInCents).toEqual(20 * 100);
+      expect(Product.build({priceInCents: 30 * 100}).price).toEqual('$' + 30);
+    })
   })
 
   describe('findOrCreate', function () {

From d04fa71d5022a49e63b65ea399c0fa1f5f7e83af Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Thu, 11 Apr 2013 18:47:19 +0200
Subject: [PATCH 232/360] fixes #529

---
 lib/dao-factory.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 54bcfb511956..80f3d227d19f 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -144,8 +144,6 @@ module.exports = (function() {
     var options = Utils._.clone(options)
 
     if (typeof options === 'object') {
-      hasJoin = true
-
       if (options.hasOwnProperty('include')) {
         hasJoin = true
 

From 53d4f5d30dfcd20d974446164c5f2b388fb6bc9c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Thu, 11 Apr 2013 18:53:43 +0200
Subject: [PATCH 233/360] die travis, DIE

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dcc67ecfce1e..cd439b421dd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,5 +19,4 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
-
+  - 0.8
\ No newline at end of file

From 3580e56dfd48fd3dcab0cd9db2ef495a2221026a Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 16 Apr 2013 11:04:42 +0300
Subject: [PATCH 234/360] added flattr button

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index d9617004143c..65364b40e0c4 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
 
 The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databases by mapping database entries to objects and vice versa. To put it in a nutshell... it's an ORM (Object-Relational-Mapper). The library is written entirely in JavaScript and can be used in the Node.JS environment.
 
+
+Flattr this
+
 ## Important Notes ##
 
 ### 1.6.0 ###

From 0d0865129d14581e417e9f05bf127fb871d8f4d0 Mon Sep 17 00:00:00 2001
From: Jonathan Crossman 
Date: Wed, 17 Apr 2013 19:12:23 +0100
Subject: [PATCH 235/360] - useful error message for bad data type (fixes #551)

---
 lib/sequelize.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 559c2c5eaa28..bd59d2c43963 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -151,6 +151,12 @@ module.exports = (function() {
     options = options || {}
     var globalOptions = this.options
 
+    for (var name in attributes){
+      if (attributes[name].type === undefined){
+        throw new Error(daoName + '.' + name + ' has been set it an undefined data type.');
+      }
+    }
+
     if (globalOptions.define) {
       options = Utils._.extend({}, globalOptions.define, options)
       Utils._(['classMethods', 'instanceMethods']).each(function(key) {

From bfed61fa9084e3fbac1b3665a88c817534c2cf4b Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Wed, 17 Apr 2013 20:41:09 +0200
Subject: [PATCH 236/360] Fix 0 primary key

---
 lib/dialects/mysql/query-generator.js |  2 +-
 spec/dao-factory.spec.js              | 30 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 42e121a4572e..ca7089bf4463 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -155,7 +155,7 @@ module.exports = (function() {
         options.attributes = optAttributes.join(', ')
       }
 
-      if (options.where) {
+      if (options.where !== undefined) {
         options.where = this.getWhereConditions(options.where, tableName)
         query += " WHERE <%= where %>"
       }
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 2296651e0ff0..c401835d3268 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -2,6 +2,7 @@ if(typeof require === 'function') {
   const buster    = require("buster")
       , Sequelize = require("../index")
       , Helpers   = require('./buster-helpers')
+      , _         = require('underscore')
       , dialect   = Helpers.getTestDialect()
 }
 
@@ -486,6 +487,35 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       }.bind(this))
     })
 
+    it('always honors ZERO as primary key', function(_done) {
+      var permutations = [
+          {v: 0,                  k: 'intV'},
+          {v: '0',                k: 'intV'},
+          {v: {where: {id: 0}},   k: 'intV'},
+          {v: {where: {id: '0'}}, k: 'strV'}
+        ]
+        , SQLs = {
+          strV: "SELECT * FROM `Users` WHERE `Users`.`id`='0' LIMIT 1;",
+          intV: "SELECT * FROM `Users` WHERE `Users`.`id`=0 LIMIT 1;"
+        }
+        , done = _.after(2 * permutations.length, _done);
+
+      this.User.create({name: 'jack'}).success(function (jack) {
+        this.User.create({name: 'jill'}).success(function (jill) {
+          permutations.forEach(function(perm) {
+            this.User.find(perm.v).done(function(err, user) {
+              expect(err).toBeNull();
+              expect(user).toBeNull();
+              done();
+            }).on('sql', function(s) {
+              expect(s).toEqual(SQLs[perm.k]);
+              done();
+            })
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
     describe('eager loading', function() {
       before(function() {
         this.Task        = this.sequelize.define('Task', { title: Sequelize.STRING })

From d3aebaa840c50b5e334f6574072b7cf481250e19 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Wed, 17 Apr 2013 20:45:52 +0200
Subject: [PATCH 237/360] Works for PG as well

---
 lib/dialects/postgres/query-generator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index f55dd503860e..0b2d060c4549 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -224,7 +224,7 @@ module.exports = (function() {
         options.attributes = optAttributes.join(', ')
       }
 
-      if(options.where) {
+      if(options.where != undefined) {
         options.where = QueryGenerator.getWhereConditions(options.where)
         query += " WHERE <%= where %>"
       }

From 26e5fe414c05bae0d410e04f83f73a58de8b2d3c Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Wed, 17 Apr 2013 20:53:37 +0200
Subject: [PATCH 238/360] Fix tests to also work for PG

---
 spec/dao-factory.spec.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index c401835d3268..3411123492d1 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -489,26 +489,22 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
     it('always honors ZERO as primary key', function(_done) {
       var permutations = [
-          {v: 0,                  k: 'intV'},
-          {v: '0',                k: 'intV'},
-          {v: {where: {id: 0}},   k: 'intV'},
-          {v: {where: {id: '0'}}, k: 'strV'}
+          0,
+          '0',
+          {where: {id: 0}},
+          {where: {id: '0'}}
         ]
-        , SQLs = {
-          strV: "SELECT * FROM `Users` WHERE `Users`.`id`='0' LIMIT 1;",
-          intV: "SELECT * FROM `Users` WHERE `Users`.`id`=0 LIMIT 1;"
-        }
         , done = _.after(2 * permutations.length, _done);
 
       this.User.create({name: 'jack'}).success(function (jack) {
         this.User.create({name: 'jill'}).success(function (jill) {
           permutations.forEach(function(perm) {
-            this.User.find(perm.v).done(function(err, user) {
+            this.User.find(perm).done(function(err, user) {
               expect(err).toBeNull();
               expect(user).toBeNull();
               done();
             }).on('sql', function(s) {
-              expect(s).toEqual(SQLs[perm.k]);
+              expect(s.indexOf(0)).not.toEqual(-1);
               done();
             })
           }.bind(this))

From e0a41d2a793f2ff5ff525b02892d73928c066e91 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Thu, 18 Apr 2013 12:33:27 +0200
Subject: [PATCH 239/360] Change to hasOwnProperty

---
 lib/dialects/mysql/query-generator.js    | 2 +-
 lib/dialects/postgres/query-generator.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index ca7089bf4463..0236f0c88d2f 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -155,7 +155,7 @@ module.exports = (function() {
         options.attributes = optAttributes.join(', ')
       }
 
-      if (options.where !== undefined) {
+      if (options.hasOwnProperty('where')) {
         options.where = this.getWhereConditions(options.where, tableName)
         query += " WHERE <%= where %>"
       }
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 0b2d060c4549..d0d9cecd41ab 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -224,7 +224,7 @@ module.exports = (function() {
         options.attributes = optAttributes.join(', ')
       }
 
-      if(options.where != undefined) {
+      if(options.hasOwnProperty('where')) {
         options.where = QueryGenerator.getWhereConditions(options.where)
         query += " WHERE <%= where %>"
       }

From db76b114dbc19f5a2f8a1becec564580c9df8604 Mon Sep 17 00:00:00 2001
From: Jonathan Crossman 
Date: Thu, 18 Apr 2013 12:46:05 +0100
Subject: [PATCH 240/360] - correcting error message

---
 lib/sequelize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index bd59d2c43963..ea3b8317ed26 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -153,7 +153,7 @@ module.exports = (function() {
 
     for (var name in attributes){
       if (attributes[name].type === undefined){
-        throw new Error(daoName + '.' + name + ' has been set it an undefined data type.');
+        throw new Error(daoName + '.' + name + ' data type is undefined.');
       }
     }
 

From 94ce9588141e3be559ff9b612cb1c05f2ba0fe5b Mon Sep 17 00:00:00 2001
From: Jonathan Crossman 
Date: Thu, 18 Apr 2013 12:55:51 +0100
Subject: [PATCH 241/360] - changed error message to match expected test result
 - coding style - support both definition styles

---
 lib/sequelize.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index ea3b8317ed26..aaed737a501e 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -151,9 +151,15 @@ module.exports = (function() {
     options = options || {}
     var globalOptions = this.options
 
-    for (var name in attributes){
-      if (attributes[name].type === undefined){
-        throw new Error(daoName + '.' + name + ' data type is undefined.');
+    for (var name in attributes) {
+      if (attributes.hasOwnProperty(name)) {
+        var dataType = attributes[name]
+        if (Utils.isHash(dataType)) {
+          dataType = dataType.type
+        }
+        if (dataType === undefined) {
+          throw new Error('Unrecognized data type for field '+ name)
+        }
       }
     }
 

From de46a5be67f3027e11f8dd25d395e55f7ac2afa4 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Fri, 19 Apr 2013 10:03:02 +0200
Subject: [PATCH 242/360] bump ...

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd439b421dd5..b4e3afeac71c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,5 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
\ No newline at end of file
+  - 0.8
+  
\ No newline at end of file

From 0c70eb473d0dbe0f9e094fe0f5e0376d8f53f5b1 Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Sat, 20 Apr 2013 15:12:10 -0400
Subject: [PATCH 243/360] Added the ability for schemas to be declared (useful
 for PostgreSQL). Other dialects will default to a prefix behavior. Closes
 #541

---
 lib/dao-factory.js                       | 25 +++++---
 lib/dao.js                               |  8 +--
 lib/dialects/mysql/query-generator.js    | 33 ++++++++++
 lib/dialects/postgres/query-generator.js | 33 ++++++++++
 lib/dialects/query-generator.js          |  4 ++
 lib/dialects/sqlite/query-generator.js   | 37 +++++++++++
 lib/query-interface.js                   | 52 +++++++++++++++
 lib/sequelize.js                         | 32 ++++++++++
 spec/dao-factory.spec.js                 | 80 +++++++++++++++++++++++-
 9 files changed, 292 insertions(+), 12 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 80f3d227d19f..91512270954c 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -16,7 +16,9 @@ module.exports = (function() {
       underscored: false,
       syncOnAssociation: true,
       paranoid: false,
-      whereCollection: null
+      whereCollection: null,
+      schema: null,
+      scheamPrefix: ''
     }, options || {})
 
     this.name = name
@@ -116,7 +118,7 @@ module.exports = (function() {
     return new Utils.CustomEventEmitter(function(emitter) {
       var doQuery = function() {
         self.QueryInterface
-          .createTable(self.tableName, self.attributes, options)
+          .createTable(self.QueryGenerator.addSchema(self), self.attributes, options)
           .success(function() { emitter.emit('success', self) })
           .error(function(err) { emitter.emit('error', err) })
           .on('sql', function(sql) { emitter.emit('sql', sql) })
@@ -134,6 +136,15 @@ module.exports = (function() {
     return this.QueryInterface.dropTable(this.tableName)
   }
 
+  DAOFactory.prototype.dropSchema = function(schema) {
+    return this.QueryInterface.dropSchema(schema)
+  }
+
+  DAOFactory.prototype.schema = function(schema) {
+    this.options.schema = schema
+    return this
+  }
+
   // alias for findAll
   DAOFactory.prototype.all = function(options) {
     return this.findAll(options)
@@ -170,7 +181,7 @@ module.exports = (function() {
     // whereCollection is used for non-primary key updates
     this.options.whereCollection = optcpy.where || null;
 
-    return this.QueryInterface.select(this, [this.tableName, joinTableName], optcpy, { type: 'SELECT' })
+    return this.QueryInterface.select(this, [this.QueryGenerator.addSchema(this), joinTableName], optcpy, { type: 'SELECT' })
   }
 
  /**
@@ -232,7 +243,7 @@ module.exports = (function() {
 
     options.limit = 1
 
-    return this.QueryInterface.select(this, this.tableName, options, {
+    return this.QueryInterface.select(this, this.QueryGenerator.addSchema(this), options, {
       plain: true,
       type: 'SELECT',
       hasJoin: hasJoin
@@ -244,7 +255,7 @@ module.exports = (function() {
     options.attributes.push(['count(*)', 'count'])
     options.parseInt = true
 
-    return this.QueryInterface.rawSelect(this.tableName, options, 'count')
+    return this.QueryInterface.rawSelect(this.QueryGenerator.addSchema(this), options, 'count')
   }
 
   DAOFactory.prototype.max = function(field, options) {
@@ -252,14 +263,14 @@ module.exports = (function() {
     options.attributes.push(['max(' + field + ')', 'max'])
     options.parseInt = true
 
-    return this.QueryInterface.rawSelect(this.tableName, options, 'max')
+    return this.QueryInterface.rawSelect(this.QueryGenerator.addSchema(this), options, 'max')
   }
   DAOFactory.prototype.min = function(field, options) {
     options = Utils._.extend({ attributes: [] }, options || {})
     options.attributes.push(['min(' + field + ')', 'min'])
     options.parseInt = true
 
-    return this.QueryInterface.rawSelect(this.tableName, options, 'min')
+    return this.QueryInterface.rawSelect(this.QueryGenerator.addSchema(this), options, 'min')
   }
 
   DAOFactory.prototype.build = function(values, options) {
diff --git a/lib/dao.js b/lib/dao.js
index 2a9f0c84c148..891400ae46c9 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -136,7 +136,7 @@ module.exports = (function() {
     }
 
     if (this.isNewRecord) {
-      return this.QueryInterface.insert(this, this.__factory.tableName, values)
+      return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id;
 
@@ -144,7 +144,7 @@ module.exports = (function() {
         identifier = this.__options.whereCollection;
       }
 
-      var tableName  = this.__factory.tableName
+      var tableName  = this.QueryInterface.QueryGenerator.addSchema(this.__factory)
         , query      = this.QueryInterface.update(this, tableName, values, identifier)
 
       return query
@@ -281,7 +281,7 @@ module.exports = (function() {
       return this.save()
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
+      return this.QueryInterface.delete(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory.tableName, this.__factory.options.schema), identifier)
     }
   }
 
@@ -301,7 +301,7 @@ module.exports = (function() {
       values = fields;
     }
 
-    return this.QueryInterface.increment(this, this.__factory.tableName, values, identifier)
+    return this.QueryInterface.increment(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory.tableName, this.__factory.options.schema), values, identifier)
   }
 
   DAO.prototype.decrement = function (fields, count) {
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 0236f0c88d2f..2c1355b30eb8 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -4,6 +4,39 @@ var Utils     = require("../../utils")
 
 module.exports = (function() {
   var QueryGenerator = {
+    addSchema: function(opts) {
+      var tableName     = undefined
+      var schema        = (!!opts && !!opts.options && !!opts.options.schema ? opts.options.schema : undefined)
+      var schemaPrefix  = (!!opts && !!opts.options && !!opts.options.schemaPrefix ? opts.options.schemaPrefix : undefined)
+
+      if (!!opts && !!opts.tableName) {
+        tableName = opts.tableName
+      }
+      else if (typeof opts === "string") {
+        tableName = opts
+      }
+
+      if (!schema || schema.toString().trim() === "") {
+        return tableName
+      }
+
+      return QueryGenerator.addQuotes(schema + (!schemaPrefix ? '.' : schemaPrefix) + tableName)
+    },
+
+    createSchema: function() {
+      var query = "SHOW TABLES"
+      return Utils._.template(query)({})
+    },
+
+    dropSchema: function() {
+      var query = "SHOW TABLES"
+      return Utils._.template(query)({})
+    },
+
+    showSchemasQuery: function() {
+      return "SHOW TABLES"
+    },
+
     createTableQuery: function(tableName, attributes, options) {
       options = Utils._.extend({
         engine: 'InnoDB',
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index d0d9cecd41ab..3de98ef83795 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -8,6 +8,39 @@ module.exports = (function() {
   var QueryGenerator = {
     options: {},
 
+    addSchema: function(opts) {
+      var tableName     = undefined
+      var schema        = (!!opts.options && !!opts.options.schema ? opts.options.schema : undefined)
+      var schemaPrefix  = (!!opts.options && !!opts.options.schemaPrefix ? opts.options.schemaPrefix : undefined)
+
+      if (!!opts.tableName) {
+        tableName = opts.tableName
+      }
+      else if (typeof opts === "string") {
+        tableName = opts
+      }
+
+      if (!schema || schema.toString().trim() === "") {
+        return tableName
+      }
+
+      return QueryGenerator.addQuotes(schema) + '.' + QueryGenerator.addQuotes(tableName)
+    },
+
+    createSchema: function(schema) {
+      var query = "CREATE SCHEMA <%= schema%>;"
+      return Utils._.template(query)({schema: schema})
+    },
+
+    dropSchema: function(schema) {
+      var query = "DROP SCHEMA <%= schema%> CASCADE;"
+      return Utils._.template(query)({schema: schema})
+    },
+
+    showSchemasQuery: function() {
+      return "SELECT schema_name FROM information_schema.schemata WHERE schema_name <> 'information_schema' AND schema_name != 'public' AND schema_name !~ E'^pg_';"
+    },
+
     createTableQuery: function(tableName, attributes, options) {
       options = Utils._.extend({
       }, options || {})
diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js
index 2669a02ca894..669b99348049 100644
--- a/lib/dialects/query-generator.js
+++ b/lib/dialects/query-generator.js
@@ -1,5 +1,9 @@
 module.exports = (function() {
   var QueryGenerator = {
+    addSchema: function(opts) {
+      throwMethodUndefined('addSchema')
+    },
+
     /*
       Returns a query for creating a table.
       Parameters:
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 7ebe0c325f6d..000fe1de10d0 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -24,6 +24,43 @@ module.exports = (function() {
   var QueryGenerator = {
     options: {},
 
+    addQuotes: function(s, quoteChar) {
+      return Utils.addTicks(s, quoteChar)
+    },
+
+    addSchema: function(opts) {
+      var tableName     = undefined
+      var schema        = (!!opts && !!opts.options && !!opts.options.schema ? opts.options.schema : undefined)
+      var schemaPrefix  = (!!opts && !!opts.options && !!opts.options.schemaPrefix ? opts.options.schemaPrefix : undefined)
+
+      if (!!opts && !!opts.tableName) {
+        tableName = opts.tableName
+      }
+      else if (typeof opts === "string") {
+        tableName = opts
+      }
+
+      if (!schema || schema.toString().trim() === "") {
+        return tableName
+      }
+
+      return QueryGenerator.addQuotes(schema + (!schemaPrefix ? '.' : schemaPrefix) + tableName)
+    },
+
+    createSchema: function() {
+      var query = "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+      return Utils._.template(query)({})
+    },
+
+    dropSchema: function() {
+      var query = "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+      return Utils._.template(query)({})
+    },
+
+    showSchemasQuery: function() {
+      return "SELECT name FROM sqlite_master WHERE type='table' and name!='sqlite_sequence';"
+    },
+
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
 
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 4e3da2ccdde7..a5361b58efd0 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -10,6 +10,58 @@ module.exports = (function() {
   }
   Utils.addEventEmitter(QueryInterface)
 
+  QueryInterface.prototype.createSchema = function(schema) {
+    var sql = this.QueryGenerator.createSchema(schema)
+    return queryAndEmit.call(this, sql, 'createSchema')
+  }
+
+  QueryInterface.prototype.dropSchema = function(schema) {
+    var sql = this.QueryGenerator.dropSchema(schema)
+    return queryAndEmit.call(this, sql, 'dropSchema')
+  }
+
+  QueryInterface.prototype.dropAllSchemas = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer()
+
+      self.showAllSchemas().success(function(schemaNames) {
+        schemaNames.forEach(function(schemaName) {
+          chainer.add(self.dropSchema(schemaName))
+        })
+        chainer
+          .run()
+          .success(function() {
+            self.emit('dropAllSchemas', null)
+            emitter.emit('success', null)
+          })
+          .error(function(err) {
+            self.emit('dropAllSchemas', err)
+            emitter.emit('error', err)
+          })
+      }).error(function(err) {
+        self.emit('dropAllSchemas', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
+  QueryInterface.prototype.showAllSchemas = function() {
+    var self = this
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var showSchemasSql = self.QueryGenerator.showSchemasQuery()
+      self.sequelize.query(showSchemasSql, null, { raw: true }).success(function(schemaNames) {
+        self.emit('showAllSchemas', null)
+        emitter.emit('success', Utils._.flatten(Utils._.map(schemaNames, function(value){ return value.schema_name })))
+      }).error(function(err) {
+        self.emit('showAllSchemas', err)
+        emitter.emit('error', err)
+      })
+    }).run()
+  }
+
   QueryInterface.prototype.createTable = function(tableName, attributes, options) {
     var attributeHashes = {}
 
diff --git a/lib/sequelize.js b/lib/sequelize.js
index 559c2c5eaa28..6918a6830c42 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -210,6 +210,38 @@ module.exports = (function() {
     return this.connectorManager.query(sql, callee, options)
   }
 
+  Sequelize.prototype.createSchema = function(schema) {
+    var chainer = new Utils.QueryChainer()
+
+    chainer.add(this.getQueryInterface().createSchema(schema))
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.showAllSchemas = function() {
+    var chainer = new Utils.QueryChainer()
+
+    chainer.add(this.getQueryInterface().showAllSchemas())
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.dropSchema = function(schema) {
+    var chainer = new Utils.QueryChainer()
+
+    chainer.add(this.getQueryInterface().dropSchema(schema))
+
+    return chainer.run()
+  }
+
+  Sequelize.prototype.dropAllSchemas = function() {
+    var self = this
+
+    var chainer = new Utils.QueryChainer()
+    chainer.add(self.getQueryInterface().dropAllSchemas())
+    return chainer.run()
+  }
+
   Sequelize.prototype.sync = function(options) {
     options = options || {}
 
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 3411123492d1..ebe0f24adb1f 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -41,7 +41,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       var User = this.sequelize.define('SuperUser', {}, { freezeTableName: false })
       var factorySize = this.sequelize.daoFactoryManager.all.length
 
-      var User2 = this.sequelize.define('SuperUser', {}, { freezeTableName: false })   
+      var User2 = this.sequelize.define('SuperUser', {}, { freezeTableName: false })
       var factorySize2 = this.sequelize.daoFactoryManager.all.length
 
       expect(factorySize).toEqual(factorySize2)
@@ -1076,4 +1076,82 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
   }) //- describe: max
+
+  describe('schematic support', function() {
+    before(function(done){
+      var self = this;
+
+      this.UserPublic = this.sequelize.define('UserPublic', {
+        age: Sequelize.INTEGER
+      })
+
+      this.UserSpecial = this.sequelize.define('UserSpecial', {
+        age: Sequelize.INTEGER
+      })
+
+      self.sequelize.dropAllSchemas().success(function(){
+        self.sequelize.createSchema('schema_test').success(function(){
+          self.sequelize.createSchema('special').success(function(){
+            self.UserSpecial.schema('special').sync({force: true}).success(function(UserSpecialSync){
+              self.UserSpecialSync = UserSpecialSync;
+              done()
+            })
+          })
+        })
+      })
+    })
+
+    it("should be able to list schemas", function(done){
+      this.sequelize.showAllSchemas().success(function(schemas){
+        expect(schemas).toBeDefined()
+        expect(schemas[0]).toBeArray()
+        expect(schemas[0].length).toEqual(2)
+        done()
+      })
+    })
+
+    if (dialect === "mysql") {
+      it("should take schemaPrefix into account if applicable", function(done){
+        var UserSpecialUnderscore = this.sequelize.define('UserSpecialUnderscore', {age: Sequelize.INTEGER}, {schema: 'hello', schemaPrefix: '_'})
+        UserSpecialUnderscore.sync({force: true}).success(function(User){
+          User.create({age: 3}).on('sql', function(sql){
+            expect(sql).toBeDefined()
+            expect(sql.indexOf('INSERT INTO `hello_UserSpecialUnderscores`')).toBeGreaterThan(-1)
+            done()
+          })
+        })
+      })
+    }
+
+    it("should be able to create and update records under any valid schematic", function(done){
+      this.UserPublic.sync({ force: true }).success(function(UserPublicSync){
+        UserPublicSync.create({age: 3}).on('sql', function(UserPublic){
+          this.UserSpecialSync.schema('special').create({age: 3})
+          .on('sql', function(UserSpecial){
+            expect(UserSpecial).toBeDefined()
+            expect(UserPublic).toBeDefined()
+            if (dialect === "postgres") {
+              expect(UserSpecial.indexOf('INSERT INTO "special"."UserSpecials"')).toBeGreaterThan(-1)
+              expect(UserPublic.indexOf('INSERT INTO "UserPublics"')).toBeGreaterThan(-1)
+            } else {
+              expect(UserSpecial.indexOf('INSERT INTO `special.UserSpecials`')).toBeGreaterThan(-1)
+              expect(UserPublic.indexOf('INSERT INTO `UserPublics`')).toBeGreaterThan(-1)
+            }
+          })
+          .success(function(UserSpecial){
+            UserSpecial.updateAttributes({age: 5})
+            .on('sql', function(user){
+              expect(user).toBeDefined()
+              if (dialect === "postgres") {
+                expect(user.indexOf('UPDATE "special"."UserSpecials"')).toBeGreaterThan(-1)
+              } else {
+                expect(user.indexOf('UPDATE `special.UserSpecials`')).toBeGreaterThan(-1)
+              }
+              done()
+            })
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+  })
 })

From 1e6d842d2c64497aade37f1cad9885663a82e99a Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Mon, 22 Apr 2013 18:05:53 -0400
Subject: [PATCH 244/360] Added basic HSTORE support for PostgreSQL

---
 lib/dao.js                               | 19 ++++++++++++++++
 lib/data-types.js                        | 16 +++++++++++++-
 lib/dialects/postgres/query-generator.js | 15 +++++++++++++
 lib/dialects/postgres/query.js           | 15 +++++++++++--
 spec/postgres/dao.spec.js                | 28 +++++++++++++++++++++---
 5 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 2a9f0c84c148..42ccb806a612 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -122,12 +122,27 @@ module.exports = (function() {
       if (this.daoFactory.rawAttributes.hasOwnProperty(attrName)) {
         var definition      = this.daoFactory.rawAttributes[attrName]
           , isEnum          = (definition.type && (definition.type.toString() === DataTypes.ENUM.toString()))
+          , isHstore        = (!!definition.type && !!definition.type.type && definition.type.type === DataTypes.HSTORE.type)
           , hasValue        = (typeof values[attrName] !== 'undefined')
           , valueOutOfScope = ((definition.values || []).indexOf(values[attrName]) === -1)
 
         if (isEnum && hasValue && valueOutOfScope) {
           throw new Error('Value "' + values[attrName] + '" for ENUM ' + attrName + ' is out of allowed scope. Allowed values: ' + definition.values.join(', '))
         }
+
+        if (isHstore) {
+          if (typeof values[attrName] === "object") {
+            var text = []
+            Utils._.each(values[attrName], function(value, key){
+              if (typeof value !== "string" && typeof value !== "number") {
+                throw new Error('Value for HSTORE must be a string or number.')
+              }
+
+              text.push(this.QueryInterface.QueryGenerator.addQuotes(key) + '=>' + (typeof value === "string" ? this.QueryInterface.QueryGenerator.addQuotes(value) : value))
+            }.bind(this))
+            values[attrName] = text.join(',')
+          }
+        }
       }
     }
 
@@ -355,6 +370,10 @@ module.exports = (function() {
     // add all passed values to the dao and store the attribute names in this.attributes
     for (var key in values) {
       if (values.hasOwnProperty(key)) {
+        if (typeof values[key] === "string" && !!this.__factory && !!this.__factory.rawAttributes[key] && !!this.__factory.rawAttributes[key].type && !!this.__factory.rawAttributes[key].type.type && this.__factory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+          values[key] = this.QueryInterface.QueryGenerator.toHstore(values[key])
+        }
+
         this.addAttribute(key, values[key])
       }
     }
diff --git a/lib/data-types.js b/lib/data-types.js
index 18fc006737c2..9e07841b4661 100644
--- a/lib/data-types.js
+++ b/lib/data-types.js
@@ -32,5 +32,19 @@ module.exports = {
 
     return result
   },
-  ARRAY: function(type) { return type + '[]' }
+
+  ARRAY: function(type) { return type + '[]' },
+
+  get HSTORE() {
+    var result = function() {
+      return {
+        type: 'HSTORE'
+      }
+    }
+
+    result.type = 'HSTORE'
+    result.toString = result.valueOf = function() { return 'TEXT' }
+
+    return result
+  }
 }
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index d0d9cecd41ab..1c491c5f2df7 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -604,6 +604,21 @@ module.exports = (function() {
       return "DROP TYPE IF EXISTS " + enumName + "; CREATE TYPE " + enumName + " AS " + dataType.match(/^ENUM\(.+\)/)[0] + "; "
     },
 
+    toHstore: function(text) {
+      var obj = {}
+        , pattern = '("\\\\.|[^"\\\\]*"\s*=|[^=]*)\s*=\s*>\s*("(?:\\.|[^"\\\\])*"|[^,]*)(?:\s*,\s*|$)'
+        , rex = new RegExp(pattern,'g')
+        , r = null
+
+      while ((r = rex.exec(text)) !== null) {
+        if (!!r[1] && !!r[2]) {
+          obj[r[1].replace(/^"/, '').replace(/"$/, '')] = r[2].replace(/^"/, '').replace(/"$/, '')
+        }
+      }
+
+      return obj
+    },
+
     padInt: function (i) {
       return (i < 10) ? '0' + i.toString() : i.toString()
     },
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 61bac5780a5c..4dbaba9003d6 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -1,5 +1,6 @@
 var Utils         = require("../../utils")
   , AbstractQuery = require('../abstract/query')
+  , DataTypes     = require('../../data-types')
 
 module.exports = (function() {
   var Query = function(client, sequelize, callee, options) {
@@ -109,7 +110,12 @@ module.exports = (function() {
     } else if (this.send('isInsertQuery')) {
       for (var key in rows[0]) {
         if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
+          var record = rows[0][key]
+          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+          }
+
+          this.callee[key] = record
         }
       }
 
@@ -117,7 +123,12 @@ module.exports = (function() {
     } else if (this.send('isUpdateQuery')) {
       for (var key in rows[0]) {
         if (rows[0].hasOwnProperty(key)) {
-          this.callee[key] = rows[0][key]
+          var record = rows[0][key]
+          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+          }
+
+          this.callee[key] = record
         }
       }
 
diff --git a/spec/postgres/dao.spec.js b/spec/postgres/dao.spec.js
index 057c43f8375a..3df5778805b8 100644
--- a/spec/postgres/dao.spec.js
+++ b/spec/postgres/dao.spec.js
@@ -18,7 +18,8 @@ if (dialect.match(/^postgres/)) {
 
           self.User = sequelize.define('User', {
             username: DataTypes.STRING,
-            email: {type: DataTypes.ARRAY(DataTypes.TEXT)}
+            email: {type: DataTypes.ARRAY(DataTypes.TEXT)},
+            document: {type: DataTypes.HSTORE, defaultValue: 'default=>value'}
           })
         },
         onComplete: function() {
@@ -34,13 +35,34 @@ if (dialect.match(/^postgres/)) {
         this.User
           .create({ username: 'user', email: ['foo@bar.com', 'bar@baz.com'] })
           .success(function(oldUser) {
-            expect(oldUser.email).toEqual(['foo@bar.com', 'bar@baz.com']);
-            done();
+            expect(oldUser.email).toEqual(['foo@bar.com', 'bar@baz.com'])
+            done()
           })
           .error(function(err) {
             console.log(err)
           })
       })
+
+      it("should handle hstore correctly", function(done) {
+        var self = this
+
+        this.User
+          .create({ username: 'user', email: ['foo@bar.com'], document: {hello: 'world'}})
+          .success(function(newUser) {
+            expect(newUser.document).toEqual({hello: 'world'})
+            // Check to see if updating an hstore field works
+            newUser.updateAttributes({document: {should: 'update', to: 'this', first: 'place'}}).success(function(oldUser){
+              // Postgres always returns keys in alphabetical order (ascending)
+              expect(oldUser.document).toEqual({first: 'place', should: 'update', to: 'this'})
+              // Check to see if the default value for an hstore field works
+              self.User.create({ username: 'user2', email: ['bar@baz.com']}).success(function(defaultUser){
+                expect(defaultUser.document).toEqual({default: 'value'})
+                done()
+              })
+            })
+          })
+          .error(console.log)
+      })
     })
   })
 }

From 9866c5d5f26cd00c434755503fcd54794e5b8465 Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Tue, 23 Apr 2013 11:44:40 +0200
Subject: [PATCH 245/360] remove property check in DAO.prototype.setDataValue -
 it is not correct and causes an infinite loop when setting a data value for a
 field that is as yet unset (via a property setter that has the same name as
 the original property)

---
 lib/dao.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 1dab97872a22..096145db3b42 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -87,10 +87,7 @@ module.exports = (function() {
   }
 
   DAO.prototype.setDataValue = function(name, value) {
-    if (this.dataValues && this.dataValues.hasOwnProperty(name))
-      this.dataValues[name] = value
-    else
-      this[name]            = value
+    this.dataValues[name] = value
   }
 
   // if an array with field names is passed to save()

From 2cf9d4f8062ba1a9575131c22b772fdbf0da202c Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Wed, 24 Apr 2013 12:26:56 -0400
Subject: [PATCH 246/360] Fixed typo in lib/dao-factory for schemaDelimiter

---
 lib/dao-factory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 17f4101efdfb..5538480c88df 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -18,7 +18,7 @@ module.exports = (function() {
       paranoid: false,
       whereCollection: null,
       schema: null,
-      scheamDelimiter: ''
+      schemaDelimiter: ''
     }, options || {})
 
     this.name = name

From 2f5415f880b11ca38d3464482e477ea43ba0f558 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 24 Apr 2013 20:24:25 +0200
Subject: [PATCH 247/360] schematics

---
 changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.md b/changelog.md
index c9499e27dd1d..bedb30f11c15 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+# v1.7.0 #
+- [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
+
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
 - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3

From 513aeb16da25a8b6cb9c5598316aee92573fc1f8 Mon Sep 17 00:00:00 2001
From: Jonathan Crossman 
Date: Thu, 25 Apr 2013 09:40:56 +0100
Subject: [PATCH 248/360] - adding second test for object style definition

- removing incomplete dataType check
- styling code more like the rest of the project
---
 lib/dao-factory.js       |  5 -----
 lib/sequelize.js         | 18 ++++++++----------
 spec/dao-factory.spec.js |  6 ++++++
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 80f3d227d19f..3c61b3481957 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -54,11 +54,6 @@ module.exports = (function() {
 
     this.primaryKeys = {};
     Utils._.each(this.attributes, function(dataTypeString, attributeName) {
-      // If you don't specify a valid data type lets help you debug it
-      if (dataTypeString === undefined) {
-        throw new Error("Unrecognized data type for field " + attributeName );
-      }
-
       if ((attributeName !== 'id') && (dataTypeString.indexOf('PRIMARY KEY') !== -1)) {
         self.primaryKeys[attributeName] = dataTypeString
       }
diff --git a/lib/sequelize.js b/lib/sequelize.js
index aaed737a501e..95eb5832cae8 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -151,17 +151,15 @@ module.exports = (function() {
     options = options || {}
     var globalOptions = this.options
 
-    for (var name in attributes) {
-      if (attributes.hasOwnProperty(name)) {
-        var dataType = attributes[name]
-        if (Utils.isHash(dataType)) {
-          dataType = dataType.type
-        }
-        if (dataType === undefined) {
-          throw new Error('Unrecognized data type for field '+ name)
-        }
+    // If you don't specify a valid data type lets help you debug it
+    Utils._.each(attributes, function(dataType, name){
+      if (Utils.isHash(dataType)) {
+        dataType = dataType.type
       }
-    }
+      if (dataType === undefined) {
+        throw new Error('Unrecognized data type for field '+ name)
+      }
+    })
 
     if (globalOptions.define) {
       options = Utils._.extend({}, globalOptions.define, options)
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 2296651e0ff0..a904084930fb 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -215,6 +215,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           activity_date: Sequelize.DATe
         })
       }.bind(this), 'Unrecognized data type for field activity_date')
+
+      Helpers.assertException(function() {
+        this.sequelize.define('UserBadDataType', {
+          activity_date: {type: Sequelize.DATe}
+        })
+      }.bind(this), 'Unrecognized data type for field activity_date')
     })
 
     it('sets a 64 bit int in bigint', function(done) {

From 0ed44c204c67f0bcf6ef131e3793d24e164f6878 Mon Sep 17 00:00:00 2001
From: thomascool 
Date: Thu, 25 Apr 2013 11:49:44 -0700
Subject: [PATCH 249/360] code fix

---
 lib/dao.js        | 168 ++++++++++++++++++++++++++++++++++++----------
 lib/data-types.js |  42 +++++++++++-
 2 files changed, 175 insertions(+), 35 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 2b0fbd90c53a..071af287cc0c 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -4,17 +4,19 @@ var Utils     = require("./utils")
   , DataTypes = require("./data-types")
 
 module.exports = (function() {
-  var DAO = function(values, options) {
-    var self = this;
-    this.__options = options;
-    this.hasPrimaryKeys = options.hasPrimaryKeys;
-    this.selectedValues = values;
+  var DAO = function(values, options, isNewRecord) {
+    var self = this
+
+    this.__options                   = options
+    this.hasPrimaryKeys              = options.hasPrimaryKeys
+    this.selectedValues              = values
+    this.__eagerlyLoadedAssociations = []
 
-    initAttributes.call(this, values)
+    initAttributes.call(this, values, isNewRecord)
 
     if (this.hasDefaultValues) {
       Utils._.each(this.defaultValues, function (value, name) {
-        if(typeof self[name] === 'undefined') {
+        if (typeof self[name] === 'undefined') {
           self.addAttribute(name, value());
         }
       })
@@ -51,7 +53,7 @@ module.exports = (function() {
       var result = {}
         , self   = this
 
-      this.attributes.forEach(function(attr) {
+      this.attributes.concat(this.__eagerlyLoadedAssociations).forEach(function(attr) {
         result[attr] = self[attr]
       })
 
@@ -74,12 +76,13 @@ module.exports = (function() {
 
   Object.defineProperty(DAO.prototype, "identifiers", {
     get: function() {
-      var primaryKeys = Utils._.keys(this.__factory.primaryKeys)
+      var primaryKeys = Object.keys(this.__factory.primaryKeys)
         , result      = {}
         , self        = this
 
-      if(!this.__factory.hasPrimaryKeys)
+      if (!this.__factory.hasPrimaryKeys) {
         primaryKeys = ['id']
+      }
 
       primaryKeys.forEach(function(identifier) {
         result[identifier] = self[identifier]
@@ -107,6 +110,7 @@ module.exports = (function() {
           fields.push(createdAtAttr)
         }
       }
+
       fields.forEach(function(field) {
         if (self.values[field] !== undefined) {
           values[field] = self.values[field]
@@ -114,26 +118,86 @@ module.exports = (function() {
       })
     }
 
-    if(this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
-      this[updatedAtAttr] = values[updatedAtAttr] = new Date()
-    }
+    for (var attrName in this.daoFactory.rawAttributes) {
+      if (this.daoFactory.rawAttributes.hasOwnProperty(attrName)) {
+        var definition      = this.daoFactory.rawAttributes[attrName]
+          , isEnum          = (definition.type && (definition.type.toString() === DataTypes.ENUM.toString()))
+          , isHstore        = (!!definition.type && !!definition.type.type && definition.type.type === DataTypes.HSTORE.type)
+          , hasValue        = (typeof values[attrName] !== 'undefined')
+          , valueOutOfScope = ((definition.values || []).indexOf(values[attrName]) === -1)
 
-    if(this.isNewRecord) {
-      // added by Scott Rutherford to set created post class creation
-      if(this.__options.timestamps && this.hasOwnProperty(createdAtAttr)) {
-        this[createdAtAttr] = values[createdAtAttr] = new Date()
+        if (isEnum && hasValue && valueOutOfScope) {
+          throw new Error('Value "' + values[attrName] + '" for ENUM ' + attrName + ' is out of allowed scope. Allowed values: ' + definition.values.join(', '))
+        }
+
+        if (isHstore) {
+          if (typeof values[attrName] === "object") {
+            var text = []
+            Utils._.each(values[attrName], function(value, key){
+              if (typeof value !== "string" && typeof value !== "number") {
+                throw new Error('Value for HSTORE must be a string or number.')
+              }
+
+              text.push(this.QueryInterface.QueryGenerator.addQuotes(key) + '=>' + (typeof value === "string" ? this.QueryInterface.QueryGenerator.addQuotes(value) : value))
+            }.bind(this))
+            values[attrName] = text.join(',')
+          }
+        }
       }
+    }
 
-      return this.QueryInterface.insert(this, this.__factory.tableName, values)
+    if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
+      this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
+    }
+
+    if (this.isNewRecord) {
+      return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
-      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-        , tableName  = this.__factory.tableName
+      var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id;
+
+      if (identifier === null && this.__options.whereCollection !== null) {
+        identifier = this.__options.whereCollection;
+      }
+
+      var tableName  = this.QueryInterface.QueryGenerator.addSchema(this.__factory)
         , query      = this.QueryInterface.update(this, tableName, values, identifier)
 
       return query
     }
   }
 
+ /*
+  * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same object.
+  * This is different from doing a `find(DAO.id)`, because that would create and return a new object. With this method,
+  * all references to the DAO are updated with the new data and no new objects are created.
+  *
+  * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
+  */
+  DAO.prototype.reload = function() {
+    var where = [
+      this.QueryInterface.QueryGenerator.addQuotes(this.__factory.tableName) + '.' + this.QueryInterface.QueryGenerator.addQuotes('id')+'=?',
+      this.id
+    ]
+
+    return new Utils.CustomEventEmitter(function(emitter) {
+      this.__factory.find({
+        where:   where,
+        limit:   1,
+        include: this.__eagerlyLoadedOptions || []
+      })
+      .on('sql', function(sql) { emitter.emit('sql', sql) })
+      .on('error', function(error) { emitter.emit('error', error) })
+      .on('success', function(obj) {
+        for (var valueName in obj.values) {
+          if (obj.values.hasOwnProperty(valueName)) {
+            this[valueName] = obj.values[valueName]
+          }
+        }
+        emitter.emit('success', this)
+      }.bind(this))
+    }.bind(this)).run()
+  }
+
   /*
    * Validate this dao's attribute values according to validation rules set in the dao definition.
    *
@@ -165,7 +229,7 @@ module.exports = (function() {
           else {
             // extra args
             fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Utils._.isArray(fn_args))
+            if (!Array.isArray(fn_args))
               fn_args = [fn_args]
             // error msg
             fn_msg = details.hasOwnProperty("msg") ? details.msg : false
@@ -200,15 +264,15 @@ module.exports = (function() {
   }
 
 
-  DAO.prototype.updateAttributes = function(updates) {
+  DAO.prototype.updateAttributes = function(updates, fields) {
     this.setAttributes(updates)
-    return this.save()
+    return this.save(fields)
   }
 
   DAO.prototype.setAttributes = function(updates) {
     var self = this
 
-    var readOnlyAttributes = Utils._.keys(this.__factory.primaryKeys)
+    var readOnlyAttributes = Object.keys(this.__factory.primaryKeys)
 
     readOnlyAttributes.push('id')
     readOnlyAttributes.push('createdAt')
@@ -226,22 +290,54 @@ module.exports = (function() {
   }
 
   DAO.prototype.destroy = function() {
-    if(this.__options.timestamps && this.__options.paranoid) {
+    if (this.__options.timestamps && this.__options.paranoid) {
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
       this[attr] = new Date()
       return this.save()
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
-      return this.QueryInterface.delete(this, this.__factory.tableName, identifier)
+      return this.QueryInterface.delete(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory.tableName, this.__factory.options.schema), identifier)
+    }
+  }
+
+  DAO.prototype.increment = function(fields, count) {
+    var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id,
+      values = {}
+
+    if (count === undefined) count = 1;
+
+    if (Utils._.isString(fields)) {
+      values[fields] = count;
+    } else if (Utils._.isArray(fields)) {
+      Utils._.each(fields, function (field) {
+        values[field] = count
+      })
+    } else { // Assume fields is key-value pairs
+      values = fields;
+    }
+
+    return this.QueryInterface.increment(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory.tableName, this.__factory.options.schema), values, identifier)
+  }
+
+  DAO.prototype.decrement = function (fields, count) {
+    if (!Utils._.isString(fields) && !Utils._.isArray(fields)) { // Assume fields is key-value pairs
+      Utils._.each(fields, function (value, field) {
+        fields[field] = -value;
+      });
     }
+
+    return this.increment(fields, 0 - count);
   }
 
   DAO.prototype.equals = function(other) {
     var result = true
-      , self   = this
 
     Utils._.each(this.values, function(value, key) {
-      result = result && (value == other[key])
+      if(Utils._.isDate(value) && Utils._.isDate(other[key])) {
+        result = result && (value.getTime() == other[key].getTime())
+      } else {
+        result = result && (value == other[key])
+      }
     })
 
     return result
@@ -270,10 +366,14 @@ module.exports = (function() {
 
   // private
 
-  var initAttributes = function(values) {
+  var initAttributes = function(values, isNewRecord) {
     // add all passed values to the dao and store the attribute names in this.attributes
     for (var key in values) {
       if (values.hasOwnProperty(key)) {
+        if (typeof values[key] === "string" && !!this.__factory && !!this.__factory.rawAttributes[key] && !!this.__factory.rawAttributes[key].type && !!this.__factory.rawAttributes[key].type.type && this.__factory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+          values[key] = this.QueryInterface.QueryGenerator.toHstore(values[key])
+        }
+
         this.addAttribute(key, values[key])
       }
     }
@@ -282,11 +382,11 @@ module.exports = (function() {
     // a newly created dao has no id
     var defaults = this.hasPrimaryKeys ? {} : { id: null }
 
-    if(this.__options.timestamps) {
-      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = new Date()
-      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = new Date()
+    if (this.__options.timestamps && isNewRecord) {
+      defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
+      defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
 
-      if(this.__options.paranoid) {
+      if (this.__options.paranoid) {
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
     }
@@ -295,7 +395,7 @@ module.exports = (function() {
       for (var attr in defaults) {
         var value = defaults[attr]
 
-        if(!this.hasOwnProperty(attr)) {
+        if (!this.hasOwnProperty(attr)) {
           this.addAttribute(attr, Utils.toDefaultValue(value))
         }
       }
diff --git a/lib/data-types.js b/lib/data-types.js
index 2feb510a1bf0..9e07841b4661 100644
--- a/lib/data-types.js
+++ b/lib/data-types.js
@@ -2,9 +2,49 @@ module.exports = {
   STRING: 'VARCHAR(255)',
   TEXT: 'TEXT',
   INTEGER: 'INTEGER',
+  BIGINT:  'BIGINT',
   DATE: 'DATETIME',
   BOOLEAN: 'TINYINT(1)',
   FLOAT: 'FLOAT',
   NOW: 'NOW',
-  BIGINT: 'BIGINT'
+
+  get ENUM() {
+    var result = function() {
+      return {
+        type:   'ENUM',
+        values: Array.prototype.slice.call(arguments).reduce(function(result, element) {
+          return result.concat(Array.isArray(element) ? element : [ element ])
+        }, [])
+      }
+    }
+
+    result.toString = result.valueOf = function() { return 'ENUM' }
+
+    return result
+  },
+
+  get DECIMAL() {
+    var result = function(precision, scale) {
+      return 'DECIMAL(' + precision + ',' + scale + ')'
+    }
+
+    result.toString = result.valueOf = function() { return 'DECIMAL' }
+
+    return result
+  },
+
+  ARRAY: function(type) { return type + '[]' },
+
+  get HSTORE() {
+    var result = function() {
+      return {
+        type: 'HSTORE'
+      }
+    }
+
+    result.type = 'HSTORE'
+    result.toString = result.valueOf = function() { return 'TEXT' }
+
+    return result
+  }
 }

From 75d7eefe6824c05b597538504633a3474e829167 Mon Sep 17 00:00:00 2001
From: Rob Fletcher 
Date: Thu, 25 Apr 2013 23:12:10 -0400
Subject: [PATCH 250/360] Update the generated migration skeleton for async

The auto-generated migrations don't mention done which is confusing if you're new to sequelize.
---
 bin/sequelize | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/sequelize b/bin/sequelize
index 06b38b954a2d..fbd6f5544d7d 100755
--- a/bin/sequelize
+++ b/bin/sequelize
@@ -145,11 +145,11 @@ if(program.migrate) {
 
   var migrationContent = [
     "module.exports = {",
-    "  up: function(migration, DataTypes) {",
-    "    // add altering commands here",
+    "  up: function(migration, DataTypes, done) {",
+    "    // add altering commands here, calling 'done' when finished",
     "  },",
-    "  down: function(migration) {",
-    "    // add reverting commands here",
+    "  down: function(migration, DataTypes, done) {",
+    "    // add reverting commands here, calling 'done' when finished",
     "  }",
     "}"
   ].join('\n')

From f1ecabbe58cc86ce376f6d68e4ebfdcd7b39ecd7 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sun, 28 Apr 2013 13:22:22 +0300
Subject: [PATCH 251/360] Change from _.each to native forEach

---
 lib/sequelize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 4d43226832df..799a265964ee 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -152,7 +152,7 @@ module.exports = (function() {
     var globalOptions = this.options
 
     // If you don't specify a valid data type lets help you debug it
-    Utils._.each(attributes, function(dataType, name){
+    attributes.forEach(function(dataType, name){
       if (Utils.isHash(dataType)) {
         dataType = dataType.type
       }

From 8ccd34b4d742df2c69fed8d55cce1b545820091a Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sun, 28 Apr 2013 13:28:25 +0300
Subject: [PATCH 252/360] Revert back to _.each, idiot

---
 lib/sequelize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 799a265964ee..4d43226832df 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -152,7 +152,7 @@ module.exports = (function() {
     var globalOptions = this.options
 
     // If you don't specify a valid data type lets help you debug it
-    attributes.forEach(function(dataType, name){
+    Utils._.each(attributes, function(dataType, name){
       if (Utils.isHash(dataType)) {
         dataType = dataType.type
       }

From 3791a29653394ffe034193ea312a0af001d15356 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Mon, 29 Apr 2013 16:01:14 +0300
Subject: [PATCH 253/360] When value is null, don't try to convert to Date,
 instead just leave it

---
 lib/dialects/sqlite/query.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/dialects/sqlite/query.js b/lib/dialects/sqlite/query.js
index 532182c666bb..f545011e7047 100644
--- a/lib/dialects/sqlite/query.js
+++ b/lib/dialects/sqlite/query.js
@@ -91,7 +91,10 @@ module.exports = (function() {
         results = results.map(function(result) {
           for (var name in result) {
             if (result.hasOwnProperty(name) && (metaData.columnTypes[name] === 'DATETIME')) {
-              result[name] = new Date(result[name]+'Z'); // Z means UTC
+              var val = result[name];
+              if(val !== null) {
+                result[name] = new Date(val+'Z'); // Z means UTC
+              }
             }
           }
           return result

From 9e82d76d7876c230d587228e47ff37327ca781c0 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Mon, 29 Apr 2013 15:37:20 +0200
Subject: [PATCH 254/360] Add test for checking the new behaviour

---
 spec/dao.spec.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index be61512c4591..1bc163bfc39c 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -19,7 +19,11 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
           username:  { type: DataTypes.STRING },
           touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
           aNumber:   { type: DataTypes.INTEGER },
-          bNumber:   { type: DataTypes.INTEGER }
+          bNumber:   { type: DataTypes.INTEGER },
+          dateAllowNullTrue: {
+            type: DataTypes.DATE,
+            allowNull: true
+          }
         })
 
         self.HistoryLog = sequelize.define('HistoryLog', {
@@ -320,6 +324,29 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
         expect(+user.touchedAt).toBe(5000)
       })
     })
+
+    describe('allowNull date', function() {
+      it('should be just "null" and not Date with Invalid Date', function(done) {
+        var self = this;
+        this.User.build({ username: 'a user'}).save().success(function() {
+          self.User.find({where: {username: 'a user'}}).success(function(user) {
+            expect(user.dateAllowNullTrue).toBe(null)
+            done()
+          })
+        })
+      })
+
+      it('should be the same valid date when saving the date', function(done) {
+        var self = this;
+        var date = new Date();
+        this.User.build({ username: 'a user', dateAllowNullTrue: date}).save().success(function() {
+          self.User.find({where: {username: 'a user'}}).success(function(user) {
+            expect(user.dateAllowNullTrue.toString()).toEqual(date.toString())
+            done()
+          })
+        })
+      })
+    })
   })
 
   describe('complete', function() {

From fe199e9e6cf45bab5b43e548a0adecd15caf7dce Mon Sep 17 00:00:00 2001
From: Filip Bonnevier 
Date: Mon, 29 Apr 2013 17:02:58 +0200
Subject: [PATCH 255/360] Change important MySQL query generator functions from
 using _.template to string concatenation. This has a large performance impact
 when doing many queries and having big result sets (attributesToSQL function)

---
 lib/dialects/mysql/query-generator.js | 108 +++++++++++++-------------
 1 file changed, 52 insertions(+), 56 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 42e121a4572e..905f3dcb7880 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -116,8 +116,8 @@ module.exports = (function() {
     },
 
     selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
+      var table = null,
+          joinQuery = ""
 
       options            = options || {}
       options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return QueryGenerator.addQuotes(tbl) }).join(", ") : QueryGenerator.addQuotes(tableName)
@@ -135,75 +135,74 @@ module.exports = (function() {
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
-            var template = Utils._.template("`<%= as %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`")
-            return template({ as: include.as, attr: attr })
+            return "`" + include.as + "`.`" + attr + "` AS `" + include.as + "." + attr + "`"
           })
 
           optAttributes = optAttributes.concat(attributes)
 
-          var joinQuery = " LEFT OUTER JOIN `<%= table %>` AS `<%= as %>` ON `<%= tableLeft %>`.`<%= attrLeft %>` = `<%= tableRight %>`.`<%= attrRight %>`"
-          query += Utils._.template(joinQuery)({
-            table:      include.daoFactory.tableName,
-            as:         include.as,
-            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.as : tableName),
-            attrLeft:   'id',
-            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.as),
-            attrRight:  include.association.identifier
-          })
+          var table = include.daoFactory.tableName
+          var as = include.as
+          var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+          var attrLeft = 'id'
+          var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+          var attrRight = include.association.identifier
+          joinQuery += " LEFT OUTER JOIN `" + table + "` AS `" + as + "` ON `" + tableLeft + "`.`" + attrLeft + "` = `" + tableRight + "`.`" + attrRight + "`"
+
         })
 
         options.attributes = optAttributes.join(', ')
       }
 
+      var query = "SELECT " + options.attributes + " FROM " + options.table
+      query += joinQuery
+
       if (options.where) {
         options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
+        query += " WHERE " + options.where
       }
 
       if (options.group) {
         options.group = Array.isArray(options.group) ? options.group.map(function(grp){return QueryGenerator.addQuotes(grp)}).join(', ') : QueryGenerator.addQuotes(options.group)
-        query += " GROUP BY <%= group %>"
+        query += " GROUP BY " + options.group
       }
 
       if (options.order) {
-        query += " ORDER BY <%= order %>"
+        query += " ORDER BY " + options.order
       }
 
 
       if (options.limit && !(options.include && (options.limit === 1))) {
         if (options.offset) {
-          query += " LIMIT <%= offset %>, <%= limit %>"
+          query += " LIMIT " + options.offset + ", " + options.limit
         } else {
-          query += " LIMIT <%= limit %>"
+          query += " LIMIT " + options.limit
         }
       }
 
       query += ";"
+      // console.log(query)
 
-      return Utils._.template(query)(options)
+      return query
     },
 
     insertQuery: function(tableName, attrValueHash) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
-
-      var replacements  = {
-        table: QueryGenerator.addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
+      var table = QueryGenerator.addQuotes(tableName)
+      var attributes = Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
+      var values = Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
-      }
 
-      return Utils._.template(query)(replacements)
+      var query = "INSERT INTO " + table + " (" + attributes + ") VALUES (" + values + ");"
+
+      return query
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
+      var values = []
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
@@ -212,34 +211,31 @@ module.exports = (function() {
         values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
       }
 
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var query = "UPDATE " + QueryGenerator.addQuotes(tableName) + 
+                  " SET " + values.join(",") + 
+                  " WHERE " + QueryGenerator.getWhereConditions(where) +
+                  ";"
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     deleteQuery: function(tableName, where, options) {
       options = options || {}
       options.limit = options.limit || 1
 
-      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
+      var table = QueryGenerator.addQuotes(tableName)
+      var where = QueryGenerator.getWhereConditions(where)
+      var limit = Utils.escape(options.limit)
+
+      var query = "DELETE FROM " + table + " WHERE " + where + " LIMIT " + limit
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     incrementQuery: function (tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> "
-        , values = []
+      var values = []
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
@@ -247,14 +243,14 @@ module.exports = (function() {
 
         values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
+      
+      var table = QueryGenerator.addQuotes(tableName)
+      var values =  values.join(",")
+      var where = QueryGenerator.getWhereConditions(where)
 
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var query = "UPDATE " + table + " SET " + values + " WHERE " + where
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     addIndexQuery: function(tableName, attributes, options) {
@@ -377,17 +373,18 @@ module.exports = (function() {
         var dataType = attributes[name]
 
         if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
+          var template
 
           if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
-              replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              template = "ENUM(" + Utils._.map(dataType.values, function(value) {
                 return Utils.escape(value)
               }).join(", ") + ")"
             } else {
               throw new Error('Values for ENUM haven\'t been defined.')
             }
+          } else {
+            template = dataType.type.toString();
           }
 
           if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
@@ -399,8 +396,7 @@ module.exports = (function() {
           }
 
           if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+            template += " DEFAULT " + Utils.escape(dataType.defaultValue)
           }
 
           if (dataType.unique) {
@@ -411,7 +407,7 @@ module.exports = (function() {
             template += " PRIMARY KEY"
           }
 
-          result[name] = Utils._.template(template)(replacements)
+          result[name] = template
         } else {
           result[name] = dataType
         }

From 1009cb9a1c694638cc936b00e7348eff3ce2faa0 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 29 Apr 2013 21:30:37 +0200
Subject: [PATCH 256/360] #572

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index bedb30f11c15..1a51790f32bd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # v1.7.0 #
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
+- [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From b2184b24f52eb36e02430814d2c3f434d9d1d8b5 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 29 Apr 2013 21:31:57 +0200
Subject: [PATCH 257/360] v1.7.0-alpha1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b30589be96bd..07fe5729ad50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sequelize",
   "description": "Multi dialect ORM for Node.JS",
-  "version": "1.6.0",
+  "version": "1.7.0-alpha1",
   "author": "Sascha Depold ",
   "contributors": [
     {

From 9cfcc80f4af6d9e95684574d2730cd34522fdd36 Mon Sep 17 00:00:00 2001
From: tjmehta 
Date: Mon, 29 Apr 2013 13:21:09 -0700
Subject: [PATCH 258/360] Updated config directory to correct location in
 examples. * other line changes are whitespace trims (auto by ide)

---
 examples/Associations/app.js               | 10 ++---
 examples/Count/app.js                      |  8 ++--
 examples/MinMax/app.js                     | 10 ++---
 examples/Performance/app.js                | 10 ++---
 examples/image-handling/app.js             | 43 +++++++++++++---------
 examples/method-passing/app.js             |  8 ++--
 examples/sequelize-with-options/app.js     |  4 +-
 examples/using-multiple-model-files/app.js |  6 +--
 8 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/examples/Associations/app.js b/examples/Associations/app.js
index 4ee7ad38d7ba..9a5f8fb512d1 100644
--- a/examples/Associations/app.js
+++ b/examples/Associations/app.js
@@ -5,11 +5,11 @@
   First of all, Person is getting associated via many-to-many with other Person objects (e.g. Person.hasMany('brothers')).
   Afterwards a Person becomes associated with a 'father' and a mother using a one-to-one association created by hasOneAndBelongsTo.
   The last association has the type many-to-one and is defined by the function hasManyAndBelongsTo.
-  The rest of the example is about setting and getting the associated data. 
+  The rest of the example is about setting and getting the associated data.
 */
 
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
   , Person    = sequelize.define('Person', { name: Sequelize.STRING })
   , Pet       = sequelize.define('Pet',    { name: Sequelize.STRING })
@@ -36,13 +36,13 @@ sequelize.sync({force:true}).on('success', function() {
     .add(brother.save())
     .add(sister.save())
     .add(pet.save())
-  
+
   chainer.run().on('success', function() {
     person.setMother(mother).on('success', function() { person.getMother().on('success', function(mom) {
-       console.log('my mom: ', mom.name) 
+       console.log('my mom: ', mom.name)
     })})
     person.setFather(father).on('success', function() { person.getFather().on('success', function(dad) {
-       console.log('my dad: ', dad.name) 
+       console.log('my dad: ', dad.name)
     })})
     person.setBrothers([brother]).on('success', function() { person.getBrothers().on('success', function(brothers) {
        console.log("my brothers: " + brothers.map(function(b) { return b.name }))
diff --git a/examples/Count/app.js b/examples/Count/app.js
index a8346e10801b..37973827e8a5 100644
--- a/examples/Count/app.js
+++ b/examples/Count/app.js
@@ -1,5 +1,5 @@
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
 
 var Person  = sequelize.define('Person', { name: Sequelize.STRING })
@@ -8,12 +8,12 @@ var Person  = sequelize.define('Person', { name: Sequelize.STRING })
 sequelize.sync({force: true}).on('success', function() {
   var count   = 10,
       queries = []
-  
+
   for(var i = 0; i < count; i++)
     chainer.add(Person.create({name: 'someone' + (i % 3)}))
-  
+
   console.log("Begin to save " + count + " items!")
-  
+
   chainer.run().on('success', function() {
     console.log("finished")
     Person.count().on('success', function(count) {
diff --git a/examples/MinMax/app.js b/examples/MinMax/app.js
index 22bdf16309e7..bce62d94174f 100644
--- a/examples/MinMax/app.js
+++ b/examples/MinMax/app.js
@@ -1,8 +1,8 @@
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
 
-var Person  = sequelize.define('Person', 
+var Person  = sequelize.define('Person',
   { name: Sequelize.STRING,
     age : Sequelize.INTEGER
 
@@ -12,12 +12,12 @@ var Person  = sequelize.define('Person',
 sequelize.sync({force: true}).on('success', function() {
   var count   = 10,
       queries = []
-  
+
   for(var i = 0; i < count; i++)
     chainer.add(Person.create({name: 'someone' + (i % 3), age : i+5}))
-  
+
   console.log("Begin to save " + count + " items!")
-  
+
   chainer.run().on('success', function() {
     console.log("finished")
     Person.max('age').on('success', function(max) {
diff --git a/examples/Performance/app.js b/examples/Performance/app.js
index ddb5d5bc68f0..05208138b441 100644
--- a/examples/Performance/app.js
+++ b/examples/Performance/app.js
@@ -1,5 +1,5 @@
 var Sequelize    = require(__dirname + "/../../index")
-  , config       = require("../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize    = new Sequelize(config.database, config.username, config.password, {logging: false, host: config.host})
   , QueryChainer = Sequelize.Utils.QueryChainer
   , sys          = require("sys")
@@ -10,16 +10,16 @@ Person.sync({force: true}).on('success', function() {
   var start = Date.now()
     , count = 10000
     , done  = 0
-  
+
   var createPerson = function() {
     Person.create({name: 'someone'}).on('success', function() {
       if(++done == count) {
         var duration = (Date.now() - start)
         console.log("\nFinished creation of " + count + " people. Took: " + duration + "ms (avg: " + (duration/count) + "ms)")
-        
+
         start = Date.now()
         console.log("Will now read them from the database:")
-      
+
         Person.findAll().on('success', function(people) {
           console.log("Reading " + people.length + " items took: " + (Date.now() - start) + "ms")
         })
@@ -35,7 +35,7 @@ Person.sync({force: true}).on('success', function() {
   for(var i = 0; i < count; i++) {
     createPerson()
   }
-    
+
 }).on('failure', function(err) {
   console.log(err)
 })
\ No newline at end of file
diff --git a/examples/image-handling/app.js b/examples/image-handling/app.js
index b7c0ab99e748..4b774b78b521 100644
--- a/examples/image-handling/app.js
+++ b/examples/image-handling/app.js
@@ -1,21 +1,28 @@
-var fs        = require("fs")
-  , Sequelize = require("sequelize")
-  , sequelize = new Sequelize('sequelize_test', 'root', null, {logging: false})
-  , Image     = sequelize.define('Image', { data: Sequelize.TEXT })
+/*
+  Title: Default values
 
-Image.sync({force: true}).on('success', function() {
-  console.log("reading image")
-  var image = fs.readFileSync(__dirname + '/source.png').toString("base64")
-  console.log("done\n")
-  
-  console.log("creating database entry")
-  Image.create({data: image}).on('success', function(img) {
-    console.log("done\n")
-    
-    console.log("writing file")
-    fs.writeFileSync(__dirname + '/target.png', img.data, "base64")
-    console.log("done\n")
-    
-    console.log("you might open the file ./target.png")
+  This example demonstrates the use of default values for defined model fields. Instead of just specifying the datatype,
+  you have to pass a hash with a type and a default. You also might want to specify either an attribute can be null or not!
+*/
+
+var Sequelize = require(__dirname + "/../../index")
+  , config    = require(__dirname + "/../../spec/config/config")
+  , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
+
+var User = sequelize.define('User', {
+      name: { type: Sequelize.STRING, allowNull: false},
+      isAdmin: { type: Sequelize.BOOLEAN, allowNull: false, defaultValue: false }
+    })
+  , user = User.build({ name: 'Someone' })
+
+sequelize.sync({force: true}).on('success', function() {
+  user.save().on('success', function(user) {
+    console.log("user.isAdmin should be the default value (false): ", user.isAdmin)
+
+    user.updateAttributes({ isAdmin: true }).on('success', function(user) {
+      console.log("user.isAdmin was overwritten to true: " + user.isAdmin)
+    })
   })
+}).on('failure', function(err) {
+  console.log(err)
 })
\ No newline at end of file
diff --git a/examples/method-passing/app.js b/examples/method-passing/app.js
index ae4d7223e8c3..58e1dcb9e8a5 100644
--- a/examples/method-passing/app.js
+++ b/examples/method-passing/app.js
@@ -1,14 +1,14 @@
 /*
   Title: Defining class and instance methods
-  
+
   This example shows the usage of the classMethods and instanceMethods option for Models.
 */
 
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
 
-// model definition    
+// model definition
 var Task = sequelize.define("Task", {
   name: Sequelize.STRING,
   deadline: Sequelize.DATE,
@@ -51,7 +51,7 @@ Task.sync({force: true}).on('success', function() {
     console.log("should be false: " + task1.passedDeadline())
     console.log("should be true: " + task2.passedDeadline())
     console.log("should be 10: " + task1.importance)
-    
+
     Task.setImportance(30, function() {
       Task.findAll().on('success', function(tasks) {
         tasks.forEach(function(task) {
diff --git a/examples/sequelize-with-options/app.js b/examples/sequelize-with-options/app.js
index df275a311ce6..b90fc340af9b 100644
--- a/examples/sequelize-with-options/app.js
+++ b/examples/sequelize-with-options/app.js
@@ -1,10 +1,10 @@
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {
       // use other database server or port
       host: 'my.srv.tld',
       port: 12345,
-      
+
       // disable logging
       logging: false
     })
diff --git a/examples/using-multiple-model-files/app.js b/examples/using-multiple-model-files/app.js
index ee6df5b3fc0e..d984a225f18d 100644
--- a/examples/using-multiple-model-files/app.js
+++ b/examples/using-multiple-model-files/app.js
@@ -1,12 +1,12 @@
 var Sequelize = require(__dirname + "/../../index")
-  , config    = require(__dirname + "/../../test/config")
+  , config    = require(__dirname + "/../../spec/config/config")
   , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
   , Project   = sequelize.import(__dirname + "/Project")
   , Task      = sequelize.import(__dirname + "/Task")
-  
+
 Project.hasMany(Task)
 Task.belongsTo(Project)
-    
+
 sequelize.sync({force: true}).on('success', function() {
   Project
     .create({ name: 'Sequelize', description: 'A nice MySQL ORM for NodeJS' })

From 397e4d8f29dc42571a093bd2edefdba489377c0a Mon Sep 17 00:00:00 2001
From: tjmehta 
Date: Mon, 29 Apr 2013 13:24:22 -0700
Subject: [PATCH 259/360] Updated readme with runnable examples

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 65364b40e0c4..7a57945bf11e 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa
 - Associations
 - Importing definitions from single files
 
-## Documentation, Examples and Updates ##
+## Documentation and Updates ##
 
 You can find the documentation and announcements of updates on the [project's website](http://www.sequelizejs.com).
 If you want to know about latest development and releases, follow me on [Twitter](http://twitter.com/sdepold).
@@ -42,6 +42,11 @@ Also make sure to take a look at the examples in the repository. The website wil
 - [Google Groups](https://groups.google.com/forum/#!forum/sequelize)
 - [XING](https://www.xing.com/net/priec1b5cx/sequelize) (pretty much inactive, but you might want to name it on your profile)
 
+## Running Examples
+Instructions for running samples are located in the [example directory](https://github.com/sequelize/sequelize/tree/master/examples). Try these samples in a live sandbox environment:
+
+
+
 ## Roadmap
 
 A very basic roadmap. Chances aren't too bad, that not mentioned things are implemented as well. Don't panic :)

From 4827513fe6b9071ef49052d6203e331ba1971755 Mon Sep 17 00:00:00 2001
From: Filip Bonnevier 
Date: Mon, 29 Apr 2013 17:02:58 +0200
Subject: [PATCH 260/360] Change important MySQL query generator functions from
 using _.template to string concatenation. This has a large performance impact
 when doing many queries and having big result sets (attributesToSQL function)

---
 lib/dialects/mysql/query-generator.js | 108 +++++++++++++-------------
 1 file changed, 52 insertions(+), 56 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 1c7be85a4e1a..04e6e1b4a8fc 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -149,8 +149,8 @@ module.exports = (function() {
     },
 
     selectQuery: function(tableName, options) {
-      var query = "SELECT <%= attributes %> FROM <%= table %>"
-        , table = null
+      var table = null,
+          joinQuery = ""
 
       options            = options || {}
       options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return QueryGenerator.addQuotes(tbl) }).join(", ") : QueryGenerator.addQuotes(tableName)
@@ -168,75 +168,74 @@ module.exports = (function() {
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
-            var template = Utils._.template("`<%= as %>`.`<%= attr %>` AS `<%= as %>.<%= attr %>`")
-            return template({ as: include.as, attr: attr })
+            return "`" + include.as + "`.`" + attr + "` AS `" + include.as + "." + attr + "`"
           })
 
           optAttributes = optAttributes.concat(attributes)
 
-          var joinQuery = " LEFT OUTER JOIN `<%= table %>` AS `<%= as %>` ON `<%= tableLeft %>`.`<%= attrLeft %>` = `<%= tableRight %>`.`<%= attrRight %>`"
-          query += Utils._.template(joinQuery)({
-            table:      include.daoFactory.tableName,
-            as:         include.as,
-            tableLeft:  ((include.association.associationType === 'BelongsTo') ? include.as : tableName),
-            attrLeft:   'id',
-            tableRight: ((include.association.associationType === 'BelongsTo') ? tableName : include.as),
-            attrRight:  include.association.identifier
-          })
+          var table = include.daoFactory.tableName
+          var as = include.as
+          var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+          var attrLeft = 'id'
+          var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+          var attrRight = include.association.identifier
+          joinQuery += " LEFT OUTER JOIN `" + table + "` AS `" + as + "` ON `" + tableLeft + "`.`" + attrLeft + "` = `" + tableRight + "`.`" + attrRight + "`"
+
         })
 
         options.attributes = optAttributes.join(', ')
       }
 
+      var query = "SELECT " + options.attributes + " FROM " + options.table
+      query += joinQuery
+
       if (options.hasOwnProperty('where')) {
         options.where = this.getWhereConditions(options.where, tableName)
-        query += " WHERE <%= where %>"
+        query += " WHERE " + options.where
       }
 
       if (options.group) {
         options.group = Array.isArray(options.group) ? options.group.map(function(grp){return QueryGenerator.addQuotes(grp)}).join(', ') : QueryGenerator.addQuotes(options.group)
-        query += " GROUP BY <%= group %>"
+        query += " GROUP BY " + options.group
       }
 
       if (options.order) {
-        query += " ORDER BY <%= order %>"
+        query += " ORDER BY " + options.order
       }
 
 
       if (options.limit && !(options.include && (options.limit === 1))) {
         if (options.offset) {
-          query += " LIMIT <%= offset %>, <%= limit %>"
+          query += " LIMIT " + options.offset + ", " + options.limit
         } else {
-          query += " LIMIT <%= limit %>"
+          query += " LIMIT " + options.limit
         }
       }
 
       query += ";"
+      // console.log(query)
 
-      return Utils._.template(query)(options)
+      return query
     },
 
     insertQuery: function(tableName, attrValueHash) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
-
-      var replacements  = {
-        table: QueryGenerator.addQuotes(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
-        values: Utils._.values(attrValueHash).map(function(value){
+      var table = QueryGenerator.addQuotes(tableName)
+      var attributes = Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
+      var values = Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
-      }
 
-      return Utils._.template(query)(replacements)
+      var query = "INSERT INTO " + table + " (" + attributes + ") VALUES (" + values + ");"
+
+      return query
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-        , values = []
+      var values = []
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
@@ -245,34 +244,31 @@ module.exports = (function() {
         values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
       }
 
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var query = "UPDATE " + QueryGenerator.addQuotes(tableName) +
+                  " SET " + values.join(",") +
+                  " WHERE " + QueryGenerator.getWhereConditions(where) +
+                  ";"
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     deleteQuery: function(tableName, where, options) {
       options = options || {}
       options.limit = options.limit || 1
 
-      var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
+      var table = QueryGenerator.addQuotes(tableName)
+      var where = QueryGenerator.getWhereConditions(where)
+      var limit = Utils.escape(options.limit)
+
+      var query = "DELETE FROM " + table + " WHERE " + where + " LIMIT " + limit
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     incrementQuery: function (tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> "
-        , values = []
+      var values = []
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
@@ -280,14 +276,14 @@ module.exports = (function() {
 
         values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
+      
+      var table = QueryGenerator.addQuotes(tableName)
+      var values =  values.join(",")
+      var where = QueryGenerator.getWhereConditions(where)
 
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        values: values.join(","),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var query = "UPDATE " + table + " SET " + values + " WHERE " + where
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     addIndexQuery: function(tableName, attributes, options) {
@@ -410,17 +406,18 @@ module.exports = (function() {
         var dataType = attributes[name]
 
         if (Utils.isHash(dataType)) {
-          var template     = "<%= type %>"
-            , replacements = { type: dataType.type }
+          var template
 
           if (dataType.type.toString() === DataTypes.ENUM.toString()) {
             if (Array.isArray(dataType.values) && (dataType.values.length > 0)) {
-              replacements.type = "ENUM(" + Utils._.map(dataType.values, function(value) {
+              template = "ENUM(" + Utils._.map(dataType.values, function(value) {
                 return Utils.escape(value)
               }).join(", ") + ")"
             } else {
               throw new Error('Values for ENUM haven\'t been defined.')
             }
+          } else {
+            template = dataType.type.toString();
           }
 
           if (dataType.hasOwnProperty('allowNull') && (!dataType.allowNull)) {
@@ -432,8 +429,7 @@ module.exports = (function() {
           }
 
           if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
-            template += " DEFAULT <%= defaultValue %>"
-            replacements.defaultValue = Utils.escape(dataType.defaultValue)
+            template += " DEFAULT " + Utils.escape(dataType.defaultValue)
           }
 
           if (dataType.unique) {
@@ -444,7 +440,7 @@ module.exports = (function() {
             template += " PRIMARY KEY"
           }
 
-          result[name] = Utils._.template(template)(replacements)
+          result[name] = template
         } else {
           result[name] = dataType
         }

From 9192014df4741ea42350a87a8931ea463777065a Mon Sep 17 00:00:00 2001
From: thomascool 
Date: Mon, 29 Apr 2013 17:56:31 -0700
Subject: [PATCH 261/360] bug fixing for undefined column in the table.

---
 lib/dialects/postgres/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 4dbaba9003d6..7e3f5a27f799 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -122,7 +122,7 @@ module.exports = (function() {
       this.emit('success', this.callee)
     } else if (this.send('isUpdateQuery')) {
       for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
+        if (rows[0].hasOwnProperty(key) && this.callee.daoFactory.rawAttributes[key]) {
           var record = rows[0][key]
           if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
             record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)

From 25ffe4004344ffe324f46794046ac49d51e34c4b Mon Sep 17 00:00:00 2001
From: thomascool 
Date: Tue, 30 Apr 2013 18:51:57 -0700
Subject: [PATCH 262/360] bug fixing on undefine column on table when create()

---
 lib/dialects/postgres/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 7e3f5a27f799..49c405cf6529 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -109,7 +109,7 @@ module.exports = (function() {
       this.emit('success', results)
     } else if (this.send('isInsertQuery')) {
       for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
+        if (rows[0].hasOwnProperty(key) && this.callee.daoFactory.rawAttributes[key]) {
           var record = rows[0][key]
           if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
             record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)

From efa85a94c525a4e95516e7154793a21406de7334 Mon Sep 17 00:00:00 2001
From: Filip Bonnevier 
Date: Thu, 2 May 2013 13:30:53 +0200
Subject: [PATCH 263/360] Remove unnecessary semi-colon from query

---
 lib/dialects/mysql/query-generator.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 04e6e1b4a8fc..b5aa4b786dd2 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -213,7 +213,6 @@ module.exports = (function() {
       }
 
       query += ";"
-      // console.log(query)
 
       return query
     },
@@ -246,8 +245,7 @@ module.exports = (function() {
 
       var query = "UPDATE " + QueryGenerator.addQuotes(tableName) +
                   " SET " + values.join(",") +
-                  " WHERE " + QueryGenerator.getWhereConditions(where) +
-                  ";"
+                  " WHERE " + QueryGenerator.getWhereConditions(where)
 
       return query
     },

From 92bb5fe22c2a864370d56194a10b79b9fd4fc818 Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 2 May 2013 14:51:22 -0400
Subject: [PATCH 264/360] Added decimal support for min/max, closes #579

---
 lib/dao-factory.js       |  4 ++--
 lib/query-interface.js   |  4 ++++
 spec/dao-factory.spec.js | 38 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 87ef96eed604..7421955b9307 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -271,14 +271,14 @@ module.exports = (function() {
   DAOFactory.prototype.max = function(field, options) {
     options = Utils._.extend({ attributes: [] }, options || {})
     options.attributes.push(['max(' + field + ')', 'max'])
-    options.parseInt = true
+    options.parseFloat = true
 
     return this.QueryInterface.rawSelect(this.getTableName(), options, 'max')
   }
   DAOFactory.prototype.min = function(field, options) {
     options = Utils._.extend({ attributes: [] }, options || {})
     options.attributes.push(['min(' + field + ')', 'min'])
-    options.parseInt = true
+    options.parseFloat = true
 
     return this.QueryInterface.rawSelect(this.getTableName(), options, 'min')
   }
diff --git a/lib/query-interface.js b/lib/query-interface.js
index a5361b58efd0..49f3fd4b6e1a 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -296,6 +296,10 @@ module.exports = (function() {
             result = parseInt(result)
           }
 
+          if (options && options.parseFloat) {
+            result = parseFloat(result)
+          }
+
           self.emit('rawSelect', null)
           emitter.emit('success', result)
         })
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 58f6016113f4..288cd8b6710d 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -1031,7 +1031,13 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         age: Sequelize.INTEGER
       })
 
-      this.UserWithAge.sync({ force: true }).success(done)
+      this.UserWithDec = this.sequelize.define('UserWithDec', {
+        value: Sequelize.DECIMAL(10, 3)
+      })
+
+      this.UserWithAge.sync({ force: true }).success(function(){
+        this.UserWithDec.sync({ force: true }).success(done)
+      }.bind(this))
     })
 
     it("should return the min value", function(done) {
@@ -1052,6 +1058,17 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         done()
       })
     })
+
+    it("should allow decimals in min", function(done){
+      this.UserWithDec.create({value: 3.5}).success(function(){
+        this.UserWithDec.create({ value: 5.5 }).success(function(){
+          this.UserWithDec.min('value').success(function(min){
+            expect(min).toEqual(3.5)
+            done()
+          })
+        }.bind(this))
+      }.bind(this))
+    })
   }) //- describe: min
 
   describe('max', function() {
@@ -1060,7 +1077,13 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         age: Sequelize.INTEGER
       })
 
-      this.UserWithAge.sync({ force: true }).success(done)
+      this.UserWithDec = this.sequelize.define('UserWithDec', {
+        value: Sequelize.DECIMAL(10, 3)
+      })
+
+      this.UserWithAge.sync({ force: true }).success(function(){
+        this.UserWithDec.sync({ force: true }).success(done)
+      }.bind(this))
     })
 
     it("should return the max value", function(done) {
@@ -1074,6 +1097,17 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       }.bind(this))
     })
 
+    it("should allow decimals in max", function(done){
+      this.UserWithDec.create({value: 3.5}).success(function(){
+        this.UserWithDec.create({ value: 5.5 }).success(function(){
+          this.UserWithDec.max('value').success(function(max){
+            expect(max).toEqual(5.5)
+            done()
+          })
+        }.bind(this))
+      }.bind(this))
+    })
+
     it('allows sql logging', function(done) {
       this.UserWithAge.max('age').on('sql', function(sql) {
         expect(sql).toBeDefined()

From 34ed0d70f5f7d7788a1964030f12489ca059d77f Mon Sep 17 00:00:00 2001
From: Alexandre Joly 
Date: Thu, 2 May 2013 23:55:54 +0200
Subject: [PATCH 265/360] 'ORDER BY' should come after 'GROUP BY'

---
 lib/dialects/postgres/query-generator.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 2c386366ac5e..e70188cdf276 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -262,13 +262,6 @@ module.exports = (function() {
         query += " WHERE <%= where %>"
       }
 
-      if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) {
-          return QueryGenerator.addQuotes(g1) + g2
-        })
-        query += " ORDER BY <%= order %>"
-      }
-
       if(options.group) {
         if (Array.isArray(options.group)) {
           options.group = options.group.map(function(grp){
@@ -281,6 +274,13 @@ module.exports = (function() {
         query += " GROUP BY <%= group %>"
       }
 
+      if(options.order) {
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) {
+          return QueryGenerator.addQuotes(g1) + g2
+        })
+        query += " ORDER BY <%= order %>"
+      }
+
       if (!(options.include && (options.limit === 1))) {
         if (options.limit) {
           query += " LIMIT <%= limit %>"

From c78b739640933e1f5874406e9f6154294f811afa Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 2 May 2013 19:17:33 -0400
Subject: [PATCH 266/360] Updated changelog

---
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.md b/changelog.md
index 1a51790f32bd..ec267f930289 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,6 @@
 # v1.7.0 #
+- [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
+- [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 

From ffb501224461258b979ce78891fdb5ddcdcdaf60 Mon Sep 17 00:00:00 2001
From: Joshua Frederick 
Date: Thu, 2 May 2013 20:31:43 -0700
Subject: [PATCH 267/360] updating generic-pool version (to include validate
 functionality)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 07fe5729ad50..7381bc16a7ff 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "validator": "0.4.x",
     "moment": "~1.7.0",
     "commander": "~0.6.0",
-    "generic-pool": "1.0.9",
+    "generic-pool": "2.0.3",
     "dottie": "0.0.6-1"
   },
   "devDependencies": {

From 692cb48831a910de7dfd93485a9178baa6b1893b Mon Sep 17 00:00:00 2001
From: Joshua Frederick 
Date: Thu, 2 May 2013 20:38:31 -0700
Subject: [PATCH 268/360] Adding connection validation and handling of
 PROTOCOL_CONNECTION_LOST errors

---
 lib/dialects/mysql/connector-manager.js | 26 ++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/dialects/mysql/connector-manager.js b/lib/dialects/mysql/connector-manager.js
index 2de43ad9603a..645fac1a85f7 100644
--- a/lib/dialects/mysql/connector-manager.js
+++ b/lib/dialects/mysql/connector-manager.js
@@ -19,7 +19,9 @@ module.exports = (function() {
     this.poolCfg = Utils._.defaults(this.config.pool, {
       maxConnections: 10,
       minConnections: 0,
-      maxIdleTime: 1000
+      maxIdleTime: 1000,
+      handleDisconnects: false,
+      validate: validateConnection
     });
     this.pendingQueries = 0;
     this.useReplicaton = !!config.replication;
@@ -83,6 +85,7 @@ module.exports = (function() {
           destroy: function(client) {
             disconnect.call(self, client)
           },
+          validate: self.poolCfg.validate,
           max: self.poolCfg.maxConnections,
           min: self.poolCfg.minConnections,
           idleTimeoutMillis: self.poolCfg.maxIdleTime
@@ -98,6 +101,7 @@ module.exports = (function() {
           destroy: function(client) {
             disconnect.call(self, client)
           },
+          validate: self.poolCfg.validate,
           max: self.poolCfg.maxConnections,
           min: self.poolCfg.minConnections,
           idleTimeoutMillis: self.poolCfg.maxIdleTime
@@ -115,6 +119,7 @@ module.exports = (function() {
         },
         max: self.poolCfg.maxConnections,
         min: self.poolCfg.minConnections,
+        validate: self.poolCfg.validate,
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
     }
@@ -247,10 +252,25 @@ module.exports = (function() {
     connection.query("SET time_zone = '+0:00'");
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
-
+    if (config.pool.handleDisconnects) {
+      handleDisconnect(this.pool, connection)
+    }
     done(null, connection)
   }
 
+  var handleDisconnect = function(pool, client) {
+    client.on('error', function(err) {
+      if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
+        throw err
+      }
+      pool.destroy(client)
+    })
+  }
+
+  var validateConnection = function(client) {
+    return client && client.state != 'disconnected'
+  }
+
   var enqueue = function(queueItem, options) {
     options = options || {}
     if (this.activeQueue.length < this.maxConcurrentQueries) {
@@ -336,4 +356,4 @@ module.exports = (function() {
   }
 
   return ConnectorManager
-})()
\ No newline at end of file
+})()

From b348b17c752be35d3fae27855ac24690078ee6cf Mon Sep 17 00:00:00 2001
From: Sergey Klimov 
Date: Fri, 3 May 2013 16:27:11 -0700
Subject: [PATCH 269/360] node domains supported

---
 lib/emitters/custom-event-emitter.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index aad8231e9c79..2ddea0ac9fdd 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -2,9 +2,20 @@ var util           = require("util")
   , EventEmitter   = require("events").EventEmitter
   , proxyEventKeys = ['success', 'error', 'sql']
 
+
+var bindToProcess = function(fct) {
+  if (fct) {
+      if(process.domain) {
+          return process.domain.bind(fct);
+      }
+  }
+
+  return fct;
+};
+
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
-    this.fct = fct
+    this.fct = bindToProcess(fct);
   }
   util.inherits(CustomEventEmitter, EventEmitter)
 
@@ -14,14 +25,14 @@ module.exports = (function() {
         this.fct.call(this, this)
       }
     }.bind(this))
-    
+
     return this
   }
 
   CustomEventEmitter.prototype.success =
   CustomEventEmitter.prototype.ok =
   function(fct) {
-    this.on('success', fct)
+    this.on('success', bindToProcess(fct))
     return this
   }
 
@@ -29,13 +40,14 @@ module.exports = (function() {
   CustomEventEmitter.prototype.fail =
   CustomEventEmitter.prototype.error =
   function(fct) {
-    this.on('error', fct)
+    this.on('error', bindToProcess(fct))
     return this;
   }
 
   CustomEventEmitter.prototype.done =
   CustomEventEmitter.prototype.complete =
   function(fct) {
+    fct = bindToProcess(fct);
     this.on('error', function(err) { fct(err, null) })
         .on('success', function(result) { fct(null, result) })
     return this
@@ -52,3 +64,4 @@ module.exports = (function() {
 
   return CustomEventEmitter;
 })()
+

From 644f6effab8bdbc2404be9f3662794a856eb920a Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 30 Apr 2013 22:10:15 +0100
Subject: [PATCH 270/360] Support for foreign keys in creating tables

---
 lib/dialects/mysql/query-generator.js         | 33 +++++++++++++++++++
 lib/dialects/postgres/query-generator.js      | 25 +++++++++++++-
 lib/dialects/sqlite/query-generator.js        | 23 +++++++++++++
 spec-jasmine/mysql/query-generator.spec.js    | 11 +++++++
 spec-jasmine/postgres/query-generator.spec.js | 11 +++++++
 spec-jasmine/sqlite/query-generator.spec.js   | 30 +++++++++++++++++
 6 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index b5aa4b786dd2..c1a604bfadcc 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -45,6 +45,7 @@ module.exports = (function() {
 
       var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>) ENGINE=<%= engine %> <%= charset %>"
         , primaryKeys = []
+        , foreignKeys = {}
         , attrStr = []
 
       for (var attr in attributes) {
@@ -54,6 +55,11 @@ module.exports = (function() {
           if (Utils._.includes(dataType, 'PRIMARY KEY')) {
             primaryKeys.push(attr)
             attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+          } else if (Utils._.includes(dataType, 'REFERENCES')) {
+            // MySQL doesn't support inline REFERENCES declarations: move to the end
+            var m = dataType.match(/^(.+) (REFERENCES.*)$/)
+            attrStr.push(QueryGenerator.addQuotes(attr) + " " + m[1])
+            foreignKeys[attr] = m[2]
           } else {
             attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType)
           }
@@ -72,6 +78,12 @@ module.exports = (function() {
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
       }
 
+      for (var fkey in foreignKeys) {
+        if(foreignKeys.hasOwnProperty(fkey)) {
+          values.attributes += ", FOREIGN KEY (" + QueryGenerator.addQuotes(fkey) + ") " + foreignKeys[fkey]
+        }
+      }
+
       return Utils._.template(query)(values).trim() + ";"
     },
 
@@ -438,6 +450,27 @@ module.exports = (function() {
             template += " PRIMARY KEY"
           }
 
+          if(dataType.references) {
+            template += " REFERENCES " + Utils.escape(dataType.references)
+
+
+            if(dataType.referencesKeys) {
+              // TODO: This isn't really right - for composite primary keys we need a different approach
+              template += "(" + dataType.referencesKeys.map(Utils.escape).join(', ') + ")"
+            } else {
+              template += "(" + Utils.escape('id') + ")"
+            }
+
+            if(dataType.onDelete) {
+              template += " ON DELETE " + dataType.onDeleteAction.toUpperCase()
+            }
+
+            if(dataType.onUpdate) {
+              template += " ON UPDATE " + dataType.onUpdateAction.toUpperCase()
+            }
+
+          }
+
           result[name] = template
         } else {
           result[name] = dataType
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index e70188cdf276..5654ca3a00e8 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -62,7 +62,7 @@ module.exports = (function() {
 
       var values  = {
         table: QueryGenerator.addQuotes(tableName),
-        attributes: attrStr.join(", "),
+        attributes: attrStr.join(", ")
       }
 
       var pks = primaryKeys[tableName].map(function(pk){
@@ -556,6 +556,29 @@ module.exports = (function() {
             template += " PRIMARY KEY"
           }
 
+          if(dataType.references) {
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            replacements.referencesTable = dataType.references
+
+            if(dataType.referencesKeys) {
+              // TODO: This isn't really right - for composite primary keys we need a different approach
+              replacements.referencesKeys = dataType.referencesKeys.map(Utils.escape).join(', ')
+            } else {
+              replacements.referencesKeys = Utils.escape('id')
+            }
+
+            if(dataType.onDelete) {
+              template += " ON DELETE <%= onDeleteAction %>"
+              replacements.onDeleteAction = dataType.onDeleteAction.toUpperCase()
+            }
+
+            if(dataType.onUpdate) {
+              template += " ON UPDATE <%= onUpdateAction %>"
+              replacements.onUpdateAction = dataType.onUpdateAction.toUpperCase()
+            }
+
+          }
+
           result[name] = Utils._.template(template)(replacements)
         } else {
           result[name] = dataType
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 000fe1de10d0..27c3be51b86b 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -217,6 +217,29 @@ module.exports = (function() {
             }
           }
 
+          if(dataType.references) {
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            replacements.referencesTable = dataType.references
+
+            if(dataType.referencesKeys) {
+              // TODO: This isn't really right - for composite primary keys we need a different approach
+              replacements.referencesKeys = dataType.referencesKeys.map(Utils.escape).join(', ')
+            } else {
+              replacements.referencesKeys = Utils.escape('id')
+            }
+
+            if(dataType.onDelete) {
+              template += " ON DELETE <%= onDeleteAction %>"
+              replacements.onDeleteAction = dataType.onDeleteAction.toUpperCase()
+            }
+
+            if(dataType.onUpdate) {
+              template += " ON UPDATE <%= onUpdateAction %>"
+              replacements.onUpdateAction = dataType.onUpdateAction.toUpperCase()
+            }
+
+          }
+
           result[name] = Utils._.template(template)(replacements)
         } else {
           result[name] = dataType
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index a2a4e78580e9..f3bf7ad3e6d8 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -10,6 +10,9 @@ describe('QueryGenerator', function() {
   afterEach(function() { Helpers.drop() })
 
   var suites = {
+
+    // TODO: Test attributesToSQL
+
     createTableQuery: [
       {
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
@@ -26,6 +29,14 @@ describe('QueryGenerator', function() {
       {
         arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}, {charset: 'latin1'}],
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` ENUM(\"A\", \"B\", \"C\"), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=latin1;"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', id: 'INTEGER PRIMARY KEY'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255), `id` INTEGER , PRIMARY KEY (`id`)) ENGINE=InnoDB;"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', otherId: 'INTEGER REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255), `otherId` INTEGER, FOREIGN KEY (`otherId`) REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB;"
       }
     ],
 
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index e8e0598113e4..4e3b2747ee4e 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -14,6 +14,9 @@ describe('QueryGenerator', function() {
   afterEach(function() { Helpers.drop() })
 
   var suites = {
+
+    // TODO: Test attributesToSQL
+
     createTableQuery: [
       {
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
@@ -26,6 +29,14 @@ describe('QueryGenerator', function() {
       {
         arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],
         expectation: "DROP TYPE IF EXISTS \"enum_myTable_title\"; CREATE TYPE \"enum_myTable_title\" AS ENUM(\"A\", \"B\", \"C\"); CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" \"enum_myTable_title\", \"name\" VARCHAR(255));"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', id: 'INTEGER PRIMARY KEY'}],
+        expectation: "CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" VARCHAR(255), \"name\" VARCHAR(255), \"id\" INTEGER , PRIMARY KEY (\"id\"));"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', otherId: 'INTEGER REFERENCES "otherTable" ("id") ON DELETE CASCADE ON UPDATE NO ACTION'}],
+        expectation: "CREATE TABLE IF NOT EXISTS \"myTable\" (\"title\" VARCHAR(255), \"name\" VARCHAR(255), \"otherId\" INTEGER REFERENCES \"otherTable\" (\"id\") ON DELETE CASCADE ON UPDATE NO ACTION);"
       }
     ],
 
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 40fce4870cde..97f5f3498ba6 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -9,6 +9,36 @@ describe('QueryGenerator', function() {
   afterEach(function() { Helpers.drop() })
 
   var suites = {
+
+    // TODO: Test attributesToSQL
+
+    createTableQuery: [
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
+      },
+      {
+        arguments: ['myTable', {title: 'ENUM("A", "B", "C")', name: 'VARCHAR(255)'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` ENUM(\"A\", \"B\", \"C\"), `name` VARCHAR(255));"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', id: 'INTEGER PRIMARY KEY'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255), `id` INTEGER PRIMARY KEY);"
+      },
+      {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)', otherId: 'INTEGER REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255), `otherId` INTEGER REFERENCES `otherTable` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION);"
+      }
+    ],
+
     insertQuery: [
       {
         arguments: ['myTable', { name: 'foo' }],

From 8f8615338014b6fc560546318f599ef60445a3d4 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 30 Apr 2013 22:31:45 +0100
Subject: [PATCH 271/360] Tests + fixes for attributesToSQL

---
 lib/dialects/mysql/query-generator.js         |  6 +-
 lib/dialects/postgres/query-generator.js      | 10 ++--
 lib/dialects/sqlite/query-generator.js        | 10 ++--
 spec-jasmine/mysql/query-generator.spec.js    | 55 ++++++++++++++++++-
 spec-jasmine/postgres/query-generator.spec.js | 55 ++++++++++++++++++-
 spec-jasmine/sqlite/query-generator.spec.js   | 55 ++++++++++++++++++-
 6 files changed, 175 insertions(+), 16 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index c1a604bfadcc..b0bdfb66b0d0 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -451,14 +451,14 @@ module.exports = (function() {
           }
 
           if(dataType.references) {
-            template += " REFERENCES " + Utils.escape(dataType.references)
+            template += " REFERENCES " + Utils.addTicks(dataType.references)
 
 
             if(dataType.referencesKeys) {
               // TODO: This isn't really right - for composite primary keys we need a different approach
-              template += "(" + dataType.referencesKeys.map(Utils.escape).join(', ') + ")"
+              template += "(" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
             } else {
-              template += "(" + Utils.escape('id') + ")"
+              template += "(" + Utils.addTicks('id') + ")"
             }
 
             if(dataType.onDelete) {
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 5654ca3a00e8..9897447ce7c5 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -558,23 +558,23 @@ module.exports = (function() {
 
           if(dataType.references) {
             template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
-            replacements.referencesTable = dataType.references
+            replacements.referencesTable = QueryGenerator.addQuotes(dataType.references)
 
             if(dataType.referencesKeys) {
               // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(Utils.escape).join(', ')
+              replacements.referencesKeys = dataType.referencesKeys.map(QueryGenerator.addQuotes).join(', ')
             } else {
-              replacements.referencesKeys = Utils.escape('id')
+              replacements.referencesKeys = QueryGenerator.addQuotes('id')
             }
 
             if(dataType.onDelete) {
               template += " ON DELETE <%= onDeleteAction %>"
-              replacements.onDeleteAction = dataType.onDeleteAction.toUpperCase()
+              replacements.onDeleteAction = dataType.onDelete.toUpperCase()
             }
 
             if(dataType.onUpdate) {
               template += " ON UPDATE <%= onUpdateAction %>"
-              replacements.onUpdateAction = dataType.onUpdateAction.toUpperCase()
+              replacements.onUpdateAction = dataType.onUpdate.toUpperCase()
             }
 
           }
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 27c3be51b86b..4c88cea2bc23 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -219,23 +219,23 @@ module.exports = (function() {
 
           if(dataType.references) {
             template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
-            replacements.referencesTable = dataType.references
+            replacements.referencesTable = Utils.addTicks(dataType.references)
 
             if(dataType.referencesKeys) {
               // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(Utils.escape).join(', ')
+              replacements.referencesKeys = dataType.referencesKeys.map(Utils.addTicks).join(', ')
             } else {
-              replacements.referencesKeys = Utils.escape('id')
+              replacements.referencesKeys = Utils.addTicks('id')
             }
 
             if(dataType.onDelete) {
               template += " ON DELETE <%= onDeleteAction %>"
-              replacements.onDeleteAction = dataType.onDeleteAction.toUpperCase()
+              replacements.onDeleteAction = dataType.onDelete.toUpperCase()
             }
 
             if(dataType.onUpdate) {
               template += " ON UPDATE <%= onUpdateAction %>"
-              replacements.onUpdateAction = dataType.onUpdateAction.toUpperCase()
+              replacements.onUpdateAction = dataType.onUpdate.toUpperCase()
             }
 
           }
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index f3bf7ad3e6d8..53df41eec03e 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -11,7 +11,60 @@ describe('QueryGenerator', function() {
 
   var suites = {
 
-    // TODO: Test attributesToSQL
+    attributesToSQL: [
+      {
+        arguments: [{id: 'INTEGER'}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: 'INTEGER', foo: 'VARCHAR(255)'}],
+        expectation: {id: 'INTEGER', foo: 'VARCHAR(255)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER'}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false}}],
+        expectation: {id: 'INTEGER NOT NULL'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: true}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', primaryKey: true, autoIncrement: true}}],
+        expectation: {id: 'INTEGER auto_increment PRIMARY KEY'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', defaultValue: 0}}],
+        expectation: {id: 'INTEGER DEFAULT 0'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', unique: true}}],
+        expectation: {id: 'INTEGER UNIQUE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onDelete: 'CASCADE'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`) ON DELETE CASCADE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`) ON UPDATE RESTRICT'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false, autoIncrement: true, defaultValue: 1, references: 'Bar', onDelete: 'CASCADE', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER NOT NULL auto_increment DEFAULT 1 REFERENCES `Bar` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT'}
+      },
+    ],
 
     createTableQuery: [
       {
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index 4e3b2747ee4e..dceb934f0196 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -15,7 +15,60 @@ describe('QueryGenerator', function() {
 
   var suites = {
 
-    // TODO: Test attributesToSQL
+    attributesToSQL: [
+      {
+        arguments: [{id: 'INTEGER'}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: 'INTEGER', foo: 'VARCHAR(255)'}],
+        expectation: {id: 'INTEGER', foo: 'VARCHAR(255)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER'}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false}}],
+        expectation: {id: 'INTEGER NOT NULL'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: true}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', primaryKey: true, autoIncrement: true}}],
+        expectation: {id: 'INTEGER SERIAL PRIMARY KEY'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', defaultValue: 0}}],
+        expectation: {id: 'INTEGER DEFAULT 0'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', unique: true}}],
+        expectation: {id: 'INTEGER UNIQUE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar'}}],
+        expectation: {id: 'INTEGER REFERENCES "Bar" ("id")'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        expectation: {id: 'INTEGER REFERENCES "Bar" ("pk")'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onDelete: 'CASCADE'}}],
+        expectation: {id: 'INTEGER REFERENCES "Bar" ("id") ON DELETE CASCADE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER REFERENCES "Bar" ("id") ON UPDATE RESTRICT'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false, defaultValue: 1, references: 'Bar', onDelete: 'CASCADE', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER NOT NULL DEFAULT 1 REFERENCES "Bar" ("id") ON DELETE CASCADE ON UPDATE RESTRICT'}
+      },
+    ],
 
     createTableQuery: [
       {
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 97f5f3498ba6..565e163e07f2 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -10,7 +10,60 @@ describe('QueryGenerator', function() {
 
   var suites = {
 
-    // TODO: Test attributesToSQL
+    attributesToSQL: [
+      {
+        arguments: [{id: 'INTEGER'}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: 'INTEGER', foo: 'VARCHAR(255)'}],
+        expectation: {id: 'INTEGER', foo: 'VARCHAR(255)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER'}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false}}],
+        expectation: {id: 'INTEGER NOT NULL'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: true}}],
+        expectation: {id: 'INTEGER'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', primaryKey: true, autoIncrement: true}}],
+        expectation: {id: 'INTEGER PRIMARY KEY AUTOINCREMENT'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', defaultValue: 0}}],
+        expectation: {id: 'INTEGER DEFAULT 0'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', unique: true}}],
+        expectation: {id: 'INTEGER UNIQUE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onDelete: 'CASCADE'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`) ON DELETE CASCADE'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER REFERENCES `Bar` (`id`) ON UPDATE RESTRICT'}
+      },
+      {
+        arguments: [{id: {type: 'INTEGER', allowNull: false, defaultValue: 1, references: 'Bar', onDelete: 'CASCADE', onUpdate: 'RESTRICT'}}],
+        expectation: {id: 'INTEGER NOT NULL DEFAULT 1 REFERENCES `Bar` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT'}
+      },
+    ],
 
     createTableQuery: [
       {

From 559e1cef9640f279c2a8a392beb1fc11c0be21d2 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 30 Apr 2013 23:31:05 +0100
Subject: [PATCH 272/360] Basic implementation of capturing foreign key status

---
 lib/associations/belongs-to.js     |  6 ++++++
 lib/associations/has-many.js       |  6 ++++++
 lib/associations/has-one.js        |  6 ++++++
 spec/associations/has-many.spec.js | 23 +++++++++++++++++++++++
 4 files changed, 41 insertions(+)

diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js
index 020f14abe2ec..dfd613054695 100644
--- a/lib/associations/belongs-to.js
+++ b/lib/associations/belongs-to.js
@@ -24,6 +24,12 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+      newAttributes[this.identifier].references = this.target.tableName,
+      newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+      newAttributes[this.identifier].onDelete = this.options.onDelete,
+      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+    }
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added
diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js
index b9f6738521db..bd70f243183c 100644
--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -65,6 +65,12 @@ module.exports = (function() {
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+        newAttributes[this.identifier].references = this.source.tableName
+        newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+        newAttributes[this.identifier].onDelete = this.options.onDelete
+        newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      }
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
 
diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js
index 69a93898b4f1..79f12845e186 100644
--- a/lib/associations/has-one.js
+++ b/lib/associations/has-one.js
@@ -29,6 +29,12 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+    if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+      newAttributes[this.identifier].references = this.source.tableName,
+      newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+      newAttributes[this.identifier].onDelete = this.options.onDelete,
+      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+    }
     Utils._.defaults(this.target.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added
diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js
index f298f0c9ce1f..6a658e594af9 100644
--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -322,5 +322,28 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
         })
       })
     })
+
+    describe("Foreign key constraints", function() {
+
+      it("can cascade deletes", function(done) {
+        var User = this.sequelize.define('User', { username: Sequelize.STRING })
+          , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+
+        User.hasMany(Task, {onDelete: 'cascade'})
+
+        this.sequelize.sync({ force: true }).success(function() {
+          User.create({ username: 'foo' }).success(function(user) {
+            Task.create({ title: 'task' }).success(function(task) {
+              user.setTasks([task]).success(function() {
+                debugger
+                done()
+              })
+            })
+          })
+        })
+      })
+
+    })
+
   })
 })

From 10ec7ff6b985e84aac12a3c3e1fa70dd34802aa4 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 4 May 2013 23:25:41 +0100
Subject: [PATCH 273/360] Tidy up setting of new attributes

---
 lib/associations/belongs-to.js | 6 ++++--
 lib/associations/has-many.js   | 6 ++++--
 lib/associations/has-one.js    | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js
index dfd613054695..ce90d771b48c 100644
--- a/lib/associations/belongs-to.js
+++ b/lib/associations/belongs-to.js
@@ -24,12 +24,14 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+
+    if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
       newAttributes[this.identifier].references = this.target.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
       newAttributes[this.identifier].onDelete = this.options.onDelete,
       newAttributes[this.identifier].onUpdate = this.options.onUpdate
     }
+
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added
diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js
index bd70f243183c..c0bff1516d4e 100644
--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -65,12 +65,14 @@ module.exports = (function() {
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-      if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+
+      if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
         newAttributes[this.identifier].references = this.source.tableName
-        newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+        newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
         newAttributes[this.identifier].onDelete = this.options.onDelete
         newAttributes[this.identifier].onUpdate = this.options.onUpdate
       }
+
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
 
diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js
index 79f12845e186..07f819edc452 100644
--- a/lib/associations/has-one.js
+++ b/lib/associations/has-one.js
@@ -29,12 +29,14 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-    if(typeof this.options.foreignKey === "undefined" || this.options.foreignKey === true) {
+
+    if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
       newAttributes[this.identifier].references = this.source.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.reduce(this.source.rawAttributes, function(memo, value, key) { if(value.primaryKey) { memo.push(key) } return memo }, [])
+      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
       newAttributes[this.identifier].onDelete = this.options.onDelete,
       newAttributes[this.identifier].onUpdate = this.options.onUpdate
     }
+
     Utils._.defaults(this.target.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added

From 556a6639d30f1a35200ae61e05757340ddec9722 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 4 May 2013 23:26:04 +0100
Subject: [PATCH 274/360] Topologically sorted iterator for DAOs taking
 dependencies into account

---
 lib/dao-factory-manager.js | 31 +++++++++++++++++++++++++++++++
 package.json               |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/dao-factory-manager.js b/lib/dao-factory-manager.js
index 092edfa83483..a42ed8d3447b 100644
--- a/lib/dao-factory-manager.js
+++ b/lib/dao-factory-manager.js
@@ -1,3 +1,5 @@
+var Toposort = require('toposort-class')
+
 module.exports = (function() {
   var DAOFactoryManager = function(sequelize) {
     this.daos = []
@@ -31,5 +33,34 @@ module.exports = (function() {
     return this.daos
   })
 
+  /**
+   * Iterate over DAOs in an order suitable for e.g. creating tables. Will
+   * take foreign key constraints into account so that dependencies are visited
+   * before dependents.
+   */
+  DAOFactoryManager.prototype.forEachDAO = function(iterator) {
+    var daos = {}
+      , sorter = new Toposort()
+
+    this.daos.forEach(function(dao) {
+      daos[dao.tableName] = dao
+      var deps = []
+
+      for(var attrName in dao.rawAttributes) {
+        if(dao.rawAttributes.hasOwnProperty(attrName)) {
+          if(dao.rawAttributes[attrName].references) {
+            deps.push(dao.rawAttributes[attrName].references)
+          }
+        }
+      }
+
+      sorter.add(dao.tableName, deps)
+    })
+
+    sorter.sort().reverse().forEach(function(name) {
+      iterator(daos[name])
+    })
+  }
+
   return DAOFactoryManager
 })()
diff --git a/package.json b/package.json
index 07fe5729ad50..4c7e0c37595a 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
     "moment": "~1.7.0",
     "commander": "~0.6.0",
     "generic-pool": "1.0.9",
-    "dottie": "0.0.6-1"
+    "dottie": "0.0.6-1",
+    "toposort-class": "0.1.4"
   },
   "devDependencies": {
     "jasmine-node": "1.5.0",

From f293a11122c2c10a64a6cf281d20a18908a5e8b3 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 4 May 2013 23:26:25 +0100
Subject: [PATCH 275/360] Create tables in dependency order

---
 lib/sequelize.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index 8f317fd49717..f4efec7bedf4 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -261,11 +261,14 @@ module.exports = (function() {
 
     var chainer = new Utils.QueryChainer()
 
-    this.daoFactoryManager.daos.forEach(function(dao) {
-      chainer.add(dao.sync(options))
+    // Topologically sort by foreign key constraints to give us an appropriate
+    // creation order
+
+    this.daoFactoryManager.forEachDAO(function(dao) {
+      chainer.add(dao, 'sync', [options])
     })
 
-    return chainer.run()
+    return chainer.runSerially()
   }
 
   Sequelize.prototype.drop = function() {

From be4ffc9bac11dcc8eadcce86aad04f317d2cd372 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 4 May 2013 23:30:14 +0100
Subject: [PATCH 276/360] Support for dropping tables with constraints

---
 lib/dialects/mysql/query-generator.js         | 10 ++++++
 lib/dialects/postgres/query-generator.js      | 12 +++++--
 lib/dialects/query-generator.js               | 15 ++++++++
 lib/dialects/sqlite/query-generator.js        | 10 ++++++
 lib/query-interface.js                        | 34 +++++++++++++++++--
 spec-jasmine/postgres/query-generator.spec.js |  4 +--
 6 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index b0bdfb66b0d0..26374a56ecd3 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -496,6 +496,16 @@ module.exports = (function() {
       return fields
     },
 
+    enableForeignKeyConstraintsQuery: function() {
+      var sql = "SET FOREIGN_KEY_CHECKS = 1;"
+      return Utils._.template(sql, {})
+    },
+
+    disableForeignKeyConstraintsQuery: function() {
+      var sql = "SET FOREIGN_KEY_CHECKS = 0;"
+      return Utils._.template(sql, {})
+    },
+
     addQuotes: function(s, quoteChar) {
       return Utils.addTicks(s, quoteChar)
     },
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 9897447ce7c5..e488d93e21b4 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -78,7 +78,7 @@ module.exports = (function() {
 
     dropTableQuery: function(tableName, options) {
       options = options || {}
-      var query = "DROP TABLE IF EXISTS <%= table %>;"
+      var query = "DROP TABLE IF EXISTS <%= table %> CASCADE;"
       return Utils._.template(query)({
         table: QueryGenerator.addQuotes(tableName)
       })
@@ -602,8 +602,16 @@ module.exports = (function() {
       return fields
     },
 
+    enableForeignKeyConstraintsQuery: function() {
+      return false // not supported by dialect
+    },
+
+    disableForeignKeyConstraintsQuery: function() {
+      return false // not supported by dialect
+    },
+
     databaseConnectionUri: function(config) {
-      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>';
+      var template = '<%= protocol %>://<%= user %>:<%= password %>@<%= host %><% if(port) { %>:<%= port %><% } %>/<%= database %>'
 
       return Utils._.template(template)({
         user:     encodeURIComponent(config.username),
diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js
index 669b99348049..3377997b8e21 100644
--- a/lib/dialects/query-generator.js
+++ b/lib/dialects/query-generator.js
@@ -229,7 +229,22 @@ module.exports = (function() {
     */
     findAutoIncrementField: function(factory) {
       throwMethodUndefined('findAutoIncrementField')
+    },
+
+    /*
+      Globally enable foreign key constraints
+    */
+    enableForeignKeyConstraintsQuery: function() {
+      throwMethodUndefined('enableForeignKeyConstraintsQuery')
+    },
+
+    /*
+      Globally disable foreign key constraints
+    */
+    disableForeignKeyConstraintsQuery: function() {
+      throwMethodUndefined('disableForeignKeyConstraintsQuery')
     }
+
   }
 
   var throwMethodUndefined = function(methodName) {
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 4c88cea2bc23..dbca580646f4 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -265,6 +265,16 @@ module.exports = (function() {
       return fields
     },
 
+    enableForeignKeyConstraintsQuery: function() {
+      var sql = "PRAGMA foreign_keys = ON;"
+      return Utils._.template(sql, {})
+    },
+
+    disableForeignKeyConstraintsQuery: function() {
+      var sql = "PRAGMA foreign_keys = OFF;"
+      return Utils._.template(sql, {})
+    },
+
     hashToWhereConditions: function(hash) {
       for (var key in hash) {
         if (hash.hasOwnProperty(key)) {
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 49f3fd4b6e1a..4bd5c95b93d4 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -91,11 +91,17 @@ module.exports = (function() {
       var chainer = new Utils.QueryChainer()
 
       self.showAllTables().success(function(tableNames) {
+
+        chainer.add(self, 'disableForeignKeyConstraints', [])
+
         tableNames.forEach(function(tableName) {
-          chainer.add(self.dropTable(tableName))
+          chainer.add(self, 'dropTable', [tableName])
         })
+
+        chainer.add(self, 'enableForeignKeyConstraints', [])
+
         chainer
-          .run()
+          .runSerially()
           .success(function() {
             self.emit('dropAllTables', null)
             emitter.emit('success', null)
@@ -313,6 +319,30 @@ module.exports = (function() {
     }).run()
   }
 
+  QueryInterface.prototype.enableForeignKeyConstraints = function() {
+    var sql = this.QueryGenerator.enableForeignKeyConstraintsQuery()
+    if(sql) {
+      return queryAndEmit.call(this, sql, 'enableForeignKeyConstraints')
+    } else {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        this.emit('enableForeignKeyConstraints', null)
+        emitter.emit('success')
+      }).run()
+    }
+  }
+
+  QueryInterface.prototype.disableForeignKeyConstraints = function() {
+    var sql = this.QueryGenerator.disableForeignKeyConstraintsQuery()
+    if(sql){
+      return queryAndEmit.call(this, sql, 'disableForeignKeyConstraints')
+    } else {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        this.emit('disableForeignKeyConstraints', null)
+        emitter.emit('success')
+      }).run()
+    }
+  }
+
   // private
 
   var queryAndEmit = function(sqlOrQueryParams, methodName, options, emitter) {
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index dceb934f0196..e0d14fbfa9c0 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -96,11 +96,11 @@ describe('QueryGenerator', function() {
     dropTableQuery: [
       {
         arguments: ['myTable'],
-        expectation: "DROP TABLE IF EXISTS \"myTable\";"
+        expectation: "DROP TABLE IF EXISTS \"myTable\" CASCADE;"
       },
       {
         arguments: ['mySchema.myTable'],
-        expectation: "DROP TABLE IF EXISTS \"mySchema\".\"myTable\";"
+        expectation: "DROP TABLE IF EXISTS \"mySchema\".\"myTable\" CASCADE;"
       }
     ],
 

From 417a832a965a4d96de345a8b93726f4a5ae180eb Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 4 May 2013 23:30:23 +0100
Subject: [PATCH 277/360] Skeletal test

---
 spec/associations/has-many.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js
index 6a658e594af9..ec5dfe0a71a8 100644
--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -288,7 +288,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
 
       var add = this.spy()
 
-      this.stub(Sequelize.Utils, 'QueryChainer').returns({ add: add, run: function(){} })
+      this.stub(Sequelize.Utils, 'QueryChainer').returns({ add: add, runSerially: function(){} })
 
       this.sequelize.sync({ force: true })
       expect(add).toHaveBeenCalledThrice()
@@ -326,8 +326,8 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
     describe("Foreign key constraints", function() {
 
       it("can cascade deletes", function(done) {
-        var User = this.sequelize.define('User', { username: Sequelize.STRING })
-          , Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+          , User = this.sequelize.define('User', { username: Sequelize.STRING })
 
         User.hasMany(Task, {onDelete: 'cascade'})
 

From 03ca02917f5e16f9a219f0c6a705f0a9a8fd9e74 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 5 May 2013 14:36:00 +0100
Subject: [PATCH 278/360] Fixes after rebase

---
 lib/dialects/mysql/query-generator.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 26374a56ecd3..50b0d9a8c4b0 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -456,17 +456,17 @@ module.exports = (function() {
 
             if(dataType.referencesKeys) {
               // TODO: This isn't really right - for composite primary keys we need a different approach
-              template += "(" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
+              template += " (" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
             } else {
-              template += "(" + Utils.addTicks('id') + ")"
+              template += " (" + Utils.addTicks('id') + ")"
             }
 
             if(dataType.onDelete) {
-              template += " ON DELETE " + dataType.onDeleteAction.toUpperCase()
+              template += " ON DELETE " + dataType.onDelete.toUpperCase()
             }
 
             if(dataType.onUpdate) {
-              template += " ON UPDATE " + dataType.onUpdateAction.toUpperCase()
+              template += " ON UPDATE " + dataType.onUpdate.toUpperCase()
             }
 
           }

From 1df9027787817e0d84968d742854859295d05b26 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 5 May 2013 14:47:04 +0100
Subject: [PATCH 279/360] Don't pretend like composite primary keys work: they
 need to be handled at table level, not attribute level

---
 lib/associations/belongs-to.js                | 12 ++++++++----
 lib/associations/has-many.js                  | 12 ++++++++----
 lib/associations/has-one.js                   | 12 ++++++++----
 lib/dialects/mysql/query-generator.js         |  5 ++---
 lib/dialects/postgres/query-generator.js      |  9 ++++-----
 lib/dialects/sqlite/query-generator.js        |  9 ++++-----
 spec-jasmine/mysql/query-generator.spec.js    |  2 +-
 spec-jasmine/postgres/query-generator.spec.js |  2 +-
 spec-jasmine/sqlite/query-generator.spec.js   |  2 +-
 9 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js
index ce90d771b48c..1e5a197721af 100644
--- a/lib/associations/belongs-to.js
+++ b/lib/associations/belongs-to.js
@@ -26,10 +26,14 @@ module.exports = (function() {
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
     if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      newAttributes[this.identifier].references = this.target.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
-      newAttributes[this.identifier].onDelete = this.options.onDelete,
-      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      var primaryKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+          newAttributes[this.identifier].references = this.target.tableName,
+          newAttributes[this.identifier].referencesKey = primaryKeys[0]
+          newAttributes[this.identifier].onDelete = this.options.onDelete,
+          newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        }
     }
 
     Utils._.defaults(this.source.rawAttributes, newAttributes)
diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js
index c0bff1516d4e..24a0b5322c2f 100644
--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -67,10 +67,14 @@ module.exports = (function() {
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
       if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-        newAttributes[this.identifier].references = this.source.tableName
-        newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-        newAttributes[this.identifier].onDelete = this.options.onDelete
-        newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+          newAttributes[this.identifier].references = this.source.tableName
+          newAttributes[this.identifier].referencesKey = primaryKeys[0]
+          newAttributes[this.identifier].onDelete = this.options.onDelete
+          newAttributes[this.identifier].onUpdate = this.options.onUpdate
+        }
       }
 
       Utils._.defaults(this.target.rawAttributes, newAttributes)
diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js
index 07f819edc452..bf11d88fde5b 100644
--- a/lib/associations/has-one.js
+++ b/lib/associations/has-one.js
@@ -31,10 +31,14 @@ module.exports = (function() {
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
 
     if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      newAttributes[this.identifier].references = this.source.tableName,
-      newAttributes[this.identifier].referencesKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-      newAttributes[this.identifier].onDelete = this.options.onDelete,
-      newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
+
+        if(primaryKeys.length == 1) { // composite keys not supported with this approach
+        newAttributes[this.identifier].references = this.source.tableName,
+        newAttributes[this.identifier].referencesKey = primaryKeys[0]
+        newAttributes[this.identifier].onDelete = this.options.onDelete,
+        newAttributes[this.identifier].onUpdate = this.options.onUpdate
+      }
     }
 
     Utils._.defaults(this.target.rawAttributes, newAttributes)
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 50b0d9a8c4b0..6d55f3d1c627 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -454,9 +454,8 @@ module.exports = (function() {
             template += " REFERENCES " + Utils.addTicks(dataType.references)
 
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              template += " (" + dataType.referencesKeys.map(Utils.addTicks).join(', ') + ")"
+            if(dataType.referencesKey) {
+              template += " (" + Utils.addTicks(dataType.referencesKey) + ")"
             } else {
               template += " (" + Utils.addTicks('id') + ")"
             }
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index e488d93e21b4..e5c6880ded8c 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -557,14 +557,13 @@ module.exports = (function() {
           }
 
           if(dataType.references) {
-            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKey %>)"
             replacements.referencesTable = QueryGenerator.addQuotes(dataType.references)
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(QueryGenerator.addQuotes).join(', ')
+            if(dataType.referencesKey) {
+              replacements.referencesKey = QueryGenerator.addQuotes(dataType.referencesKey)
             } else {
-              replacements.referencesKeys = QueryGenerator.addQuotes('id')
+              replacements.referencesKey = QueryGenerator.addQuotes('id')
             }
 
             if(dataType.onDelete) {
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index dbca580646f4..66c2987f98d1 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -218,14 +218,13 @@ module.exports = (function() {
           }
 
           if(dataType.references) {
-            template += " REFERENCES <%= referencesTable %> (<%= referencesKeys %>)"
+            template += " REFERENCES <%= referencesTable %> (<%= referencesKey %>)"
             replacements.referencesTable = Utils.addTicks(dataType.references)
 
-            if(dataType.referencesKeys) {
-              // TODO: This isn't really right - for composite primary keys we need a different approach
-              replacements.referencesKeys = dataType.referencesKeys.map(Utils.addTicks).join(', ')
+            if(dataType.referencesKey) {
+              replacements.referencesKey = Utils.addTicks(dataType.referencesKey)
             } else {
-              replacements.referencesKeys = Utils.addTicks('id')
+              replacements.referencesKey = Utils.addTicks('id')
             }
 
             if(dataType.onDelete) {
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 53df41eec03e..70e64e2b3e37 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -49,7 +49,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
       },
       {
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index e0d14fbfa9c0..f58cf6c66585 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -53,7 +53,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES "Bar" ("id")'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES "Bar" ("pk")'}
       },
       {
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 565e163e07f2..6fa87b7389bb 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -48,7 +48,7 @@ describe('QueryGenerator', function() {
         expectation: {id: 'INTEGER REFERENCES `Bar` (`id`)'}
       },
       {
-        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKeys: ['pk']}}],
+        arguments: [{id: {type: 'INTEGER', references: 'Bar', referencesKey: 'pk'}}],
         expectation: {id: 'INTEGER REFERENCES `Bar` (`pk`)'}
       },
       {

From 151a23f64cdba8f20ffbdb630696f92d79d64b9a Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 5 May 2013 14:57:45 +0100
Subject: [PATCH 280/360] Factor FK constraint logic out into a helper function

---
 lib/associations/belongs-to.js | 14 ++------------
 lib/associations/has-many.js   | 14 ++------------
 lib/associations/has-one.js    | 14 ++------------
 lib/associations/helpers.js    | 25 +++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 36 deletions(-)
 create mode 100644 lib/associations/helpers.js

diff --git a/lib/associations/belongs-to.js b/lib/associations/belongs-to.js
index 1e5a197721af..ce82c607a852 100644
--- a/lib/associations/belongs-to.js
+++ b/lib/associations/belongs-to.js
@@ -1,5 +1,6 @@
 var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
+  , Helpers   = require('./helpers')
 
 module.exports = (function() {
   var BelongsTo = function(srcDAO, targetDAO, options) {
@@ -24,18 +25,7 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-
-    if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      var primaryKeys = Utils._.filter(Utils._.keys(this.target.rawAttributes), function(key) { return this.target.rawAttributes[key].primaryKey }, this)
-
-        if(primaryKeys.length == 1) { // composite keys not supported with this approach
-          newAttributes[this.identifier].references = this.target.tableName,
-          newAttributes[this.identifier].referencesKey = primaryKeys[0]
-          newAttributes[this.identifier].onDelete = this.options.onDelete,
-          newAttributes[this.identifier].onUpdate = this.options.onUpdate
-        }
-    }
-
+    Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added
diff --git a/lib/associations/has-many.js b/lib/associations/has-many.js
index 24a0b5322c2f..e0b4e36b0734 100644
--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -1,5 +1,6 @@
 var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
+  , Helpers   = require('./helpers')
 
 var HasManySingleLinked = require("./has-many-single-linked")
   , HasManyMultiLinked  = require("./has-many-double-linked")
@@ -65,18 +66,7 @@ module.exports = (function() {
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-
-      if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-        var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-
-        if(primaryKeys.length == 1) { // composite keys not supported with this approach
-          newAttributes[this.identifier].references = this.source.tableName
-          newAttributes[this.identifier].referencesKey = primaryKeys[0]
-          newAttributes[this.identifier].onDelete = this.options.onDelete
-          newAttributes[this.identifier].onUpdate = this.options.onUpdate
-        }
-      }
-
+      Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
 
diff --git a/lib/associations/has-one.js b/lib/associations/has-one.js
index bf11d88fde5b..6fe8121a9c2d 100644
--- a/lib/associations/has-one.js
+++ b/lib/associations/has-one.js
@@ -1,5 +1,6 @@
 var Utils     = require("./../utils")
   , DataTypes = require('./../data-types')
+  , Helpers   = require("./helpers")
 
 module.exports = (function() {
   var HasOne = function(srcDAO, targetDAO, options) {
@@ -29,18 +30,7 @@ module.exports = (function() {
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
     newAttributes[this.identifier] = { type: DataTypes.INTEGER }
-
-    if(this.options.foreignKeyConstraint || this.options.onDelete || this.options.onUpdate) {
-      var primaryKeys = Utils._.filter(Utils._.keys(this.source.rawAttributes), function(key) { return this.source.rawAttributes[key].primaryKey }, this)
-
-        if(primaryKeys.length == 1) { // composite keys not supported with this approach
-        newAttributes[this.identifier].references = this.source.tableName,
-        newAttributes[this.identifier].referencesKey = primaryKeys[0]
-        newAttributes[this.identifier].onDelete = this.options.onDelete,
-        newAttributes[this.identifier].onUpdate = this.options.onUpdate
-      }
-    }
-
+    Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
     Utils._.defaults(this.target.rawAttributes, newAttributes)
 
     // Sync attributes to DAO proto each time a new assoc is added
diff --git a/lib/associations/helpers.js b/lib/associations/helpers.js
new file mode 100644
index 000000000000..7ea29f4d3527
--- /dev/null
+++ b/lib/associations/helpers.js
@@ -0,0 +1,25 @@
+var Utils = require("./../utils")
+
+module.exports = {
+
+  addForeignKeyConstraints: function(newAttribute, source, target, options) {
+    // FK constraints are opt-in: users must either rset `foreignKeyConstraints`
+    // on the association, or request an `onDelete` or `onUpdate` behaviour
+
+    if(options.foreignKeyConstraint || options.onDelete || options.onUpdate) {
+
+      // Find primary keys: composite keys not supported with this approach
+      var primaryKeys = Utils._.filter(Utils._.keys(source.rawAttributes), function(key) {
+        return source.rawAttributes[key].primaryKey
+      })
+
+      if(primaryKeys.length == 1) {
+        newAttribute.references = source.tableName,
+        newAttribute.referencesKey = primaryKeys[0]
+        newAttribute.onDelete = options.onDelete,
+        newAttribute.onUpdate = options.onUpdate
+      }
+    }
+  }
+
+}

From 6643167ad226842e40c03b724e53836bf783eb17 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 13:55:12 +0100
Subject: [PATCH 281/360] Make cascade optional

---
 lib/dialects/postgres/query-generator.js      | 5 +++--
 lib/query-interface.js                        | 6 +++---
 spec-jasmine/postgres/query-generator.spec.js | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index e5c6880ded8c..47c3c48fc426 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -78,9 +78,10 @@ module.exports = (function() {
 
     dropTableQuery: function(tableName, options) {
       options = options || {}
-      var query = "DROP TABLE IF EXISTS <%= table %> CASCADE;"
+      var query = "DROP TABLE IF EXISTS <%= table %><%= cascade %>;"
       return Utils._.template(query)({
-        table: QueryGenerator.addQuotes(tableName)
+        table: QueryGenerator.addQuotes(tableName),
+        cascade: options.cascade? " CASCADE" : ""
       })
     },
 
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 4bd5c95b93d4..7aa0b8098380 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -79,8 +79,8 @@ module.exports = (function() {
     return queryAndEmit.call(this, sql, 'createTable')
   }
 
-  QueryInterface.prototype.dropTable = function(tableName) {
-    var sql = this.QueryGenerator.dropTableQuery(tableName)
+  QueryInterface.prototype.dropTable = function(tableName, options) {
+    var sql = this.QueryGenerator.dropTableQuery(tableName, options)
     return queryAndEmit.call(this, sql, 'dropTable')
   }
 
@@ -95,7 +95,7 @@ module.exports = (function() {
         chainer.add(self, 'disableForeignKeyConstraints', [])
 
         tableNames.forEach(function(tableName) {
-          chainer.add(self, 'dropTable', [tableName])
+          chainer.add(self, 'dropTable', [tableName, {cascade: true}])
         })
 
         chainer.add(self, 'enableForeignKeyConstraints', [])
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index f58cf6c66585..2b3dec5f588e 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -95,11 +95,11 @@ describe('QueryGenerator', function() {
 
     dropTableQuery: [
       {
-        arguments: ['myTable'],
+        arguments: ['myTable', {cascade: true}],
         expectation: "DROP TABLE IF EXISTS \"myTable\" CASCADE;"
       },
       {
-        arguments: ['mySchema.myTable'],
+        arguments: ['mySchema.myTable', {cascade: true}],
         expectation: "DROP TABLE IF EXISTS \"mySchema\".\"myTable\" CASCADE;"
       }
     ],

From 47f7e4c8ce1646fb00b8541d8b59ba910940729e Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 13:55:21 +0100
Subject: [PATCH 282/360] Turn on foreign key checking for SQLite

---
 lib/dialects/sqlite/connector-manager.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/dialects/sqlite/connector-manager.js b/lib/dialects/sqlite/connector-manager.js
index 85436f8372bf..1324497cb45d 100644
--- a/lib/dialects/sqlite/connector-manager.js
+++ b/lib/dialects/sqlite/connector-manager.js
@@ -6,10 +6,21 @@ module.exports = (function() {
   var ConnectorManager = function(sequelize) {
     this.sequelize = sequelize
     this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
+    this.opened    = false
   }
   Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
+    var self = this
+    // Turn on foreign key checking (if the database has any) unless explicitly
+    // disallowed globally.
+    if(!this.opened && this.sequelize.options.foreignKeys !== false) {
+      this.database.serialize(function() {
+        self.database.run("PRAGMA FOREIGN_KEYS = ON")
+        self.opened = true
+      })
+    }
+
     return new Query(this.database, this.sequelize, callee, options).run(sql)
   }
 

From c3caadc97b324354abd24200c8d3fbc8dc9e5ae9 Mon Sep 17 00:00:00 2001
From: Alexandre Joly 
Date: Thu, 2 May 2013 21:49:07 +0200
Subject: [PATCH 283/360] the 'include' parameter of the find method should not
 overwrite the 'attributes' parameter, if it's set

---
 lib/dialects/mysql/query-generator.js    |  2 +-
 lib/dialects/postgres/query-generator.js |  2 +-
 spec/dao-factory.spec.js                 | 31 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index b5aa4b786dd2..66f4607b0b64 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -164,7 +164,7 @@ module.exports = (function() {
       options.attributes = options.attributes || '*'
 
       if (options.include) {
-        var optAttributes = [options.table + '.*']
+        var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index e70188cdf276..d37aa2be0b2d 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -232,7 +232,7 @@ module.exports = (function() {
       options.attributes = options.attributes || '*'
 
       if (options.include) {
-        var optAttributes = [options.table + '.*']
+        var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
 
         options.include.forEach(function(include) {
           var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 288cd8b6710d..c16d4646f397 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -493,6 +493,37 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       }.bind(this))
     })
 
+    it('returns the selected fields and all fields of the included table as instance.selectedValues', function(done) {
+      this.Mission = this.sequelize.define('Mission', {
+        title:  {type: Sequelize.STRING, defaultValue: 'a mission!'},
+        foo:    {type: Sequelize.INTEGER, defaultValue: 2},
+      })
+
+      this.Mission.belongsTo(this.User)
+      this.User.hasMany(this.Mission)
+
+      this.sequelize.sync({ force: true }).complete(function() {
+        this.Mission.create()
+        .success(function(mission) {
+          this.User.create({
+            username: 'John DOE'
+          }).success(function(user) {
+            mission.setUser(user)
+            .success(function() {
+              this.User.find({
+                where: { username: 'John DOE' },
+                attributes: ['username'],
+                include: [this.Mission]
+              }).success(function(user) {
+                expect(user.selectedValues).toEqual({ username: 'John DOE' })
+                done()
+              })
+            }.bind(this))
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
     it('always honors ZERO as primary key', function(_done) {
       var permutations = [
           0,

From db1a504c5a0474a6cfcb283d08d2ce02f708e0e9 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 15:03:48 +0100
Subject: [PATCH 284/360] Improve pragma handling for sqlite3

---
 lib/dialects/sqlite/connector-manager.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/dialects/sqlite/connector-manager.js b/lib/dialects/sqlite/connector-manager.js
index 1324497cb45d..cf12f46d851f 100644
--- a/lib/dialects/sqlite/connector-manager.js
+++ b/lib/dialects/sqlite/connector-manager.js
@@ -5,22 +5,17 @@ var Utils   = require("../../utils")
 module.exports = (function() {
   var ConnectorManager = function(sequelize) {
     this.sequelize = sequelize
-    this.database  = new sqlite3.Database(sequelize.options.storage || ':memory:')
-    this.opened    = false
+    this.database  = db = new sqlite3.Database(sequelize.options.storage || ':memory:', function(err) {
+      if(!err && sequelize.options.foreignKeys !== false) {
+        // Make it possible to define and use foreign key constraints unelss
+        // explicitly disallowed. It's still opt-in per relation
+        db.run('PRAGMA FOREIGN_KEYS=ON')
+      }
+    })
   }
   Utils._.extend(ConnectorManager.prototype, require("../connector-manager").prototype)
 
   ConnectorManager.prototype.query = function(sql, callee, options) {
-    var self = this
-    // Turn on foreign key checking (if the database has any) unless explicitly
-    // disallowed globally.
-    if(!this.opened && this.sequelize.options.foreignKeys !== false) {
-      this.database.serialize(function() {
-        self.database.run("PRAGMA FOREIGN_KEYS = ON")
-        self.opened = true
-      })
-    }
-
     return new Query(this.database, this.sequelize, callee, options).run(sql)
   }
 

From 918084475ed802de3aa3a7768c91d398f05b7210 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 15:03:59 +0100
Subject: [PATCH 285/360] Improve test coverage for cascade deletion in
 postgres

---
 spec-jasmine/postgres/query-generator.spec.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index 2b3dec5f588e..0086582341b8 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -94,6 +94,14 @@ describe('QueryGenerator', function() {
     ],
 
     dropTableQuery: [
+      {
+        arguments: ['myTable'],
+        expectation: "DROP TABLE IF EXISTS \"myTable\";"
+      },
+      {
+        arguments: ['mySchema.myTable'],
+        expectation: "DROP TABLE IF EXISTS \"mySchema\".\"myTable\";"
+      },
       {
         arguments: ['myTable', {cascade: true}],
         expectation: "DROP TABLE IF EXISTS \"myTable\" CASCADE;"

From 7491c223fb4f1b8e2659095a2e0b3d57bdc724a0 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 15:04:04 +0100
Subject: [PATCH 286/360] Tests for delete cascade

---
 spec/associations/belongs-to.spec.js | 72 ++++++++++++++++++++++++++++
 spec/associations/has-many.spec.js   | 70 ++++++++++++++++++++++-----
 spec/associations/has-one.spec.js    | 72 ++++++++++++++++++++++++++++
 3 files changed, 203 insertions(+), 11 deletions(-)

diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js
index 932396b63fce..4b7128503337 100644
--- a/spec/associations/belongs-to.spec.js
+++ b/spec/associations/belongs-to.spec.js
@@ -47,4 +47,76 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
       })
     })
   })
+
+  describe("Foreign key constraints", function() {
+
+    it("are not enabled by default", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      Task.belongsTo(User)
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUser(user).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can cascade deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      Task.belongsTo(User, {onDelete: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUser(user).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(0)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can restrict deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      Task.belongsTo(User, {onDelete: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUser(user).success(function() {
+              user.destroy().error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+  })
+
 })
diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js
index ec5dfe0a71a8..e0487f0fe26f 100644
--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -322,27 +322,75 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
         })
       })
     })
+  })
 
-    describe("Foreign key constraints", function() {
+  describe("Foreign key constraints", function() {
 
-      it("can cascade deletes", function(done) {
-        var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
-          , User = this.sequelize.define('User', { username: Sequelize.STRING })
+    it("are not enabled by default", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
 
-        User.hasMany(Task, {onDelete: 'cascade'})
+      User.hasMany(Task)
 
-        this.sequelize.sync({ force: true }).success(function() {
-          User.create({ username: 'foo' }).success(function(user) {
-            Task.create({ title: 'task' }).success(function(task) {
-              user.setTasks([task]).success(function() {
-                debugger
-                done()
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTasks([task]).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can cascade deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasMany(Task, {onDelete: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTasks([task]).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(0)
+                  done()
+                })
               })
             })
           })
         })
       })
+    })
+
+    it("can restrict deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
 
+      User.hasMany(Task, {onDelete: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTasks([task]).success(function() {
+              user.destroy().error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
     })
 
   })
diff --git a/spec/associations/has-one.spec.js b/spec/associations/has-one.spec.js
index 0791c637881b..5ee3684c8907 100644
--- a/spec/associations/has-one.spec.js
+++ b/spec/associations/has-one.spec.js
@@ -47,4 +47,76 @@ describe(Helpers.getTestDialectTeaser("HasOne"), function() {
       })
     })
   })
+
+  describe("Foreign key constraints", function() {
+
+    it("are not enabled by default", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasOne(Task)
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTask(task).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can cascade deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasOne(Task, {onDelete: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTask(task).success(function() {
+              user.destroy().success(function() {
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(0)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can restrict deletes", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasOne(Task, {onDelete: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTask(task).success(function() {
+              user.destroy().error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+  })
+
 })

From 27e9f9a1340ebba174074cedf761d62f6b0e829e Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Mon, 6 May 2013 15:54:27 -0400
Subject: [PATCH 287/360] Replaced underscore with lodash.

---
 lib/utils.js             | 2 +-
 package.json             | 2 +-
 spec/dao-factory.spec.js | 2 +-
 spec/dao.spec.js         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/utils.js b/lib/utils.js
index 7f7357b823e5..73adbd260233 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -4,7 +4,7 @@ var util       = require("util")
 
 var Utils = module.exports = {
   _: (function() {
-    var _  = require("underscore")
+    var _  = require("lodash")
       , _s = require('underscore.string')
 
     _.mixin(_s.exports())
diff --git a/package.json b/package.json
index 07fe5729ad50..3087ff03b7b7 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "url": "https://github.com/sdepold/sequelize/issues"
   },
   "dependencies": {
-    "underscore": "~1.4.0",
+    "lodash": "~1.2.1",
     "underscore.string": "~2.3.0",
     "lingo": "~0.0.5",
     "validator": "0.4.x",
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 288cd8b6710d..074bb38c4c89 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -2,7 +2,7 @@ if(typeof require === 'function') {
   const buster    = require("buster")
       , Sequelize = require("../index")
       , Helpers   = require('./buster-helpers')
-      , _         = require('underscore')
+      , _         = require('lodash')
       , dialect   = Helpers.getTestDialect()
 }
 
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 1bc163bfc39c..256e1d3f9af0 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -2,7 +2,7 @@ if (typeof require === 'function') {
   const buster  = require("buster")
       , Helpers = require('./buster-helpers')
       , dialect = Helpers.getTestDialect()
-      , _ = require('underscore')
+      , _ = require('lodash')
 }
 
 buster.spec.expose()

From 35aeb2c812b607c4d705107761479194ee18b63d Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 23:10:42 +0100
Subject: [PATCH 288/360] Test for update cascade and restrict

---
 spec/associations/belongs-to.spec.js | 61 ++++++++++++++++++++++++++++
 spec/associations/has-many.spec.js   | 61 ++++++++++++++++++++++++++++
 spec/associations/has-one.spec.js    | 61 ++++++++++++++++++++++++++++
 3 files changed, 183 insertions(+)

diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js
index 4b7128503337..74e9d17f1ec1 100644
--- a/spec/associations/belongs-to.spec.js
+++ b/spec/associations/belongs-to.spec.js
@@ -117,6 +117,67 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
       })
     })
 
+    it("can cascade updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      Task.belongsTo(User, {onUpdate: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUser(user).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .success(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  expect(tasks[0].UserId).toEqual(999)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can restrict updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      Task.belongsTo(User, {onUpdate: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            task.setUser(user).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
   })
 
 })
diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js
index e0487f0fe26f..9e3752949984 100644
--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -393,5 +393,66 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
       })
     })
 
+    it("can cascade updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasMany(Task, {onUpdate: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTasks([task]).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .success(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  expect(tasks[0].UserId).toEqual(999)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can restrict updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasMany(Task, {onUpdate: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTasks([task]).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
   })
 })
diff --git a/spec/associations/has-one.spec.js b/spec/associations/has-one.spec.js
index 5ee3684c8907..3a50d5392ad5 100644
--- a/spec/associations/has-one.spec.js
+++ b/spec/associations/has-one.spec.js
@@ -117,6 +117,67 @@ describe(Helpers.getTestDialectTeaser("HasOne"), function() {
       })
     })
 
+    it("can cascade updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasOne(Task, {onUpdate: 'cascade'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTask(task).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .success(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  expect(tasks[0].UserId).toEqual(999)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
+    it("can restrict updates", function(done) {
+      var Task = this.sequelize.define('Task', { title: Sequelize.STRING })
+        , User = this.sequelize.define('User', { username: Sequelize.STRING })
+
+      User.hasOne(Task, {onUpdate: 'restrict'})
+
+      this.sequelize.sync({ force: true }).success(function() {
+        User.create({ username: 'foo' }).success(function(user) {
+          Task.create({ title: 'task' }).success(function(task) {
+            user.setTask(task).success(function() {
+
+              // Changing the id of a DAO requires a little dance since
+              // the `UPDATE` query generated by `save()` uses `id` in the
+              // `WHERE` clause
+
+              var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
+              user.QueryInterface.update(user, tableName, {id: 999}, user.id)
+              .error(function() {
+                // Should fail due to FK restriction
+                Task.findAll().success(function(tasks) {
+                  expect(tasks.length).toEqual(1)
+                  done()
+                })
+              })
+            })
+          })
+        })
+      })
+    })
+
   })
 
 })

From bc2a70826fb11df014ad2d8799d059e9a2ad55b4 Mon Sep 17 00:00:00 2001
From: scottrutherford 
Date: Tue, 7 May 2013 00:51:48 +0000
Subject: [PATCH 289/360] readd changes from sar sequelize

---
 lib/dao.js                               | 4 ++++
 lib/dialects/postgres/query-generator.js | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/dao.js b/lib/dao.js
index 071af287cc0c..4bb8caaf248a 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -151,6 +151,10 @@ module.exports = (function() {
     }
 
     if (this.isNewRecord) {
+      // added by Scott Rutherford to set created post class creation
+      if(this.__options.timestamps && this.hasOwnProperty(createdAtAttr)) {
+        this[createdAtAttr] = values[createdAtAttr] = new Date()
+      }
       return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id;
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 2c386366ac5e..1ca8204b785d 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -297,7 +297,10 @@ module.exports = (function() {
     },
 
     insertQuery: function(tableName, attrValueHash) {
-      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull);
+
+      // added by Scott Rutherford 01/29/13
+      delete attrValueHash['id'];
 
       var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
         , returning = []

From 809453f7f3fd0c9461145b69c1cc57df1f0bd18e Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 7 May 2013 23:55:49 +0100
Subject: [PATCH 290/360] Minor updates following comments form @janmeier

---
 lib/dialects/sqlite/connector-manager.js    | 2 +-
 spec-jasmine/sqlite/query-generator.spec.js | 8 --------
 spec/associations/belongs-to.spec.js        | 1 -
 spec/associations/has-many.spec.js          | 1 -
 spec/associations/has-one.spec.js           | 1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/dialects/sqlite/connector-manager.js b/lib/dialects/sqlite/connector-manager.js
index cf12f46d851f..f3c6b9b238b2 100644
--- a/lib/dialects/sqlite/connector-manager.js
+++ b/lib/dialects/sqlite/connector-manager.js
@@ -7,7 +7,7 @@ module.exports = (function() {
     this.sequelize = sequelize
     this.database  = db = new sqlite3.Database(sequelize.options.storage || ':memory:', function(err) {
       if(!err && sequelize.options.foreignKeys !== false) {
-        // Make it possible to define and use foreign key constraints unelss
+        // Make it possible to define and use foreign key constraints unless
         // explicitly disallowed. It's still opt-in per relation
         db.run('PRAGMA FOREIGN_KEYS=ON')
       }
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 6fa87b7389bb..429a4f424340 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -66,14 +66,6 @@ describe('QueryGenerator', function() {
     ],
 
     createTableQuery: [
-      {
-        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
-        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
-      },
-      {
-        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
-        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
-      },
       {
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}],
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255));"
diff --git a/spec/associations/belongs-to.spec.js b/spec/associations/belongs-to.spec.js
index 74e9d17f1ec1..40c8c11f017b 100644
--- a/spec/associations/belongs-to.spec.js
+++ b/spec/associations/belongs-to.spec.js
@@ -135,7 +135,6 @@ describe(Helpers.getTestDialectTeaser("BelongsTo"), function() {
               var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
               user.QueryInterface.update(user, tableName, {id: 999}, user.id)
               .success(function() {
-                // Should fail due to FK restriction
                 Task.findAll().success(function(tasks) {
                   expect(tasks.length).toEqual(1)
                   expect(tasks[0].UserId).toEqual(999)
diff --git a/spec/associations/has-many.spec.js b/spec/associations/has-many.spec.js
index 9e3752949984..d8fc58575711 100644
--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -411,7 +411,6 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
               var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
               user.QueryInterface.update(user, tableName, {id: 999}, user.id)
               .success(function() {
-                // Should fail due to FK restriction
                 Task.findAll().success(function(tasks) {
                   expect(tasks.length).toEqual(1)
                   expect(tasks[0].UserId).toEqual(999)
diff --git a/spec/associations/has-one.spec.js b/spec/associations/has-one.spec.js
index 3a50d5392ad5..e00a7432d153 100644
--- a/spec/associations/has-one.spec.js
+++ b/spec/associations/has-one.spec.js
@@ -135,7 +135,6 @@ describe(Helpers.getTestDialectTeaser("HasOne"), function() {
               var tableName = user.QueryInterface.QueryGenerator.addSchema(user.__factory)
               user.QueryInterface.update(user, tableName, {id: 999}, user.id)
               .success(function() {
-                // Should fail due to FK restriction
                 Task.findAll().success(function(tasks) {
                   expect(tasks.length).toEqual(1)
                   expect(tasks[0].UserId).toEqual(999)

From 3b03f5dcabc37489d932f5ef3e23df3c96e52336 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 8 May 2013 08:19:57 +0300
Subject: [PATCH 291/360] Update README.md

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 65364b40e0c4..f10a50861c88 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,8 @@ Also make sure to take a look at the examples in the repository. The website wil
 
 A very basic roadmap. Chances aren't too bad, that not mentioned things are implemented as well. Don't panic :)
 
-### 1.6.0 (ToDo)
-- ~~Fix last issues with eager loading of associated data~~
-- ~~Find out why Person.belongsTo(House) would add person_id to house. It should add house_id to person~~
-
 ### 1.7.0
-- Check if lodash is a proper alternative to current underscore usage.
+- ~~Check if lodash is a proper alternative to current underscore usage.~~
 - Transactions
 - Support for update of tables without primary key
 - MariaDB support

From d25e697d9adb53230bddb83001ba83c22973e62c Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 8 May 2013 08:21:13 +0300
Subject: [PATCH 292/360] lodash

---
 changelog.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2d29ca05c5cc..94d5d26c24ef 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,10 @@
 # v1.7.0 #
-- [BUG] Fix string escape with postgresql on raw SQL queries/ [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
+- [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
+- [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
 - [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
-- [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
+- [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From d0cfa94b888b2b27a9c1a99eb4c6f1dd35868742 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 8 May 2013 08:25:03 +0300
Subject: [PATCH 293/360] fk constraints

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 94d5d26c24ef..619fcb290ba1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,7 @@
 - [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
+- [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From cfa224b7e3607c7217a25eca0746f33031aba235 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Wed, 8 May 2013 10:24:12 +0300
Subject: [PATCH 294/360] Updated roadmap with foreign key support

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f10a50861c88..acef1ade547b 100644
--- a/README.md
+++ b/README.md
@@ -55,8 +55,8 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099)
 - Model#delete
 - Validate a model before it gets saved. (Move validation of enum attribute value to validate method)
-- BLOB [#99](https://github.com/sdepold/sequelize/issues/99)
-- Support for foreign keys
+- BLOB [#99](https://github.com/sequelize/sequelize/issues/99)
+- ~~Support for foreign keys~~ Implemented in [#595](https://github.com/sequelize/sequelize/pull/595), thanks to @optilude
 
 ### 1.7.x
 - Complete support for non-id primary keys

From 08c69a818d8515d58579a8f8aaf77c0680426ba6 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Wed, 8 May 2013 19:45:19 +0200
Subject: [PATCH 295/360] Added deletedAt buster tests borrowed from
 @gustawpursche

---
 spec-jasmine/dao-factory.spec.js | 19 -----------
 spec/dao.spec.js                 | 57 +++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/spec-jasmine/dao-factory.spec.js b/spec-jasmine/dao-factory.spec.js
index 71ec088cb4c2..27342e9e1ee5 100644
--- a/spec-jasmine/dao-factory.spec.js
+++ b/spec-jasmine/dao-factory.spec.js
@@ -90,25 +90,6 @@ describe('DAOFactory', function() {
           })
         })
 
-        it('marks the database entry as deleted if dao is paranoid', function() {
-          Helpers.async(function(done) {
-            User = sequelize.define('User', {
-              name: Sequelize.STRING, bio: Sequelize.TEXT
-            }, { paranoid:true })
-            User.sync({ force: true }).success(done)
-          })
-
-          Helpers.async(function(done) {
-            User.create({ name: 'asd', bio: 'asd' }).success(function(u) {
-              expect(u.deletedAt).toBeNull()
-              u.destroy().success(function(u) {
-                expect(u.deletedAt).toBeTruthy()
-                done()
-              })
-            })
-          })
-        })
-
         it('allows sql logging of update statements', function() {
           Helpers.async(function(done) {
             User = sequelize.define('User', {
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 256e1d3f9af0..8657f6585dac 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -31,10 +31,20 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
           aNumber:   { type: DataTypes.INTEGER },
           aRandomId: { type: DataTypes.INTEGER }
         })
+
+        self.ParanoidUser = sequelize.define('ParanoidUser', {
+          username: { type: DataTypes.STRING }
+        }, {
+          paranoid: true
+        })
+
+        self.ParanoidUser.hasOne( self.ParanoidUser )
       },
       onComplete: function() {
         self.User.sync({ force: true }).success(function(){
-          self.HistoryLog.sync({ force: true }).success(done)
+          self.HistoryLog.sync({ force: true }).success(function(){
+            self.ParanoidUser.sync({force: true }).success(done)
+          })
         })
       }
     })
@@ -494,6 +504,51 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       }.bind(this))
     })
 
+    it("creates the deletedAt property, when defining paranoid as true", function(done) {
+      this.ParanoidUser.create({ username: 'fnord' }).success(function() {
+        this.ParanoidUser.findAll().success(function(users) {
+          expect(users[0].deletedAt).toBeDefined()
+          expect(users[0].deletedAt).toBe(null)
+          done()
+        }.bind(this))
+      }.bind(this))
+    })
+
+    it("sets deletedAt property to a specific date when deleting an instance", function(done) {
+      this.ParanoidUser.create({ username: 'fnord' }).success(function() {
+        this.ParanoidUser.findAll().success(function(users) {
+          users[0].destroy().success(function(user) {
+            expect(user.deletedAt.getMonth).toBeDefined()
+            done()
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
+    it("keeps the deletedAt-attribute with value null, when running updateAttributes", function(done) {
+      this.ParanoidUser.create({ username: 'fnord' }).success(function() {
+        this.ParanoidUser.findAll().success(function(users) {
+          users[0].updateAttributes({username: 'newFnord'}).success(function(user) {
+            expect(user.deletedAt).toBe(null)
+            done()
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
+    it("keeps the deletedAt-attribute with value null, when updating associations", function(done) {
+      this.ParanoidUser.create({ username: 'fnord' }).success(function() {
+        this.ParanoidUser.findAll().success(function(users) {
+          this.ParanoidUser.create({ username: 'linkedFnord' }).success(function( linkedUser ) {
+            users[0].setParanoidUser( linkedUser ).success(function(user) {
+              expect(user.deletedAt).toBe(null)
+              done()
+            }.bind(this))
+          }.bind(this))
+        }.bind(this))
+      }.bind(this))
+    })
+
     it("can reuse query option objects", function(done) {
       this.User.create({ username: 'fnord' }).success(function() {
         var query = { where: { username: 'fnord' }}

From 7affa31c5dabe0cebbf560ab434875b8528bf1cb Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Thu, 9 May 2013 20:44:26 +0200
Subject: [PATCH 296/360] fixed url to irc channel

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index acef1ade547b..37f84b06592f 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Also make sure to take a look at the examples in the repository. The website wil
 
 - [Documentation](http://www.sequelizejs.com)
 - [Twitter](http://twitter.com/sdepold)
-- [IRC](irc://irc.freenode.net/sequelizejs)
+- [IRC](http://webchat.freenode.net?channels=sequelizejs)
 - [Google Groups](https://groups.google.com/forum/#!forum/sequelize)
 - [XING](https://www.xing.com/net/priec1b5cx/sequelize) (pretty much inactive, but you might want to name it on your profile)
 

From 3c05453120ce4b12af6389a16e69fc7923823eef Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 9 May 2013 16:06:13 -0400
Subject: [PATCH 297/360] Validations will now be called upon .save() and
 allowNull: true skips validations (if the value is null).

---
 lib/dao.js       | 13 +++++++++++--
 spec/dao.spec.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 071af287cc0c..5bc8594c7b89 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -150,7 +150,14 @@ module.exports = (function() {
       this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
-    if (this.isNewRecord) {
+    var errors = this.validate()
+
+    if (!!errors) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        emitter.emit('error', errors)
+      }).run()
+    }
+    else if (this.isNewRecord) {
       return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id;
@@ -211,7 +218,9 @@ module.exports = (function() {
     Utils._.each(self.values, function(value, field) {
 
       // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
+      var allowsNulls = (self.rawAttributes[field].allowNull && self.rawAttributes[field].allowNull === true && (value === null || value === undefined));
+
+      if (self.validators.hasOwnProperty(field) && !allowsNulls) {
         // for each validator
         Utils._.each(self.validators[field], function(details, validatorType) {
 
diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 8657f6585dac..81f35ea127f9 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -20,6 +20,18 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
           touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
           aNumber:   { type: DataTypes.INTEGER },
           bNumber:   { type: DataTypes.INTEGER },
+
+          validateTest: {
+            type: DataTypes.INTEGER,
+            allowNull: true,
+            validate: {isInt: true}
+          },
+          validateCustom: {
+            type: DataTypes.STRING,
+            allowNull: true,
+            validate: {len: {msg: 'Length failed.', args: [1,20]}}
+          },
+
           dateAllowNullTrue: {
             type: DataTypes.DATE,
             allowNull: true
@@ -378,6 +390,44 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
   })
 
   describe('save', function() {
+    it('should fail a validation upon creating', function(done){
+      this.User.create({aNumber: 0, validateTest: 'hello'}).error(function(err){
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateTest).toBeArray()
+        expect(err.validateTest[0]).toBeDefined()
+        expect(err.validateTest[0].indexOf('Invalid integer')).toBeGreaterThan(-1);
+        done();
+      });
+    })
+
+    it('should fail a validation upon building', function(done){
+      this.User.build({aNumber: 0, validateCustom: 'aaaaaaaaaaaaaaaaaaaaaaaaaa'}).save()
+      .error(function(err){
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateCustom).toBeDefined()
+        expect(err.validateCustom).toBeArray()
+        expect(err.validateCustom[0]).toBeDefined()
+        expect(err.validateCustom[0]).toEqual('Length failed.')
+        done()
+      })
+    })
+
+    it('should fail a validation when updating', function(done){
+      this.User.create({aNumber: 0}).success(function(user){
+        user.updateAttributes({validateTest: 'hello'}).error(function(err){
+          expect(err).toBeDefined()
+          expect(err).toBeObject()
+          expect(err.validateTest).toBeDefined()
+          expect(err.validateTest).toBeArray()
+          expect(err.validateTest[0]).toBeDefined()
+          expect(err.validateTest[0].indexOf('Invalid integer:')).toBeGreaterThan(-1)
+          done()
+        })
+      })
+    })
+
     it('takes zero into account', function(done) {
       this.User.build({ aNumber: 0 }).save([ 'aNumber' ]).success(function(user) {
         expect(user.aNumber).toEqual(0)

From 421fc4f1eca20d5d55967bead9c7f5c02248f5b3 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 21 Apr 2013 10:08:37 +0100
Subject: [PATCH 298/360] DAO factory API sketch

---
 lib/dao-factory.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 7421955b9307..d7db7f216a88 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -328,6 +328,43 @@ module.exports = (function() {
     }).run()
   }
 
+  /**
+   * Create and insert multiple instances
+   *
+   * @param  {Array} values List of objects (key/value pairs) to create instances from
+   * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
+   *
+   * The `success` handler is passed a list of newly inserted models.
+   */
+  DaoFactory.prototype.bulkCreate = function(values, options) {
+    var factory = this
+    return this.bulkInsert(values.map(function(attrs) {
+      return factory.build(attrs, options)
+    })
+  }
+
+  /**
+   * Insert multiple instances
+   *
+   * @param  {Array} daos   List of built DAOs
+   * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
+   *
+   * The `success` handler is passed a list of newly inserted models.
+   */
+  DaoFactory.prototype.bulkInsert = function(daos, fields) {
+    // XXX: TODO
+  }
+
+  /**
+   * Delete multiple instances
+   *
+   * @param  {Object} options Options to describe the scope of the search.
+   * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
+   */
+  DaoFactory.prototype.bulkDelete = function(options) {
+    // XXX: TODO
+  }
+
   // private
 
   var query = function() {

From 2029345bcb22c2fca40dac60b7bf79df79d2ec58 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 21 Apr 2013 10:18:00 +0100
Subject: [PATCH 299/360] Query interface and generator API sketch

---
 lib/dialects/mysql/query-generator.js    |  4 ++++
 lib/dialects/postgres/query-generator.js |  4 ++++
 lib/dialects/query-generator.js          |  8 ++++++++
 lib/dialects/sqlite/query-generator.js   |  4 ++++
 lib/query-interface.js                   | 12 ++++++++++++
 5 files changed, 32 insertions(+)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 6d55f3d1c627..ae1f02c7b8b2 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -243,6 +243,10 @@ module.exports = (function() {
       return query
     },
 
+    bulkInsertQuery: function(tableName, attrValueHashes) {
+      throwMethodUndefined('bulkInsertQuery')
+    },
+
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 47c3c48fc426..b10f7d26a5fd 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -327,6 +327,10 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
+    bulkInsertQuery: function(tableName, attrValueHashes) {
+      throwMethodUndefined('bulkInsertQuery')
+    },
+
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js
index 3377997b8e21..033804cac22e 100644
--- a/lib/dialects/query-generator.js
+++ b/lib/dialects/query-generator.js
@@ -118,6 +118,14 @@ module.exports = (function() {
       throwMethodUndefined('insertQuery')
     },
 
+    /*
+      Returns an insert into command for multiple values.
+      Parameters: table name + list of hashes of attribute-value-pairs.
+    */
+    bulkInsertQuery: function(tableName, attrValueHashes) {
+      throwMethodUndefined('bulkInsertQuery')
+    },
+
     /*
       Returns an update query.
       Parameters:
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 66c2987f98d1..c6100115f157 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -125,6 +125,10 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
+    bulkInsertQuery: function(tableName, attrValueHashes) {
+      throwMethodUndefined('bulkInsertQuery')
+    },
+
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 7aa0b8098380..edf42e1d797e 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -260,6 +260,13 @@ module.exports = (function() {
     })
   }
 
+  QueryInterface.prototype.bulkInsert = function(tableName, records) {
+    var sql = this.QueryGenerator.bulkInsertQuery(tableName, records)
+    return queryAndEmit.call(this, sql, 'bulkInsert', {
+      success: function(objs) { objs.forEach(function(v) { v.isNewRecord = false }) }
+    })
+  }
+
   QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
     var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
     return queryAndEmit.call(this, [sql, dao], 'update')
@@ -270,6 +277,11 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, dao], 'delete')
   }
 
+  QueryInterface.prototype.bulkDelete = function(tableName, identifier) {
+    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
+    return queryAndEmit.call(this, sql, 'bulkDelete')
+  }
+
   QueryInterface.prototype.select = function(factory, tableName, options, queryOptions) {
     options = options || {}
 

From cfb657adca2bce6fcf07e8dd1545c5b9f382b5bf Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 23 Apr 2013 09:40:40 +0100
Subject: [PATCH 300/360] Implementation sketch and query generators

---
 lib/dao-factory.js                            | 71 +++++++++++++++++--
 lib/dialects/mysql/query-generator.js         | 19 ++++-
 lib/dialects/postgres/query-generator.js      | 21 +++++-
 lib/dialects/sqlite/query-generator.js        | 19 ++++-
 lib/query-interface.js                        |  5 ++
 spec-jasmine/mysql/query-generator.spec.js    | 31 ++++++++
 spec-jasmine/postgres/query-generator.spec.js | 40 +++++++++++
 spec-jasmine/sqlite/query-generator.spec.js   | 37 ++++++++++
 8 files changed, 234 insertions(+), 9 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index d7db7f216a88..45d174ccdcf6 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -336,23 +336,75 @@ module.exports = (function() {
    *
    * The `success` handler is passed a list of newly inserted models.
    */
-  DaoFactory.prototype.bulkCreate = function(values, options) {
+  DAOFactory.prototype.bulkCreate = function(values, options) {
     var factory = this
     return this.bulkInsert(values.map(function(attrs) {
       return factory.build(attrs, options)
-    })
+    }))
   }
 
   /**
    * Insert multiple instances
    *
    * @param  {Array} daos   List of built DAOs
+   * @param  {Array} fields Fields to insert (defaults to all fields)
    * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
    *
    * The `success` handler is passed a list of newly inserted models.
    */
-  DaoFactory.prototype.bulkInsert = function(daos, fields) {
-    // XXX: TODO
+  DAOFactory.prototype.bulkInsert = function(daos, fields) {
+    var self          = this
+      , records       = []
+      , updatedAtAttr = self.options.underscored ? 'updated_at' : 'updatedAt'
+      , createdAtAttr = self.options.underscored ? 'created_at' : 'createdAt'
+
+    if (fields) {
+      if (self.options.timestamps) {
+        if (fields.indexOf(updatedAtAttr) === -1) {
+          fields.push(updatedAtAttr)
+        }
+
+        if (fields.indexOf(createdAtAttr) === -1) {
+          fields.push(createdAtAttr)
+        }
+      }
+
+      daos.forEach(function(dao) {
+        var values = {};
+        fields.forEach(function(field) {
+          if (dao.values[field] !== undefined) {
+            values[field] = dao.values[field]
+          }
+        })
+        records.push(values);
+      })
+    } else {
+      daos.forEach(function(dao) {
+        records.push(dao.values)
+      })
+    }
+
+    records.forEach(function(values) {
+      for (var attrName in self.rawAttributes) {
+        if (self.rawAttributes.hasOwnProperty(attrName)) {
+          var definition      = self.rawAttributes[attrName]
+            , isEnum          = (definition.type && (definition.type.toString() === DataTypes.ENUM.toString()))
+            , hasValue        = (typeof values[attrName] !== 'undefined')
+            , valueOutOfScope = ((definition.values || []).indexOf(values[attrName]) === -1)
+
+          if (isEnum && hasValue && valueOutOfScope) {
+            throw new Error('Value "' + values[attrName] + '" for ENUM ' + attrName + ' is out of allowed scope. Allowed values: ' + definition.values.join(', '))
+          }
+        }
+      }
+
+      if (self.options.timestamps && dao.hasOwnProperty(updatedAtAttr)) {
+        dao[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
+      }
+
+    })
+
+    return self.QueryInterface.bulkInsert(self.tableName, records)
   }
 
   /**
@@ -361,8 +413,15 @@ module.exports = (function() {
    * @param  {Object} options Options to describe the scope of the search.
    * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
    */
-  DaoFactory.prototype.bulkDelete = function(options) {
-    // XXX: TODO
+  DAOFactory.prototype.bulkDelete = function(options) {
+    if (this.options.timestamps && this.options.paranoid) {
+      var attr = this.options.underscored ? 'deleted_at' : 'deletedAt'
+      var attrValueHash = {}
+      attrValueHash[attr] = new Date()
+      return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
+    } else {
+      return this.QueryInterface.bulkDelete(this.tableName, options)
+    }
   }
 
   // private
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index ae1f02c7b8b2..eda65cb72937 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -244,7 +244,24 @@ module.exports = (function() {
     },
 
     bulkInsertQuery: function(tableName, attrValueHashes) {
-      throwMethodUndefined('bulkInsertQuery')
+      var query  = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
+        , tuples = []
+
+      Utils._.forEach(attrValueHashes, function(attrValueHash) {
+        tuples.push("(" +
+          Utils._.values(attrValueHash).map(function(value){
+            return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+          }).join(",") +
+        ")")
+      })
+
+      var replacements  = {
+        table: QueryGenerator.addQuotes(tableName),
+        attributes: Object.keys(attrValueHashes[0]).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
+        tuples: tuples.join(",")
+      }
+
+      return Utils._.template(query)(replacements)
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index b10f7d26a5fd..57c12abf8da8 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -328,7 +328,26 @@ module.exports = (function() {
     },
 
     bulkInsertQuery: function(tableName, attrValueHashes) {
-      throwMethodUndefined('bulkInsertQuery')
+      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %> RETURNING *;"
+        , tuples    = []
+
+      Utils._.forEach(attrValueHashes, function(attrValueHash) {
+        tuples.push("(" +
+          Utils._.values(attrValueHash).map(function(value){
+            return QueryGenerator.pgEscape(value)
+          }).join(",") +
+        ")")
+      })
+
+      var replacements  = {
+        table:      QueryGenerator.addQuotes(tableName)
+      , attributes: Object.keys(attrValueHashes[0]).map(function(attr){
+                      return QueryGenerator.addQuotes(attr)
+                    }).join(",")
+      , tuples:     tuples.join(",")
+      }
+
+      return Utils._.template(query)(replacements)
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index c6100115f157..6d35dcb78358 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -126,7 +126,24 @@ module.exports = (function() {
     },
 
     bulkInsertQuery: function(tableName, attrValueHashes) {
-      throwMethodUndefined('bulkInsertQuery')
+      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
+        , tuples = []
+
+      Utils._.forEach(attrValueHashes, function(attrValueHash) {
+        tuples.push("(" +
+          Utils._.values(attrValueHash).map(function(value){
+            return escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
+          }).join(",") +
+        ")")
+      })
+
+      var replacements  = {
+        table: Utils.addTicks(tableName),
+        attributes: Object.keys(attrValueHashes[0]).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        tuples: tuples
+      }
+
+      return Utils._.template(query)(replacements)
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
diff --git a/lib/query-interface.js b/lib/query-interface.js
index edf42e1d797e..e3b83241151c 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -272,6 +272,11 @@ module.exports = (function() {
     return queryAndEmit.call(this, [sql, dao], 'update')
   }
 
+  QueryInterface.prototype.bulkUpdate = function(tableName, values, identifier) {
+    var sql = this.QueryGenerator.updateQuery(tableName, values, identifier)
+    return queryAndEmit.call(this, sql, 'bulkUpdate')
+  }
+
   QueryInterface.prototype.delete = function(dao, tableName, identifier) {
     var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
     return queryAndEmit.call(this, [sql, dao], 'delete')
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 70e64e2b3e37..22c94e2da624 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -200,6 +200,37 @@ describe('QueryGenerator', function() {
       }
     ],
 
+    bulkInsertQuery: [
+      {
+        arguments: ['myTable', [{name: 'foo'}, {name: 'bar'}]],
+        expectation: "INSERT INTO `myTable` (`name`) VALUES ('foo'),('bar');"
+      }, {
+        arguments: ['myTable', [{name: "foo';DROP TABLE myTable;"}, {name: 'bar'}]],
+        expectation: "INSERT INTO `myTable` (`name`) VALUES ('foo\\';DROP TABLE myTable;'),('bar');"
+      }, {
+        arguments: ['myTable', [{name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {name: 'bar', birthday: new Date(Date.UTC(2012, 2, 27, 10, 1, 55))}]],
+        expectation: "INSERT INTO `myTable` (`name`,`birthday`) VALUES ('foo','2011-03-27 10:01:55'),('bar','2012-03-27 10:01:55');"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1}, {name: 'bar', foo: 2}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1),('bar',2);"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',NULL);"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: false}}
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: true}} // Note: We don't honour this because it makes little sense when some rows may have nulls and others not
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: undefined}, {name: 'bar', foo: 2, undefinedValue: undefined}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: true}} // Note: As above
+      }
+    ],
+
     updateQuery: [
       {
         arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index 0086582341b8..eabdb314c1b9 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -208,6 +208,46 @@ describe('QueryGenerator', function() {
       }
     ],
 
+    bulkInsertQuery: [
+      {
+        arguments: ['myTable', [{name: 'foo'}, {name: 'bar'}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\") VALUES ('foo'),('bar') RETURNING *;"
+      }, {
+        arguments: ['myTable', [{name: "foo';DROP TABLE myTable;"}, {name: 'bar'}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\") VALUES ('foo'';DROP TABLE myTable;'),('bar') RETURNING *;"
+      }, {
+        arguments: ['myTable', [{name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {name: 'bar', birthday: new Date(Date.UTC(2012, 2, 27, 10, 1, 55))}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.0Z'),('bar','2012-03-27 10:01:55.0Z') RETURNING *;"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1}, {name: 'bar', foo: 2}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"foo\") VALUES ('foo',1),('bar',2) RETURNING *;"
+      }, {
+        arguments: ['myTable', [{name: 'foo', nullValue: null}, {name: 'bar', nullValue: null}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"nullValue\") VALUES ('foo',NULL),('bar',NULL) RETURNING *;"
+      }, {
+        arguments: ['myTable', [{name: 'foo', nullValue: null}, {name: 'bar', nullValue: null}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"nullValue\") VALUES ('foo',NULL),('bar',NULL) RETURNING *;",
+        context: {options: {omitNull: false}}
+      }, {
+        arguments: ['myTable', [{name: 'foo', nullValue: null}, {name: 'bar', nullValue: null}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"nullValue\") VALUES ('foo',NULL),('bar',NULL) RETURNING *;",
+        context: {options: {omitNull: true}} // Note: We don't honour this because it makes little sense when some rows may have nulls and others not
+      }, {
+        arguments: ['myTable', [{name: 'foo', nullValue: undefined}, {name: 'bar', nullValue: undefined}]],
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"nullValue\") VALUES ('foo',NULL),('bar',NULL) RETURNING *;",
+        context: {options: {omitNull: true}} // Note: As above
+      }, {
+        arguments: ['mySchema.myTable', [{name: 'foo'}, {name: 'bar'}]],
+        expectation: "INSERT INTO \"mySchema\".\"myTable\" (\"name\") VALUES ('foo'),('bar') RETURNING *;"
+      }, {
+        arguments: ['mySchema.myTable', [{name: JSON.stringify({info: 'Look ma a " quote'})}, {name: JSON.stringify({info: 'Look ma another " quote'})}]],
+        expectation: "INSERT INTO \"mySchema\".\"myTable\" (\"name\") VALUES ('{\"info\":\"Look ma a \\\" quote\"}'),('{\"info\":\"Look ma another \\\" quote\"}') RETURNING *;"
+      }, {
+        arguments: ['mySchema.myTable', [{name: "foo';DROP TABLE mySchema.myTable;"}, {name: 'bar'}]],
+        expectation: "INSERT INTO \"mySchema\".\"myTable\" (\"name\") VALUES ('foo'';DROP TABLE mySchema.myTable;'),('bar') RETURNING *;"
+      }
+    ],
+
     updateQuery: [
       {
         arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 429a4f424340..037af166ea87 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -121,6 +121,43 @@ describe('QueryGenerator', function() {
       }
     ],
 
+    bulkInsertQuery: [
+      {
+        arguments: ['myTable', [{name: 'foo'}, {name: 'bar'}]],
+        expectation: "INSERT INTO `myTable` (`name`) VALUES ('foo'),('bar');"
+      }, {
+        arguments: ['myTable', [{name: "'bar'"}, {name: 'foo'}]],
+        expectation: "INSERT INTO `myTable` (`name`) VALUES ('''bar'''),('foo');"
+      }, {
+        arguments: ['myTable', [{name: "bar", value: null}, {name: 'foo', value: 1}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('bar',NULL),('foo',1);"
+      }, {
+        arguments: ['myTable', [{name: "bar", value: undefined}, {name: 'bar', value: 2}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('bar',NULL),('bar',2);"
+      }, {
+        arguments: ['myTable', [{name: "foo", value: true}, {name: 'bar', value: false}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',1),('bar',0);"
+      }, {
+        arguments: ['myTable', [{name: "foo", value: false}, {name: 'bar', value: false}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',0),('bar',0);"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);"
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: false}}
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: true}} // Note: We don't honour this because it makes little sense when some rows may have nulls and others not
+      }, {
+        arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: null}, {name: 'bar', foo: 2, nullValue: null}]],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
+        context: {options: {omitNull: true}} // Note: As above
+      }
+    ],
+
     updateQuery: [
       {
         arguments: ['myTable', { name: 'foo' }, { id: 2 }],

From 290e89542073f9ec44243baf2a6d772ecd924b34 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Thu, 25 Apr 2013 00:30:17 +0100
Subject: [PATCH 301/360] Refactored and simplified create method plus outline
 tests

---
 lib/dao-factory.js             | 47 ++++++++---------
 lib/dialects/postgres/query.js | 32 ++++++------
 lib/query-interface.js         |  4 +-
 spec/dao-factory.spec.js       | 93 ++++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+), 46 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 45d174ccdcf6..da96e025b43d 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -331,34 +331,28 @@ module.exports = (function() {
   /**
    * Create and insert multiple instances
    *
-   * @param  {Array} values List of objects (key/value pairs) to create instances from
-   * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
-   *
-   * The `success` handler is passed a list of newly inserted models.
-   */
-  DAOFactory.prototype.bulkCreate = function(values, options) {
-    var factory = this
-    return this.bulkInsert(values.map(function(attrs) {
-      return factory.build(attrs, options)
-    }))
-  }
-
-  /**
-   * Insert multiple instances
-   *
-   * @param  {Array} daos   List of built DAOs
+   * @param  {Array} records List of objects (key/value pairs) to create instances from
    * @param  {Array} fields Fields to insert (defaults to all fields)
    * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
    *
-   * The `success` handler is passed a list of newly inserted models.
+   * Note: the `success` handler is not passed any arguments. To obtain DAOs for
+   * the newly created values, you will need to query for them again. This is
+   * because MySQL and SQLite do not make it easy to obtain back automatically
+   * generated IDs and other default values in a way that can be mapped to
+   * multiple records
    */
-  DAOFactory.prototype.bulkInsert = function(daos, fields) {
+  DAOFactory.prototype.bulkCreate = function(records, fields) {
     var self          = this
-      , records       = []
+      , daos          = records.map(function(v) { return self.build(v) })
       , updatedAtAttr = self.options.underscored ? 'updated_at' : 'updatedAt'
       , createdAtAttr = self.options.underscored ? 'created_at' : 'createdAt'
 
+    // we will re-create from DAOs, which may have set up default attributes
+    records = []
+
     if (fields) {
+
+      // Always insert updated and created time stamps
       if (self.options.timestamps) {
         if (fields.indexOf(updatedAtAttr) === -1) {
           fields.push(updatedAtAttr)
@@ -369,21 +363,25 @@ module.exports = (function() {
         }
       }
 
+      // Build records for the fields we know about
       daos.forEach(function(dao) {
         var values = {};
         fields.forEach(function(field) {
-          if (dao.values[field] !== undefined) {
-            values[field] = dao.values[field]
-          }
+          values[field] = dao.values[field]
         })
+        if (self.options.timestamps) {
+          values[updatedAtAttr] = Utils.now()
+        }
         records.push(values);
       })
+
     } else {
       daos.forEach(function(dao) {
         records.push(dao.values)
       })
     }
 
+    // Validate enums
     records.forEach(function(values) {
       for (var attrName in self.rawAttributes) {
         if (self.rawAttributes.hasOwnProperty(attrName)) {
@@ -397,11 +395,6 @@ module.exports = (function() {
           }
         }
       }
-
-      if (self.options.timestamps && dao.hasOwnProperty(updatedAtAttr)) {
-        dao[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
-      }
-
     })
 
     return self.QueryInterface.bulkInsert(self.tableName, records)
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 4dbaba9003d6..a83d2057eb8e 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -108,27 +108,27 @@ module.exports = (function() {
     } else if (this.send('isShowOrDescribeQuery')) {
       this.emit('success', results)
     } else if (this.send('isInsertQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          var record = rows[0][key]
-          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
-            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
-          }
-
-          this.callee[key] = record
+      if(this.callee !== null) { // may happen for bulk inserts
+        for (var key in rows[0]) {
+          if (rows[0].hasOwnProperty(key)) {
+            var record = rows[0][key]
+            if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+              record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+            }
+            this.callee[key] = record
         }
       }
 
       this.emit('success', this.callee)
     } else if (this.send('isUpdateQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key)) {
-          var record = rows[0][key]
-          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
-            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
-          }
-
-          this.callee[key] = record
+      if(this.callee !== null) { // may happen for bulk updates
+        for (var key in rows[0]) {
+          if (rows[0].hasOwnProperty(key)) {
+            var record = rows[0][key]
+            if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+              record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+            }
+            this.callee[key] = record
         }
       }
 
diff --git a/lib/query-interface.js b/lib/query-interface.js
index e3b83241151c..b49984e87c76 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -262,9 +262,7 @@ module.exports = (function() {
 
   QueryInterface.prototype.bulkInsert = function(tableName, records) {
     var sql = this.QueryGenerator.bulkInsertQuery(tableName, records)
-    return queryAndEmit.call(this, sql, 'bulkInsert', {
-      success: function(objs) { objs.forEach(function(v) { v.isNewRecord = false }) }
-    })
+    return queryAndEmit.call(this, sql, 'bulkInsert')
   }
 
   QueryInterface.prototype.update = function(dao, tableName, values, identifier) {
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 074bb38c4c89..c256d8f8d905 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -387,6 +387,99 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
     })
   })
 
+  describe('bulkCreate', function() {
+
+    it('inserts multiple values', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul', secretValue: '23'}]
+
+      this.User.bulkCreate(data, ['username']).success(function(users) {
+        // self.User.find(user.id).success(function(_user) {
+        //   expect(_user.username).toEqual(data.username)
+        //   expect(_user.secretValue).not.toEqual(data.secretValue)
+        //   expect(_user.secretValue).toEqual(null)
+        done()
+      })
+    })
+
+  }) // - bulkCreate
+
+    // it('should only store the values passed in the witelist', function(done) {
+    //   var self = this
+    //     , data = { username: 'Peter', secretValue: '42' }
+
+    //   this.User.create(data, ['username']).success(function(user) {
+    //     self.User.find(user.id).success(function(_user) {
+    //       expect(_user.username).toEqual(data.username)
+    //       expect(_user.secretValue).not.toEqual(data.secretValue)
+    //       expect(_user.secretValue).toEqual(null)
+    //       done()
+    //     })
+    //   })
+    // })
+
+    // it('should store all values if no whitelist is specified', function(done) {
+    //   var self = this
+    //     , data = { username: 'Peter', secretValue: '42' }
+
+    //   this.User.create(data).success(function(user) {
+    //     self.User.find(user.id).success(function(_user) {
+    //       expect(_user.username).toEqual(data.username)
+    //       expect(_user.secretValue).toEqual(data.secretValue)
+    //       done()
+    //     })
+    //   })
+    // })
+
+    // it('saves data with single quote', function(done) {
+    //   var quote = "single'quote"
+    //     , self  = this
+
+    //   this.User.create({ data: quote }).success(function(user) {
+    //     expect(user.data).toEqual(quote, 'memory single quote')
+
+    //     self.User.find({where: { id: user.id }}).success(function(user) {
+    //       expect(user.data).toEqual(quote, 'SQL single quote')
+    //       done()
+    //     })
+    //   })
+    // })
+
+    // it('saves data with double quote', function(done) {
+    //   var quote = 'double"quote'
+    //     , self  = this
+
+    //   this.User.create({ data: quote }).success(function(user) {
+    //     expect(user.data).toEqual(quote, 'memory double quote')
+
+    //     self.User.find({where: { id: user.id }}).success(function(user) {
+    //       expect(user.data).toEqual(quote, 'SQL double quote')
+    //       done()
+    //     })
+    //   })
+    // })
+
+    // it('saves stringified JSON data', function(done) {
+    //   var json = JSON.stringify({ key: 'value' })
+    //     , self = this
+
+    //   this.User.create({ data: json }).success(function(user) {
+    //     expect(user.data).toEqual(json, 'memory data')
+    //     self.User.find({where: { id: user.id }}).success(function(user) {
+    //       expect(user.data).toEqual(json, 'SQL data')
+    //       done()
+    //     })
+    //   })
+    // })
+
+    // it('stores the current date in createdAt', function(done) {
+    //   this.User.create({ username: 'foo' }).success(function(user) {
+    //     expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+    //     done()
+    //   })
+    // })
+
   describe('find', function find() {
     before(function(done) {
       this.User.create({

From eff68d6bcdd965a1609b4d14b1154af848291a14 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 21:01:34 +0100
Subject: [PATCH 302/360] Refactor given understanding of how it's possible to
 return autogenerated ids; tests for bulkCreate

---
 lib/dao-factory.js                       |  19 ++-
 lib/dialects/postgres/query-generator.js |  12 ++
 spec/dao-factory.spec.js                 | 198 +++++++++++++----------
 3 files changed, 145 insertions(+), 84 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index da96e025b43d..045f3d106e18 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -404,19 +404,34 @@ module.exports = (function() {
    * Delete multiple instances
    *
    * @param  {Object} options Options to describe the scope of the search.
-   * @return {Object}       A promise which fires `success`, `error`, `complete` and `sql`.
+   * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
    */
   DAOFactory.prototype.bulkDelete = function(options) {
     if (this.options.timestamps && this.options.paranoid) {
       var attr = this.options.underscored ? 'deleted_at' : 'deletedAt'
       var attrValueHash = {}
-      attrValueHash[attr] = new Date()
+      attrValueHash[attr] = Utils.now()
       return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
     } else {
       return this.QueryInterface.bulkDelete(this.tableName, options)
     }
   }
 
+  /**
+   * Update multiple instances
+   *
+   * @param  {Object} attrValueHash A hash of fields to change and their new values
+   * @param  {Object} options       Options to describe the scope of the search.
+   * @return {Object}               A promise which fires `success`, `error`, `complete` and `sql`.
+   */
+  DAOFactory.prototype.bulkUpdate = function(attrValueHash, options) {
+    if(this.options.timestamps) {
+      var attr = this.options.underscored ? 'updated_at' : 'updatedAt'
+      attrValueHash[attr] = Utils.now()
+    }
+    return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
+  }
+
   // private
 
   var query = function() {
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 57c12abf8da8..3fac092aa24c 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -332,6 +332,18 @@ module.exports = (function() {
         , tuples    = []
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
+
+        // don't insert serials (Postgres doesn't like it when they're NULL)
+        Utils._.forEach(attrValueHash, function(value, key, hash) {
+          if (tables[tableName] && tables[tableName][key]) {
+            switch (tables[tableName][key]) {
+              case 'serial':
+                delete hash[key]
+                break
+            }
+          }
+        });
+
         tuples.push("(" +
           Utils._.values(attrValueHash).map(function(value){
             return QueryGenerator.pgEscape(value)
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index c256d8f8d905..7ecd9300cc5d 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -389,96 +389,130 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
   describe('bulkCreate', function() {
 
-    it('inserts multiple values', function(done) {
+    it('inserts multiple values respecting the white list', function(done) {
       var self = this
         , data = [{ username: 'Peter', secretValue: '42' },
                   { username: 'Paul', secretValue: '23'}]
 
-      this.User.bulkCreate(data, ['username']).success(function(users) {
-        // self.User.find(user.id).success(function(_user) {
-        //   expect(_user.username).toEqual(data.username)
-        //   expect(_user.secretValue).not.toEqual(data.secretValue)
-        //   expect(_user.secretValue).toEqual(null)
-        done()
+      this.User.bulkCreate(data, ['username']).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].secretValue).toBeNull();
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].secretValue).toBeNull();
+
+          done()
+        })
       })
     })
 
-  }) // - bulkCreate
+    it('should store all values if no whitelist is specified', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul', secretValue: '23'}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].secretValue).toEqual('42')
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].secretValue).toEqual('23')
+
+          done()
+        })
+      })
+    })
+
+    it('saves data with single quote', function(done) {
+      var self = this
+        , quote = "Single'Quote"
+        , data = [{ username: 'Peter', data: quote},
+                  { username: 'Paul', data: quote}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(quote)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(quote)
+
+          done()
+        })
+      })
+    })
+
+    it('saves data with double quote', function(done) {
+      var self = this
+        , quote = 'Double"Quote'
+        , data = [{ username: 'Peter', data: quote},
+                  { username: 'Paul', data: quote}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(quote)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(quote)
+
+          done()
+        })
+      })
+    })
+
+    it('saves stringified JSON data', function(done) {
+      var self = this
+        , json = JSON.stringify({ key: 'value' })
+        , data = [{ username: 'Peter', data: json},
+                  { username: 'Paul', data: json}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
+
+          expect(users[0].username).toEqual("Peter")
+          expect(users[0].data).toEqual(json)
+
+          expect(users[1].username).toEqual("Paul")
+          expect(users[1].data).toEqual(json)
+
+          done()
+        })
+      })
+    })
+
+    it('stores the current date in createdAt', function(done) {
+      var self = this
+        , data = [{ username: 'Peter'},
+                  { username: 'Paul'}]
+
+      this.User.bulkCreate(data).success(function() {
+        self.User.findAll().success(function(users) {
+          expect(users.length).toEqual(2)
 
-    // it('should only store the values passed in the witelist', function(done) {
-    //   var self = this
-    //     , data = { username: 'Peter', secretValue: '42' }
-
-    //   this.User.create(data, ['username']).success(function(user) {
-    //     self.User.find(user.id).success(function(_user) {
-    //       expect(_user.username).toEqual(data.username)
-    //       expect(_user.secretValue).not.toEqual(data.secretValue)
-    //       expect(_user.secretValue).toEqual(null)
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('should store all values if no whitelist is specified', function(done) {
-    //   var self = this
-    //     , data = { username: 'Peter', secretValue: '42' }
-
-    //   this.User.create(data).success(function(user) {
-    //     self.User.find(user.id).success(function(_user) {
-    //       expect(_user.username).toEqual(data.username)
-    //       expect(_user.secretValue).toEqual(data.secretValue)
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves data with single quote', function(done) {
-    //   var quote = "single'quote"
-    //     , self  = this
-
-    //   this.User.create({ data: quote }).success(function(user) {
-    //     expect(user.data).toEqual(quote, 'memory single quote')
-
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(quote, 'SQL single quote')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves data with double quote', function(done) {
-    //   var quote = 'double"quote'
-    //     , self  = this
-
-    //   this.User.create({ data: quote }).success(function(user) {
-    //     expect(user.data).toEqual(quote, 'memory double quote')
-
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(quote, 'SQL double quote')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('saves stringified JSON data', function(done) {
-    //   var json = JSON.stringify({ key: 'value' })
-    //     , self = this
-
-    //   this.User.create({ data: json }).success(function(user) {
-    //     expect(user.data).toEqual(json, 'memory data')
-    //     self.User.find({where: { id: user.id }}).success(function(user) {
-    //       expect(user.data).toEqual(json, 'SQL data')
-    //       done()
-    //     })
-    //   })
-    // })
-
-    // it('stores the current date in createdAt', function(done) {
-    //   this.User.create({ username: 'foo' }).success(function(user) {
-    //     expect(parseInt(+user.createdAt/5000)).toEqual(parseInt(+new Date()/5000))
-    //     done()
-    //   })
-    // })
+          expect(users[0].username).toEqual("Peter")
+          expect(parseInt(+users[0].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+
+          expect(users[1].username).toEqual("Paul")
+          expect(parseInt(+users[1].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+
+          done()
+        })
+      })
+    })
+
+  }) // - bulkCreate
 
   describe('find', function find() {
     before(function(done) {

From ea0926f4a3ea45c4793645aa94ae22fa563f07ba Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 21:10:10 +0100
Subject: [PATCH 303/360] Enum test

---
 spec/dao-factory.spec.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 7ecd9300cc5d..a33a886479a6 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -512,6 +512,28 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
 
+    describe('enums', function() {
+      before(function(done) {
+        this.Item = this.sequelize.define('Item', {
+          state: { type: Helpers.Sequelize.ENUM, values: ['available', 'in_cart', 'shipped'] },
+          name: Sequelize.STRING
+        })
+
+        this.sequelize.sync({ force: true }).success(function() {
+          this.Item.bulkCreate([{state: 'in_cart', name: 'A'}, { state: 'available', name: 'B'}]).success(function() {
+            done()
+          }.bind(this))
+        }.bind(this))
+      })
+
+      it('correctly restores enum values', function(done) {
+        this.Item.find({ where: { state: 'available' }}).success(function(item) {
+          expect(item.name).toEqual('B')
+          done()
+        }.bind(this))
+      })
+    })
+
   }) // - bulkCreate
 
   describe('find', function find() {

From daf936fe1c352014e2725cc0f7de9dacfa410b98 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 21:23:08 +0100
Subject: [PATCH 304/360] Test for bulk update

---
 spec/dao-factory.spec.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index a33a886479a6..b22784dbd8a4 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -536,6 +536,33 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
   }) // - bulkCreate
 
+  describe('bulkUpdate', function() {
+
+    it('updates only values that match filter', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul',  secretValue: '42' },
+                  { username: 'Bob',   secretValue: '43' }]
+
+      this.User.bulkCreate(data, data).success(function() {
+
+        self.User.bulkUpdate({username: 'Bill'}, {where: {secretValue: '42'}})
+          .success(function() {
+            self.User.findAll().success(function(users) {
+              expect(users.length).toEqual(3)
+
+              expect(users[0].username).toEqual("Bill")
+              expect(users[1].username).toEqual("Bill")
+              expect(users[2].username).toEqual("Bob")
+
+              done()
+            })
+          });
+      })
+    })
+
+  )}
+
   describe('find', function find() {
     before(function(done) {
       this.User.create({

From a8a1254217b67a551eac056eb8606ee7bbbce26e Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 21:36:05 +0100
Subject: [PATCH 305/360] Tests for bulkUpdate

---
 spec/dao-factory.spec.js | 49 +++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index b22784dbd8a4..2056f51570c6 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -395,7 +395,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul', secretValue: '23'}]
 
       this.User.bulkCreate(data, ['username']).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -415,7 +415,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul', secretValue: '23'}]
 
       this.User.bulkCreate(data).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -436,7 +436,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul', data: quote}]
 
       this.User.bulkCreate(data).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -457,7 +457,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul', data: quote}]
 
       this.User.bulkCreate(data).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -478,7 +478,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul', data: json}]
 
       this.User.bulkCreate(data).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -498,7 +498,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul'}]
 
       this.User.bulkCreate(data).success(function() {
-        self.User.findAll().success(function(users) {
+        self.User.findAll({order: 'id'}).success(function(users) {
           expect(users.length).toEqual(2)
 
           expect(users[0].username).toEqual("Peter")
@@ -544,11 +544,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
                   { username: 'Paul',  secretValue: '42' },
                   { username: 'Bob',   secretValue: '43' }]
 
-      this.User.bulkCreate(data, data).success(function() {
+      this.User.bulkCreate(data).success(function() {
 
-        self.User.bulkUpdate({username: 'Bill'}, {where: {secretValue: '42'}})
+        self.User.bulkUpdate({username: 'Bill'}, {secretValue: '42'})
           .success(function() {
-            self.User.findAll().success(function(users) {
+            self.User.findAll({order: 'id'}).success(function(users) {
               expect(users.length).toEqual(3)
 
               expect(users[0].username).toEqual("Bill")
@@ -557,11 +557,38 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
               done()
             })
-          });
+          })
+      })
+    })
+
+    it('sets updatedAt to the current timestamp', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul',  secretValue: '42' },
+                  { username: 'Bob',   secretValue: '43' }]
+
+      this.User.bulkCreate(data).success(function() {
+
+        self.User.bulkUpdate({username: 'Bill'}, {secretValue: '42'})
+          .success(function() {
+            self.User.findAll({order: 'id'}).success(function(users) {
+              expect(users.length).toEqual(3)
+
+              expect(users[0].username).toEqual("Bill")
+              expect(users[1].username).toEqual("Bill")
+              expect(users[2].username).toEqual("Bob")
+
+              expect(parseInt(+users[0].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+              expect(parseInt(+users[1].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
+              expect(parseInt(+users[2].createdAt)).not.toEqual(parseInt(+users[0].createdAt/5000))
+
+              done()
+            })
+          })
       })
     })
 
-  )}
+  }) // - bulkUpdate
 
   describe('find', function find() {
     before(function(done) {

From ade36f1e02ef5d90534e8891c2d33fdc97ff00f5 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 22:25:56 +0100
Subject: [PATCH 306/360] Test + fix for bulk delete

---
 lib/dao-factory.js                            | 14 ++--
 lib/dialects/mysql/query-generator.js         | 12 ++++
 lib/dialects/postgres/query-generator.js      | 26 ++++++++
 lib/dialects/query-generator.js               | 13 ++++
 lib/dialects/sqlite/query-generator.js        | 12 ++++
 lib/query-interface.js                        |  2 +-
 spec-jasmine/mysql/query-generator.spec.js    | 13 ++++
 spec-jasmine/postgres/query-generator.spec.js | 19 ++++++
 spec/dao-factory.spec.js                      | 65 +++++++++++++++++++
 9 files changed, 168 insertions(+), 8 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 045f3d106e18..11d3c94993b5 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -403,17 +403,17 @@ module.exports = (function() {
   /**
    * Delete multiple instances
    *
-   * @param  {Object} options Options to describe the scope of the search.
+   * @param  {Object} where   Options to describe the scope of the search.
    * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
    */
-  DAOFactory.prototype.bulkDelete = function(options) {
+  DAOFactory.prototype.bulkDelete = function(where) {
     if (this.options.timestamps && this.options.paranoid) {
       var attr = this.options.underscored ? 'deleted_at' : 'deletedAt'
       var attrValueHash = {}
       attrValueHash[attr] = Utils.now()
-      return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
+      return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, where)
     } else {
-      return this.QueryInterface.bulkDelete(this.tableName, options)
+      return this.QueryInterface.bulkDelete(this.tableName, where)
     }
   }
 
@@ -421,15 +421,15 @@ module.exports = (function() {
    * Update multiple instances
    *
    * @param  {Object} attrValueHash A hash of fields to change and their new values
-   * @param  {Object} options       Options to describe the scope of the search.
+   * @param  {Object} where         Options to describe the scope of the search.
    * @return {Object}               A promise which fires `success`, `error`, `complete` and `sql`.
    */
-  DAOFactory.prototype.bulkUpdate = function(attrValueHash, options) {
+  DAOFactory.prototype.bulkUpdate = function(attrValueHash, where) {
     if(this.options.timestamps) {
       var attr = this.options.underscored ? 'updated_at' : 'updatedAt'
       attrValueHash[attr] = Utils.now()
     }
-    return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, options)
+    return this.QueryInterface.bulkUpdate(this.tableName, attrValueHash, where)
   }
 
   // private
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index eda65cb72937..ed4d2e4df075 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -296,6 +296,18 @@ module.exports = (function() {
       return query
     },
 
+    bulkDeleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
+      var replacements = {
+        table: QueryGenerator.addQuotes(tableName),
+        where: QueryGenerator.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
     incrementQuery: function (tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 3fac092aa24c..f07d7ccfd2f2 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -410,6 +410,32 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
+    bulkDeleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      primaryKeys[tableName] = primaryKeys[tableName] || [];
+
+      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %>)"
+
+      var pks;
+      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
+        pks = primaryKeys[tableName].map(function(pk) {
+          return QueryGenerator.addQuotes(pk)
+        }).join(',')
+      } else {
+        pks = QueryGenerator.addQuotes('id')
+      }
+
+      var replacements = {
+        table: QueryGenerator.addQuotes(tableName),
+        where: QueryGenerator.getWhereConditions(where),
+        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
+        primaryKeysSelection: pks
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
     incrementQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js
index 033804cac22e..b9ea58e47407 100644
--- a/lib/dialects/query-generator.js
+++ b/lib/dialects/query-generator.js
@@ -155,6 +155,19 @@ module.exports = (function() {
       throwMethodUndefined('deleteQuery')
     },
 
+    /*
+      Returns a bulk deletion query.
+      Parameters:
+        - tableName -> Name of the table
+        - where -> A hash with conditions (e.g. {name: 'foo'})
+                   OR an ID as integer
+                   OR a string with conditions (e.g. 'name="foo"').
+                   If you use a string, you have to escape it on your own.
+    */
+    deleteQuery: function(tableName, where, options) {
+      throwMethodUndefined('bulkDeleteQuery')
+    },
+
     /*
       Returns an update query.
       Parameters:
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 6d35dcb78358..9fcf8e2d215a 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -179,6 +179,18 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
+    bulkDeleteQuery: function(tableName, where, options) {
+      options = options || {}
+
+      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
+      var replacements = {
+        table: Utils.addTicks(tableName),
+        where: this.getWhereConditions(where)
+      }
+
+      return Utils._.template(query)(replacements)
+    },
+
     incrementQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
diff --git a/lib/query-interface.js b/lib/query-interface.js
index b49984e87c76..7836dda10eed 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -281,7 +281,7 @@ module.exports = (function() {
   }
 
   QueryInterface.prototype.bulkDelete = function(tableName, identifier) {
-    var sql = this.QueryGenerator.deleteQuery(tableName, identifier)
+    var sql = this.QueryGenerator.bulkDeleteQuery(tableName, identifier)
     return queryAndEmit.call(this, sql, 'bulkDelete')
   }
 
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 22c94e2da624..bdbb5abe7378 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -274,6 +274,19 @@ describe('QueryGenerator', function() {
       }
     ],
 
+    bulkDeleteQuery: [
+      {
+        arguments: ['myTable', {name: 'foo'}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', 1],
+        expectation: "DELETE FROM `myTable` WHERE `id`=1"
+      }, {
+        arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo\\';DROP TABLE myTable;'"
+      }
+    ],
+
     addIndexQuery: [
       {
         arguments: ['User', ['username', 'isAdmin']],
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index eabdb314c1b9..3409e88df7dc 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -307,6 +307,25 @@ describe('QueryGenerator', function() {
       }
     ],
 
+    bulkDeleteQuery: [
+      {
+        arguments: ['myTable', {name: 'foo'}],
+        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\"='foo')"
+      }, {
+        arguments: ['myTable', 1],
+        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"id\"=1)"
+      }, {
+        arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}],
+        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\"='foo'';DROP TABLE myTable;')"
+      }, {
+        arguments: ['mySchema.myTable', {name: 'foo'}],
+        expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo')"
+      }, {
+        arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}],
+        expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo'';DROP TABLE mySchema.myTable;')"
+      }
+    ],
+
     addIndexQuery: [
       {
         arguments: ['User', ['username', 'isAdmin']],
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 2056f51570c6..c7f83f25f99c 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -590,6 +590,71 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
   }) // - bulkUpdate
 
+  describe('bulkDelete', function() {
+
+    it('deletes values that match filter', function(done) {
+      var self = this
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul',  secretValue: '42' },
+                  { username: 'Bob',   secretValue: '43' }]
+
+      this.User.bulkCreate(data).success(function() {
+
+        self.User.bulkDelete({secretValue: '42'})
+          .success(function() {
+            self.User.findAll({order: 'id'}).success(function(users) {
+              expect(users.length).toEqual(1)
+
+              expect(users[0].username).toEqual("Bob")
+
+              done()
+            })
+          })
+      })
+    })
+
+    it('sets deletedAt to the current timestamp if paranoid is true', function(done) {
+
+      var self = this
+        , User = this.sequelize.define('ParanoidUser', {
+            username:     Sequelize.STRING,
+            secretValue:  Sequelize.STRING,
+            data:         Sequelize.STRING
+          }, {
+            paranoid: true
+          })
+        , data = [{ username: 'Peter', secretValue: '42' },
+                  { username: 'Paul',  secretValue: '42' },
+                  { username: 'Bob',   secretValue: '43' }]
+
+      User.sync({ force: true }).success(function() {
+
+        User.bulkCreate(data).success(function() {
+
+          User.bulkDelete({secretValue: '42'})
+            .success(function() {
+              User.findAll({order: 'id'}).success(function(users) {
+                expect(users.length).toEqual(3)
+
+                expect(users[0].username).toEqual("Peter")
+                expect(users[1].username).toEqual("Paul")
+                expect(users[2].username).toEqual("Bob")
+
+                expect(parseInt(+users[0].deletedAt/5000)).toEqual(parseInt(+new Date()/5000))
+                expect(parseInt(+users[1].deletedAt/5000)).toEqual(parseInt(+new Date()/5000))
+                expect(parseInt(+users[2].deletedAt)).not.toEqual(parseInt(+new Date()/5000))
+
+                done()
+              })
+            })
+        })
+
+      })
+
+    })
+
+  }) // - bulkDelete
+
   describe('find', function find() {
     before(function(done) {
       this.User.create({

From 65db2ad095e35e3269b8f60c2e5b4e081f08b2af Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 22:27:40 +0100
Subject: [PATCH 307/360] Changelog entry

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 619fcb290ba1..751fce4d4baa 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
+- [FEATURE] Support for bulk insert (`.bulkCreate()`, update (``.bulkUpdate()`) and delete (``.bulkDelete()`)
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From 31ec3a194d3324073ecd01fe8e93ab1bb9568a18 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sat, 27 Apr 2013 22:38:08 +0100
Subject: [PATCH 308/360] Fix typo in interface method name

---
 lib/dialects/query-generator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/query-generator.js b/lib/dialects/query-generator.js
index b9ea58e47407..ea5b4a4cf8f4 100644
--- a/lib/dialects/query-generator.js
+++ b/lib/dialects/query-generator.js
@@ -164,7 +164,7 @@ module.exports = (function() {
                    OR a string with conditions (e.g. 'name="foo"').
                    If you use a string, you have to escape it on your own.
     */
-    deleteQuery: function(tableName, where, options) {
+    bulkDeleteQuery: function(tableName, where, options) {
       throwMethodUndefined('bulkDeleteQuery')
     },
 

From 3b951e13eaa441dc47b74f797dd11854d3c60733 Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Sun, 28 Apr 2013 14:03:55 +0100
Subject: [PATCH 309/360] Rename and rationalise methods as per discussion on
 GitHub

---
 changelog.md                                  |  2 +-
 lib/dao-factory.js                            |  4 +-
 lib/dialects/mysql/query-generator.js         | 13 +++-
 lib/dialects/postgres/query-generator.js      | 74 ++++++-------------
 lib/dialects/sqlite/query-generator.js        | 15 +---
 lib/query-interface.js                        |  2 +-
 spec-jasmine/mysql/query-generator.spec.js    | 14 +---
 spec-jasmine/postgres/query-generator.spec.js | 20 +----
 spec-jasmine/sqlite/query-generator.spec.js   | 19 +++++
 spec/dao-factory.spec.js                      | 16 ++--
 10 files changed, 69 insertions(+), 110 deletions(-)

diff --git a/changelog.md b/changelog.md
index 751fce4d4baa..fc4d42199245 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,7 +6,7 @@
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
-- [FEATURE] Support for bulk insert (`.bulkCreate()`, update (``.bulkUpdate()`) and delete (``.bulkDelete()`)
+- [FEATURE] Support for bulk insert (`.bulkCreate()`, update (``.update()`) and delete (``.destroy()`)
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 11d3c94993b5..3f2f5c314598 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -406,7 +406,7 @@ module.exports = (function() {
    * @param  {Object} where   Options to describe the scope of the search.
    * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
    */
-  DAOFactory.prototype.bulkDelete = function(where) {
+  DAOFactory.prototype.destroy = function(where) {
     if (this.options.timestamps && this.options.paranoid) {
       var attr = this.options.underscored ? 'deleted_at' : 'deletedAt'
       var attrValueHash = {}
@@ -424,7 +424,7 @@ module.exports = (function() {
    * @param  {Object} where         Options to describe the scope of the search.
    * @return {Object}               A promise which fires `success`, `error`, `complete` and `sql`.
    */
-  DAOFactory.prototype.bulkUpdate = function(attrValueHash, where) {
+  DAOFactory.prototype.update = function(attrValueHash, where) {
     if(this.options.timestamps) {
       var attr = this.options.underscored ? 'updated_at' : 'updatedAt'
       attrValueHash[attr] = Utils.now()
diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index ed4d2e4df075..fdd373c14aae 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -285,13 +285,20 @@ module.exports = (function() {
 
     deleteQuery: function(tableName, where, options) {
       options = options || {}
-      options.limit = options.limit || 1
 
       var table = QueryGenerator.addQuotes(tableName)
       var where = QueryGenerator.getWhereConditions(where)
-      var limit = Utils.escape(options.limit)
+      var limit = ""
 
-      var query = "DELETE FROM " + table + " WHERE " + where + " LIMIT " + limit
+      if(Utils._.isUndefined(options.limit)) {
+        options.limit = 1;
+      }
+
+      if(!!options.limit) {
+        limit = " LIMIT " + Utils.escape(options.limit)
+      }
+
+      var query = "DELETE FROM " + table + " WHERE " + where + limit
 
       return query
     },
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index f07d7ccfd2f2..5a81693728df 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -301,18 +301,7 @@ module.exports = (function() {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
       var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
-        , returning = []
-
-      Utils._.forEach(attrValueHash, function(value, key, hash) {
-        if (tables[tableName] && tables[tableName][key]) {
-          switch (tables[tableName][key]) {
-            case 'serial':
-              delete hash[key]
-              returning.push(key)
-              break
-          }
-        }
-      });
+        , returning = removeSerialsFromHash(tableName, attrValueHash)
 
       var replacements  = {
         table:      QueryGenerator.addQuotes(tableName)
@@ -332,18 +321,7 @@ module.exports = (function() {
         , tuples    = []
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
-
-        // don't insert serials (Postgres doesn't like it when they're NULL)
-        Utils._.forEach(attrValueHash, function(value, key, hash) {
-          if (tables[tableName] && tables[tableName][key]) {
-            switch (tables[tableName][key]) {
-              case 'serial':
-                delete hash[key]
-                break
-            }
-          }
-        });
-
+        removeSerialsFromHash(tableName, attrValueHash)
         tuples.push("(" +
           Utils._.values(attrValueHash).map(function(value){
             return QueryGenerator.pgEscape(value)
@@ -384,38 +362,14 @@ module.exports = (function() {
 
     deleteQuery: function(tableName, where, options) {
       options = options || {}
-      options.limit = options.limit || 1
-
-      primaryKeys[tableName] = primaryKeys[tableName] || [];
-
-      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>)"
-
-      var pks;
-      if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
-        pks = primaryKeys[tableName].map(function(pk) {
-          return QueryGenerator.addQuotes(pk)
-        }).join(',')
-      } else {
-        pks = QueryGenerator.addQuotes('id')
-      }
 
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where),
-        limit: QueryGenerator.pgEscape(options.limit),
-        primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
-        primaryKeysSelection: pks
+      if(Utils._.isUndefined(options.limit)) {
+        options.limit = 1;
       }
 
-      return Utils._.template(query)(replacements)
-    },
-
-    bulkDeleteQuery: function(tableName, where, options) {
-      options = options || {}
-
       primaryKeys[tableName] = primaryKeys[tableName] || [];
 
-      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %>)"
+      var query = "DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %> WHERE <%= where %><%= limit %>)"
 
       var pks;
       if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) {
@@ -429,6 +383,7 @@ module.exports = (function() {
       var replacements = {
         table: QueryGenerator.addQuotes(tableName),
         where: QueryGenerator.getWhereConditions(where),
+        limit: !!options.limit? " LIMIT " + QueryGenerator.pgEscape(options.limit) : "",
         primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks,
         primaryKeysSelection: pks
       }
@@ -782,5 +737,22 @@ module.exports = (function() {
     }
   }
 
+  // Private
+
+  var removeSerialsFromHash = function(tableName, attrValueHash) {
+    var returning = [];
+    Utils._.forEach(attrValueHash, function(value, key, hash) {
+        if (tables[tableName] && tables[tableName][key]) {
+          switch (tables[tableName][key]) {
+            case 'serial':
+              delete hash[key]
+              returning.push(key)
+              break
+          }
+        }
+      });
+    return returning;
+  }
+
   return Utils._.extend(Utils._.clone(require("../query-generator")), QueryGenerator)
 })()
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index 9fcf8e2d215a..fe850d29f444 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -172,20 +172,7 @@ module.exports = (function() {
       var query = "DELETE FROM <%= table %> WHERE <%= where %>"
       var replacements = {
         table: Utils.addTicks(tableName),
-        where: this.getWhereConditions(where),
-        limit: Utils.escape(options.limit)
-      }
-
-      return Utils._.template(query)(replacements)
-    },
-
-    bulkDeleteQuery: function(tableName, where, options) {
-      options = options || {}
-
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: Utils.addTicks(tableName),
-        where: this.getWhereConditions(where)
+        where: MySqlQueryGenerator.getWhereConditions(where)
       }
 
       return Utils._.template(query)(replacements)
diff --git a/lib/query-interface.js b/lib/query-interface.js
index 7836dda10eed..8a8287c5efeb 100644
--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -281,7 +281,7 @@ module.exports = (function() {
   }
 
   QueryInterface.prototype.bulkDelete = function(tableName, identifier) {
-    var sql = this.QueryGenerator.bulkDeleteQuery(tableName, identifier)
+    var sql = this.QueryGenerator.deleteQuery(tableName, identifier, {limit: null})
     return queryAndEmit.call(this, sql, 'bulkDelete')
   }
 
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index bdbb5abe7378..d34d9f8c34c6 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -271,19 +271,9 @@ describe('QueryGenerator', function() {
       }, {
         arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
         expectation: "DELETE FROM `myTable` WHERE `name`='foo\\';DROP TABLE myTable;' LIMIT 10"
-      }
-    ],
-
-    bulkDeleteQuery: [
-      {
-        arguments: ['myTable', {name: 'foo'}],
-        expectation: "DELETE FROM `myTable` WHERE `name`='foo'"
-      }, {
-        arguments: ['myTable', 1],
-        expectation: "DELETE FROM `myTable` WHERE `id`=1"
       }, {
-        arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}],
-        expectation: "DELETE FROM `myTable` WHERE `name`='foo\\';DROP TABLE myTable;'"
+        arguments: ['myTable', {name: 'foo'}, {limit: null}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo'"
       }
     ],
 
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index 3409e88df7dc..606ea19dca80 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -304,25 +304,9 @@ describe('QueryGenerator', function() {
       }, {
         arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {limit: 10}],
         expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo'';DROP TABLE mySchema.myTable;' LIMIT 10)"
-      }
-    ],
-
-    bulkDeleteQuery: [
-      {
-        arguments: ['myTable', {name: 'foo'}],
-        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\"='foo')"
-      }, {
-        arguments: ['myTable', 1],
-        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"id\"=1)"
-      }, {
-        arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}],
-        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\"='foo'';DROP TABLE myTable;')"
       }, {
-        arguments: ['mySchema.myTable', {name: 'foo'}],
-        expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo')"
-      }, {
-        arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}],
-        expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo'';DROP TABLE mySchema.myTable;')"
+        arguments: ['myTable', {name: 'foo'}, {limit: null}],
+        expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\"='foo')"
       }
     ],
 
diff --git a/spec-jasmine/sqlite/query-generator.spec.js b/spec-jasmine/sqlite/query-generator.spec.js
index 037af166ea87..8dd60a4081d9 100644
--- a/spec-jasmine/sqlite/query-generator.spec.js
+++ b/spec-jasmine/sqlite/query-generator.spec.js
@@ -189,6 +189,25 @@ describe('QueryGenerator', function() {
         expectation: "UPDATE `myTable` SET `bar`=2 WHERE `name`='foo'",
         context: {options: {omitNull: true}}
       }
+    ],
+
+    deleteQuery: [
+      {
+        arguments: ['myTable', {name: 'foo'}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', 1],
+        expectation: "DELETE FROM `myTable` WHERE `id`=1"
+      }, {
+        arguments: ['myTable', 1, {limit: 10}],
+        expectation: "DELETE FROM `myTable` WHERE `id`=1"
+      }, {
+        arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo\\';DROP TABLE myTable;'"
+      }, {
+        arguments: ['myTable', {name: 'foo'}, {limit: null}],
+        expectation: "DELETE FROM `myTable` WHERE `name`='foo'"
+      }
     ]
   };
 
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index c7f83f25f99c..f4c5ba6fa71c 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -536,7 +536,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
   }) // - bulkCreate
 
-  describe('bulkUpdate', function() {
+  describe('update', function() {
 
     it('updates only values that match filter', function(done) {
       var self = this
@@ -546,7 +546,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
       this.User.bulkCreate(data).success(function() {
 
-        self.User.bulkUpdate({username: 'Bill'}, {secretValue: '42'})
+        self.User.update({username: 'Bill'}, {secretValue: '42'})
           .success(function() {
             self.User.findAll({order: 'id'}).success(function(users) {
               expect(users.length).toEqual(3)
@@ -569,7 +569,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
       this.User.bulkCreate(data).success(function() {
 
-        self.User.bulkUpdate({username: 'Bill'}, {secretValue: '42'})
+        self.User.update({username: 'Bill'}, {secretValue: '42'})
           .success(function() {
             self.User.findAll({order: 'id'}).success(function(users) {
               expect(users.length).toEqual(3)
@@ -588,9 +588,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       })
     })
 
-  }) // - bulkUpdate
+  }) // - update
 
-  describe('bulkDelete', function() {
+  describe('destroy', function() {
 
     it('deletes values that match filter', function(done) {
       var self = this
@@ -600,7 +600,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
       this.User.bulkCreate(data).success(function() {
 
-        self.User.bulkDelete({secretValue: '42'})
+        self.User.destroy({secretValue: '42'})
           .success(function() {
             self.User.findAll({order: 'id'}).success(function(users) {
               expect(users.length).toEqual(1)
@@ -631,7 +631,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
         User.bulkCreate(data).success(function() {
 
-          User.bulkDelete({secretValue: '42'})
+          User.destroy({secretValue: '42'})
             .success(function() {
               User.findAll({order: 'id'}).success(function(users) {
                 expect(users.length).toEqual(3)
@@ -653,7 +653,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
     })
 
-  }) // - bulkDelete
+  }) // - destroy
 
   describe('find', function find() {
     before(function(done) {

From d2e9adcb9700d874a5695bda9a46facd59e00def Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Mon, 6 May 2013 23:56:19 +0100
Subject: [PATCH 310/360] Rebase onto sequelize master and reflect MySQL query
 generator refactoring there

---
 lib/dialects/mysql/query-generator.js | 27 ++++++++++++---------------
 lib/dialects/postgres/query.js        |  2 ++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index fdd373c14aae..659408602b44 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -244,8 +244,7 @@ module.exports = (function() {
     },
 
     bulkInsertQuery: function(tableName, attrValueHashes) {
-      var query  = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
-        , tuples = []
+      var tuples = []
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
         tuples.push("(" +
@@ -255,13 +254,12 @@ module.exports = (function() {
         ")")
       })
 
-      var replacements  = {
-        table: QueryGenerator.addQuotes(tableName),
-        attributes: Object.keys(attrValueHashes[0]).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
-        tuples: tuples.join(",")
-      }
+      var table      = QueryGenerator.addQuotes(tableName)
+      var attributes = Object.keys(attrValueHashes[0]).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
+
+      var query  = "INSERT INTO " + table + " (" + attributes + ") VALUES " + tuples.join(",") + ";"
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     updateQuery: function(tableName, attrValueHash, where) {
@@ -306,13 +304,12 @@ module.exports = (function() {
     bulkDeleteQuery: function(tableName, where, options) {
       options = options || {}
 
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var table = QueryGenerator.addQuotes(tableName)
+      var where = QueryGenerator.getWhereConditions(where)
+
+      var query = "DELETE FROM " + table + " WHERE " + where
 
-      return Utils._.template(query)(replacements)
+      return query
     },
 
     incrementQuery: function (tableName, attrValueHash, where) {
@@ -326,7 +323,7 @@ module.exports = (function() {
 
         values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
-      
+
       var table = QueryGenerator.addQuotes(tableName)
       var values =  values.join(",")
       var where = QueryGenerator.getWhereConditions(where)
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index a83d2057eb8e..61f045468de8 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -116,6 +116,7 @@ module.exports = (function() {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             this.callee[key] = record
+          }
         }
       }
 
@@ -129,6 +130,7 @@ module.exports = (function() {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             this.callee[key] = record
+          }
         }
       }
 

From f5d935964ee0ed6f657049e145db9dd69720bb6c Mon Sep 17 00:00:00 2001
From: Martin Aspeli 
Date: Tue, 7 May 2013 23:48:38 +0100
Subject: [PATCH 311/360] Update tests thanks to @janmeier's review

---
 spec/dao-factory.spec.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index f4c5ba6fa71c..a9ef5e27c9bb 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -551,9 +551,13 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
             self.User.findAll({order: 'id'}).success(function(users) {
               expect(users.length).toEqual(3)
 
-              expect(users[0].username).toEqual("Bill")
-              expect(users[1].username).toEqual("Bill")
-              expect(users[2].username).toEqual("Bob")
+              users.forEach(function (user) {
+                if (user.secretValue == '42') {
+                  expect(user.username).toEqual("Bill")
+                } else {
+                  expect(user.username).toEqual("Bob")
+                }
+              })
 
               done()
             })
@@ -578,9 +582,8 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
               expect(users[1].username).toEqual("Bill")
               expect(users[2].username).toEqual("Bob")
 
-              expect(parseInt(+users[0].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
-              expect(parseInt(+users[1].createdAt/5000)).toEqual(parseInt(+new Date()/5000))
-              expect(parseInt(+users[2].createdAt)).not.toEqual(parseInt(+users[0].createdAt/5000))
+              expect(parseInt(+users[0].updatedAt/5000)).toEqual(parseInt(+new Date()/5000))
+              expect(parseInt(+users[1].updatedAt/5000)).toEqual(parseInt(+new Date()/5000))
 
               done()
             })
@@ -642,7 +645,6 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
                 expect(parseInt(+users[0].deletedAt/5000)).toEqual(parseInt(+new Date()/5000))
                 expect(parseInt(+users[1].deletedAt/5000)).toEqual(parseInt(+new Date()/5000))
-                expect(parseInt(+users[2].deletedAt)).not.toEqual(parseInt(+new Date()/5000))
 
                 done()
               })

From 00f5f771df8c62a9eec7680f2a8467be92843c63 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Thu, 9 May 2013 23:21:11 +0200
Subject: [PATCH 312/360] Change roadmap for bulk update, insert, delete

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 37f84b06592f..3e9b239cdb32 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - Transactions
 - Support for update of tables without primary key
 - MariaDB support
-- Support for update and delete calls for whole tables without previous loading of instances
+- ~~Support for update and delete calls for whole tables without previous loading of instances~~ Implemented in [#569](https://github.com/sequelize/sequelize/pull/569) thanks to @optiltude
 - Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099)
 - Model#delete
 - Validate a model before it gets saved. (Move validation of enum attribute value to validate method)

From ecd16720dc8010d588a0c088d91aff415d067f76 Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 9 May 2013 17:05:09 -0400
Subject: [PATCH 313/360] Added final changes as requested by sdepold

---
 README.md    | 3 ++-
 changelog.md | 1 +
 lib/dao.js   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index acef1ade547b..0770865c4e5f 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,8 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 - Support for update and delete calls for whole tables without previous loading of instances
 - Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099)
 - Model#delete
-- Validate a model before it gets saved. (Move validation of enum attribute value to validate method)
+- ~~Validate a model before it gets saved.~~ Implemented in [#601](https://github.com/sequelize/sequelize/pull/601), thanks to @durango
+- Move validation of enum attribute value to validate method
 - BLOB [#99](https://github.com/sequelize/sequelize/issues/99)
 - ~~Support for foreign keys~~ Implemented in [#595](https://github.com/sequelize/sequelize/pull/595), thanks to @optilude
 
diff --git a/changelog.md b/changelog.md
index 619fcb290ba1..178ba6bc2213 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,5 @@
 # v1.7.0 #
+- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601), thanks to durango
 - [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
 - [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
diff --git a/lib/dao.js b/lib/dao.js
index 5bc8594c7b89..0207307bad12 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -218,9 +218,9 @@ module.exports = (function() {
     Utils._.each(self.values, function(value, field) {
 
       // if field has validators
-      var allowsNulls = (self.rawAttributes[field].allowNull && self.rawAttributes[field].allowNull === true && (value === null || value === undefined));
+      var hasAllowedNull = (self.rawAttributes[field].allowNull && self.rawAttributes[field].allowNull === true && (value === null || value === undefined));
 
-      if (self.validators.hasOwnProperty(field) && !allowsNulls) {
+      if (self.validators.hasOwnProperty(field) && !hasAllowedNull) {
         // for each validator
         Utils._.each(self.validators[field], function(details, validatorType) {
 

From 054a6031d71eacb2f22e1369b0378d1ffa2d39e6 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Fri, 10 May 2013 00:23:34 +0300
Subject: [PATCH 314/360] Added link to bulk insert, update, delete

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index fc4d42199245..d66890b785fb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,7 +6,7 @@
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
-- [FEATURE] Support for bulk insert (`.bulkCreate()`, update (``.update()`) and delete (``.destroy()`)
+- [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From eea3828211a8a136ca29cfb10bfa60f4579313b9 Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 9 May 2013 17:42:05 -0400
Subject: [PATCH 315/360] Some PR broke this concept, so I'm not safely type
 checking all the way down for HSTORE.

---
 lib/dialects/postgres/query.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 61f045468de8..6dff30fed944 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -112,7 +112,7 @@ module.exports = (function() {
         for (var key in rows[0]) {
           if (rows[0].hasOwnProperty(key)) {
             var record = rows[0][key]
-            if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+            if (!!this.callee.daoFactory && !!this.callee.daoFactory.rawAttributes && !!this.callee.daoFactory.rawAttributes[key] && !!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             this.callee[key] = record
@@ -126,7 +126,7 @@ module.exports = (function() {
         for (var key in rows[0]) {
           if (rows[0].hasOwnProperty(key)) {
             var record = rows[0][key]
-            if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+            if (!!this.callee.daoFactory && !!this.callee.daoFactory.rawAttributes && !!this.callee.daoFactory.rawAttributes[key] && !!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             this.callee[key] = record

From d066f936d29f7209e437b1ca8a96f6c999d2606b Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 9 May 2013 19:19:43 -0400
Subject: [PATCH 316/360] Upgraded validation for IPv6 support. Closes #371

---
 changelog.md                 | 3 ++-
 package.json                 | 2 +-
 spec/dao.validations.spec.js | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 5a105248bfb0..d8b316c76895 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # v1.7.0 #
-- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601), thanks to durango
+- [DEPENDENCIES] Upgraded validator for IPv6 support. [#603](https://github.com/sequelize/sequelize/pull/603). thanks to durango
+- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
 - [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
diff --git a/package.json b/package.json
index 7f0f8e3ac60a..99469ee43d21 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "lodash": "~1.2.1",
     "underscore.string": "~2.3.0",
     "lingo": "~0.0.5",
-    "validator": "0.4.x",
+    "validator": "1.1.1",
     "moment": "~1.7.0",
     "commander": "~0.6.0",
     "generic-pool": "1.0.9",
diff --git a/spec/dao.validations.spec.js b/spec/dao.validations.spec.js
index 4d17c2d34bf7..db23e6850315 100644
--- a/spec/dao.validations.spec.js
+++ b/spec/dao.validations.spec.js
@@ -42,6 +42,10 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
         fail: "abc",
         pass: "129.89.23.1"
       }
+    , isIPv6 : {
+      fail: '1111:2222:3333::5555:',
+      pass: 'fe80:0000:0000:0000:0204:61ff:fe9d:f156'
+    }
     , isAlpha : {
         fail: "012",
         pass: "abc"

From b168e5577bf4c854a855bc747fcb96e07215cd2e Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Fri, 10 May 2013 19:59:32 +0200
Subject: [PATCH 317/360] error messages ftw

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 006490e65392..eab181e13326 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 ### 2.0.0
 - ~~save datetimes in UTC~~
 - encapsulate attributes if a dao inside the attributes property + add getters and setters
+- add proper error message everywhere
 
 
 ## Collaboration 2.0 ##

From 5e8eac2adb02761e73a722c6eeaaa56a5b5e0422 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Fri, 10 May 2013 14:19:45 -0400
Subject: [PATCH 318/360] Add failing case for MySQL query gen with bool.
 (Issue #607)

---
 spec-jasmine/mysql/query-generator.spec.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index d34d9f8c34c6..aed6c470b089 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -197,6 +197,12 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {name: 'foo', foo: 1, nullValue: undefined}],
         expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1);",
         context: {options: {omitNull: true}}
+      }, {
+        arguments: ['myTable', {foo: false}],
+        expectation: "INSERT INTO `myTable` (`foo`) VALUES (0);"
+      }, {
+        arguments: ['myTable', {foo: true}],
+        expectation: "INSERT INTO `myTable` (`foo`) VALUES (1);"
       }
     ],
 
@@ -228,6 +234,9 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: undefined}, {name: 'bar', foo: 2, undefinedValue: undefined}]],
         expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
         context: {options: {omitNull: true}} // Note: As above
+      }, {
+        arguments: ['myTable', [{name: "foo", value: true}, {name: 'bar', value: false}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',1),('bar',0);"
       }
     ],
 
@@ -255,6 +264,12 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {bar: 2, nullValue: null}, {name: 'foo'}],
         expectation: "UPDATE `myTable` SET `bar`=2 WHERE `name`='foo'",
         context: {options: {omitNull: true}}
+      }, {
+        arguments: ['myTable', {bar: false}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=0 WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', {bar: true}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=1 WHERE `name`='foo'"
       }
     ],
 

From 42a44f101b061b7b510ac084896835b269d0cbc1 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Fri, 10 May 2013 15:04:33 -0400
Subject: [PATCH 319/360] MySQL: Outgoing booleans are turned into ints

In the MySQL dialect, values used to generate insert, bulk insert, and update queries are now checked for boolean-ness and will be turned into an int.

There was already duplicated logic applied to outgoing values to check if the value was a Date or not. I factored out value processing to a single function and added a check for typeof boolean.

The new function also escapes the return value since that was also being done everywhere.

Fixes #607
---
 lib/dialects/mysql/query-generator.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index 659408602b44..d53b97d8dacb 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -2,6 +2,16 @@ var Utils     = require("../../utils")
   , DataTypes = require("../../data-types")
   , util      = require("util")
 
+var processAndEscapeValue = function(value) {
+  var processedValue = value
+  if (value instanceof Date) {
+    processedValue = Utils.toSqlDate(value)
+  } else if (typeof value === 'boolean') {
+    processedValue = value ? 1 : 0
+  }
+  return Utils.escape(processedValue)
+}
+
 module.exports = (function() {
   var QueryGenerator = {
     addSchema: function(opts) {
@@ -234,9 +244,7 @@ module.exports = (function() {
 
       var table = QueryGenerator.addQuotes(tableName)
       var attributes = Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
-      var values = Utils._.values(attrValueHash).map(function(value){
-          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
+      var values = Utils._.values(attrValueHash).map(processAndEscapeValue).join(",")
 
       var query = "INSERT INTO " + table + " (" + attributes + ") VALUES (" + values + ");"
 
@@ -248,9 +256,7 @@ module.exports = (function() {
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
         tuples.push("(" +
-          Utils._.values(attrValueHash).map(function(value){
-            return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-          }).join(",") +
+          Utils._.values(attrValueHash).map(processAndEscapeValue).join(",") +
         ")")
       })
 
@@ -269,9 +275,9 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+          , _value = processAndEscapeValue(value)
 
-        values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + _value)
       }
 
       var query = "UPDATE " + QueryGenerator.addQuotes(tableName) +
@@ -319,9 +325,9 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+          , _value = processAndEscapeValue(value)
 
-        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " + _value)
       }
 
       var table = QueryGenerator.addQuotes(tableName)

From 72d2737b7dc57b2162611900e030282b894f6648 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Fri, 10 May 2013 15:10:35 -0400
Subject: [PATCH 320/360] Minor low-hanging changes to improve jshint
 performance

---
 lib/dialects/mysql/query-generator.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index d53b97d8dacb..bc15e09b9f20 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -15,7 +15,7 @@ var processAndEscapeValue = function(value) {
 module.exports = (function() {
   var QueryGenerator = {
     addSchema: function(opts) {
-      var tableName     = undefined
+      var tableName
       var schema        = (!!opts && !!opts.options && !!opts.options.schema ? opts.options.schema : undefined)
       var schemaDelimiter  = (!!opts && !!opts.options && !!opts.options.schemaDelimiter ? opts.options.schemaDelimiter : undefined)
 
@@ -141,7 +141,7 @@ module.exports = (function() {
       var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
       var attrString = []
 
-      for (attrName in attributes) {
+      for (var attrName in attributes) {
         var definition = attributes[attrName]
 
         attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
@@ -291,7 +291,7 @@ module.exports = (function() {
       options = options || {}
 
       var table = QueryGenerator.addQuotes(tableName)
-      var where = QueryGenerator.getWhereConditions(where)
+      where = QueryGenerator.getWhereConditions(where)
       var limit = ""
 
       if(Utils._.isUndefined(options.limit)) {
@@ -311,7 +311,7 @@ module.exports = (function() {
       options = options || {}
 
       var table = QueryGenerator.addQuotes(tableName)
-      var where = QueryGenerator.getWhereConditions(where)
+      where = QueryGenerator.getWhereConditions(where)
 
       var query = "DELETE FROM " + table + " WHERE " + where
 
@@ -331,8 +331,8 @@ module.exports = (function() {
       }
 
       var table = QueryGenerator.addQuotes(tableName)
-      var values =  values.join(",")
-      var where = QueryGenerator.getWhereConditions(where)
+      values = values.join(",")
+      where = QueryGenerator.getWhereConditions(where)
 
       var query = "UPDATE " + table + " SET " + values + " WHERE " + where
 
@@ -431,7 +431,7 @@ module.exports = (function() {
 
         if (Array.isArray(value)) {
           // is value an array?
-          if (value.length == 0) { value = [null] }
+          if (value.length === 0) { value = [null] }
           _value = "(" + value.map(function(subValue) {
             return Utils.escape(subValue);
           }).join(',') + ")"
@@ -481,7 +481,7 @@ module.exports = (function() {
             template += " auto_increment"
           }
 
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+          if ((dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
             template += " DEFAULT " + Utils.escape(dataType.defaultValue)
           }
 

From 026efd4b030dcc19ac1ae613b3692af78781cf56 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Fri, 10 May 2013 15:43:02 -0400
Subject: [PATCH 321/360] Failing tests for MySQL where clause value processing

---
 spec-jasmine/mysql/query-generator.spec.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index aed6c470b089..58387185414b 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -340,6 +340,27 @@ describe('QueryGenerator', function() {
       {
         arguments: [{ id: [] }],
         expectation: "`id` IN (NULL)"
+      },
+      {
+        arguments: [{ maple: false, bacon: true }],
+        expectation: "`maple`=0 AND `bacon`=1"
+      },
+      {
+        arguments: [{ beaver: [false, true] }],
+        expectation: "`beaver` IN (0,1)"
+      },
+      {
+        arguments: [{birthday: new Date(Date.UTC(2011, 6, 1, 10, 1, 55))}],
+        expectation: "`birthday`='2011-07-01 10:01:55'"
+      },
+      {
+        arguments: [{ birthday: new Date(Date.UTC(2011, 6, 1, 10, 1, 55)),
+                      otherday: new Date(Date.UTC(2013, 6, 2, 10, 1, 22)) }],
+        expectation: "`birthday`='2011-07-01 10:01:55' AND `otherday`='2013-07-02 10:01:22'"
+      },
+      {
+        arguments: [{ birthday: [new Date(Date.UTC(2011, 6, 1, 10, 1, 55)), new Date(Date.UTC(2013, 6, 2, 10, 1, 22))] }],
+        expectation: "`birthday` IN ('2011-07-01 10:01:55','2013-07-02 10:01:22')"
       }
     ]
   }

From 3f20fb5a92c59c87ad4fa8df2350d2d34102eab2 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Fri, 10 May 2013 15:43:26 -0400
Subject: [PATCH 322/360] Process values going into WHERE clauses in MySQL

---
 lib/dialects/mysql/query-generator.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index bc15e09b9f20..f77e5e026e85 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -432,19 +432,17 @@ module.exports = (function() {
         if (Array.isArray(value)) {
           // is value an array?
           if (value.length === 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return Utils.escape(subValue);
-          }).join(',') + ")"
+          _value = "(" + value.map(processAndEscapeValue).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
-        } else if ((value) && (typeof value == 'object')) {
+        } else if ((value) && (typeof value == 'object') && !(value instanceof Date)) {
           // is value an object?
 
           //using as sentinel for join column => value
           _value = value.join.split('.').map(function(col){ return QueryGenerator.addQuotes(col) }).join(".")
           result.push([_key, _value].join("="))
         } else {
-          _value = Utils.escape(value)
+          _value = processAndEscapeValue(value)
           result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
         }
       }

From 46f5caf93c702fea1c3670b1005dab122b435ccf Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Sat, 11 May 2013 00:20:04 -0400
Subject: [PATCH 323/360] Migration environment set from command line args

Still defaults to 'development' if NODE_ENV isn't set so backwards compatibility is ensured.
---
 bin/sequelize | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/sequelize b/bin/sequelize
index fbd6f5544d7d..aee6d5fd9ddd 100755
--- a/bin/sequelize
+++ b/bin/sequelize
@@ -8,6 +8,7 @@ const path      = require("path")
     , _         = Sequelize.Utils._
 
 var configPath       = process.cwd() + '/config'
+  , environment      = process.env.NODE_ENV || 'development'
   , migrationsPath   = process.cwd() + '/migrations'
   , packageJsonPath  = __dirname + '/../package.json'
   , packageJson      = JSON.parse(fs.readFileSync(packageJsonPath).toString())
@@ -52,10 +53,9 @@ var createMigrationsFolder = function(force) {
 var readConfig = function() {
   try {
     var config = JSON.parse(fs.readFileSync(configFile))
-      , env    = process.env.NODE_ENV || 'development'
 
-    if (config[env]) {
-      config = config[env]
+    if (config[environment]) {
+      config = config[environment]
     }
 
     return config
@@ -68,11 +68,17 @@ program
   .version(packageJson.version)
   .option('-i, --init', 'Initializes the project. Creates a config/config.json')
   .option('-m, --migrate', 'Runs undone migrations')
+  .option('-e, --env ', 'Specify the environment.')
   .option('-u, --undo', 'Undo the last migration.')
   .option('-f, --force', 'Forces the action to be done.')
   .option('-c, --create-migration [migration-name]', 'Create a new migration skeleton file.')
   .parse(process.argv)
 
+if(typeof program.env === 'string') {
+  environment = program.env
+}
+console.log("Using environment '" + environment + "'.")
+
 if(program.migrate) {
   if(configFileExists) {
     var config = readConfig()

From 37244f1873f4af9f08c9e035b14c74f5ad482dba Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Sat, 11 May 2013 00:27:51 -0400
Subject: [PATCH 324/360] (Subjectively) improve copy in binary

Also replaced one thrown error with a console.log. The rest of the errors were not thrown, and since this file is run from the shell, it will be an edge case that it will ever be caught. It looks messy when it happens. So it now returns an exit code of 1 to indicate things went sideways.
---
 bin/sequelize | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bin/sequelize b/bin/sequelize
index aee6d5fd9ddd..91143de3f650 100755
--- a/bin/sequelize
+++ b/bin/sequelize
@@ -66,12 +66,12 @@ var readConfig = function() {
 
 program
   .version(packageJson.version)
-  .option('-i, --init', 'Initializes the project. Creates a config/config.json')
-  .option('-m, --migrate', 'Runs undone migrations')
+  .option('-i, --init', 'Initializes the project.')
   .option('-e, --env ', 'Specify the environment.')
+  .option('-m, --migrate', 'Run pending migrations.')
   .option('-u, --undo', 'Undo the last migration.')
   .option('-f, --force', 'Forces the action to be done.')
-  .option('-c, --create-migration [migration-name]', 'Create a new migration skeleton file.')
+  .option('-c, --create-migration [migration-name]', 'Creates a new migration.')
   .parse(process.argv)
 
 if(typeof program.env === 'string') {
@@ -110,7 +110,8 @@ if(program.migrate) {
       sequelize.migrate()
     }
   } else {
-    throw new Error('Please add a configuration file under config/config.json. You might run "sequelize --init".')
+    console.log('Cannot find "config/config.json". Have you run "sequelize --init"?')
+    process.exit(1)
   }
 } else if(program.init) {
   if(!configFileExists || !!program.force) {
@@ -135,9 +136,10 @@ if(program.migrate) {
       }
     })
 
-    console.log('Successfully created config.json')
+    console.log('Created "config/config.json"')
   } else {
-    console.log('A config.json already exists. Run "sequelize --init --force" to overwrite it.')
+    console.log('"config/config.json" already exists. Run "sequelize --init --force" to overwrite.')
+    process.exit(1)
   }
 
   createMigrationsFolder(program.force)
@@ -162,5 +164,5 @@ if(program.migrate) {
 
   fs.writeFileSync(migrationsPath + '/' + migrationName, migrationContent)
 } else {
-  console.log('Please define any params!')
+  console.log('Try "sequelize --help" for usage information.')
 }

From 6f65e6dec64c2f4a247a2c755bd0b75d319e3beb Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Sat, 11 May 2013 00:38:55 -0400
Subject: [PATCH 325/360] Include a done() in the migration skeleton

Because I always forget to add one to 'down' and then my migrations don't undo.

Also upgraded a ==.
---
 bin/sequelize | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/sequelize b/bin/sequelize
index 91143de3f650..df8c20c65e84 100755
--- a/bin/sequelize
+++ b/bin/sequelize
@@ -148,16 +148,18 @@ if(program.migrate) {
 
   var migrationName = [
     moment().format('YYYYMMDDHHmmss'),
-    (typeof program.createMigration == 'string') ? program.createMigration : 'unnamed-migration'
+    (typeof program.createMigration === 'string') ? program.createMigration : 'unnamed-migration'
   ].join('-') + '.js'
 
   var migrationContent = [
     "module.exports = {",
     "  up: function(migration, DataTypes, done) {",
     "    // add altering commands here, calling 'done' when finished",
+    "    done()",
     "  },",
     "  down: function(migration, DataTypes, done) {",
     "    // add reverting commands here, calling 'done' when finished",
+    "    done()",
     "  }",
     "}"
   ].join('\n')

From 4c23c8a103f6e7a7752529ed9044891b9c39cd4c Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Sat, 11 May 2013 01:38:27 -0400
Subject: [PATCH 326/360] Throw nicer errors when we can't read config.json

And quit with a code after outputting it.
---
 bin/sequelize | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/bin/sequelize b/bin/sequelize
index df8c20c65e84..191b4d9545f7 100755
--- a/bin/sequelize
+++ b/bin/sequelize
@@ -51,17 +51,23 @@ var createMigrationsFolder = function(force) {
 }
 
 var readConfig = function() {
+  var config
   try {
-    var config = JSON.parse(fs.readFileSync(configFile))
+    config = fs.readFileSync(configFile)
+  } catch(e) {
+    throw new Error('Error reading "config/config.json".')
+  }
 
-    if (config[environment]) {
-      config = config[environment]
-    }
+  try {
+    config = JSON.parse(config)
+  } catch (e) {
+    throw new Error('Error parsing "config/config.json" as JSON.')
+  }
 
-    return config
-  } catch(e) {
-    throw new Error('The config.json is not available or contains invalid JSON.')
+  if (config[environment]) {
+    config = config[environment]
   }
+  return config
 }
 
 program
@@ -81,9 +87,16 @@ console.log("Using environment '" + environment + "'.")
 
 if(program.migrate) {
   if(configFileExists) {
-    var config = readConfig()
+    var config
       , options  = {}
 
+    try {
+      config = readConfig()
+    } catch(e) {
+      console.log(e.message)
+      process.exit(1)
+    }
+
     _.each(config, function(value, key) {
       if(['database', 'username', 'password'].indexOf(key) == -1) {
         options[key] = value

From 61482c0b1c3fa7fc7652a1e8b174a084d151e943 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Sat, 11 May 2013 01:41:54 -0400
Subject: [PATCH 327/360] Make migrations more verbose and time migrations

---
 lib/migrator.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/migrator.js b/lib/migrator.js
index f9768b85fb5d..5d0c7a69fc4e 100644
--- a/lib/migrator.js
+++ b/lib/migrator.js
@@ -53,16 +53,26 @@ module.exports = (function() {
             migrations.reverse()
           }
 
+          if (migrations.length === 0) {
+            self.options.logging("There are no pending migrations.")
+          } else {
+            self.options.logging("Running migrations...")
+          }
           migrations.forEach(function(migration) {
+            var migrationTime
             chainer.add(migration, 'execute', [options], {
               before: function(migration) {
                 if (self.options.logging !== false) {
-                  self.options.logging('Executing migration: ' + migration.filename)
+                  self.options.logging(migration.filename)
                 }
+                migrationTime = process.hrtime()
               },
               after: function(migration) {
+                migrationTime = process.hrtime(migrationTime)
+                migrationTime = Math.round( (migrationTime[0] * 1000) + (migrationTime[1] / 1000000));
+
                 if (self.options.logging !== false) {
-                  self.options.logging('Executed migration: ' + migration.filename)
+                  self.options.logging('Completed in ' + migrationTime + 'ms')
                 }
               },
               success: function(migration, callback) {

From eda888a60a6a5625758596d436e7b878825ba7b1 Mon Sep 17 00:00:00 2001
From: William Riancho 
Date: Sat, 11 May 2013 14:09:06 +0200
Subject: [PATCH 328/360] DataTypes improved

---
 lib/data-types.js | 148 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 144 insertions(+), 4 deletions(-)

diff --git a/lib/data-types.js b/lib/data-types.js
index 9e07841b4661..6b5bd6b35b2a 100644
--- a/lib/data-types.js
+++ b/lib/data-types.js
@@ -1,11 +1,151 @@
+var STRING = function(length, binary) {
+  if (this instanceof STRING) {
+    this._binary = !!binary;
+    if (typeof length === 'number') {
+      this._length = length;
+    } else {
+      this._length = 255;
+    }
+  } else {
+    return new STRING(length, binary);
+  }
+};
+
+STRING.prototype = {
+  get BINARY() {
+    this._binary = true;
+    return this;
+  },
+  get type() {
+    return this.toString();
+  },
+  toString: function() {
+    return 'VARCHAR(' + this._length + ')' + ((this._binary) ? ' BINARY' : '');
+  }
+};
+
+Object.defineProperty(STRING, 'BINARY', {
+  get: function() {
+    return new STRING(undefined, true);
+  }
+});
+
+var INTEGER = function() {
+  return INTEGER.prototype.construct.apply(this, [INTEGER].concat(Array.prototype.slice.apply(arguments)));
+};
+
+var BIGINT = function() {
+  return BIGINT.prototype.construct.apply(this, [BIGINT].concat(Array.prototype.slice.apply(arguments)));
+};
+
+var FLOAT = function() {
+  return FLOAT.prototype.construct.apply(this, [FLOAT].concat(Array.prototype.slice.apply(arguments)));
+};
+
+FLOAT._type = FLOAT;
+FLOAT._typeName = 'FLOAT';
+INTEGER._type = INTEGER;
+INTEGER._typeName = 'INTEGER';
+BIGINT._type = BIGINT;
+BIGINT._typeName = 'BIGINT';
+STRING._type = STRING;
+STRING._typeName = 'VARCHAR';
+
+STRING.toString = INTEGER.toString = FLOAT.toString = BIGINT.toString = function() {
+  return new this._type().toString();
+};
+
+FLOAT.prototype = BIGINT.prototype = INTEGER.prototype = {
+
+  construct: function(RealType, length, decimals, unsigned, zerofill) {
+    if (this instanceof RealType) {
+      this._typeName = RealType._typeName;
+      this._unsigned = !!unsigned;
+      this._zerofill = !!zerofill;
+      if (typeof length === 'number') {
+        this._length = length;
+      }
+      if (typeof decimals === 'number') {
+        this._decimals = decimals;
+      }
+    } else {
+      return new RealType(length, decimals, unsigned, zerofill);
+    }
+  },
+
+  get type() {
+    return this.toString();
+  },
+
+  get UNSIGNED() {
+    this._unsigned = true;
+    return this;
+  },
+
+  get ZEROFILL() {
+    this._zerofill = true;
+    return this;
+  },
+
+  toString: function() {
+    var result = this._typeName;
+    if (this._length) {
+      result += '(' + this._length;
+      if (typeof this._decimals === 'number') {
+        result += ',' + this._decimals;
+      }
+      result += ')';
+    }
+    if (this._unsigned) {
+      result += ' UNSIGNED';
+    }
+    if (this._zerofill) {
+      result += ' ZEROFILL';
+    }
+    return result;
+  }
+};
+
+var unsignedDesc = {
+  get: function() {
+    return new this._type(undefined, undefined, true);
+  }
+};
+
+var zerofillDesc = {
+  get: function() {
+    return new this._type(undefined, undefined, undefined, true);
+  }
+};
+
+var typeDesc = {
+  get: function() {
+    return new this._type().toString();
+  }
+};
+
+Object.defineProperty(STRING,  'type', typeDesc);
+Object.defineProperty(INTEGER, 'type', typeDesc);
+Object.defineProperty(BIGINT,  'type', typeDesc);
+Object.defineProperty(FLOAT,   'type', typeDesc);
+
+Object.defineProperty(INTEGER, 'UNSIGNED', unsignedDesc);
+Object.defineProperty(BIGINT,  'UNSIGNED', unsignedDesc);
+Object.defineProperty(FLOAT,   'UNSIGNED', unsignedDesc);
+
+Object.defineProperty(INTEGER, 'ZEROFILL', zerofillDesc);
+Object.defineProperty(BIGINT,  'ZEROFILL', zerofillDesc);
+Object.defineProperty(FLOAT,   'ZEROFILL', zerofillDesc);
+
 module.exports = {
-  STRING: 'VARCHAR(255)',
+  STRING: STRING,
+
   TEXT: 'TEXT',
-  INTEGER: 'INTEGER',
-  BIGINT:  'BIGINT',
+  INTEGER: INTEGER,
+  BIGINT:  BIGINT,
   DATE: 'DATETIME',
   BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT',
+  FLOAT: FLOAT,
   NOW: 'NOW',
 
   get ENUM() {

From 3935784dd2964a6a705980720900358321c5c028 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sat, 11 May 2013 20:55:59 +0200
Subject: [PATCH 329/360] package.json now links to the right repo

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 99469ee43d21..05b5142f74a7 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,10 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/sdepold/sequelize.git"
+    "url": "https://github.com/sequelize/sequelize.git"
   },
   "bugs": {
-    "url": "https://github.com/sdepold/sequelize/issues"
+    "url": "https://github.com/sequelize/sequelize/issues"
   },
   "dependencies": {
     "lodash": "~1.2.1",

From ae1d4f6bc6a85e64600b3f20d6dea5b5a371dbfe Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sat, 11 May 2013 22:04:57 +0200
Subject: [PATCH 330/360] Allow find and findall to take query options

---
 lib/dao-factory.js       | 17 +++++----
 spec/dao-factory.spec.js | 79 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 3f2f5c314598..ea31b8c875b8 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -156,11 +156,11 @@ module.exports = (function() {
   }
 
   // alias for findAll
-  DAOFactory.prototype.all = function(options) {
-    return this.findAll(options)
+  DAOFactory.prototype.all = function(options, queryOptions) {
+    return this.findAll(options, queryOptions)
   }
 
-  DAOFactory.prototype.findAll = function(options) {
+  DAOFactory.prototype.findAll = function(options, queryOptions) {
     var hasJoin = false
     var options = Utils._.clone(options)
 
@@ -177,10 +177,10 @@ module.exports = (function() {
       this.options.whereCollection = options.where || null
     }
 
-    return this.QueryInterface.select(this, this.tableName, options, {
+    return this.QueryInterface.select(this, this.tableName, options, Utils._.defaults({
       type:    'SELECT',
       hasJoin: hasJoin
-    })
+    }, queryOptions))
   }
 
   //right now, the caller (has-many-double-linked) is in charge of the where clause
@@ -199,9 +199,10 @@ module.exports = (function() {
   *
   * @param  {Object} options Options to describe the scope of the search.
   *   @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
+  * @param  {Object} set the query options, e.g. raw, specifying that you want raw data instead of built data
   * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
   */
-  DAOFactory.prototype.find = function(options) {
+  DAOFactory.prototype.find = function(options, queryOptions) {
     var hasJoin = false
 
     // no options defined?
@@ -253,11 +254,11 @@ module.exports = (function() {
 
     options.limit = 1
 
-    return this.QueryInterface.select(this, this.getTableName(), options, {
+    return this.QueryInterface.select(this, this.getTableName(), options, Utils._.defaults({
       plain: true,
       type: 'SELECT',
       hasJoin: hasJoin
-    })
+    }, queryOptions))
   }
 
   DAOFactory.prototype.count = function(options) {
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index a9ef5e27c9bb..fd7b4da00f4b 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -1060,6 +1060,42 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         })
       })
     })
+
+    describe('queryOptions', function() {
+      before(function(done) {
+        this.User.create({
+          username: 'barfooz'
+        }).success(function(user) {
+          this.user = user
+          done()
+        }.bind(this))
+      })
+
+      it("should return a DAO when queryOptions are not set", function (done) {
+        this.User.find({ where: { username: 'barfooz'}}).done(function (err, user) {
+          expect(user).toHavePrototype(this.User.DAO.prototype)
+
+          done();
+        }.bind(this))
+      })
+
+      it("should return a DAO when raw is false", function (done) {
+        this.User.find({ where: { username: 'barfooz'}}, { raw: false }).done(function (err, user) {
+          expect(user).toHavePrototype(this.User.DAO.prototype)
+
+          done();
+        }.bind(this))
+      })  
+
+      it("should return raw data when raw is true", function (done) {
+        this.User.find({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, user) {
+          expect(user).not.toHavePrototype(this.User.DAO.prototype)
+          expect(user).toBeObject()
+
+          done();
+        }.bind(this))
+      })
+    }) // - describe: queryOptions
   }) //- describe: find
 
   describe('findAll', function findAll() {
@@ -1292,6 +1328,49 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
           }.bind(this))
         })
       })
+
+      describe('queryOptions', function() {
+        before(function(done) {
+          this.User.create({
+            username: 'barfooz'
+          }).success(function(user) {
+            this.user = user
+            done()
+          }.bind(this))
+        })
+
+        it("should return a DAO when queryOptions are not set", function (done) {
+          this.User.findAll({ where: { username: 'barfooz'}}).done(function (err, users) {
+            users.forEach(function (user) {
+              expect(user).toHavePrototype(this.User.DAO.prototype)  
+            }, this)
+            
+
+            done();
+          }.bind(this))
+        })
+
+        it("should return a DAO when raw is false", function (done) {
+          this.User.findAll({ where: { username: 'barfooz'}}, { raw: false }).done(function (err, users) {
+            users.forEach(function (user) {
+              expect(user).toHavePrototype(this.User.DAO.prototype)  
+            }, this)
+            
+            done();
+          }.bind(this))
+        })  
+
+        it("should return raw data when raw is true", function (done) {
+          this.User.findAll({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, users) {
+            users.forEach(function (user) {
+              expect(user).not.toHavePrototype(this.User.DAO.prototype) 
+              expect(users[0]).toBeObject()
+            }, this)
+
+            done();
+          }.bind(this))
+        })
+      }) // - describe: queryOptions
     })
   }) //- describe: findAll
 

From 3d1043c54dc9062a27f914206fb7097ec03a4215 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sat, 11 May 2013 22:19:05 +0200
Subject: [PATCH 331/360] update changelog

---
 changelog.md       | 1 +
 lib/dao-factory.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index d8b316c76895..2e883f1fc3ea 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
+- [FEATURE] Add an extra `queryOptions` parameter to `DAOFactory.find` and `DAOFactory.findAll`. This allows a user to specify `{ raw: true }`, meaning that the raw result should be returned, instead of built DAOs. Usefull for queries returning large datasets, see [#611](https://github.com/sequelize/sequelize/pull/611) janmeier
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index ea31b8c875b8..b8bc36e8b245 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -199,7 +199,7 @@ module.exports = (function() {
   *
   * @param  {Object} options Options to describe the scope of the search.
   *   @param {Array} include A list of associations which shall get eagerly loaded. Supported is either { include: [ DaoFactory1, DaoFactory2, ...] } or { include: [ { daoFactory: DaoFactory1, as: 'Alias' } ] }.
-  * @param  {Object} set the query options, e.g. raw, specifying that you want raw data instead of built data
+  * @param  {Object} set the query options, e.g. raw, specifying that you want raw data instead of built DAOs
   * @return {Object}         A promise which fires `success`, `error`, `complete` and `sql`.
   */
   DAOFactory.prototype.find = function(options, queryOptions) {

From 023e751650b8ec416c961d458e3c7fc3215ec696 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sat, 11 May 2013 23:00:48 +0200
Subject: [PATCH 332/360] Yay TRAVIS

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b4e3afeac71c..cd439b421dd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,5 +19,4 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
-  
\ No newline at end of file
+  - 0.8
\ No newline at end of file

From 01b66ce02cb3f9a517be6826208222bd2878469f Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 20:44:51 +0200
Subject: [PATCH 333/360] added tests for new data types

---
 spec/data-types.spec.js | 52 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/spec/data-types.spec.js b/spec/data-types.spec.js
index 373f9e686c59..898bf100dc48 100644
--- a/spec/data-types.spec.js
+++ b/spec/data-types.spec.js
@@ -7,7 +7,7 @@ if(typeof require === 'function') {
 
 buster.spec.expose()
 
-describe(Helpers.getTestDialectTeaser('Data types'), function() {
+describe(Helpers.getTestDialectTeaser('DataTypes'), function() {
   it('should return DECIMAL for the default decimal type', function() {
     expect(Sequelize.DECIMAL).toEqual('DECIMAL');
   });
@@ -15,4 +15,52 @@ describe(Helpers.getTestDialectTeaser('Data types'), function() {
   it('should return DECIMAL(10,2) for the default decimal type with arguments', function() {
     expect(Sequelize.DECIMAL(10, 2)).toEqual('DECIMAL(10,2)');
   });
-});
+
+  var tests = [
+    [Sequelize.STRING, 'STRING', 'VARCHAR(255)'],
+    [Sequelize.STRING(1234), 'STRING(1234)', 'VARCHAR(1234)'],
+    [Sequelize.STRING(1234).BINARY, 'STRING(1234).BINARY', 'VARCHAR(1234) BINARY'],
+    [Sequelize.STRING.BINARY, 'STRING.BINARY', 'VARCHAR(255) BINARY'],
+
+    [Sequelize.TEXT, 'TEXT', 'TEXT'],
+    [Sequelize.DATE, 'DATE', 'DATETIME'],
+    [Sequelize.NOW, 'NOW', 'NOW'],
+    [Sequelize.BOOLEAN, 'BOOLEAN', 'TINYINT(1)'],
+
+    [Sequelize.INTEGER, 'INTEGER', 'INTEGER'],
+    [Sequelize.INTEGER.UNSIGNED, 'INTEGER.UNSIGNED', 'INTEGER UNSIGNED'],
+    [Sequelize.INTEGER(11), 'INTEGER(11)','INTEGER(11)'],
+    [Sequelize.INTEGER(11).UNSIGNED, 'INTEGER(11).UNSIGNED', 'INTEGER(11) UNSIGNED'],
+    [Sequelize.INTEGER(11).UNSIGNED.ZEROFILL,'INTEGER(11).UNSIGNED.ZEROFILL','INTEGER(11) UNSIGNED ZEROFILL'],
+    [Sequelize.INTEGER(11).ZEROFILL,'INTEGER(11).ZEROFILL', 'INTEGER(11) ZEROFILL'],
+    [Sequelize.INTEGER(11).ZEROFILL.UNSIGNED,'INTEGER(11).ZEROFILL.UNSIGNED', 'INTEGER(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.BIGINT, 'BIGINT', 'BIGINT'],
+    [Sequelize.BIGINT.UNSIGNED, 'BIGINT.UNSIGNED', 'BIGINT UNSIGNED'],
+    [Sequelize.BIGINT(11), 'BIGINT(11)','BIGINT(11)'],
+    [Sequelize.BIGINT(11).UNSIGNED, 'BIGINT(11).UNSIGNED', 'BIGINT(11) UNSIGNED'],
+    [Sequelize.BIGINT(11).UNSIGNED.ZEROFILL, 'BIGINT(11).UNSIGNED.ZEROFILL','BIGINT(11) UNSIGNED ZEROFILL'],
+    [Sequelize.BIGINT(11).ZEROFILL, 'BIGINT(11).ZEROFILL', 'BIGINT(11) ZEROFILL'],
+    [Sequelize.BIGINT(11).ZEROFILL.UNSIGNED, 'BIGINT(11).ZEROFILL.UNSIGNED', 'BIGINT(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.FLOAT, 'FLOAT', 'FLOAT'],
+    [Sequelize.FLOAT.UNSIGNED, 'FLOAT.UNSIGNED', 'FLOAT UNSIGNED'],
+    [Sequelize.FLOAT(11), 'FLOAT(11)','FLOAT(11)'],
+    [Sequelize.FLOAT(11).UNSIGNED, 'FLOAT(11).UNSIGNED', 'FLOAT(11) UNSIGNED'],
+    [Sequelize.FLOAT(11).UNSIGNED.ZEROFILL,'FLOAT(11).UNSIGNED.ZEROFILL','FLOAT(11) UNSIGNED ZEROFILL'],
+    [Sequelize.FLOAT(11).ZEROFILL,'FLOAT(11).ZEROFILL', 'FLOAT(11) ZEROFILL'],
+    [Sequelize.FLOAT(11).ZEROFILL.UNSIGNED,'FLOAT(11).ZEROFILL.UNSIGNED', 'FLOAT(11) UNSIGNED ZEROFILL'],
+
+    [Sequelize.FLOAT(11, 12), 'FLOAT(11,12)','FLOAT(11,12)'],
+    [Sequelize.FLOAT(11, 12).UNSIGNED, 'FLOAT(11,12).UNSIGNED', 'FLOAT(11,12) UNSIGNED'],
+    [Sequelize.FLOAT(11, 12).UNSIGNED.ZEROFILL,'FLOAT(11,12).UNSIGNED.ZEROFILL','FLOAT(11,12) UNSIGNED ZEROFILL'],
+    [Sequelize.FLOAT(11, 12).ZEROFILL,'FLOAT(11,12).ZEROFILL', 'FLOAT(11,12) ZEROFILL'],
+    [Sequelize.FLOAT(11, 12).ZEROFILL.UNSIGNED,'FLOAT(11,12).ZEROFILL.UNSIGNED', 'FLOAT(11,12) UNSIGNED ZEROFILL']
+  ]
+
+  tests.forEach(function(test) {
+    it('transforms "' + test[1] + '" to "' + test[2] + '"', function() {
+      expect(test[0]).toEqual(test[2])
+    })
+  })
+})

From 6d5b8a196c1e3e4ef23b21e6518a7d92437860f2 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 20:55:31 +0200
Subject: [PATCH 334/360] convenient data types

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 2e883f1fc3ea..92222fc38e23 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,7 @@
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
 - [FEATURE] Add an extra `queryOptions` parameter to `DAOFactory.find` and `DAOFactory.findAll`. This allows a user to specify `{ raw: true }`, meaning that the raw result should be returned, instead of built DAOs. Usefull for queries returning large datasets, see [#611](https://github.com/sequelize/sequelize/pull/611) janmeier
+- [FEATURE] Added convenient data types. [#616](https://github.com/sequelize/sequelize/pull/616). Thanks to Costent
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From b4361e6a58e1e3d05253f42723e950ae5dc527ff Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 21:19:52 +0200
Subject: [PATCH 335/360] fixed logging

---
 spec/migrator.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/migrator.spec.js b/spec/migrator.spec.js
index d65665e8baca..dd39606ca33d 100644
--- a/spec/migrator.spec.js
+++ b/spec/migrator.spec.js
@@ -14,8 +14,8 @@ describe(Helpers.getTestDialectTeaser("Migrator"), function() {
   before(function(done) {
     this.init = function(options, callback) {
       options = Helpers.Sequelize.Utils._.extend({
-        path: __dirname + '/assets/migrations',
-        logging: false
+        path:    __dirname + '/assets/migrations',
+        logging: function(){}
       }, options || {})
 
       var migrator = new Migrator(this.sequelize, options)

From 2514c2de58c30eb53c2671b887cccac636611a8f Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 21:21:18 +0200
Subject: [PATCH 336/360] more verbose binary

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 92222fc38e23..62ab845d6e95 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,7 @@
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
 - [FEATURE] Add an extra `queryOptions` parameter to `DAOFactory.find` and `DAOFactory.findAll`. This allows a user to specify `{ raw: true }`, meaning that the raw result should be returned, instead of built DAOs. Usefull for queries returning large datasets, see [#611](https://github.com/sequelize/sequelize/pull/611) janmeier
 - [FEATURE] Added convenient data types. [#616](https://github.com/sequelize/sequelize/pull/616). Thanks to Costent
+- [FEATURE] Binary is more verbose now. [#612](https://github.com/sequelize/sequelize/pull/612). Thanks to terraflubb
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From 1f2ef88532eaf98876a2ae506091b7065730a2c1 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 21:50:12 +0200
Subject: [PATCH 337/360] a test that makes sure that null values are correctly
 restored

---
 spec/dao.spec.js | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/spec/dao.spec.js b/spec/dao.spec.js
index 81f35ea127f9..b86d46c903ac 100644
--- a/spec/dao.spec.js
+++ b/spec/dao.spec.js
@@ -644,4 +644,44 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       }.bind(this))
     })
   })
+
+  describe('updateAttributes', function() {
+    it('stores and restores null values', function(done) {
+      var Download = this.sequelize.define('download', {
+        startedAt: Helpers.Sequelize.DATE,
+        canceledAt: Helpers.Sequelize.DATE,
+        finishedAt: Helpers.Sequelize.DATE
+      })
+
+      Download.sync({ force: true }).success(function() {
+        Download.create({
+          startedAt: new Date()
+        }).success(function(download) {
+          expect(download.startedAt instanceof Date).toBeTrue()
+          expect(download.canceledAt).toBeFalsy()
+          expect(download.finishedAt).toBeFalsy()
+
+          download.updateAttributes({
+            canceledAt: new Date()
+          }).success(function(download) {
+            expect(download.startedAt instanceof Date).toBeTrue()
+            expect(download.canceledAt instanceof Date).toBeTrue()
+            expect(download.finishedAt).toBeFalsy()
+
+            Download.all({
+              where: (dialect === 'postgres' ? '"finishedAt" IS NULL' : "`finishedAt` IS NULL")
+            }).success(function(downloads) {
+              downloads.forEach(function(download) {
+                expect(download.startedAt instanceof Date).toBeTrue()
+                expect(download.canceledAt instanceof Date).toBeTrue()
+                expect(download.finishedAt).toBeFalsy()
+              })
+
+              done()
+            })
+          })
+        })
+      })
+    })
+  })
 })

From 2cf8d708672885e6f92cef1d0c4f68af36f6a807 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 13 May 2013 21:56:33 +0200
Subject: [PATCH 338/360] boolean handling

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 62ab845d6e95..157526dff2f8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
 - [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
+- [BUG] Correctly handle booleans in MySQL. [#608](https://github.com/sequelize/sequelize/pull/608). Thanks to terraflubb
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude

From 4b69b34e4ca96da99a0fd67025357108687d1a08 Mon Sep 17 00:00:00 2001
From: terraflubb 
Date: Mon, 13 May 2013 22:15:31 -0400
Subject: [PATCH 339/360] MySQL: Empty `where` param makes bogus query.

Added failing MySQL tests for SelectQuery when the `where` is all kinds of empty.
Now it returns `1=1` if nothing else, as suggested by @muka.
---
 lib/dialects/mysql/query-generator.js      |  2 +-
 spec-jasmine/mysql/query-generator.spec.js | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/dialects/mysql/query-generator.js b/lib/dialects/mysql/query-generator.js
index f77e5e026e85..19bfedfdee5c 100644
--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -416,7 +416,7 @@ module.exports = (function() {
         result = Utils.format(smth)
       }
 
-      return result
+      return result ? result : '1=1'
     },
 
     hashToWhereConditions: function(hash) {
diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index 58387185414b..a794b7cebf4c 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -166,6 +166,26 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {offset: 2}],
         expectation: "SELECT * FROM `myTable`;",
         context: QueryGenerator
+      }, {
+        title: 'multiple where arguments',
+        arguments: ['myTable', {where: {boat: 'canoe', weather: 'cold'}}],
+        expectation: "SELECT * FROM `myTable` WHERE `myTable`.`boat`='canoe' AND `myTable`.`weather`='cold';",
+        context: QueryGenerator
+      }, {
+        title: 'no where arguments (object)',
+        arguments: ['myTable', {where: {}}],
+        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        context: QueryGenerator
+      }, {
+        title: 'no where arguments (string)',
+        arguments: ['myTable', {where: ''}],
+        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        context: QueryGenerator
+      }, {
+        title: 'no where arguments (null)',
+        arguments: ['myTable', {where: null}],
+        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        context: QueryGenerator
       }
     ],
 

From fa6112f440f4b66c75f7271221871866391a5a5f Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 14 May 2013 07:12:55 +0200
Subject: [PATCH 340/360] fixed specs

---
 spec-jasmine/mysql/query-generator.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec-jasmine/mysql/query-generator.spec.js b/spec-jasmine/mysql/query-generator.spec.js
index a794b7cebf4c..c6d6b462e129 100644
--- a/spec-jasmine/mysql/query-generator.spec.js
+++ b/spec-jasmine/mysql/query-generator.spec.js
@@ -174,17 +174,17 @@ describe('QueryGenerator', function() {
       }, {
         title: 'no where arguments (object)',
         arguments: ['myTable', {where: {}}],
-        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        expectation: "SELECT * FROM `myTable` WHERE 1=1;",
         context: QueryGenerator
       }, {
         title: 'no where arguments (string)',
         arguments: ['myTable', {where: ''}],
-        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        expectation: "SELECT * FROM `myTable` WHERE 1=1;",
         context: QueryGenerator
       }, {
         title: 'no where arguments (null)',
         arguments: ['myTable', {where: null}],
-        expectation: "SELECT * FROM `myTable` WHERE 1;",
+        expectation: "SELECT * FROM `myTable` WHERE 1=1;",
         context: QueryGenerator
       }
     ],

From 5cd5c641b017ab7e7028801e2150310f2f9fc29b Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Tue, 14 May 2013 08:15:40 +0300
Subject: [PATCH 341/360] fixed empty where conditions for mysql

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 157526dff2f8..86f45cf0907f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@
 - [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [BUG] Correctly handle booleans in MySQL. [#608](https://github.com/sequelize/sequelize/pull/608). Thanks to terraflubb
+- [BUG] Fixed empty where conditions in MySQL. [#619](https://github.com/sequelize/sequelize/pull/619). Thanks to terraflubb
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude

From 8cc128a2cecbc5347fddbc4a0953119c6120fd34 Mon Sep 17 00:00:00 2001
From: Javier Echenique 
Date: Tue, 14 May 2013 15:15:28 -0400
Subject: [PATCH 342/360] Added options to fix #490. Now you can use a
 connection string (i.e. Heroku) and options can be passed as second
 parameter.

---
 lib/sequelize.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/sequelize.js b/lib/sequelize.js
index f4efec7bedf4..f21d80bda6f2 100644
--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -47,7 +47,8 @@ module.exports = (function() {
     var urlParts
     options = options || {}
 
-    if (arguments.length === 1) {
+    if (arguments.length === 1 || (arguments.length === 2 && typeof username === 'object')) {
+      options = username || {}
       urlParts = url.parse(arguments[0])
       database = urlParts.path.replace(/^\//,  '')
       dialect = urlParts.protocol

From 1f1f31f58d15c0c3060949c2e21ecc338991c9fc Mon Sep 17 00:00:00 2001
From: Alexandre Joly 
Date: Wed, 15 May 2013 14:16:58 +0200
Subject: [PATCH 343/360] commit for travis ;)

---
 spec/dao-factory.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index c16d4646f397..66b540f3bade 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -495,7 +495,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
     it('returns the selected fields and all fields of the included table as instance.selectedValues', function(done) {
       this.Mission = this.sequelize.define('Mission', {
-        title:  {type: Sequelize.STRING, defaultValue: 'a mission!'},
+        title:  {type: Sequelize.STRING, defaultValue: 'a mission!!'},
         foo:    {type: Sequelize.INTEGER, defaultValue: 2},
       })
 

From 8fda52ba44ddf91bd66df43bbb38c58e3d272d58 Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Thu, 16 May 2013 23:45:38 +0200
Subject: [PATCH 344/360] make it possible to define property getter and setter
 functions in a data attribute definition (by defining a "get" and/or "set"
 property) ... these take preference to getters/setters defined (for an
 attribute of the given name) in the options object - some buster tests
 included

---
 lib/dao-factory.js       | 26 ++++++++------
 lib/dao.js               |  2 +-
 spec/dao-factory.spec.js | 73 ++++++++++++++++++++++++++++++++--------
 3 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 84c58f79c920..deff80c7a676 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -83,19 +83,23 @@ module.exports = (function() {
     }
 
     Utils._.each(['Get', 'Set'], function(type) {
-      var opt  = type.toLowerCase() + 'terMethods',
-          meth = '__define' + type + 'ter__';
-
-      if (self.options[opt]) {
-        Utils._.each(self.options[opt], function(fct, name) {
-          //var def = {};
+      var prop  = type.toLowerCase(),
+          opt   = prop + 'terMethods',
+          meth  = '__define' + type + 'ter__',
+          funcs = Utils._.isObject(self.options[opt]) ? self.options[opt] : {}
+      ;
+
+      Utils._.each(self.rawAttributes, function(attr, name) {
+        if (attr.hasOwnProperty(prop))
+          funcs[name] = attr[prop]
+      });
 
-          if (!Utils._.isFunction(fct))
-            throw new Error(type + 'ter for "' + name + '" is not a function.')
+      Utils._.each(funcs, function(fct, name) {
+        if (!Utils._.isFunction(fct))
+          throw new Error(type + 'ter for "' + name + '" is not a function.')
 
-          self.DAO.prototype[meth](name, fct);
-        })
-      }
+        self.DAO.prototype[meth](name, fct);
+      })
     })
 
     this.DAO.prototype.attributes = Object.keys(this.DAO.prototype.rawAttributes);
diff --git a/lib/dao.js b/lib/dao.js
index f389f6df43d9..f0ff30af871c 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -381,7 +381,7 @@ module.exports = (function() {
     })(this);
 
     // node-v0.8.19:
-    //    calling either __defineGetter__ any previously defined setters for the attribute in
+    //    calling __defineGetter__ destroys any previously defined setters for the attribute in
     //    question *if* that property setter was defined on the object's prototype (which is what
     //    we do in dao-factory) ... therefore we need to [re]define both the setter and getter
     //    here with either the function that already existed OR the default/automatic definition
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 36dc061bfcfc..67d0b632d740 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -101,17 +101,37 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       expect(user.selectedValues).toEqual({ username: 'John Wayne' })
     })
 
-    it("attaches getter and setter methods", function() {
-      var Product = this.sequelize.define('ProductWithSettersAndGetters', {
+    it("attaches getter and setter methods from attribute definition", function() {
+      var Product = this.sequelize.define('ProductWithSettersAndGetters1', {
+        price: {
+          type: Sequelize.INTEGER,
+          get : function() {
+            return 'answer = ' + this.getDataValue('price');
+          },
+          set : function(v) {
+            return this.setDataValue('price', v + 42);
+          }
+        }
+      },{
+      });
+
+      expect(Product.build({price: 42}).price).toEqual('answer = 84');
+
+      var p = Product.build({price: 1});
+
+      expect(p.price).toEqual('answer = 43');
+
+      p.price = 0;
+
+      expect(p.price).toEqual('answer = 42'); // ah finally the right answer :-)
+    })
+
+    it("attaches getter and setter methods from options", function() {
+      var Product = this.sequelize.define('ProductWithSettersAndGetters2', {
         priceInCents: {
           type: Sequelize.INTEGER
         }
       },{
-        instanceMethods: {
-          foo: function() {
-            console.log('woot')
-          }
-        },
         setterMethods: {
           price: function(value) {
             this.dataValues.priceInCents = value * 100;
@@ -131,6 +151,31 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       expect(Product.build({price: 20}).priceInCents).toEqual(20 * 100);
       expect(Product.build({priceInCents: 30 * 100}).price).toEqual('$' + 30);
     })
+
+    it("attaches getter and setter methods from options only if not defined in attribute", function() {
+      var Product = this.sequelize.define('ProductWithSettersAndGetters3', {
+        price1: {
+          type: Sequelize.INTEGER,
+          set : function(v) { this.setDataValue('price1', v * 10); }
+        },
+        price2: {
+          type: Sequelize.INTEGER,
+          get : function(v) { return this.getDataValue('price2') * 10; }
+        }
+      },{
+        setterMethods: {
+          price1: function(v) { this.setDataValue('price1', v * 100); }
+        },
+        getterMethods: {
+          price2: function() { return '$' + this.getDataValue('price2'); }
+        }
+      });
+
+      var p = Product.build({ price1: 1, price2: 2 });
+
+      expect(p.price1).toEqual(10);
+      expect(p.price2).toEqual(20);
+    })
   })
 
   describe('findOrCreate', function () {
@@ -1147,7 +1192,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
           done();
         }.bind(this))
-      })  
+      })
 
       it("should return raw data when raw is true", function (done) {
         this.User.find({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, user) {
@@ -1404,9 +1449,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         it("should return a DAO when queryOptions are not set", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).toHavePrototype(this.User.DAO.prototype)  
+              expect(user).toHavePrototype(this.User.DAO.prototype)
             }, this)
-            
+
 
             done();
           }.bind(this))
@@ -1415,17 +1460,17 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         it("should return a DAO when raw is false", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}, { raw: false }).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).toHavePrototype(this.User.DAO.prototype)  
+              expect(user).toHavePrototype(this.User.DAO.prototype)
             }, this)
-            
+
             done();
           }.bind(this))
-        })  
+        })
 
         it("should return raw data when raw is true", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).not.toHavePrototype(this.User.DAO.prototype) 
+              expect(user).not.toHavePrototype(this.User.DAO.prototype)
               expect(users[0]).toBeObject()
             }, this)
 

From b335eaa139286d1e108b197285bbd80a1b0e1c8c Mon Sep 17 00:00:00 2001
From: Jochem Maas 
Date: Thu, 16 May 2013 23:54:21 +0200
Subject: [PATCH 345/360] bogus commit (no code changes) to force travis-ci to
 run again (lets hope there are no timeouts in the postgres test run this time
 :-/

---
 lib/dao.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dao.js b/lib/dao.js
index f0ff30af871c..6eb40447f463 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -380,7 +380,7 @@ module.exports = (function() {
         };
     })(this);
 
-    // node-v0.8.19:
+    // @ node-v0.8.19:
     //    calling __defineGetter__ destroys any previously defined setters for the attribute in
     //    question *if* that property setter was defined on the object's prototype (which is what
     //    we do in dao-factory) ... therefore we need to [re]define both the setter and getter

From 6c5208001e1efcff0bcfc19cd66df93cfb2b4790 Mon Sep 17 00:00:00 2001
From: Kevin Beaty 
Date: Thu, 16 May 2013 22:05:39 -0500
Subject: [PATCH 346/360] Add promise then to custom emitter

---
 lib/emitters/custom-event-emitter.js |  12 ++
 package.json                         |   2 +-
 spec/promise.spec.js                 | 295 +++++++++++++++++++++++++++
 3 files changed, 308 insertions(+), 1 deletion(-)
 create mode 100644 spec/promise.spec.js

diff --git a/lib/emitters/custom-event-emitter.js b/lib/emitters/custom-event-emitter.js
index 2ddea0ac9fdd..4f84646bc1f0 100644
--- a/lib/emitters/custom-event-emitter.js
+++ b/lib/emitters/custom-event-emitter.js
@@ -1,5 +1,6 @@
 var util           = require("util")
   , EventEmitter   = require("events").EventEmitter
+  , Promise        = require("promise")
   , proxyEventKeys = ['success', 'error', 'sql']
 
 
@@ -61,6 +62,17 @@ module.exports = (function() {
     }.bind(this))
   }
 
+  CustomEventEmitter.prototype.then =
+  function (onFulfilled, onRejected) {
+    var self = this
+    onFulfilled = bindToProcess(onFulfilled)
+    onRejected = bindToProcess(onRejected)
+    return new Promise(function (resolve, reject) {
+      self.on('error', reject)
+          .on('success', resolve);
+    }).then(onFulfilled, onRejected)
+  }
+
 
   return CustomEventEmitter;
 })()
diff --git a/package.json b/package.json
index f9eb78680a12..b92d8e0423d2 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "dottie": "0.0.6-1",
     "toposort-class": "0.1.4",
     "generic-pool": "2.0.3",
-    "dottie": "0.0.6-1"
+    "promise": "~3.0.0"
   },
   "devDependencies": {
     "jasmine-node": "1.5.0",
diff --git a/spec/promise.spec.js b/spec/promise.spec.js
new file mode 100644
index 000000000000..9ed37e23ebf9
--- /dev/null
+++ b/spec/promise.spec.js
@@ -0,0 +1,295 @@
+if (typeof require === 'function') {
+  const buster  = require("buster")
+      , Helpers = require('./buster-helpers')
+      , dialect = Helpers.getTestDialect()
+      , _ = require('lodash')
+}
+
+buster.spec.expose()
+
+describe(Helpers.getTestDialectTeaser("Promise"), function () {
+  before(function (done) {
+    var self = this
+
+    Helpers.initTests({
+      dialect: dialect,
+      beforeComplete: function (sequelize, DataTypes) {
+        self.sequelize = sequelize
+        self.User      = sequelize.define('User', {
+          username:  { type: DataTypes.STRING },
+          touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
+          aNumber:   { type: DataTypes.INTEGER },
+          bNumber:   { type: DataTypes.INTEGER },
+
+          validateTest: {
+            type: DataTypes.INTEGER,
+            allowNull: true,
+            validate: {isInt: true}
+          },
+          validateCustom: {
+            type: DataTypes.STRING,
+            allowNull: true,
+            validate: {len: {msg: 'Length failed.', args: [1, 20]}}
+          },
+
+          dateAllowNullTrue: {
+            type: DataTypes.DATE,
+            allowNull: true
+          }
+        })
+
+        self.HistoryLog = sequelize.define('HistoryLog', {
+          someText:  { type: DataTypes.STRING },
+          aNumber:   { type: DataTypes.INTEGER },
+          aRandomId: { type: DataTypes.INTEGER }
+        })
+
+        self.ParanoidUser = sequelize.define('ParanoidUser', {
+          username: { type: DataTypes.STRING }
+        }, {
+          paranoid: true
+        })
+
+        self.ParanoidUser.hasOne(self.ParanoidUser)
+      },
+      onComplete: function () {
+        self.User.sync({ force: true }).then(function () {
+            return self.HistoryLog.sync({ force: true })
+          }).then(function () {
+            return self.ParanoidUser.sync({force: true })
+          })
+          .then(function () {done()}, done)
+      }
+    })
+  })
+
+  describe('increment', function () {
+    before(function (done) {
+      this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done)
+    });
+
+    it('with array', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).then(function (user1) {
+        return user1.increment(['aNumber'], 2)
+      }).then(function (user2) {
+        return self.User.find(1)
+      }).then(function (user3) {
+        expect(user3.aNumber).toBe(2);
+        done();
+      }, done);
+    });
+
+    it('should still work right with other concurrent updates', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).then(function (user1) {
+        // Select the user again (simulating a concurrent query)
+        return self.User.find(1).then(function (user2) {
+          return user2.updateAttributes({
+            aNumber: user2.aNumber + 1
+          }).then(function (user3) {
+            return user1.increment(['aNumber'], 2)
+          }).then(function (user4) {
+            return self.User.find(1)
+          }).then(function (user5) {
+            expect(user5.aNumber).toBe(3);
+            done();
+          }, done)
+        });
+      });
+    });
+
+    it('with key value pair', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).then(function (user1) {
+        return user1.increment({ 'aNumber': 1, 'bNumber': 2})
+      }).then(function () {
+        return self.User.find(1)
+      }).then(function (user3) {
+        expect(user3.aNumber).toBe(1);
+        expect(user3.bNumber).toBe(2);
+        done();
+      }, done);
+    });
+  });
+
+  describe('decrement', function () {
+    before(function (done) {
+      this.User.create({ id: 1, aNumber: 0, bNumber: 0 }).done(done)
+    });
+
+    it('with array', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).then(function (user1) {
+        return user1.decrement(['aNumber'], 2)
+      }).then(function () {
+        return self.User.find(1);
+      }).then(function (user3) {
+        expect(user3.aNumber).toBe(-2);
+        done();
+      }, done);
+    });
+
+    it('with single field', function (done) {
+      var self = this;
+
+      // Select something
+      this.User.find(1).then(function (user1) {
+        return user1.decrement(['aNumber'], 2)
+      }).then(function () {
+        return self.User.find(1);
+      }).then(function (user3) {
+        expect(user3.aNumber).toBe(-2);
+        done();
+      }, done);
+    });
+
+    it('should still work right with other concurrent decrements', function (done) {
+      var self = this;
+      // Select something
+      this.User.find(1).then(function (user1) {
+        var _done = _.after(3, function () {
+          self.User.find(1).then(function (user2) {
+            expect(user2.aNumber).toEqual(-6);
+            done();
+          })
+        });
+
+        user1.decrement(['aNumber'], 2).done(_done);
+        user1.decrement(['aNumber'], 2).done(_done);
+        user1.decrement(['aNumber'], 2).done(_done);
+      });
+    });
+  });
+
+  describe('reload', function () {
+    it("should return a reference to the same DAO instead of creating a new one", function (done) {
+      this.User.create({ username: 'John Doe' }).then(function (originalUser) {
+
+        return originalUser.updateAttributes({ username: 'Doe John' }).then(function () {
+          return originalUser.reload()
+        }).then(function (updatedUser) {
+          expect(originalUser === updatedUser).toBeTrue()
+          done();
+        }, done)
+      })
+    })
+
+    it("should update the values on all references to the DAO", function (done) {
+      var self = this
+
+      this.User.create({ username: 'John Doe' }).then(function (originalUser) {
+        return self.User.find(originalUser.id).then(function (updater) {
+          return updater.updateAttributes({ username: 'Doe John' })
+        }).then(function () {
+          // We used a different reference when calling updateAttributes, so originalUser is now out of sync
+          expect(originalUser.username).toEqual('John Doe')
+          return originalUser.reload()
+        }).then(function (updatedUser) {
+          expect(originalUser.username).toEqual('Doe John')
+          expect(updatedUser.username).toEqual('Doe John')
+
+          done();
+        }, done)
+      })
+    })
+
+
+    it("should update the associations as well", function (done) {
+      var Book = this.sequelize.define('Book', { title:   Helpers.Sequelize.STRING })
+        , Page = this.sequelize.define('Page', { content: Helpers.Sequelize.TEXT })
+
+      Book.hasMany(Page)
+      Page.belongsTo(Book)
+
+      this.sequelize.sync({ force: true }).then(function () {
+        return Book.create({ title: 'A very old book' })
+      }).then(function (book) {
+        return Page.create({ content: 'om nom nom' }).then(function (page) {
+          return book.setPages([ page ]).then(function () {
+            return Book.find({
+              where: (dialect === 'postgres' ? '"Books"."id"=' : '`Books`.`id`=') + book.id,
+              include: [Page]
+            }).then(function (leBook) {
+              return page.updateAttributes({ content: 'something totally different' }).then(function (page) {
+                expect(leBook.pages[0].content).toEqual('om nom nom')
+                expect(page.content).toEqual('something totally different')
+
+                return leBook.reload().then(function (leBook) {
+                  expect(leBook.pages[0].content).toEqual('something totally different')
+                  expect(page.content).toEqual('something totally different')
+
+                  done()
+                })
+              })
+            })
+          })
+        })
+      }, done)
+    })
+  });
+
+  describe('complete', function () {
+    it("gets triggered if an error occurs", function (done) {
+      this.User.find({ where: "asdasdasd" }).then(null, function (err) {
+        expect(err).toBeDefined()
+        expect(err.message).toBeDefined()
+        done()
+      })
+    })
+
+    it("gets triggered if everything was ok", function (done) {
+      this.User.count().then(function (result) {
+        expect(result).toBeDefined()
+        done()
+      })
+    })
+  })
+
+  describe('save', function () {
+    it('should fail a validation upon creating', function (done) {
+      this.User.create({aNumber: 0, validateTest: 'hello'}).then(null, function (err) {
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateTest).toBeArray()
+        expect(err.validateTest[0]).toBeDefined()
+        expect(err.validateTest[0].indexOf('Invalid integer')).toBeGreaterThan(-1);
+        done();
+      });
+    })
+
+    it('should fail a validation upon building', function (done) {
+      this.User.build({aNumber: 0, validateCustom: 'aaaaaaaaaaaaaaaaaaaaaaaaaa'}).save()
+      .then(null, function (err) {
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateCustom).toBeDefined()
+        expect(err.validateCustom).toBeArray()
+        expect(err.validateCustom[0]).toBeDefined()
+        expect(err.validateCustom[0]).toEqual('Length failed.')
+        done()
+      })
+    })
+
+    it('should fail a validation when updating', function (done) {
+      this.User.create({aNumber: 0}).then(function (user) {
+        return user.updateAttributes({validateTest: 'hello'})
+      }).then(null, function (err) {
+        expect(err).toBeDefined()
+        expect(err).toBeObject()
+        expect(err.validateTest).toBeDefined()
+        expect(err.validateTest).toBeArray()
+        expect(err.validateTest[0]).toBeDefined()
+        expect(err.validateTest[0].indexOf('Invalid integer:')).toBeGreaterThan(-1)
+        done()
+      })
+    })
+  })
+})

From 9ff786f0ae6cf547c6a92f91bec0511ef1bb2d94 Mon Sep 17 00:00:00 2001
From: Peter Braun 
Date: Sat, 18 May 2013 11:26:16 -0500
Subject: [PATCH 347/360] "getWhereConditions" in the postgres "QueryGenerator"
 can now prepend table names to attributes. This fixes issue #629.

---
 lib/dialects/postgres/query-generator.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 2c386366ac5e..7ed1e38ed8b6 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -258,7 +258,7 @@ module.exports = (function() {
       }
 
       if(options.hasOwnProperty('where')) {
-        options.where = QueryGenerator.getWhereConditions(options.where)
+        options.where = QueryGenerator.getWhereConditions(options.where, tableName)
         query += " WHERE <%= where %>"
       }
 
@@ -457,14 +457,17 @@ module.exports = (function() {
       })
     },
 
-    getWhereConditions: function(smth) {
+    getWhereConditions: function(smth, tableName) {
       var result = null
 
       if (Utils.isHash(smth)) {
+        smth = Utils.prependTableNameToHash(tableName, smth)
         result = QueryGenerator.hashToWhereConditions(smth)
       }
       else if (typeof smth === "number") {
-        result = '\"id\"' + "=" + QueryGenerator.pgEscape(smth)
+        smth = QueryGenerator.pgEscape(smth)
+        smth = Utils.prependTableNameToHash(tableName, { id: smth })
+        result = QueryGenerator.hashToWhereConditions(smth)
       }
       else if (typeof smth === "string") {
         result = smth

From e03956a0a4035ff861bc4e257e0d6f46e298d421 Mon Sep 17 00:00:00 2001
From: Peter Braun 
Date: Sat, 18 May 2013 11:29:01 -0500
Subject: [PATCH 348/360] Fixed two syntax errors in postgres QueryGenerator
 (removed 2 unneeded commas).

---
 lib/dialects/postgres/query-generator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 7ed1e38ed8b6..45fbbadbf30c 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -62,7 +62,7 @@ module.exports = (function() {
 
       var values  = {
         table: QueryGenerator.addQuotes(tableName),
-        attributes: attrStr.join(", "),
+        attributes: attrStr.join(", ")
       }
 
       var pks = primaryKeys[tableName].map(function(pk){
@@ -192,7 +192,7 @@ module.exports = (function() {
       for (var attributeName in attributes) {
         attrString.push(Utils._.template('<%= before %> TO <%= after %>')({
           before: QueryGenerator.addQuotes(attrBefore),
-          after:  QueryGenerator.addQuotes(attributeName),
+          after:  QueryGenerator.addQuotes(attributeName)
         }))
       }
 

From 7683f133b08d1d76242add87c93f86b259428566 Mon Sep 17 00:00:00 2001
From: Peter Braun 
Date: Sat, 18 May 2013 15:52:31 -0500
Subject: [PATCH 349/360] Updated postgres query-generator jasmine spec to make
 changes in issue #629 pass.

---
 lib/dialects/postgres/query-generator.js      |  1 -
 spec-jasmine/postgres/query-generator.spec.js | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 45fbbadbf30c..bb1bca96647e 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -465,7 +465,6 @@ module.exports = (function() {
         result = QueryGenerator.hashToWhereConditions(smth)
       }
       else if (typeof smth === "number") {
-        smth = QueryGenerator.pgEscape(smth)
         smth = Utils.prependTableNameToHash(tableName, { id: smth })
         result = QueryGenerator.hashToWhereConditions(smth)
       }
diff --git a/spec-jasmine/postgres/query-generator.spec.js b/spec-jasmine/postgres/query-generator.spec.js
index e8e0598113e4..35e885c6c0a5 100644
--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -49,16 +49,16 @@ describe('QueryGenerator', function() {
         expectation: "SELECT \"id\", \"name\" FROM \"myTable\";"
       }, {
         arguments: ['myTable', {where: {id: 2}}],
-        expectation: "SELECT * FROM \"myTable\" WHERE \"id\"=2;"
+        expectation: "SELECT * FROM \"myTable\" WHERE \"myTable\".\"id\"=2;"
       }, {
         arguments: ['myTable', {where: {name: 'foo'}}],
-        expectation: "SELECT * FROM \"myTable\" WHERE \"name\"='foo';"
+        expectation: "SELECT * FROM \"myTable\" WHERE \"myTable\".\"name\"='foo';"
       }, {
         arguments: ['myTable', {where: {name: "foo';DROP TABLE myTable;"}}],
-        expectation: "SELECT * FROM \"myTable\" WHERE \"name\"='foo'';DROP TABLE myTable;';"
+        expectation: "SELECT * FROM \"myTable\" WHERE \"myTable\".\"name\"='foo'';DROP TABLE myTable;';"
       }, {
         arguments: ['myTable', {where: 2}],
-        expectation: "SELECT * FROM \"myTable\" WHERE \"id\"=2;"
+        expectation: "SELECT * FROM \"myTable\" WHERE \"myTable\".\"id\"=2;"
       }, {
         arguments: ['foo', { attributes: [['count(*)', 'count']] }],
         expectation: 'SELECT count(*) as \"count\" FROM \"foo\";'
@@ -92,7 +92,7 @@ describe('QueryGenerator', function() {
         expectation: "SELECT * FROM \"mySchema\".\"myTable\";"
       }, {
         arguments: ['mySchema.myTable', {where: {name: "foo';DROP TABLE mySchema.myTable;"}}],
-        expectation: "SELECT * FROM \"mySchema\".\"myTable\" WHERE \"name\"='foo'';DROP TABLE mySchema.myTable;';"
+        expectation: "SELECT * FROM \"mySchema\".\"myTable\" WHERE \"mySchema\".\"myTable\".\"name\"='foo'';DROP TABLE mySchema.myTable;';"
       }
     ],
 

From 4bca6178162acbb5bbc0585b09ec7259bf5bb214 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Sun, 19 May 2013 23:52:17 +0200
Subject: [PATCH 350/360] Run tests for 0.10 as well

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd439b421dd5..4bb8bf24b9f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,5 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
\ No newline at end of file
+  - 0.8
+  - 0.10

From b67f4075d53116132cb21dfb86a347ae9db85983 Mon Sep 17 00:00:00 2001
From: Jan Aagaard Meier 
Date: Mon, 20 May 2013 00:13:29 +0200
Subject: [PATCH 351/360] PG does not like v0.10. Update buster dep. to 0.6.3

---
 .travis.yml  | 3 +--
 package.json | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bb8bf24b9f3..cd439b421dd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,5 +19,4 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
-  - 0.10
+  - 0.8
\ No newline at end of file
diff --git a/package.json b/package.json
index f9eb78680a12..7ac3496430f1 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "sqlite3": "~2.1.5",
     "mysql": "~2.0.0-alpha7",
     "pg": "~0.10.2",
-    "buster": "~0.6.0",
+    "buster": "~0.6.3",
     "watchr": "~2.2.0",
     "yuidocjs": "~0.3.36"
   },

From 02e8dddc8c31b2d64e7797253b05ec0cf41d59ae Mon Sep 17 00:00:00 2001
From: Bart Nagel 
Date: Sun, 19 May 2013 15:22:26 -0700
Subject: [PATCH 352/360] add test for skipping validations when value is null
 and allowNull is true

---
 spec/dao.validations.spec.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/dao.validations.spec.js b/spec/dao.validations.spec.js
index db23e6850315..4d234bb91457 100644
--- a/spec/dao.validations.spec.js
+++ b/spec/dao.validations.spec.js
@@ -282,5 +282,29 @@ describe(Helpers.getTestDialectTeaser("DAO"), function() {
       var successfulUser = User.build({ name : "2" })
       expect(successfulUser.validate()).toBeNull()
     })
+
+    it('skips other validations if allowNull is true and the value is null', function() {
+      var User = this.sequelize.define('User' + Math.random(), {
+        age: {
+          type: Sequelize.INTEGER,
+          allowNull: true,
+          validate: {
+            min: { args: 0, msg: 'must be positive' }
+          }
+        }
+      })
+
+      var failingUser = User.build({ age: -1 })
+        , errors      = failingUser.validate()
+
+      expect(errors).not.toBeNull(null)
+      expect(errors).toEqual({ age: ['must be positive'] })
+
+      var successfulUser1 = User.build({ age: null })
+      expect(successfulUser1.validate()).toBeNull()
+
+      var successfulUser2 = User.build({ age: 1 })
+      expect(successfulUser2.validate()).toBeNull()
+    })
   })
 })

From b14ecc52ce17ef47d92a94c660b00daa21077ee4 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Mon, 20 May 2013 15:28:10 +0300
Subject: [PATCH 353/360] promises/a support

---
 changelog.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 86f45cf0907f..d1f20d46d3a0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,5 @@
 # v1.7.0 #
 - [DEPENDENCIES] Upgraded validator for IPv6 support. [#603](https://github.com/sequelize/sequelize/pull/603). thanks to durango
-- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
 - [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
 - [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
@@ -8,12 +7,14 @@
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [BUG] Correctly handle booleans in MySQL. [#608](https://github.com/sequelize/sequelize/pull/608). Thanks to terraflubb
 - [BUG] Fixed empty where conditions in MySQL. [#619](https://github.com/sequelize/sequelize/pull/619). Thanks to terraflubb
+- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Support for bulk insert (`.bulkCreate()`, update (`.update()`) and delete (`.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
 - [FEATURE] Add an extra `queryOptions` parameter to `DAOFactory.find` and `DAOFactory.findAll`. This allows a user to specify `{ raw: true }`, meaning that the raw result should be returned, instead of built DAOs. Usefull for queries returning large datasets, see [#611](https://github.com/sequelize/sequelize/pull/611) janmeier
 - [FEATURE] Added convenient data types. [#616](https://github.com/sequelize/sequelize/pull/616). Thanks to Costent
 - [FEATURE] Binary is more verbose now. [#612](https://github.com/sequelize/sequelize/pull/612). Thanks to terraflubb
+- [FEATURE] Promises/A support. [#626](https://github.com/sequelize/sequelize/pull/626). Thanks to kevinbeaty
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From 16e13f6c3288716c57fe715322640a8c79a7ee5b Mon Sep 17 00:00:00 2001
From: sevastos 
Date: Tue, 21 May 2013 04:34:59 +0300
Subject: [PATCH 354/360] Enable the override of the default attributes

---
 lib/dao-factory.js                       |  4 +++-
 lib/dialects/postgres/query-generator.js | 10 ++++++++--
 lib/dialects/sqlite/query-generator.js   |  4 ++++
 spec/sequelize.spec.js                   | 24 ++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index b8bc36e8b245..2714c1862113 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -481,7 +481,9 @@ module.exports = (function() {
     }
 
     Utils._.each(defaultAttributes, function(value, attr) {
-      self.rawAttributes[attr] = value
+      if (Utils._.isUndefined(self.rawAttributes[attr])) {
+        self.rawAttributes[attr] = value
+      }
     })
   }
 
diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 0c999f141528..6078329d8cab 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -726,9 +726,15 @@ module.exports = (function() {
       }
 
       if (Utils._.includes(dataType, 'SERIAL')) {
-        dataType = dataType.replace(/INTEGER/, '')
+        if (Utils._.includes(dataType, 'BIGINT')) {
+          dataType = dataType.replace(/SERIAL/, 'BIGSERIAL')
+          dataType = dataType.replace(/BIGINT/, '')
+          tables[tableName][attr] = 'bigserial'
+        } else {
+          dataType = dataType.replace(/INTEGER/, '')
+          tables[tableName][attr] = 'serial'
+        }
         dataType = dataType.replace(/NOT NULL/, '')
-        tables[tableName][attr] = 'serial'
       }
 
       if (dataType.match(/^ENUM\(/)) {
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index fe850d29f444..b9920020de1f 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -76,6 +76,10 @@ module.exports = (function() {
         if (attributes.hasOwnProperty(attr)) {
           var dataType = attributes[attr]
 
+          if (Utils._.includes(dataType, 'AUTOINCREMENT')) {
+            dataType = dataType.replace(/BIGINT/, 'INTEGER')
+          }
+
           if (Utils._.includes(dataType, 'PRIMARY KEY') && needsMultiplePrimaryKeys) {
             primaryKeys.push(attr)
             attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, 'NOT NULL'))
diff --git a/spec/sequelize.spec.js b/spec/sequelize.spec.js
index 074096daa33f..a55f33db8202 100644
--- a/spec/sequelize.spec.js
+++ b/spec/sequelize.spec.js
@@ -194,5 +194,29 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
         })
       })
     })
+
+    describe('table', function() {
+      [
+        { id: { type: Helpers.Sequelize.BIGINT } },
+        { id: { type: Helpers.Sequelize.STRING, allowNull: true } },
+        { id: { type: Helpers.Sequelize.BIGINT, allowNull: false, primaryKey: true, autoIncrement: true } }
+      ].forEach(function(customAttributes) {
+
+        it('should be able to override options on the default attributes', function(done) {
+          var Picture = this.sequelize.define('picture', Helpers.Sequelize.Utils._.cloneDeep(customAttributes))
+          Picture.sync({ force: true }).success(function() {
+            Object.keys(customAttributes).forEach(function(attribute) {
+              Object.keys(customAttributes[attribute]).forEach(function(option) {
+                var optionValue = customAttributes[attribute][option];
+                expect(Picture.rawAttributes[attribute][option]).toBe(optionValue)
+              });
+            })
+            done()
+          })
+        })
+
+      })
+    })
+
   })
 })

From a524aeae732749484d75886d4c8deea5ecddff66 Mon Sep 17 00:00:00 2001
From: Michael Weibel 
Date: Tue, 21 May 2013 19:17:31 +0200
Subject: [PATCH 355/360] Ugly fix: SQLite addQuotes is wrongly done, hence
 copy the code from postgres & mysql dialect query generator

---
 lib/dialects/sqlite/query-generator.js | 81 +++++++++++++++++++++++++-
 spec/dao-factory.spec.js               | 18 +++---
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
index fe850d29f444..1c842903f650 100644
--- a/lib/dialects/sqlite/query-generator.js
+++ b/lib/dialects/sqlite/query-generator.js
@@ -24,8 +24,17 @@ module.exports = (function() {
   var QueryGenerator = {
     options: {},
 
-    addQuotes: function(s, quoteChar) {
-      return Utils.addTicks(s, quoteChar)
+    removeQuotes: function (s, quoteChar) {
+      quoteChar = quoteChar || '`'
+      return s.replace(new RegExp(quoteChar, 'g'), '')
+    },
+
+    addQuotes: function (s, quoteChar) {
+      quoteChar = quoteChar || '`'
+      return QueryGenerator.removeQuotes(s, quoteChar)
+        .split('.')
+        .map(function(e) { return quoteChar + String(e) + quoteChar })
+        .join('.')
     },
 
     addSchema: function(opts) {
@@ -145,6 +154,74 @@ module.exports = (function() {
 
       return Utils._.template(query)(replacements)
     },
+    selectQuery: function(tableName, options) {
+      var table = null,
+          joinQuery = ""
+
+      options            = options || {}
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return QueryGenerator.addQuotes(tbl) }).join(", ") : QueryGenerator.addQuotes(tableName)
+      options.attributes = options.attributes && options.attributes.map(function(attr){
+        if(Array.isArray(attr) && attr.length == 2) {
+          return [attr[0], QueryGenerator.addQuotes(attr[1])].join(' as ')
+        } else {
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? QueryGenerator.addQuotes(attr) : attr
+        }
+      }).join(", ")
+      options.attributes = options.attributes || '*'
+
+      if (options.include) {
+        var optAttributes = options.attributes === '*' ? [options.table + '.*'] : [options.attributes]
+
+        options.include.forEach(function(include) {
+          var attributes = Object.keys(include.daoFactory.attributes).map(function(attr) {
+            return "`" + include.as + "`.`" + attr + "` AS `" + include.as + "." + attr + "`"
+          })
+
+          optAttributes = optAttributes.concat(attributes)
+
+          var table = include.daoFactory.tableName
+          var as = include.as
+          var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+          var attrLeft = 'id'
+          var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+          var attrRight = include.association.identifier
+          joinQuery += " LEFT OUTER JOIN `" + table + "` AS `" + as + "` ON `" + tableLeft + "`.`" + attrLeft + "` = `" + tableRight + "`.`" + attrRight + "`"
+
+        })
+
+        options.attributes = optAttributes.join(', ')
+      }
+
+      var query = "SELECT " + options.attributes + " FROM " + options.table
+      query += joinQuery
+
+      if (options.hasOwnProperty('where')) {
+        options.where = this.getWhereConditions(options.where, tableName)
+        query += " WHERE " + options.where
+      }
+
+      if (options.group) {
+        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return QueryGenerator.addQuotes(grp)}).join(', ') : QueryGenerator.addQuotes(options.group)
+        query += " GROUP BY " + options.group
+      }
+
+      if (options.order) {
+        query += " ORDER BY " + options.order
+      }
+
+
+      if (options.limit && !(options.include && (options.limit === 1))) {
+        if (options.offset) {
+          query += " LIMIT " + options.offset + ", " + options.limit
+        } else {
+          query += " LIMIT " + options.limit
+        }
+      }
+
+      query += ";"
+
+      return query
+    },
 
     updateQuery: function(tableName, attrValueHash, where) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
diff --git a/spec/dao-factory.spec.js b/spec/dao-factory.spec.js
index 9e3361523f62..f1c61d884baf 100644
--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -1116,7 +1116,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
 
           done();
         }.bind(this))
-      })  
+      })
 
       it("should return raw data when raw is true", function (done) {
         this.User.find({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, user) {
@@ -1373,9 +1373,9 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         it("should return a DAO when queryOptions are not set", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).toHavePrototype(this.User.DAO.prototype)  
+              expect(user).toHavePrototype(this.User.DAO.prototype)
             }, this)
-            
+
 
             done();
           }.bind(this))
@@ -1384,17 +1384,17 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
         it("should return a DAO when raw is false", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}, { raw: false }).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).toHavePrototype(this.User.DAO.prototype)  
+              expect(user).toHavePrototype(this.User.DAO.prototype)
             }, this)
-            
+
             done();
           }.bind(this))
-        })  
+        })
 
         it("should return raw data when raw is true", function (done) {
           this.User.findAll({ where: { username: 'barfooz'}}, { raw: true }).done(function (err, users) {
             users.forEach(function (user) {
-              expect(user).not.toHavePrototype(this.User.DAO.prototype) 
+              expect(user).not.toHavePrototype(this.User.DAO.prototype)
               expect(users[0]).toBeObject()
             }, this)
 
@@ -1563,6 +1563,10 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
               expect(self.UserSpecialSync.getTableName()).toEqual('"special"."UserSpecials"');
               expect(UserSpecial.indexOf('INSERT INTO "special"."UserSpecials"')).toBeGreaterThan(-1)
               expect(UserPublic.indexOf('INSERT INTO "UserPublics"')).toBeGreaterThan(-1)
+            } else if (dialect === "sqlite") {
+              expect(self.UserSpecialSync.getTableName()).toEqual('`special`.`UserSpecials`');
+              expect(UserSpecial.indexOf('INSERT INTO `special.UserSpecials`')).toBeGreaterThan(-1)
+              expect(UserPublic.indexOf('INSERT INTO `UserPublics`')).toBeGreaterThan(-1)
             } else {
               expect(self.UserSpecialSync.getTableName()).toEqual('`special.UserSpecials`');
               expect(UserSpecial.indexOf('INSERT INTO `special.UserSpecials`')).toBeGreaterThan(-1)

From b9e335d63c071d598c55883cc6abfbc471cb8572 Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 22 May 2013 09:21:09 +0300
Subject: [PATCH 356/360] overriding default columns

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index d1f20d46d3a0..d6db56ab9b36 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@
 - [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
 - [BUG] Correctly handle booleans in MySQL. [#608](https://github.com/sequelize/sequelize/pull/608). Thanks to terraflubb
 - [BUG] Fixed empty where conditions in MySQL. [#619](https://github.com/sequelize/sequelize/pull/619). Thanks to terraflubb
+- [BUG] Allow overriding of default columns. [#635](https://github.com/sequelize/sequelize/pull/635). Thanks to sevastos
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

From 41c1b6aef5ab6fa82d251815071ab33c5642302a Mon Sep 17 00:00:00 2001
From: Sascha Depold 
Date: Wed, 22 May 2013 10:56:59 +0200
Subject: [PATCH 357/360] evil space

---
 lib/dao-factory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dao-factory.js b/lib/dao-factory.js
index 2714c1862113..930278aa5044 100644
--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -19,7 +19,7 @@ module.exports = (function() {
       whereCollection: null,
       schema: null,
       schemaDelimiter: ''
-    }, options || {})
+    }, options || {})
 
     this.name = name
     if (!this.options.tableName) {

From 42b68bfccc1432b5a181e329c5d7ab1e49781e8d Mon Sep 17 00:00:00 2001
From: Daniel Durante 
Date: Thu, 23 May 2013 10:42:47 -0400
Subject: [PATCH 358/360] Updating changelog and readme for getters/setters.

---
 README.md    | 3 ++-
 changelog.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index df2048ea93f9..5bfb0cd7770c 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,8 @@ A very basic roadmap. Chances aren't too bad, that not mentioned things are impl
 
 ### 2.0.0
 - ~~save datetimes in UTC~~
-- encapsulate attributes if a dao inside the attributes property + add getters and setters
+- encapsulate attributes if a dao inside the attributes property
+- ~~add getters and setters for dao~~ Implemented in [#538](https://github.com/sequelize/sequelize/pull/538), thanks to iamjochem
 - add proper error message everywhere
 
 
diff --git a/changelog.md b/changelog.md
index d6db56ab9b36..7a6ad0b21625 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,7 @@
 - [FEATURE] Added convenient data types. [#616](https://github.com/sequelize/sequelize/pull/616). Thanks to Costent
 - [FEATURE] Binary is more verbose now. [#612](https://github.com/sequelize/sequelize/pull/612). Thanks to terraflubb
 - [FEATURE] Promises/A support. [#626](https://github.com/sequelize/sequelize/pull/626). Thanks to kevinbeaty
+- [FEATURE] Added Getters/Setters method for DAO. [#538](https://github.com/sequelize/sequelize/pull/538). Thanks to iamjochem
 
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

From abfd3fee617b9ed655ce2baadf5a0e8fe0e6966d Mon Sep 17 00:00:00 2001
From: thomascool 
Date: Thu, 23 May 2013 17:19:30 -0700
Subject: [PATCH 359/360] code fix to support existing features

---
 lib/dao.js                     | 231 +++++++++++++++++++++------------
 lib/dialects/postgres/query.js |  30 +++--
 2 files changed, 164 insertions(+), 97 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 4bb8caaf248a..e8a2ba0f34a1 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -7,28 +7,15 @@ module.exports = (function() {
   var DAO = function(values, options, isNewRecord) {
     var self = this
 
+    this.dataValues                  = {}
     this.__options                   = options
     this.hasPrimaryKeys              = options.hasPrimaryKeys
     this.selectedValues              = values
     this.__eagerlyLoadedAssociations = []
 
     initAttributes.call(this, values, isNewRecord)
-
-    if (this.hasDefaultValues) {
-      Utils._.each(this.defaultValues, function (value, name) {
-        if (typeof self[name] === 'undefined') {
-          self.addAttribute(name, value());
-        }
-      })
-    }
-
-    if (this.booleanValues.length) {
-      this.booleanValues.forEach(function (name) {
-        //transform integer 0,1 into boolean
-        self[name] = !!self[name];
-      });
-    }
   }
+
   Utils._.extend(DAO.prototype, Mixin.prototype)
 
   Object.defineProperty(DAO.prototype, 'sequelize', {
@@ -42,7 +29,7 @@ module.exports = (function() {
   Object.defineProperty(DAO.prototype, 'isDeleted', {
     get: function() {
       var result = this.__options.timestamps && this.__options.paranoid
-      result = result && this[this.__options.underscored ? 'deleted_at' : 'deletedAt'] !== null
+      result = result && this.dataValues[this.__options.underscored ? 'deleted_at' : 'deletedAt'] !== null
 
       return result
     }
@@ -54,7 +41,10 @@ module.exports = (function() {
         , self   = this
 
       this.attributes.concat(this.__eagerlyLoadedAssociations).forEach(function(attr) {
-        result[attr] = self[attr]
+        result[attr] = self.dataValues.hasOwnProperty(attr)
+                     ? self.dataValues[attr]
+                     : self[attr]
+                     ;
       })
 
       return result
@@ -67,7 +57,7 @@ module.exports = (function() {
         , self   = this
 
       Utils._.each(this.__factory.primaryKeys, function(_, attr) {
-        result[attr] = self[attr]
+        result[attr] = self.dataValues[attr]
       })
 
       return result
@@ -85,13 +75,21 @@ module.exports = (function() {
       }
 
       primaryKeys.forEach(function(identifier) {
-        result[identifier] = self[identifier]
+        result[identifier] = self.dataValues[identifier]
       })
 
       return result
     }
   })
 
+  DAO.prototype.getDataValue = function(name) {
+    return this.dataValues && this.dataValues.hasOwnProperty(name) ? this.dataValues[name] : this[name]
+  }
+
+  DAO.prototype.setDataValue = function(name, value) {
+    this.dataValues[name] = value
+  }
+
   // if an array with field names is passed to save()
   // only those fields will be updated
   DAO.prototype.save = function(fields) {
@@ -111,9 +109,11 @@ module.exports = (function() {
         }
       }
 
+      var tmpVals = self.values
+
       fields.forEach(function(field) {
-        if (self.values[field] !== undefined) {
-          values[field] = self.values[field]
+        if (tmpVals[field] !== undefined) {
+          values[field] = tmpVals[field]
         }
       })
     }
@@ -146,14 +146,20 @@ module.exports = (function() {
       }
     }
 
-    if (this.__options.timestamps && this.hasOwnProperty(updatedAtAttr)) {
-      this[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
+    if (this.__options.timestamps && this.dataValues.hasOwnProperty(updatedAtAttr)) {
+      this.dataValues[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
     }
 
-    if (this.isNewRecord) {
-      // added by Scott Rutherford to set created post class creation
-      if(this.__options.timestamps && this.hasOwnProperty(createdAtAttr)) {
-        this[createdAtAttr] = values[createdAtAttr] = new Date()
+    var errors = this.validate()
+
+    if (!!errors) {
+      return new Utils.CustomEventEmitter(function(emitter) {
+        emitter.emit('error', errors)
+      }).run()
+    }
+    else if (this.isNewRecord) {
+      if (this.__options.timestamps && this.dataValues.hasOwnProperty(createdAtAttr)) {
+        this.dataValues[createdAtAttr] = values[createdAtAttr] = Utils.now()
       }
       return this.QueryInterface.insert(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory), values)
     } else {
@@ -214,54 +220,61 @@ module.exports = (function() {
     // for each field and value
     Utils._.each(self.values, function(value, field) {
 
-      // if field has validators
-      if (self.validators.hasOwnProperty(field)) {
-        // for each validator
-        Utils._.each(self.validators[field], function(details, validatorType) {
-
-          var is_custom_fn = false  // if true then it's a custom validation method
-          var fn_method = null      // the validation function to call
-          var fn_args = []          // extra arguments to pass to validation function
-          var fn_msg = ""           // the error message to return if validation fails
-
-          // is it a custom validator function?
-          if (Utils._.isFunction(details)) {
-            is_custom_fn = true
-            fn_method = Utils._.bind(details, self, value)
-          }
-          // is it a validator module function?
-          else {
-            // extra args
-            fn_args = details.hasOwnProperty("args") ? details.args : details
-            if (!Array.isArray(fn_args))
-              fn_args = [fn_args]
-            // error msg
-            fn_msg = details.hasOwnProperty("msg") ? details.msg : false
-            // check method exists
-            var v = Validator.check(value, fn_msg)
-            if (!Utils._.isFunction(v[validatorType]))
-              throw new Error("Invalid validator function: " + validatorType)
-            // bind to validator obj
-            fn_method = Utils._.bind(v[validatorType], v)
-          }
+      // Bypass if the field is a nested JSON
+      if (typeof self.rawAttributes[field] != 'undefined') {
+        // if field has validators
+        var hasAllowedNull = (self.rawAttributes[field].allowNull && self.rawAttributes[field].allowNull === true
+                              && (value === null || value === undefined
+                              || ((typeof self.rawAttributes[field].defaultValue != 'undefined') && value === self.rawAttributes[field].defaultValue)));
+
+        if (self.validators.hasOwnProperty(field) && !hasAllowedNull) {
+          // for each validator
+          Utils._.each(self.validators[field], function(details, validatorType) {
+
+            var is_custom_fn = false  // if true then it's a custom validation method
+            var fn_method = null      // the validation function to call
+            var fn_args = []          // extra arguments to pass to validation function
+            var fn_msg = ""           // the error message to return if validation fails
+
+            // is it a custom validator function?
+            if (Utils._.isFunction(details)) {
+              is_custom_fn = true
+              fn_method = Utils._.bind(details, self, value)
+            }
+            // is it a validator module function?
+            else {
+              // extra args
+              fn_args = details.hasOwnProperty("args") ? details.args : details
+              if (!Array.isArray(fn_args))
+                fn_args = [fn_args]
+              // error msg
+              fn_msg = details.hasOwnProperty("msg") ? details.msg : false
+              // check method exists
+              var v = Validator.check(value, fn_msg)
+              if (!Utils._.isFunction(v[validatorType]))
+                throw new Error("Invalid validator function: " + validatorType)
+              // bind to validator obj
+              fn_method = Utils._.bind(v[validatorType], v)
+            }
 
-          try {
-            fn_method.apply(null, fn_args)
-          } catch (err) {
-            err = err.message
-            // if we didn't provide a custom error message then augment the default one returned by the validator
-            if (!fn_msg && !is_custom_fn)
-              err += ": " + field
-            // each field can have multiple validation failures stored against it
-            if (failures.hasOwnProperty(field)) {
-              failures[field].push(err)
-            } else {
-              failures[field] = [err]
+            try {
+              fn_method.apply(null, fn_args)
+            } catch (err) {
+              err = err.message
+              // if we didn't provide a custom error message then augment the default one returned by the validator
+              if (!fn_msg && !is_custom_fn)
+                err += ": " + field
+              // each field can have multiple validation failures stored against it
+              if (failures.hasOwnProperty(field)) {
+                failures[field].push(err)
+              } else {
+                failures[field] = [err]
+              }
             }
-          }
 
-        }) // for each validator for this field
-      } // if field has validator set
+          }) // for each validator for this field
+        } // if field has validator set
+      } // Bypass the field if it is a nested JSON
     }) // for each field
 
     return (Utils._.isEmpty(failures) ? null : failures)
@@ -296,7 +309,7 @@ module.exports = (function() {
   DAO.prototype.destroy = function() {
     if (this.__options.timestamps && this.__options.paranoid) {
       var attr = this.__options.underscored ? 'deleted_at' : 'deletedAt'
-      this[attr] = new Date()
+      this.dataValues[attr] = new Date()
       return this.save()
     } else {
       var identifier = this.__options.hasPrimaryKeys ? this.primaryKeyValues : this.id
@@ -357,7 +370,37 @@ module.exports = (function() {
   }
 
   DAO.prototype.addAttribute = function(attribute, value) {
-    this[attribute] = value
+    if (typeof this.dataValues[attribute] !== 'undefined')
+      return;
+
+    if (this.booleanValues.length && this.booleanValues.indexOf(attribute) !== -1) // transform integer 0,1 into boolean
+      value = !!value;
+
+    var has = (function(o) {
+      var predef = Object.getOwnPropertyDescriptor(o, attribute);
+
+      if (predef && predef.hasOwnProperty('value'))
+        return true; // true here means 'this property exist as a simple value property, do not place setters or getters at all'
+
+        return {
+          get: (predef && predef.hasOwnProperty('get') ? predef.get : null) || o.__lookupGetter__(attribute),
+          set: (predef && predef.hasOwnProperty('set') ? predef.set : null) || o.__lookupSetter__(attribute)
+        };
+    })(this);
+
+    // @ node-v0.8.19:
+    //    calling __defineGetter__ destroys any previously defined setters for the attribute in
+    //    question *if* that property setter was defined on the object's prototype (which is what
+    //    we do in dao-factory) ... therefore we need to [re]define both the setter and getter
+    //    here with either the function that already existed OR the default/automatic definition
+    //
+    //    (the same is true for __defineSetter and 'prototype' getters)
+    if (has !== true) {
+      this.__defineGetter__(attribute, has.get || function()  { return this.dataValues[attribute]; });
+      this.__defineSetter__(attribute, has.set || function(v) { this.dataValues[attribute] = v;    });
+    }
+
+    this[attribute] = value;
   }
 
   DAO.prototype.setValidators = function(attribute, validators) {
@@ -371,8 +414,13 @@ module.exports = (function() {
   // private
 
   var initAttributes = function(values, isNewRecord) {
+    // set id to null if not passed as value, a newly created dao has no id
+    var defaults = this.hasPrimaryKeys ? {} : { id: null },
+        attrs    = {},
+        key;
+
     // add all passed values to the dao and store the attribute names in this.attributes
-    for (var key in values) {
+    for (key in values) {
       if (values.hasOwnProperty(key)) {
         if (typeof values[key] === "string" && !!this.__factory && !!this.__factory.rawAttributes[key] && !!this.__factory.rawAttributes[key].type && !!this.__factory.rawAttributes[key].type.type && this.__factory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
           values[key] = this.QueryInterface.QueryGenerator.toHstore(values[key])
@@ -382,10 +430,6 @@ module.exports = (function() {
       }
     }
 
-    // set id to null if not passed as value
-    // a newly created dao has no id
-    var defaults = this.hasPrimaryKeys ? {} : { id: null }
-
     if (this.__options.timestamps && isNewRecord) {
       defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
       defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
@@ -393,17 +437,38 @@ module.exports = (function() {
       if (this.__options.paranoid) {
         defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null
       }
+
+      if (this.hasDefaultValues) {
+        Utils._.each(this.defaultValues, function(valueFn, key) {
+          if (!defaults.hasOwnProperty(key))
+            defaults[key] = valueFn()
+        })
+      }
     }
 
     if (Utils._.size(defaults)) {
-      for (var attr in defaults) {
-        var value = defaults[attr]
+      for (key in defaults) {
+        attrs[key] = Utils.toDefaultValue(defaults[key])
+      }
+    }
 
-        if (!this.hasOwnProperty(attr)) {
-          this.addAttribute(attr, Utils.toDefaultValue(value))
+    Utils._.each(this.attributes, function(key) {
+      if (!attrs.hasOwnProperty(key)) {
+        attrs[key] = undefined
+      }
+    })
+
+    if (values) {
+      for (key in values) {
+        if (values.hasOwnProperty(key)) {
+          attrs[key] = values[key]
         }
       }
     }
+
+    for (key in attrs) {
+      this.addAttribute(key, attrs[key])
+    }
   }
 
   return DAO
diff --git a/lib/dialects/postgres/query.js b/lib/dialects/postgres/query.js
index 49c405cf6529..6dff30fed944 100644
--- a/lib/dialects/postgres/query.js
+++ b/lib/dialects/postgres/query.js
@@ -108,27 +108,29 @@ module.exports = (function() {
     } else if (this.send('isShowOrDescribeQuery')) {
       this.emit('success', results)
     } else if (this.send('isInsertQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key) && this.callee.daoFactory.rawAttributes[key]) {
-          var record = rows[0][key]
-          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
-            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+      if(this.callee !== null) { // may happen for bulk inserts
+        for (var key in rows[0]) {
+          if (rows[0].hasOwnProperty(key)) {
+            var record = rows[0][key]
+            if (!!this.callee.daoFactory && !!this.callee.daoFactory.rawAttributes && !!this.callee.daoFactory.rawAttributes[key] && !!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+              record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+            }
+            this.callee[key] = record
           }
-
-          this.callee[key] = record
         }
       }
 
       this.emit('success', this.callee)
     } else if (this.send('isUpdateQuery')) {
-      for (var key in rows[0]) {
-        if (rows[0].hasOwnProperty(key) && this.callee.daoFactory.rawAttributes[key]) {
-          var record = rows[0][key]
-          if (!!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
-            record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+      if(this.callee !== null) { // may happen for bulk updates
+        for (var key in rows[0]) {
+          if (rows[0].hasOwnProperty(key)) {
+            var record = rows[0][key]
+            if (!!this.callee.daoFactory && !!this.callee.daoFactory.rawAttributes && !!this.callee.daoFactory.rawAttributes[key] && !!this.callee.daoFactory.rawAttributes[key].type && !!this.callee.daoFactory.rawAttributes[key].type.type && this.callee.daoFactory.rawAttributes[key].type.type === DataTypes.HSTORE.type) {
+              record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
+            }
+            this.callee[key] = record
           }
-
-          this.callee[key] = record
         }
       }
 

From f3441cead1a9d91d28c4d12cb8ea83e872969dda Mon Sep 17 00:00:00 2001
From: thomascool 
Date: Thu, 23 May 2013 17:57:30 -0700
Subject: [PATCH 360/360] bug fixing

add the table name for each selected column
---
 lib/dialects/postgres/query-generator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialects/postgres/query-generator.js b/lib/dialects/postgres/query-generator.js
index 1b058e7fe6a1..c852a642df26 100644
--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -226,7 +226,7 @@ module.exports = (function() {
         } else if (attr.indexOf('`') >= 0) {
           return attr.replace(/`/g, '"')
         } else {
-          return QueryGenerator.addQuotes(attr)
+          return options.table + '.' + QueryGenerator.addQuotes(attr)
         }
       }).join(", ")