Merge pull request #160 from strongloop/revert-157-eslint

Revert "Add eslint infrastructure"

Author: loay

.eslintrc

@@ -3,23 +3,23 @@
 // This file is licensed under the Artistic License 2.0.
 // License text available at https://opensource.org/licenses/Artistic-2.0
 
-'use strict';
 var DataSource = require('loopback-datasource-juggler').DataSource;
 
 var config = require('rc')('loopback', {dev: {postgresql: {}}}).dev.postgresql;
 
 var ds = new DataSource(require('../'), config);
 
 function show(err, models) {
-  if (err) {
-    console.error(err);
-  } else {
-    models.forEach(function(m) {
-      console.dir(m);
-    });
-  }
+    if (err) {
+        console.error(err);
+    } else {
+        models.forEach(function(m) {
+            console.dir(m);
+        });
+    }
 }
 
+
 ds.discoverModelDefinitions({views: true, limit: 20}, show);
 
 ds.discoverModelProperties('product', show);
@@ -60,4 +60,6 @@ ds.discoverAndBuildModels('INVENTORY', {owner: 'STRONGLOOP', visited: {}, associ
     });
 });
 
+
 */
+

example/app.js

@@ -2,7 +2,6 @@
 // Node module: loopback-connector-postgresql
 // This file is licensed under the Artistic License 2.0.
 // License text available at https://opensource.org/licenses/Artistic-2.0
-'use strict';
 var SG = require('strong-globalize');
 var g = SG();
 
@@ -14,33 +13,34 @@ var ds = new DataSource(require('../'), config);
 
 // Define a account model
 var Account = ds.createModel('account', {
-  name: String,
-  emails: [String],
-  age: Number},
+    name: String,
+    emails: [String],
+    age: Number},
     {strict: true});
 
 ds.automigrate('account', function(err) {
 // Create two instances
-  Account.create({
+Account.create({
     name: 'John1',
     emails: ['[email protected]', '[email protected]'],
-    age: 30,
-  }, function(err, account1) {
+    age: 30
+}, function (err, account1) {
     console.log('Account 1: ', account1.toObject());
     Account.create({
-      name: 'John2',
-      emails: ['[email protected]', '[email protected]'],
-      age: 30,
-    }, function(err, account2) {
-      console.log('Account 2: ', account2.toObject());
-      Account.findById(account2.id, function(err, account3) {
-        console.log(account3.toObject());
-      });
-      Account.find({where: {name: 'John1'}, limit: 3}, function(err, accounts) {
-        accounts.forEach(function(c) {
-          console.log(c.toObject());
+        name: 'John2',
+        emails: ['[email protected]', '[email protected]'],
+        age: 30
+    }, function (err, account2) {
+        console.log('Account 2: ', account2.toObject());
+        Account.findById(account2.id, function(err, account3) {
+            console.log(account3.toObject());
+        });
+        Account.find({where: {name: 'John1'}, limit: 3}, function(err, accounts) {
+            accounts.forEach(function(c) {
+                console.log(c.toObject());
+            });
         });
-      });
     });
-  });
+
+});
 });

example/model.js

@@ -3,7 +3,6 @@
 // This file is licensed under the Artistic License 2.0.
 // License text available at https://opensource.org/licenses/Artistic-2.0
 
-'use strict';
 var SG = require('strong-globalize');
 SG.SetRootDir(__dirname);
 

index.js

@@ -3,7 +3,6 @@
 // This file is licensed under the Artistic License 2.0.
 // License text available at https://opensource.org/licenses/Artistic-2.0
 
-'use strict';
 var g = require('strong-globalize')();
 
 module.exports = mixinDiscovery;
@@ -57,6 +56,7 @@ function mixinDiscovery(PostgreSQL) {
   function queryViews(options) {
     var sqlViews = null;
     if (options.views) {
+
       var owner = options.owner || options.schema;
 
       if (options.all && !owner) {
@@ -82,24 +82,24 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options Options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverModelDefinitions = function(options, cb) {
+  PostgreSQL.prototype.discoverModelDefinitions = function (options, cb) {
     if (!cb && typeof options === 'function') {
       cb = options;
       options = {};
     }
     options = options || {};
 
     var self = this;
-    var calls = [function(callback) {
+    var calls = [function (callback) {
       self.execute(queryTables(options), callback);
     }];
 
     if (options.views) {
-      calls.push(function(callback) {
+      calls.push(function (callback) {
         self.execute(queryViews(options), callback);
       });
     }
-    async.parallel(calls, function(err, data) {
+    async.parallel(calls, function (err, data) {
       if (err) {
         cb(err, data);
       } else {
@@ -135,7 +135,7 @@ function mixinDiscovery(PostgreSQL) {
       owner: options.owner || options.schema,
       table: table,
       options: options,
-      cb: cb,
+      cb: cb
     };
   }
 
@@ -148,17 +148,15 @@ function mixinDiscovery(PostgreSQL) {
   function queryColumns(owner, table) {
     var sql = null;
     if (owner) {
-      sql = paginateSQL('SELECT table_schema AS "owner", table_name AS "tableName", column_name AS "columnName",'
-          + 'data_type AS "dataType", character_maximum_length AS "dataLength", numeric_precision AS "dataPrecision",'
-          + ' numeric_scale AS "dataScale", is_nullable AS "nullable"'
+      sql = paginateSQL('SELECT table_schema AS "owner", table_name AS "tableName", column_name AS "columnName", data_type AS "dataType",'
+          + ' character_maximum_length AS "dataLength", numeric_precision AS "dataPrecision", numeric_scale AS "dataScale", is_nullable AS "nullable"'
           + ' FROM information_schema.columns'
           + ' WHERE table_schema=\'' + owner + '\''
           + (table ? ' AND table_name=\'' + table + '\'' : ''),
         'table_name, ordinal_position', {});
     } else {
-      sql = paginateSQL('SELECT current_schema() AS "owner", table_name AS "tableName", column_name AS "columnName",'
-          + ' data_type AS "dataType", character_maximum_length AS "dataLength", numeric_precision AS "dataPrecision",'
-          + ' numeric_scale AS "dataScale", is_nullable AS "nullable"'
+      sql = paginateSQL('SELECT current_schema() AS "owner", table_name AS "tableName", column_name AS "columnName", data_type AS "dataType",'
+          + ' character_maximum_length AS "dataLength", numeric_precision AS "dataPrecision", numeric_scale AS "dataScale", is_nullable AS "nullable"'
           + ' FROM information_schema.columns'
           + (table ? ' WHERE table_name=\'' + table + '\'' : ''),
         'table_name, ordinal_position', {});
@@ -173,19 +171,19 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Function} [cb] The callback function
    *
    */
-  PostgreSQL.prototype.discoverModelProperties = function(table, options, cb) {
+  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) {
+    var callback = function (err, results) {
       if (err) {
         cb(err, results);
       } else {
-        results.map(function(r) {
+        results.map(function (r) {
           r.type = mysqlDataTypeToJSONType(r.dataType, r.dataLength);
         });
         cb(err, results);
@@ -194,6 +192,7 @@ function mixinDiscovery(PostgreSQL) {
     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)
 
   /*
@@ -239,7 +238,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverPrimaryKeys = function(table, options, cb) {
+  PostgreSQL.prototype.discoverPrimaryKeys = function (table, options, cb) {
     var args = getArgs(table, options, cb);
     var owner = args.owner;
     table = args.table;
@@ -297,7 +296,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverForeignKeys = function(table, options, cb) {
+  PostgreSQL.prototype.discoverForeignKeys = function (table, options, cb) {
     var args = getArgs(table, options, cb);
     var owner = args.owner;
     table = args.table;
@@ -342,7 +341,7 @@ function mixinDiscovery(PostgreSQL) {
    * @param {Object} options The options for discovery
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverExportedForeignKeys = function(table, options, cb) {
+  PostgreSQL.prototype.discoverExportedForeignKeys = function (table, options, cb) {
     var args = getArgs(table, options, cb);
     var owner = args.owner;
     table = args.table;
@@ -386,19 +385,21 @@ function mixinDiscovery(PostgreSQL) {
     }
   }
 
+
   /**
    * Discover database indexes for the specified table
    * @param {String} table The table name
    * @param {Function} [cb] The callback function
    */
-  PostgreSQL.prototype.discoverModelIndexes = function(model, cb) {
+  PostgreSQL.prototype.discoverModelIndexes = function (model, cb) {
     this.getTableStatus(model, function(err, fields, indexes) {
       var indexData = {};
-      indexes.forEach(function(index) {
+      indexes.forEach(function (index) {
         indexData[index.name] = index;
         delete index.name;
       });
       cb(err, indexData);
     });
-  };
+  }
+
 }