add more column specs

README.md

@@ -9,5 +9,5 @@ postgres driver for db-migrate
 ## Installation
 
 ```
-npm install db-migrate-pg
-```
+npm install --save db-migrate-pg
+```

index.js

@@ -39,6 +39,12 @@ var PgDriver = Base.extend({
     },
 
     createColumnDef: function(name, spec, options, tableName) {
+        // add support for datatype timetz, timestamptz
+        // https://www.postgresql.org/docs/9.5/static/datatype.html
+        spec.type = spec.type.replace(/^(time|timestamp)tz$/, function($, type) {
+            spec.timezone = true
+            return type
+        })
         var type = spec.autoIncrement ? '' : this.mapDataType(spec.type);
         var len = spec.length ? util.format('(%s)', spec.length) : '';
         var constraint = this.createColumnConstraint(spec, options, tableName, name);
@@ -47,11 +53,15 @@ var PgDriver = Base.extend({
         }
 
         return { foreignKey: constraint.foreignKey,
+                 callbacks: constraint.callbacks,
                  constraints: [name, type, len, constraint.constraints].join(' ') };
     },
 
     mapDataType: function(str) {
         switch(str) {
+          case 'json':
+          case 'jsonb':
+            return str.toUpperCase()
           case type.STRING:
             return 'VARCHAR';
           case type.DATE_TIME:
@@ -267,6 +277,7 @@ var PgDriver = Base.extend({
 
     createColumnConstraint: function(spec, options, tableName, columnName) {
         var constraint = [],
+            callbacks = [],
             cb;
 
         if (spec.primaryKey && options.emitPrimaryKey) {
@@ -284,6 +295,10 @@ var PgDriver = Base.extend({
             constraint.push('UNIQUE');
         }
 
+        if (spec.timezone) {
+            constraint.push('WITH TIME ZONE')
+        }
+
         if (spec.defaultValue !== undefined) {
             constraint.push('DEFAULT');
             if (typeof spec.defaultValue == 'string'){
@@ -293,12 +308,20 @@ var PgDriver = Base.extend({
             }
         }
 
+        // keep foreignKey for backward compatiable, push to callbacks in the future
         if (spec.foreignKey) {
 
           cb = this.bindForeignKey(tableName, columnName, spec.foreignKey);
         }
+        if (spec.comment) {
+          // TODO: create a new function addComment is not callable from here
+          callbacks.push((function(tableName, columnName, comment, callback) {
+            var sql = util.format("COMMENT on COLUMN %s.%s IS '%s'", tableName, columnName, comment)
+            return this.runSql(sql).nodeify(callback)
+          }).bind(this, tableName, columnName, spec.comment))
+        }
 
-        return { foreignKey: cb, constraints: constraint.join(' ') };
+        return { foreignKey: cb, callbacks: callbacks, constraints: constraint.join(' ') };
     },
 
     renameTable: function(tableName, newTableName, callback) {

test/pg_test.js

@@ -47,6 +47,7 @@ vows.describe('pg').addBatch({
         smalint: dataType.SMALLINT,
         dt: dataType.DATE,
         dti: dataType.DATE_TIME,
+        dti_tz: { type: dataType.DATE_TIME, timezone: true },
         bl: dataType.BOOLEAN
       }, this.callback.bind(this));
     },
@@ -77,9 +78,9 @@ vows.describe('pg').addBatch({
         }.bind(this));
       },
 
-      'with 10 columns': function(err, columns) {
+      'with 11 columns': function(err, columns) {
         assert.isNotNull(columns);
-        assert.equal(columns.length, 10);
+        assert.equal(columns.length, 11);
       },
 
       'that has integer id column that is primary key, non-nullable, and auto increments': function(err, columns) {
@@ -127,6 +128,12 @@ vows.describe('pg').addBatch({
         assert.equal(column.isNullable(), true);
       },
 
+      'that has timestamp with time zone column': function(err, columns) {
+        var column = findByName(columns, 'dti_tz');
+        assert.equal(column.getDataType(), 'TIMESTAMP WITH TIME ZONE');
+        assert.equal(column.isNullable(), true);
+      },
+
       'that has boolean bl column': function(err, columns) {
         var column = findByName(columns, 'bl');
         assert.equal(column.getDataType(), 'BOOLEAN');