Refactor discovery models

Author: Loay Gewily

lib/discovery.js

@@ -5,6 +5,8 @@
 
 'use strict';
 var g = require('strong-globalize')();
+var SqlConnector = require('loopback-connector').SqlConnector;
+var ParameterizedSQL = SqlConnector.ParameterizedSQL;
 
 module.exports = mixinDiscovery;
 
@@ -31,7 +33,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param options {all: for all owners, owner: for a given owner}
    * @returns {string} The sql statement
    */
-  function queryTables(options) {
+  PostgreSQL.prototype.queryTables = function(options) {
     var sqlTables = null;
     var owner = options.owner || options.schema;
 
@@ -54,7 +56,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param options {all: for all owners, owner: for a given owner}
    * @returns {string} The sql statement
    */
-  function queryViews(options) {
+  PostgreSQL.prototype.queryViews = function(options) {
     var sqlViews = null;
     if (options.views) {
       var owner = options.owner || options.schema;
@@ -82,44 +84,14 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options Options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverModelDefinitions = function(options, cb) {
-    if (!cb && typeof options === 'function') {
-      cb = options;
-      options = {};
-    }
-    options = options || {};
-
-    var self = this;
-    var calls = [function(callback) {
-      self.execute(queryTables(options), callback);
-    }];
-
-    if (options.views) {
-      calls.push(function(callback) {
-        self.execute(queryViews(options), callback);
-      });
-    }
-    async.parallel(calls, function(err, data) {
-      if (err) {
-        cb(err, data);
-      } else {
-        var merged = [];
-        merged = merged.concat(data.shift());
-        if (data.length) {
-          merged = merged.concat(data.shift());
-        }
-        cb(err, merged);
-      }
-    });
-  };
 
   /*!
    * Normalize the arguments
    * @param table string, required
    * @param options object, optional
    * @param cb function, optional
    */
-  function getArgs(table, options, cb) {
+  PostgreSQL.prototype.getArgs = function(table, options, cb) {
     if ('string' !== typeof table || !table) {
       throw new Error(g.f('{{table}} is a required string argument: %s' + table));
     }
@@ -145,7 +117,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param table
    * @returns {String} The sql statement
    */
-  function queryColumns(owner, table) {
+  PostgreSQL.prototype.queryColumns = function(owner, table) {
     var sql = null;
     if (owner) {
       sql = paginateSQL('SELECT table_schema AS "owner", table_name AS "tableName", column_name AS "columnName",'
@@ -173,26 +145,6 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Function} [cb] The callback function
    *
    */
-  PostgreSQL.prototype.discoverModelProperties = function(table, options, cb) {
-    var args = getArgs(table, options, cb);
-    var owner = args.owner;
-    table = args.table;
-    options = args.options;
-    cb = args.cb;
-
-    var sql = queryColumns(owner, table);
-    var callback = function(err, results) {
-      if (err) {
-        cb(err, results);
-      } else {
-        results.map(function(r) {
-          r.type = mysqlDataTypeToJSONType(r.dataType, r.dataLength);
-        });
-        cb(err, results);
-      }
-    };
-    this.execute(sql, callback);
-  };
 
 // http://docs.oracle.com/javase/6/docs/api/java/sql/DatabaseMetaData.html#getPrimaryKeys(java.lang.String, java.lang.String, java.lang.String)
 
@@ -212,7 +164,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param table
    * @returns {string}
    */
-  function queryForPrimaryKeys(owner, table) {
+  PostgreSQL.prototype.queryForPrimaryKeys = function(owner, table) {
     var sql = 'SELECT kc.table_schema AS "owner", '
       + 'kc.table_name AS "tableName", kc.column_name AS "columnName",'
       + ' kc.ordinal_position AS "keySeq",'
@@ -239,16 +191,6 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverPrimaryKeys = function(table, options, cb) {
-    var args = getArgs(table, options, cb);
-    var owner = args.owner;
-    table = args.table;
-    options = args.options;
-    cb = args.cb;
-
-    var sql = queryForPrimaryKeys(owner, table);
-    this.execute(sql, cb);
-  };
 
   /*
    SELECT
@@ -270,7 +212,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param table
    * @returns {string}
    */
-  function queryForeignKeys(owner, table) {
+  PostgreSQL.prototype.queryForeignKeys = function(owner, table) {
     var sql =
       'SELECT tc.table_schema AS "fkOwner", tc.constraint_name AS "fkName", tc.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
@@ -297,16 +239,6 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverForeignKeys = function(table, options, cb) {
-    var args = getArgs(table, options, cb);
-    var owner = args.owner;
-    table = args.table;
-    options = args.options;
-    cb = args.cb;
-
-    var sql = queryForeignKeys(owner, table);
-    this.execute(sql, cb);
-  };
 
   /*!
    * Retrieves a description of the foreign key columns that reference the given table's primary key columns (the foreign keys exported by a table).
@@ -315,7 +247,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param table
    * @returns {string}
    */
-  function queryExportedForeignKeys(owner, table) {
+  PostgreSQL.prototype.queryExportedForeignKeys = function(owner, table) {
     var sql = 'SELECT kcu.constraint_name AS "fkName", kcu.table_schema AS "fkOwner", kcu.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
       + ' \'PK\' AS "pkName", ccu.table_schema AS "pkOwner",'
@@ -342,18 +274,8 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverExportedForeignKeys = function(table, options, cb) {
-    var args = getArgs(table, options, cb);
-    var owner = args.owner;
-    table = args.table;
-    options = args.options;
-    cb = args.cb;
-
-    var sql = queryExportedForeignKeys(owner, table);
-    this.execute(sql, cb);
-  };
 
-  function mysqlDataTypeToJSONType(mysqlType, dataLength) {
+  PostgreSQL.prototype.mysqlDataTypeToJSONType = function(mysqlType, dataLength) {
     var type = mysqlType.toUpperCase();
     switch (type) {
       case 'BOOLEAN':