Add showIndexes and showFields function

Author: ssh24

lib/migration.js

@@ -11,67 +11,67 @@ var async = require('async');
 module.exports = mixinMigration;
 
 function mixinMigration(PostgreSQL) {
+  PostgreSQL.prototype.showFields = function(model, cb) {
+    var sql = 'SELECT column_name AS "column", data_type AS "type", ' +
+    'is_nullable AS "nullable", character_maximum_length as "length"' // , data_default AS "Default"'
+    + ' FROM "information_schema"."columns" WHERE table_name=\'' +
+    this.table(model) + '\'';
+    this.execute(sql, function(err, fields) {
+      if (err) {
+        return cb(err);
+      } else {
+        cb(err, fields);
+      }
+    });
+  };
+
+  PostgreSQL.prototype.showIndexes = function(model, cb) {
+    var sql = 'SELECT t.relname AS "table", i.relname AS "name", ' +
+          'am.amname AS "type", ix.indisprimary AS "primary", ' +
+          'ix.indisunique AS "unique", ' +
+          'ARRAY(SELECT pg_get_indexdef(ix.indexrelid, k + 1, true) ' +
+          '  FROM generate_subscripts(ix.indkey, 1) AS k ' +
+          '  ORDER BY k ) AS "keys", ' +
+          'ARRAY(SELECT ' +
+          '  CASE ix.indoption[k] & 1 WHEN 1 THEN \'DESC\' ELSE \'ASC\' END ' +
+          '  FROM generate_subscripts(ix.indoption, 1) AS k ' +
+          '  ORDER BY k ' +
+          ') AS "order" ' +
+          'FROM pg_class t, pg_class i, pg_index ix, pg_am am ' +
+          'WHERE t.oid = ix.indrelid AND i.oid = ix.indexrelid AND ' +
+          'i.relam = am.oid AND ' +
+          't.relkind=\'r\' AND t.relname=\'' +
+          this.table(model) + '\'';
+    this.execute(sql, function(err, indexes) {
+      if (err) {
+        return cb(err);
+      } else {
+        cb(err, indexes);
+      }
+    });
+  };
+
   /*!
    * Discover the properties from a table
    * @param {String} model The model name
    * @param {Function} cb The callback function
    */
   PostgreSQL.prototype.getTableStatus = function(model, cb) {
-    var fields;
-    var indexes;
-
-    function done(err) {
-      if (fields && indexes) {
-        cb(err, fields, indexes);
-      }
-    }
+    var fields, indexes;
+    var self = this;
 
-    function decoratedTableDataCallback(err, data) {
-      if (err) {
-        console.error(err);
-      }
-      if (!err) {
-        data.forEach(function(field) {
-          field.type = mapPostgreSQLDatatypes(field.type, field.length);
-        });
-      }
+    this.showFields(model, function(err, data) {
+      if (err) return cb(err);
       fields = data;
-      done(err);
-    }
 
-    function decoratedIndexDataCallback(err, data) {
-      var indexHash = {};
+      self.showIndexes(model, function(err, data) {
+        if (err) return cb(err);
+        indexes = data;
 
-      if (err) {
-        console.log(err);
-      }
-
-      indexes = data;
-      done(err);
-    }
-
-    this.execute('SELECT column_name AS "column", data_type AS "type", ' +
-      'is_nullable AS "nullable", character_maximum_length as "length"' // , data_default AS "Default"'
-      + ' FROM "information_schema"."columns" WHERE table_name=\'' +
-      this.table(model) + '\'', decoratedTableDataCallback);
-
-    this.execute(
-      'SELECT t.relname AS "table", i.relname AS "name", ' +
-      'am.amname AS "type", ix.indisprimary AS "primary", ' +
-      'ix.indisunique AS "unique", ' +
-      'ARRAY(SELECT pg_get_indexdef(ix.indexrelid, k + 1, true) ' +
-      '  FROM generate_subscripts(ix.indkey, 1) AS k ' +
-      '  ORDER BY k ) AS "keys", ' +
-      'ARRAY(SELECT ' +
-      '  CASE ix.indoption[k] & 1 WHEN 1 THEN \'DESC\' ELSE \'ASC\' END ' +
-      '  FROM generate_subscripts(ix.indoption, 1) AS k ' +
-      '  ORDER BY k ' +
-      ') AS "order" ' +
-      'FROM pg_class t, pg_class i, pg_index ix, pg_am am ' +
-      'WHERE t.oid = ix.indrelid AND i.oid = ix.indexrelid AND ' +
-      'i.relam = am.oid AND ' +
-      't.relkind=\'r\' AND t.relname=\'' +
-      this.table(model) + '\'', decoratedIndexDataCallback);
+        if (fields && indexes)
+          return cb(null, fields, indexes);
+      });
+    });
   };
 
   /**