Bring up the postgresql connector

Author: Raymond Feng

lib/discovery.js

@@ -352,42 +352,31 @@ function mixinDiscovery(PostgreSQL) {
     function mysqlDataTypeToJSONType(mysqlType, dataLength) {
         var type = mysqlType.toUpperCase();
         switch (type) {
-            case 'CHAR':
-                if (dataLength === 1) {
-                    // Treat char(1) as boolean
-                    return 'Boolean';
-                } else {
-                    return 'String';
-                }
-
+            case 'BOOLEAN':
+                return 'Boolean';
+            case 'CHARACTER VARYING':
             case 'VARCHAR':
-            case 'TINYTEXT':
-            case 'MEDIUMTEXT':
-            case 'LONGTEXT':
+            case 'CHARACTER':
             case 'TEXT':
-            case 'ENUM':
-            case 'SET':
                 return 'String';
-            case 'TINYBLOB':
-            case 'MEDIUMBLOB':
-            case 'LONGBLOB':
-            case 'BLOB':
-            case 'BINARY':
-            case 'VARBINARY':
-            case 'BIT':
+            case 'BYTEA':
                 return 'Binary';
-            case 'TINYINT':
             case 'SMALLINT':
-            case 'INT':
-            case 'MEDIUMINT':
-            case 'YEAR':
-            case 'FLOAT':
-            case 'DOUBLE':
+            case 'INTEGER':
+            case 'BIGINT':
+            case 'DECIMAL':
+            case 'NUMERIC':
+            case 'REAL':
+            case 'DOUBLE PRECISION':
+            case 'SERIAL':
+            case 'BIGSERIAL':
                 return 'Number';
             case 'DATE':
             case 'TIMESTAMP':
-            case 'DATETIME':
+            case 'TIME':
                 return 'Date';
+            case 'POINT':
+                return 'GeoPoint';
             default:
                 return 'String';
         }

lib/postgresql.js

@@ -201,7 +201,8 @@ PostgreSQL.prototype.count = function count(model, callback, filter) {
     this.query('SELECT count(*) as "cnt"  FROM '
         + ' ' + this.toFilter(model, filter && {where: filter}), function (err, data) {
         if (err) return callback(err);
-        callback(err, data && data[0] && data[0].cnt);
+        var c = data && data[0] && data[0].cnt;
+        callback(err, Number(c));
     }.bind(this));
 };
 
@@ -468,18 +469,41 @@ PostgreSQL.prototype.toDatabase = function (prop, val) {
                 return 'NULL';
             }
         }
+        if (!val) {
+            if( prop.autoIncrement ) {
+                return 'DEFAULT';
+            }
+            else {
+                return 'NULL';
+            }
+        }
+        if (!val.toISOString) {
+            val = new Date(val);
+        }
+        var iso = escape(val.toISOString());
+        return 'TIMESTAMP WITH TIME ZONE ' + iso;
+        /*
         if (!val.toUTCString) {
             val = new Date(val);
         }
         return dateToPostgreSQL(val, prop.type.name === 'Date');
+        */
     }
 
     // PostgreSQL support char(1) Y/N
     if (prop.type.name === 'Boolean') {
         if (!val) {
-            return "'Y'";
+            return "TRUE";
         } else {
-            return "'N'";
+            return "FALSE";
+        }
+    }
+
+    if (prop.type.name === 'GeoPoint') {
+        if(val) {
+            return '(' + val.lat + ',' + val.lng +')';
+        } else {
+            return 'NULL';
         }
     }
 
@@ -958,7 +982,9 @@ function getAddModifyColumns(model, actualFields) {
     sql = sql.concat(getColumnsToAdd.call(self, model, actualFields));
     var drops = getPropertiesToModify.call(self, model, actualFields);
     if(drops.length > 0) {
-        sql = sql.concat(', ');
+        if(sql.length > 0) {
+            sql = sql.concat(', ');
+        }
         sql = sql.concat(drops);
     }
     // sql = sql.concat(getColumnsToDrop.call(self, model, actualFields));
@@ -1230,7 +1256,7 @@ function escape(val) {
 
     switch (typeof val) {
         case 'boolean':
-            return (val) ? "'Y'" : "'N'";
+            return (val) ? "true" : "false";
         case 'number':
             return val + '';
     }
@@ -1299,11 +1325,11 @@ PostgreSQL.prototype.columnDataType = function (model, property) {
         case 'Number':
             return 'INTEGER';
         case 'Date':
-            return 'DATE';
+            return 'TIMESTAMP WITH TIME ZONE';
         case 'Timestamp':
-            return 'TIMESTAMP(3)';
+            return 'TIMESTAMP WITH TIME ZONE';
         case 'Boolean':
-            return 'CHAR(1)'; // PostgreSQL doesn't have built-in boolean
+            return 'BOOLEAN'; // PostgreSQL doesn't have built-in boolean
     }
 };
 

run-tests

@@ -1,4 +1,4 @@
 #!/bin/bash
 ROOT=`dirname $0`
-$ROOT/node_modules/.bin/mocha --timeout 30000 --require $ROOT/test/init.js $ROOT/test/*.test.js
+$ROOT/node_modules/.bin/mocha --timeout 10000 --require $ROOT/test/init.js $ROOT/test/*.test.js
 

test/postgresql.discover.test.js

@@ -172,8 +172,8 @@ describe('Discover model foreign keys', function () {
     });
 });
 
-describe('Discover ADL schema from a table', function () {
-    it('should return an ADL schema for INVENTORY', function (done) {
+describe('Discover LDL schema from a table', function () {
+    it('should return an LDL schema for INVENTORY', function (done) {
         db.discoverSchema('INVENTORY', {owner: 'STRONGLOOP'}, function (err, schema) {
             // console.log('%j', schema);
             assert(schema.name === 'Inventory');