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

Conflicts: lib/dialects/postgres/query-generator.js

Merge branch 'master' of github.com:sequelize/sequelize
Conflicts: lib/dialects/postgres/query-generator.js
Benjamin Woodruff
Commit 70d38f78 authored Jul 10, 2013 by Benjamin Woodruff
Showing with 136 additions and 44 deletions
changelog.md
lib/associations/belongs-to.js
lib/associations/has-many.js
lib/associations/has-one.js
lib/dao-factory.js
lib/dao.js
lib/dialects/abstract/query.js
lib/dialects/postgres/query-generator.js
lib/query-interface.js
lib/sequelize.js
lib/sql-string.js
lib/utils.js
package.json
spec/dao-factory.spec.js
spec/language.spec.js
--- a/changelog.md
+++ b/changelog.md
 # v1.7.0 #
 - [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
 - [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
@@ -28,6 +29,8 @@
 - [FEATURE] BigInts can now be used for autoincrement/serial columns. [#673](https://github.com/sequelize/sequelize/pull/673). thanks to sevastos
 - [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
 - [FEATURE] Use moment for better postgres timestamp strings. [#710](https://github.com/sequelize/sequelize/pull/710). Thanks to seth-admittedly
+- [FEATURE] Keep milliseconds in timestamps for postgres. [#712](https://github.com/sequelize/sequelize/pull/712). Thanks to seth-admittedly
+- [FEATURE] You can now set lingo's language through Sequelize. [#713](https://github.com/sequelize/sequelize/pull/713). Thanks to durango
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

--- a/lib/associations/belongs-to.js
+++ b/lib/associations/belongs-to.js
@@ -11,7 +11,7 @@ module.exports = (function() {
    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.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as, this.source.options.language) + "Id", this.source.options.underscored)
    }
    this.associationAccessor = this.isSelfAssociation
@@ -23,7 +23,7 @@ module.exports = (function() {
  BelongsTo.prototype.injectAttributes = function() {
    var newAttributes  = {}
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName) + "Id", this.source.options.underscored)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName, this.target.options.language) + "Id", this.source.options.underscored)
    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
    Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)
    Utils._.defaults(this.source.rawAttributes, newAttributes)
@@ -36,7 +36,7 @@ module.exports = (function() {
  BelongsTo.prototype.injectGetter = function(obj) {
    var self     = this
-      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName)))
+      , accessor = Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language)))
    obj[accessor] = function(params) {
      var id = this[self.identifier]
@@ -59,7 +59,7 @@ module.exports = (function() {
  BelongsTo.prototype.injectSetter = function(obj) {
    var self     = this
-      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+      , accessor = Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language)))
    obj[accessor] = function(associatedObject) {
      this[self.identifier] = associatedObject ? associatedObject.id : null

--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -21,14 +21,14 @@ module.exports = (function() {
    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
    this.options.tableName = this.combinedName
-    var as = (this.options.as || Utils.pluralize(this.target.tableName))
+    var as = (this.options.as || Utils.pluralize(this.target.tableName, this.target.options.language))
    this.accessors = {
      get: Utils._.camelize('get_' + as),
      set: Utils._.camelize('set_' + as),
-      add: Utils._.camelize(Utils.singularize('add_' + as)),
+      add: Utils._.camelize(Utils.singularize('add_' + as, this.target.options.language)),
-      remove: Utils._.camelize(Utils.singularize('remove_' + as)),
+      remove: Utils._.camelize(Utils.singularize('remove_' + as, this.target.options.language)),
-      hasSingle: Utils._.camelize(Utils.singularize('has_' + as)),
+      hasSingle: Utils._.camelize(Utils.singularize('has_' + as, this.target.options.language)),
      hasAll: Utils._.camelize('has_' + as)
    }
  }
@@ -37,7 +37,7 @@ module.exports = (function() {
  // 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)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "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?

--- a/lib/associations/has-one.js
+++ b/lib/associations/has-one.js
@@ -11,7 +11,7 @@ module.exports = (function() {
    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.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as, this.target.options.language) + "Id", this.options.underscored)
    }
    this.associationAccessor = this.isSelfAssociation
@@ -19,8 +19,8 @@ module.exports = (function() {
      : this.options.as || this.target.tableName
    this.accessors = {
-      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName))),
+      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language))),
-      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName)))
+      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language)))
    }
  }
@@ -28,7 +28,7 @@ module.exports = (function() {
  HasOne.prototype.injectAttributes = function() {
    var newAttributes = {}
-    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName) + "Id", this.options.underscored)
+    this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
    Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
    Utils._.defaults(this.target.rawAttributes, newAttributes)

--- a/lib/dao-factory.js
+++ b/lib/dao-factory.js
@@ -18,7 +18,8 @@ module.exports = (function() {
      paranoid: false,
      whereCollection: null,
      schema: null,
-      schemaDelimiter: ''
+      schemaDelimiter: '',
+      language: 'en'
    }, options || {})
    // error check options
@@ -31,7 +32,7 @@ module.exports = (function() {
    this.name = name
    if (!this.options.tableName) {
-      this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name)
+      this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name, this.options.language)
    } else {
      this.tableName = this.options.tableName
    }
@@ -298,14 +299,14 @@ module.exports = (function() {
  DAOFactory.prototype.max = function(field, options) {
    options = Utils._.extend({ attributes: [] }, options || {})
-    options.attributes.push(['max(' + field + ')', 'max'])
+    options.attributes.push(['max(' + this.QueryInterface.QueryGenerator.quoteIdentifier(field) + ')', 'max'])
    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.attributes.push(['min(' + this.QueryInterface.QueryGenerator.quoteIdentifier(field) + ')', 'min'])
    options.parseFloat = true
    return this.QueryInterface.rawSelect(this.getTableName(), options, 'min')

--- a/lib/dao.js
+++ b/lib/dao.js
@@ -138,7 +138,7 @@ module.exports = (function() {
    }
    if (this.__options.timestamps && this.dataValues.hasOwnProperty(updatedAtAttr)) {
-      this.dataValues[updatedAtAttr] = values[updatedAtAttr] = Utils.now()
+      this.dataValues[updatedAtAttr] = values[updatedAtAttr] = Utils.now(this.sequelize.options.dialect)
    }
    var errors = this.validate()
@@ -369,8 +369,8 @@ module.exports = (function() {
      }
      if (this.__options.timestamps) {
-        defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now()
+        defaults[this.__options.underscored ? 'created_at' : 'createdAt'] = Utils.now(this.sequelize.options.dialect)
-        defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now()
+        defaults[this.__options.underscored ? 'updated_at' : 'updatedAt'] = Utils.now(this.sequelize.options.dialect)
        if (this.__options.paranoid) {
          defaults[this.__options.underscored ? 'deleted_at' : 'deletedAt'] = null

--- a/lib/dialects/abstract/query.js
+++ b/lib/dialects/abstract/query.js
@@ -302,11 +302,12 @@ module.exports = (function() {
  var buildAssociatedDaoInstances = function(tableName, associationData, dao) {
    var associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(tableName, { attribute: 'tableName' })
      , association          = null
+      , self                 = this
    if (!!associatedDaoFactory) {
      association = this.callee.getAssociation(associatedDaoFactory)
    } else {
-      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName), { attribute: 'tableName' })
+      associatedDaoFactory = this.sequelize.daoFactoryManager.getDAO(Utils.pluralize(tableName, this.sequelize.language), { attribute: 'tableName' })
      if (!!associatedDaoFactory) {
        association = this.callee.getAssociation(associatedDaoFactory)
@@ -326,7 +327,7 @@ module.exports = (function() {
        , isEmpty     = !Utils.firstValueOfHash(daoInstance.identifiers)
      if (['BelongsTo', 'HasOne'].indexOf(association.associationType) > -1) {
-        accessor = Utils.singularize(accessor)
+        accessor = Utils.singularize(accessor, self.sequelize.language)
        dao[accessor] = isEmpty ? null : daoInstance
      } else {
        dao[accessor] = dao[accessor] || []

--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -289,7 +289,7 @@ module.exports = (function() {
      return Utils._.template(query)(options)
    },
-    insertQuery: function(tableName, attrValueHash) {
+    insertQuery: function(tableName, attrValueHash, attributes) {
      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
@@ -306,14 +306,17 @@ module.exports = (function() {
        }
      });
+      var rowValues = []
+      Object.keys(attrValueHash).forEach(function(attr) {
+        rowValues[rowValues.length] = this.escape(attrValueHash[attr], (!!attributes && !!attributes[attr] ? attributes[attr] : undefined))
+      }.bind(this))
      var replacements  = {
        table:      this.quoteIdentifiers(tableName)
      , attributes: Object.keys(attrValueHash).map(function(attr){
                      return this.quoteIdentifier(attr)
                    }.bind(this)).join(",")
-      , values:     Utils._.values(attrValueHash).map(function(value){
+      , values:     rowValues.join(",")
-                      return this.escape(value)
-                    }.bind(this)).join(",")
      }
      return Utils._.template(query)(replacements)
@@ -730,8 +733,8 @@ module.exports = (function() {
      return identifiers.split('.').map(function(t) { return this.quoteIdentifier(t, force) }.bind(this)).join('.')
    },
-    escape: function(value) {
+    escape: function(value, field) {
-      return SqlString.escape(value, false, null, "postgres")
+      return SqlString.escape(value, false, null, "postgres", field)
    }
  }

--- a/lib/query-interface.js
+++ b/lib/query-interface.js
@@ -254,7 +254,7 @@ module.exports = (function() {
  }
  QueryInterface.prototype.insert = function(dao, tableName, values) {
-    var sql = this.QueryGenerator.insertQuery(tableName, values)
+    var sql = this.QueryGenerator.insertQuery(tableName, values, dao.daoFactory.rawAttributes)
    return queryAndEmit.call(this, [sql, dao], 'insert', {
      success: function(obj) { obj.isNewRecord = false }
    })

--- a/lib/sequelize.js
+++ b/lib/sequelize.js
@@ -79,7 +79,8 @@ module.exports = (function() {
      native: false,
      replication: false,
      pool: {},
-      quoteIdentifiers: true
+      quoteIdentifiers: true,
+      language: 'en'
    }, options || {})
    if (this.options.logging === true) {
@@ -172,7 +173,9 @@ module.exports = (function() {
        }
      })
    }
    options.omitNull = globalOptions.omitNull
+    options.language = globalOptions.language
    // if you call "define" multiple times for the same daoName, do not clutter the factory
    if(this.isDefined(daoName)) {

--- a/lib/sql-string.js
+++ b/lib/sql-string.js
@@ -8,7 +8,7 @@ SqlString.escapeId = function (val, forbidQualified) {
  return '`' + val.replace(/`/g, '``').replace(/\./g, '`.`') + '`';
 };
-SqlString.escape = function(val, stringifyObjects, timeZone, dialect) {
+SqlString.escape = function(val, stringifyObjects, timeZone, dialect, field) {
  if (val === undefined || val === null) {
    return 'NULL';
  }
@@ -31,7 +31,7 @@ SqlString.escape = function(val, stringifyObjects, timeZone, dialect) {
  }
  if (Array.isArray(val)) {
-    return SqlString.arrayToList(val, timeZone, dialect);
+    return SqlString.arrayToList(val, timeZone, dialect, field);
  }
  if (typeof val === 'object') {
@@ -62,11 +62,15 @@ SqlString.escape = function(val, stringifyObjects, timeZone, dialect) {
  return "'"+val+"'";
 };
-SqlString.arrayToList = function(array, timeZone, dialect) {
+SqlString.arrayToList = function(array, timeZone, dialect, field) {
  if (dialect === 'postgres') {
-    return 'ARRAY[' + array.map(function(v) {
+    var ret = 'ARRAY[' + array.map(function(v) {
-      return SqlString.escape(v, true, timeZone, dialect);
+      return SqlString.escape(v, true, timeZone, dialect, field);
    }).join(',') + ']';
+    if (!!field && !!field.type) {
+      ret += '::' + field.type.replace(/\(\d+\)/g, '');
+    }
+    return ret;
  } else {
    return array.map(function(v) {
      if (Array.isArray(v))

--- a/lib/utils.js
+++ b/lib/utils.js
@@ -61,12 +61,12 @@ var Utils = module.exports = {
    return (tableName1.toLowerCase() < tableName2.toLowerCase()) ? (tableName1 + tableName2) : (tableName2 + tableName1)
  },
-  singularize: function(s) {
+  singularize: function(s, language) {
-    return Utils.Lingo.en.isSingular(s) ? s : Utils.Lingo.en.singularize(s)
+    return Utils.Lingo[language || 'en'].isSingular(s) ? s : Utils.Lingo[language || 'en'].singularize(s)
  },
-  pluralize: function(s) {
+  pluralize: function(s, language) {
-    return Utils.Lingo.en.isPlural(s) ? s : Utils.Lingo.en.pluralize(s)
+    return Utils.Lingo[language || 'en'].isPlural(s) ? s : Utils.Lingo[language || 'en'].pluralize(s)
  },
  removeCommentsFromFunctionString: function(s) {
@@ -153,9 +153,9 @@ var Utils = module.exports = {
    return subClass;
  },
-  now: function() {
+  now: function(dialect) {
    var now = new Date()
-    now.setMilliseconds(0)
+    if(dialect != "postgres") now.setMilliseconds(0)
    return now
  },

--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
    "jasmine-node": "1.5.0",
    "sqlite3": "~2.1.5",
    "mysql": "~2.0.0-alpha7",
-    "pg": "~0.10.2",
+    "pg": "~2.0.0",
    "buster": "~0.6.3",
    "watchr": "~2.2.0",
    "yuidocjs": "~0.3.36"

--- a/spec/dao-factory.spec.js
+++ b/spec/dao-factory.spec.js
@@ -281,6 +281,26 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
  })
  describe('create', function() {
+    it("casts empty arrays correctly for postgresql", function(done) {
+      if (dialect !== "postgres" && dialect !== "postgresql-native") {
+        expect('').toEqual('')
+        return done()
+      }
+      var User = this.sequelize.define('UserWithArray', {
+        myvals: { type: Sequelize.ARRAY(Sequelize.INTEGER) },
+        mystr: { type: Sequelize.ARRAY(Sequelize.STRING) }
+      })
+      User.sync({force: true}).success(function() {
+        User.create({myvals: [], mystr: []}).on('sql', function(sql){
+          expect(sql.indexOf('ARRAY[]::INTEGER[]')).toBeGreaterThan(-1)
+          expect(sql.indexOf('ARRAY[]::VARCHAR[]')).toBeGreaterThan(-1)
+          done()
+        })
+      })
+    })
    it("doesn't allow duplicated records with unique:true", function(done) {
      var User = this.sequelize.define('UserWithUniqueUsername', {
        username: { type: Sequelize.STRING, unique: true }
@@ -357,7 +377,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
      User.sync({ force: true }).success(function() {
        User.create({ big: '9223372036854775807' }).on('success', function(user) {
-          expect(user.big).toEqual( '9223372036854775807' )
+          expect(user.big).toBe( '9223372036854775807' )
          done()
        })
      })
@@ -1635,7 +1655,8 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
  describe('max', function() {
    before(function(done) {
      this.UserWithAge = this.sequelize.define('UserWithAge', {
-        age: Sequelize.INTEGER
+        age: Sequelize.INTEGER,
+        order: Sequelize.INTEGER
      })
      this.UserWithDec = this.sequelize.define('UserWithDec', {
@@ -1647,6 +1668,15 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
      }.bind(this))
    })
+    it("should return the max value for a field named the same as an SQL reserved keyword", function(done) {
+      this.UserWithAge.create({age: 3, order: 5}).success(function(){
+        this.UserWithAge.max('order').success(function(max) {
+          expect(max).toEqual(5)
+          done()
+        })
+      }.bind(this))
+    })
    it("should return the max value", function(done) {
      this.UserWithAge.create({ age: 2 }).success(function() {
        this.UserWithAge.create({ age: 3 }).success(function() {

--- a/spec/language.spec.js
+++ b/spec/language.spec.js
+if(typeof require === 'function') {
+  const buster    = require("buster")
+      , Sequelize = require("../index")
+      , Helpers   = require('./buster-helpers')
+      , dialect   = Helpers.getTestDialect()
+}
+buster.spec.expose()
+buster.testRunner.timeout = 1000
+describe(Helpers.getTestDialectTeaser("Language Util"), function() {
+  describe("Plural", function(){
+    before(function(done) {
+      Helpers.initTests({
+        dialect: dialect,
+        onComplete: function(sequelize) {
+          this.sequelize = sequelize
+          this.sequelize.options.language = 'es'
+          done()
+        }.bind(this)
+      })
+    })
+    it("should rename tables to their plural form...", function(done){
+      var table = this.sequelize.define('arbol', {name: Sequelize.STRING})
+      var table2 = this.sequelize.define('androide', {name: Sequelize.STRING})
+      expect(table.tableName).toEqual('arboles')
+      expect(table2.tableName).toEqual('androides')
+      done()
+    })
+    it("should be able to pluralize/singularize associations...", function(done){
+      var table = this.sequelize.define('arbol', {name: Sequelize.STRING})
+      var table2 = this.sequelize.define('androide', {name: Sequelize.STRING})
+      var table3 = this.sequelize.define('hombre', {name: Sequelize.STRING})
+      table.hasOne(table2)
+      table2.belongsTo(table)
+      table3.hasMany(table2)
+      expect(table.associations.androides.identifier).toEqual('arbolId')
+      expect(table2.associations.arboles).toBeDefined()
+      expect(table3.associations.androideshombres).toBeDefined()
+      done()
+    })
+  })
+})