Merge remote-tracking branch 'upstream/master'

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

Merge remote-tracking branch 'upstream/master'
Conflicts: lib/dialects/postgres/query-generator.js
Benjamin Woodruff
Commit db4a252c authored Jun 18, 2013 by Benjamin Woodruff
Showing with 60 additions and 27 deletions
changelog.md
lib/associations/has-many.js
lib/dialects/postgres/query-generator.js
lib/sql-string.js
spec-jasmine/postgres/query-generator.spec.js
spec/associations/has-many.spec.js
--- a/changelog.md
+++ b/changelog.md
@@ -12,6 +12,7 @@
 - [BUG] Default ports are now declared in the connector manager, which means the default port for PG correctly becomes 5432. [#633](https://github.com/sequelize/sequelize/issues/633). durango
 - [BUG] Columns with type BOOLEAN were always added to toJSON output, even if they were not selected [see](https://gist.github.com/gchaincl/45aca14e93934bf4a05e). janmeier
 - [BUG] Hstore is now fully supported [#695](https://github.com/sequelize/sequelize/pull/695). thanks to tadman
+- [BUG] Correct join table name for tables with custom names [#698](https://github.com/sequelize/sequelize/pull/698). thanks to jjclark1982
 - [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
@@ -26,6 +27,7 @@
 - [FEATURE] Field and table comments for MySQL and PG. [#523](https://github.com/sequelize/sequelize/pull/523). MySQL by iamjochen. PG by janmeier
 - [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
 # v1.6.0 #
 - [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work

--- a/lib/associations/has-many.js
+++ b/lib/associations/has-many.js
@@ -19,6 +19,7 @@ module.exports = (function() {
      this.isSelfAssociation ? (this.options.as || this.target.tableName) : this.target.tableName
    )
    this.associationAccessor = this.combinedName = (this.options.joinTableName || combinedTableName)
+    this.options.tableName = this.combinedName
    var as = (this.options.as || Utils.pluralize(this.target.tableName))

--- a/lib/dialects/postgres/query-generator.js
+++ b/lib/dialects/postgres/query-generator.js
@@ -496,7 +496,7 @@ module.exports = (function() {
        result = smth
      }
      else if (Array.isArray(smth)) {
-        result = Utils.format(smth)
+        result = Utils.format(smth, "postgres")
      }
      return result

--- a/lib/sql-string.js
+++ b/lib/sql-string.js
-var SqlString = exports;
+var moment = require("moment")
+  , SqlString = exports;
 SqlString.escapeId = function (val, forbidQualified) {
  if (forbidQualified) {
@@ -90,7 +91,12 @@ SqlString.format = function(sql, values, timeZone, dialect) {
 SqlString.dateToString = function(date, timeZone, dialect) {
  var dt = new Date(date);
-  if (timeZone != 'local') {
+  // TODO: Ideally all dialects would work a bit more like this
+  if (dialect === "postgres") {
+    return moment(dt).format("YYYY-MM-DD HH:mm:ss.SSS Z");
+  }
+  if (timeZone !== 'local') {
    var tz = convertTimezone(timeZone);
    dt.setTime(dt.getTime() + (dt.getTimezoneOffset() * 60000));
@@ -99,20 +105,7 @@ SqlString.dateToString = function(date, timeZone, dialect) {
    }
  }
-  var year   = dt.getFullYear();
+  return moment(dt).format("YYYY-MM-DD HH:mm:ss") + (dialect === 'mysql' ? '.0Z' : '');
-  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 +
-         (dialect === 'mysql' ? '.0Z' : '');
 };
 SqlString.bufferToString = function(buffer) {

--- a/spec-jasmine/postgres/query-generator.spec.js
+++ b/spec-jasmine/postgres/query-generator.spec.js
@@ -338,7 +338,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.0Z') RETURNING *;"
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.000 +00:00') RETURNING *;"
      }, {
        arguments: ['myTable', {name: 'foo', foo: 1}],
        expectation: "INSERT INTO \"myTable\" (\"name\",\"foo\") VALUES ('foo',1) RETURNING *;"
@@ -379,7 +379,7 @@ describe('QueryGenerator', function() {
        context: {options: {quoteIdentifiers: false}}
      }, {
        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.0Z') RETURNING *;",
+        expectation: "INSERT INTO myTable (name,birthday) VALUES ('foo','2011-03-27 10:01:55.000 +00:00') RETURNING *;",
        context: {options: {quoteIdentifiers: false}}
      }, {
        arguments: ['myTable', {name: 'foo', foo: 1}],
@@ -426,7 +426,7 @@ describe('QueryGenerator', function() {
        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 *;"
+        expectation: "INSERT INTO \"myTable\" (\"name\",\"birthday\") VALUES ('foo','2011-03-27 10:01:55.000 +00:00'),('bar','2012-03-27 10:01:55.000 +00:00') RETURNING *;"
      }, {
        arguments: ['myTable', [{name: 'foo', foo: 1}, {name: 'bar', foo: 2}]],
        expectation: "INSERT INTO \"myTable\" (\"name\",\"foo\") VALUES ('foo',1),('bar',2) RETURNING *;"
@@ -467,7 +467,7 @@ describe('QueryGenerator', function() {
        context: {options: {quoteIdentifiers: false}}
      }, {
        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 *;",
+        expectation: "INSERT INTO myTable (name,birthday) VALUES ('foo','2011-03-27 10:01:55.000 +00:00'),('bar','2012-03-27 10:01:55.000 +00:00') RETURNING *;",
        context: {options: {quoteIdentifiers: false}}
      }, {
        arguments: ['myTable', [{name: 'foo', foo: 1}, {name: 'bar', foo: 2}]],
@@ -507,10 +507,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.0Z' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.000 +00:00' 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.0Z' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.000 +00:00' WHERE \"id\"=2 RETURNING *"
      }, {
        arguments: ['myTable', {bar: 2}, {name: 'foo'}],
        expectation: "UPDATE \"myTable\" SET \"bar\"=2 WHERE \"name\"='foo' RETURNING *"
@@ -534,7 +534,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.0Z' WHERE \"id\"=2 RETURNING *"
+        expectation: "UPDATE \"mySchema\".\"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.000 +00:00' 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 *"
@@ -543,11 +543,11 @@ describe('QueryGenerator', function() {
      // Variants when quoteIdentifiers is false
      {
        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.0Z' WHERE id=2 RETURNING *",
+        expectation: "UPDATE myTable SET name='foo',birthday='2011-03-27 10:01:55.000 +00:00' WHERE id=2 RETURNING *",
        context: {options: {quoteIdentifiers: false}}
      }, {
        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.0Z' WHERE id=2 RETURNING *",
+        expectation: "UPDATE myTable SET name='foo',birthday='2011-03-27 10:01:55.000 +00:00' WHERE id=2 RETURNING *",
        context: {options: {quoteIdentifiers: false}}
      }, {
        arguments: ['myTable', {bar: 2}, {name: 'foo'}],
@@ -575,7 +575,7 @@ describe('QueryGenerator', function() {
        context: {options: {omitNull: true, quoteIdentifiers: false}},
      }, {
        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.0Z' WHERE id=2 RETURNING *",
+        expectation: "UPDATE mySchema.myTable SET name='foo',birthday='2011-03-27 10:01:55.000 +00:00' WHERE id=2 RETURNING *",
        context: {options: {quoteIdentifiers: false}}
      }, {
        arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {name: 'foo'}],

--- a/spec/associations/has-many.spec.js
+++ b/spec/associations/has-many.spec.js
@@ -415,6 +415,43 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
        }.bind(this))
      })
    }) // end optimization using bulk create, destroy and update
+    describe('join table creation', function () {
+      before(function (done) {
+        this.User = this.sequelize.define('User',
+          { username: Sequelize.STRING },
+          { tableName: 'users'}
+        )
+        this.Task = this.sequelize.define('Task',
+          { title: Sequelize.STRING },
+          { tableName: 'tasks' }
+        )
+        this.User.hasMany(this.Task,
+          { joinTableName: 'user_has_tasks' }
+        )
+        this.Task.hasMany(this.User)  
+        this.sequelize.sync({force: true}).success(done)
+      })
+      it('uses the specified joinTableName or a reasonable default', function(done) {
+        for (var associationName in this.User.associations) {
+          expect(associationName).not.toEqual(this.User.tableName)
+          expect(associationName).not.toEqual(this.Task.tableName)
+          var joinTableName = this.User.associations[associationName].options.joinTableName
+          if (typeof joinTableName !== 'undefined') {
+            expect(joinTableName).toEqual(associationName)
+          }
+          var tableName = this.User.associations[associationName].options.tableName
+          if (typeof tableName !== 'undefined') {
+            expect(tableName).toEqual(associationName)
+          }
+        }
+        done()
+      })
+    })
  })
  describe("Foreign key constraints", function() {