showFields patch merge

Author: rathreya

lib/migration.js

@@ -25,24 +25,78 @@ function mixinMigration(PostgreSQL) {
     }
     options = options || {};
 
-    const sql = 'SELECT column_name AS "column", data_type AS "type", ' +
-    'datetime_precision AS time_precision, ' +
-    'is_nullable AS "nullable", character_maximum_length as "length"' // , data_default AS "Default"'
-    + ' FROM "information_schema"."columns" WHERE table_name=\'' +
-    this.table(model) + '\' and table_schema=\'' +
-    this.schema(model) + '\'';
-    this.execute(sql, [], options, function(err, fields) {
+
+    const sql =
+      'SELECT column_name AS "column", data_type AS "type", ' +
+      'datetime_precision AS time_precision, ' +
+      'is_nullable AS "nullable", character_maximum_length as "length" , numeric_precision, numeric_scale' + // , data_default AS "Default"'
+      ' FROM "information_schema"."columns" WHERE table_name=\'' +
+      this.table(model) +
+      "' and table_schema='" +
+      this.schema(model) +
+      "'";
+
+    connector.execute(sql, [], options, function (err, fields) {
       if (err) {
         return cb(err);
       } else {
-        fields.forEach(function(field) {
-          field.type = mapPostgreSQLDatatypes(field.type, field.length, field.time_precision);
+        fields.forEach(function (field) {
+          const type = field.type.toUpperCase();
+
+          let strPrecision = '';
+
+          if (field.time_precision < 6) {
+            // default is 6
+            strPrecision = '(' + field.time_precision + ') ';
+          }
+
+          switch (type) {
+            case 'CHARACTER VARYING':
+            case 'VARCHAR':
+              field.type = field.length ? 'VARCHAR(' + field.length + ')' : 'VARCHAR(1024)';
+              break;
+            case 'NUMERIC':
+              field.type = 'NUMERIC(' + field.numeric_precision + ',' + field.numeric_scale + ')';
+              break;
+            case 'TIMESTAMP WITHOUT TIME ZONE':
+              field.type = 'TIMESTAMP ' + strPrecision + 'WITHOUT TIME ZONE';
+              break;
+            case 'TIMESTAMP WITH TIME ZONE':
+              field.type = 'TIMESTAMP ' + strPrecision + 'WITH TIME ZONE';
+              break;
+            case 'TIME WITHOUT TIME ZONE':
+              field.type = 'TIME ' + strPrecision + 'WITHOUT TIME ZONE';
+              break;
+            case 'TIME WITH TIME ZONE':
+              field.type = 'TIME ' + strPrecision + 'WITH TIME ZONE';
+              break;
+            default:
+              field.type = field.type;
+          }
         });
         cb(err, fields);
       }
     });
   };
 
+    // const sql = 'SELECT column_name AS "column", data_type AS "type", ' +
+    // 'datetime_precision AS time_precision, ' +
+    // 'is_nullable AS "nullable", character_maximum_length as "length"' // , data_default AS "Default"'
+    // + ' FROM "information_schema"."columns" WHERE table_name=\'' +
+    // this.table(model) + '\' and table_schema=\'' +
+    // this.schema(model) + '\'';
+    // this.execute(sql, [], options, function(err, fields) {
+    //   if (err) {
+    //     return cb(err);
+    //   } else {
+    //     fields.forEach(function(field) {
+    //       field.type = mapPostgreSQLDatatypes(field.type, field.length, field.time_precision);
+    //     });
+    //     cb(err, fields);
+    //   }
+    // });
+  };
+
   PostgreSQL.prototype.showIndexes = function(model, options, cb) {
 
     if ((!cb) && typeof options === 'function') {