Merge branch 'master' of github.com:sequelize/sequelize

Sascha Depold
Commit 7fb7a9e7 authored Jul 30, 2013 by Sascha Depold
Showing with 97 additions and 24 deletions
README.md
changelog.md
lib/dialects/mysql/query-generator.js
package.json
test/dao.validations.test.js
test/mysql/dao-factory.test.js
test/mysql/query-generator.test.js
test/postgres/associations.test.js
test/query-interface.test.js
test/sqlite/query-generator.test.js
test/support.js
--- a/README.md
+++ b/README.md
@@ -139,30 +139,27 @@ $ npm install
 ### 4. Run the tests ###
-Right now, the test base is split into the `spec` folder (which contains the
+Right now, the test base is split into the `test` folder (which contains the
-lovely [BusterJS](http://busterjs.org) tests).
+lovely [Mocha](http://visionmedia.github.io/mocha/) tests).
 As you might haven't installed all of the supported SQL dialects, here is how
 to run the test suites for your development environment:
 ```console
 $ # run all tests at once:
-$ npm test
+$ make all
-$ # run all of the buster specs (for all dialects):
-$ npm run test-buster
 $ # run the buster specs for mysql:
-$ npm run test-buster-mysql
+$ make mysql
 $ # run the buster specs for sqlite:
-$ npm run test-buster-sqlite
+$ make sqlite
 $ # run the buster specs for postgresql:
-$ npm run test-buster-postgres
+$ make pgsql
-$ # alternatively you can pass database credentials with $variables when testing with buster.js
+$ # alternatively you can pass database credentials with $variables when testing
-$ DIALECT=dialect SEQ_DB=database SEQ_USER=user SEQ_PW=password buster-test
+$ DIALECT=dialect SEQ_DB=database SEQ_USER=user SEQ_PW=password make test
 ```
 ### 5. That's all ###

--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,8 @@
 - [DEPENDENCIES] Upgraded validator for IPv6 support. [#603](https://github.com/sequelize/sequelize/pull/603). thanks to durango
 - [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
 - [DEPENDENCIES] Upgraded pg to 2.0.0. [#711](https://github.com/sequelize/sequelize/pull/711). thanks to durango
+- [DEPENDENCIES] Upgraded command to 2.0.0 and generic-pool to 2.0.4. thanks to durango
+- [DEPENDENCIES] No longer require semver. 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
@@ -21,6 +23,8 @@
 - [BUG] bulkCreate would have problems with a disparate field list [#738](https://github.com/sequelize/sequelize/pull/738). thanks to durango
 - [BUG] Fixed problems with quoteIdentifiers and {raw: false} option on raw queries [#751](https://github.com/sequelize/sequelize/pull/751). thanks to janmeier
 - [BUG] Fixed SQL escaping with sqlite and unified escaping [#700](https://github.com/sequelize/sequelize/pull/700). thanks to PiPeep
+- [BUG] Fixed Postgres' pools [ff57af63](https://github.com/sequelize/sequelize/commit/ff57af63c2eb395b4828a5984a22984acdc2a5e1)
+- [BUG] Fixed BLOB/TEXT columns having a default value declared in MySQL [#793](https://github.com/sequelize/sequelize/pull/793). thanks to durango
 - [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
@@ -42,8 +46,10 @@
 - [FEATURE] Added support for where clauses containing !=, < etc. and support for date ranges  [#727](https://github.com/sequelize/sequelize/pull/727). Thanks to durango
 - [FEATURE] Added support for model instances being referenced [#761](https://github.com/sequelize/sequelize/pull/761) thanks to sdepold
 - [FEATURE] Added support for specifying the path to load a module for a dialect. [#766](https://github.com/sequelize/sequelize/pull/766) thanks to sonnym.
+- [FEATURE] Drop index if exists has been added to sqlite [#766](https://github.com/sequelize/sequelize/pull/776) thanks to coderbuzz
 - [REFACTORING] hasMany now uses a single SQL statement when creating and destroying associations, instead of removing each association seperately [690](https://github.com/sequelize/sequelize/pull/690). Inspired by [#104](https://github.com/sequelize/sequelize/issues/104). janmeier
 - [REFACTORING] Consistent handling of offset across dialects. Offset is now always applied, and limit is set to max table size of not limit is given [#725](https://github.com/sequelize/sequelize/pull/725). janmeier
+- [REFACTORING] Moved Jasmine to Buster and then Buster to Mocha + Chai. sdepold and durango
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

--- a/lib/dialects/mysql/query-generator.js
+++ b/lib/dialects/mysql/query-generator.js
@@ -520,7 +520,8 @@ module.exports = (function() {
            template += " auto_increment"
          }
-          if ((dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+          // Blobs/texts cannot have a defaultValue
+          if (dataType.type !== "TEXT" && dataType.type._binary !== true && (dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
            template += " DEFAULT " + this.escape(dataType.defaultValue)
          }

--- a/package.json
+++ b/package.json
@@ -22,6 +22,10 @@
        "janzeh@gmail.com",
        "jmei@itu.dk"
      ]
+    },
+    {
+      "name": "Daniel Durante",
+      "email": "me@danieldurante.com"
    }
  ],
  "repository": {
@@ -37,10 +41,10 @@
    "lingo": "~0.0.5",
    "validator": "~1.3.0",
    "moment": "~2.1.0",
-    "commander": "~1.3.0",
+    "commander": "~2.0.0",
    "dottie": "0.0.8-0",
    "toposort-class": "~0.2.0",
-    "generic-pool": "2.0.3",
+    "generic-pool": "2.0.4",
    "promise": "~3.2.0"
  },
  "devDependencies": {

--- a/test/dao.validations.test.js
+++ b/test/dao.validations.test.js
@@ -253,6 +253,53 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
      }
    }
+    describe('#create', function() {
+      beforeEach(function(done) {
+        var self = this
+        var Project = this.sequelize.define('Project', {
+          name: {
+            type: Sequelize.STRING,
+            allowNull: false,
+            defaultValue: 'unknown',
+            validate: {
+              isIn: [['unknown', 'hello', 'test']]
+            }
+          }
+        })
+        var Task = this.sequelize.define('Task', {
+          something: Sequelize.INTEGER
+        })
+        Project.hasOne(Task)
+        Task.hasOne(Project)
+        Project.sync({ force: true }).success(function() {
+          Task.sync({ force: true }).success(function() {
+            self.Project = Project
+            self.Task = Task
+            done()
+          })
+        })
+      })
+      it('correctly validates using create method ', function(done) {
+        var self = this
+        this.Project.create({}).success(function(project) {
+          self.Task.create({something: 1}).success(function(task) {
+            project.setTask(task).success(function(task) {
+              expect(task.ProjectId).to.not.be.null
+              task.setProject(project).success(function(project) {
+                expect(project.ProjectId).to.not.be.null
+                done()
+              })
+            })
+          })
+        })
+      })
+    })
    it('correctly validates using custom validation methods', function(done) {
      var User = this.sequelize.define('User' + config.rand(), {
        name: {

--- a/test/mysql/dao-factory.test.js
+++ b/test/mysql/dao-factory.test.js
@@ -71,6 +71,18 @@ if (dialect.match(/^mysql/)) {
        expect(User.attributes).to.deep.equal({id:"INTEGER NOT NULL auto_increment PRIMARY KEY", deleted_at:"DATETIME", updated_at:"DATETIME NOT NULL", created_at:"DATETIME NOT NULL"})
        done()
      })
+      it('omits text fields with defaultValues', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {name: {type: DataTypes.TEXT, defaultValue: 'helloworld'}})
+        expect(User.attributes.name).to.equal('TEXT')
+        done()
+      })
+      it('omits blobs fields with defaultValues', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {name: {type: DataTypes.STRING.BINARY, defaultValue: 'helloworld'}})
+        expect(User.attributes.name).to.equal('VARCHAR(255) BINARY')
+        done()
+      })
    })
    describe('primaryKeys', function() {

--- a/test/mysql/query-generator.test.js
+++ b/test/mysql/query-generator.test.js
@@ -68,7 +68,7 @@ if (dialect.match(/^mysql/)) {
        {
          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: [

--- a/test/postgres/associations.test.js
+++ b/test/postgres/associations.test.js
@@ -9,11 +9,6 @@ chai.Assertion.includeStack = true
 if (dialect.match(/^postgres/)) {
  describe('[POSTGRES Specific] associations', function() {
-    beforeEach(function(done) {
-      this.sequelize.options.quoteIdentifier = true
-      done()
-    })
    describe('many-to-many', function() {
      describe('where tables have the same prefix', function() {
        it("should create a table wp_table1wp_table2s", function(done) {
@@ -76,7 +71,6 @@ if (dialect.match(/^postgres/)) {
            tasks[tasks.length] = {name: 'Task' + Math.random()}
          }
-          self.sequelize.getQueryInterface().dropAllTables().success(function() {
          self.User.sync({ force: true }).success(function() {
            self.Task.sync({ force: true }).success(function() {
              self.User.bulkCreate(users).success(function() {
@@ -93,7 +87,6 @@ if (dialect.match(/^postgres/)) {
            })
          })
        })
-        })
        it('should correctly add an association to the dao', function(done) {
          var self = this

--- a/test/query-interface.test.js
+++ b/test/query-interface.test.js
@@ -48,7 +48,7 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
  })
  describe('indexes', function() {
-    before(function(done) {
+    beforeEach(function(done) {
      var self = this
      this.queryInterface.dropTable('Users').success(function() {
        self.queryInterface.createTable('Users', {

--- a/test/sqlite/query-generator.test.js
+++ b/test/sqlite/query-generator.test.js
@@ -5,6 +5,7 @@ var chai      = require('chai')
  , dialect   = Support.getTestDialect()
  , util      = require("util")
  , _         = require('lodash')
+  , moment    = require('moment')
  , QueryGenerator = require("../../lib/dialects/sqlite/query-generator")
 chai.Assertion.includeStack = true
@@ -109,6 +110,9 @@ if (dialect === 'sqlite') {
          arguments: ['myTable', { name: "bar", value: undefined }],
          expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('bar',NULL);"
        }, {
+          arguments: ['myTable', {name: 'foo', birthday: moment("2011-03-27 10:01:55 +0000", "YYYY-MM-DD HH:mm:ss Z").toDate()}],
+          expectation: "INSERT INTO `myTable` (`name`,`birthday`) VALUES ('foo','2011-03-27 10:01:55');"
+        }, {
          arguments: ['myTable', { name: "foo", value: true }],
          expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',1);"
        }, {
@@ -140,6 +144,9 @@ if (dialect === 'sqlite') {
          arguments: ['myTable', [{name: "'bar'"}, {name: 'foo'}]],
          expectation: "INSERT INTO `myTable` (`name`) VALUES ('''bar'''),('foo');"
        }, {
+          arguments: ['myTable', [{name: 'foo', birthday: moment("2011-03-27 10:01:55 +0000", "YYYY-MM-DD HH:mm:ss Z").toDate()}, {name: 'bar', birthday: moment("2012-03-27 10:01:55 +0000", "YYYY-MM-DD HH:mm:ss Z").toDate()}]],
+          expectation: "INSERT INTO `myTable` (`name`,`birthday`) VALUES ('foo','2011-03-27 10:01:55'),('bar','2012-03-27 10:01:55');"
+        }, {
          arguments: ['myTable', [{name: "bar", value: null}, {name: 'foo', value: 1}]],
          expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('bar',NULL),('foo',1);"
        }, {
@@ -171,6 +178,12 @@ if (dialect === 'sqlite') {
      updateQuery: [
        {
+          arguments: ['myTable', {name: 'foo', birthday: moment("2011-03-27 10:01:55 +0000", "YYYY-MM-DD HH:mm:ss Z").toDate()}, {id: 2}],
+          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2"
+        }, {
+          arguments: ['myTable', {name: 'foo', birthday: moment("2011-03-27 10:01:55 +0000", "YYYY-MM-DD HH:mm:ss Z").toDate()}, 2],
+          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id`=2"
+        }, {
          arguments: ['myTable', { name: 'foo' }, { id: 2 }],
          expectation: "UPDATE `myTable` SET `name`='foo' WHERE `id`=2"
        }, {

--- a/test/support.js
+++ b/test/support.js
@@ -121,7 +121,7 @@ before(function(done) {
  done()
 })
-afterEach(function(done) {
+beforeEach(function(done) {
  Support.clearDatabase(this.sequelize, function() {
    done()
  })