Fix autoupdate

Author: Raymond Feng

lib/postgresql.js

@@ -836,8 +836,8 @@ function getTableStatus(model, cb) {
         cb(err, data);
     }
 
-    this.query('SELECT column_name AS "column", data_type AS "type", nullable AS "nullable"' // , data_default AS "Default"'
-        + ' FROM "information_schema"."tables" WHERE table_name=\'' + this.table(model) + '\'', decoratedCallback);
+    this.query('SELECT column_name AS "column", data_type AS "type", is_nullable AS "nullable"' // , data_default AS "Default"'
+        + ' FROM "information_schema"."columns" WHERE table_name=\'' + this.table(model) + '\'', decoratedCallback);
 
 }
 
@@ -956,7 +956,11 @@ function getAddModifyColumns(model, actualFields) {
     var sql = [];
     var self = this;
     sql = sql.concat(getColumnsToAdd.call(self, model, actualFields));
-    sql = sql.concat(getPropertiesToModify.call(self, model, actualFields));
+    var drops = getPropertiesToModify.call(self, model, actualFields);
+    if(drops.length > 0) {
+        sql = sql.concat(', ');
+        sql = sql.concat(drops);
+    }
     // sql = sql.concat(getColumnsToDrop.call(self, model, actualFields));
     return sql;
 }
@@ -977,11 +981,11 @@ function getColumnsToAdd(model, actualFields) {
         if (self.id(model, propName)) return;
         var found = searchForPropertyInActual.call(self, model, self.column(model, propName), actualFields);
         if (!found && propertyHasNotBeenDeleted.call(self, model, propName)) {
-            sql.push(addPropertyToActual.call(self, model, propName));
+            sql.push('ADD COLUMN ' + addPropertyToActual.call(self, model, propName));
         }
     });
     if (sql.length > 0) {
-        sql = ['ADD', '(' + sql.join(',') + ')'];
+        sql = [sql.join(', ')];
     }
     return sql;
 }
@@ -1018,17 +1022,18 @@ function getPropertiesToModify(model, actualFields) {
         found = searchForPropertyInActual.call(self, model, propName, actualFields);
         if (found && propertyHasNotBeenDeleted.call(self, model, propName)) {
             if (datatypeChanged(propName, found)) {
-                sql.push(modifyDatatypeInActual.call(self, model, propName));
+                sql.push('ALTER COLUMN ' + modifyDatatypeInActual.call(self, model, propName));
             }
             if (nullabilityChanged(propName, found)) {
-                sql.push(modifyNullabilityInActual.call(self, model, propName));
+                sql.push('ALTER COLUMN' + modifyNullabilityInActual.call(self, model, propName));
             }
         }
     });
 
-    if (sql.length > 0) {
-        sql = ['MODIFY', '(' + sql.join(',') + ')'];
+    if(sql.length >0) {
+        sql = [sql.join(', ')];
     }
+
     return sql;
 
     function datatypeChanged(propName, oldSettings) {
@@ -1053,7 +1058,7 @@ function getPropertiesToModify(model, actualFields) {
 
 function modifyDatatypeInActual(model, propName) {
     var self = this;
-    var sqlCommand = self.columnEscaped(model, propName) + ' ' + self.columnDataType(model, propName);
+    var sqlCommand = self.columnEscaped(model, propName) + ' TYPE ' + self.columnDataType(model, propName);
     return sqlCommand;
 }
 
@@ -1077,11 +1082,11 @@ function getColumnsToDrop(model, actualFields) {
             return;
         }
         if (actualFieldNotPresentInModel(actualField, model)) {
-            sql.push(self.escapeName(actualField.column));
+            sql.push('DROP COLUMN ' + self.escapeName(actualField.column));
         }
     });
-    if (sql.length > 0) {
-        sql = ['DROP', '(' + sql.join(',') + ')'];
+    if(sql.length >0) {
+        sql = [sql.join(', ')];
     }
     return sql;
 
@@ -1203,7 +1208,7 @@ PostgreSQL.prototype.disconnect = function disconnect(cb) {
         }
         var conn = this.connection;
         this.connection = null;
-        conn.close();  // This is sync
+        conn.end();  // This is sync
     }
 
     if (cb) {

test/postgresql.discover.sync.test.js

@@ -6,7 +6,7 @@ var async = require('async');
 var db;
 
 before(function () {
-    db = getDataSource();
+    db = getSchema();
 });
 
 describe('Mapping models', function () {
@@ -25,28 +25,28 @@ describe('Mapping models', function () {
                 /*
                 "id": {
                     "type": "String", "required": true, "length": 20, "id": 1, "postgresql": {
-                        "columnName": "INVENTORY_ID", "dataType": "VARCHAR2", "nullable": "N"
+                        "columnName": "INVENTORY_ID", "dataType": "VARCHAR", "nullable": "N"
                     }
                 },
                 */
                 "productId": {
                     "type": "String", "required": true, "length": 20, "id": 1, "postgresql": {
-                        "columnName": "PRODUCT_ID", "dataType": "VARCHAR2", "nullable": "N"
+                        "columnName": "PRODUCT_ID", "dataType": "VARCHAR", "nullable": "N"
                     }
                 },
                 "locationId": {
                     "type": "String", "required": true, "length": 20, "id": 2, "postgresql": {
-                        "columnName": "LOCATION_ID", "dataType": "VARCHAR2", "nullable": "N"
+                        "columnName": "LOCATION_ID", "dataType": "VARCHAR", "nullable": "N"
                     }
                 },
                 "available": {
-                    "type": "Number", "required": false, "length": 22, "postgresql": {
-                        "columnName": "AVAILABLE", "dataType": "NUMBER", "nullable": "Y"
+                    "type": "Number", "required": false, "postgresql": {
+                        "columnName": "AVAILABLE", "dataType": "INTEGER", "nullable": "Y"
                     }
                 },
                 "total": {
-                    "type": "Number", "required": false, "length": 22, "postgresql": {
-                        "columnName": "TOTAL", "dataType": "NUMBER", "nullable": "Y"
+                    "type": "Number", "required": false, "postgresql": {
+                        "columnName": "TOTAL", "dataType": "INTEGER", "nullable": "Y"
                     }
                 }
             }