Sequelize latest

.travis.yml

@@ -19,5 +19,4 @@ env:
 language: node_js
 
 node_js:
-  - 0.8
-
+  - 0.8

README.md

@@ -38,29 +38,26 @@ 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)
 
 ## 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~~
-- ~~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
-- 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)
-- BLOB [#99](https://github.com/sdepold/sequelize/issues/99)
-- Support for foreign keys
+- ~~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
 
 ### 1.7.x
 - Complete support for non-id primary keys
@@ -74,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 ##

bin/sequelize

@@ -9,6 +9,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())
@@ -78,22 +79,36 @@ var readConfig = function() {
       throw new Error('The config.json is not available or contains invalid JSON.')
     }
   }
+  return config
 }
 
 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 <environment>', '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') {
+  environment = program.env
+}
+console.log("Using environment '" + environment + "'.")
+
 if(program.migrate) {
   if(process.env.DATABASE_URL || configFileExists) {
     var config = readConfig()
       , 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
@@ -146,9 +161,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)
@@ -157,21 +173,23 @@ 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) {",
-    "    // add altering commands here",
+    "  up: function(migration, DataTypes, done) {",
+    "    // add altering commands here, calling 'done' when finished",
+    "    done()",
     "  },",
-    "  down: function(migration) {",
-    "    // add reverting commands here",
+    "  down: function(migration, DataTypes, done) {",
+    "    // add reverting commands here, calling 'done' when finished",
+    "    done()",
     "  }",
     "}"
   ].join('\n')
 
   fs.writeFileSync(migrationsPath + '/' + migrationName, migrationContent)
 } else {
-  console.log('Please define any params!')
+  console.log('Try "sequelize --help" for usage information.')
 }

changelog.md

@@ -1,5 +1,18 @@
 # 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
+- [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 (`<DAOFactory>.bulkCreate()`, update (`<DAOFactory>.update()`) and delete (`<DAOFactory>.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

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,6 +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 }
+    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

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,6 +66,7 @@ module.exports = (function() {
     } else {
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
+      Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
       Utils._.defaults(this.target.rawAttributes, newAttributes)
     }
 

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,6 +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 }
+    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

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
+      }
+    }
+  }
+
+}

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
 })()