Manually fix remaining linting violations

bajtos · bajtos · commit be7e95cf5e45 · 2019-07-04T14:14:22.000+02:00
Signed-off-by: Miroslav Bajtoš &lt;mbajtoss@gmail.com&gt;
diff --git a/lib/migration.js b/lib/migration.js
@@ -83,7 +83,7 @@ function mixinMigration(PostgreSQL) {
       return !!m.settings.indexes[name];
     }) : [];
 
-    var applyPending = function(actions, cb, err, result) {
+    const applyPending = function(actions, cb, err, result) {
       const action = actions.shift();
       const pendingChanges = action && action() || [];
       if (pendingChanges.length) {
@@ -566,7 +566,7 @@ function mixinMigration(PostgreSQL) {
 
     if (actualFks) {
       const keys = Object.keys(actualFks);
-      for (var i = 0; i < keys.length; i++) {
+      for (let i = 0; i < keys.length; i++) {
         // all existing fks are already checked in PostgreSQL.prototype.dropForeignKeys
         // so we need check only names - skip if found
         if (existingFks.filter(function(fk) {
@@ -783,7 +783,8 @@ function mixinMigration(PostgreSQL) {
           if (identical && siKeys.length > 1) {
             if (siKeys.length !== i.keys.length) {
               // lengths differ, obviously non-matching
-              orderMatched = false;
+              // ??? orderMatched is not defined and not used anywhere else
+              // orderMatched = false;
             } else {
               siKeys.forEach(function(propName, iter) {
                 identical = identical && self.column(model, propName) === i.keys[iter];
diff --git a/lib/postgresql.js b/lib/postgresql.js
@@ -435,7 +435,7 @@ PostgreSQL.prototype.buildExpression = function(columnName, operator,
       if (operatorValue.multiline)
         g.warn('{{PostgreSQL}} regex syntax does not respect the {{`m`}} flag');
 
-      var regexOperator = operatorValue.ignoreCase ? ' ~* ?' : ' ~ ?';
+      const regexOperator = operatorValue.ignoreCase ? ' ~* ?' : ' ~ ?';
       return new ParameterizedSQL(columnName + regexOperator,
         [operatorValue.source]);
     default:
diff --git a/test/init.js b/test/init.js
@@ -48,7 +48,7 @@ global.getDataSource = global.getSchema = function(useUrl) {
   // Return cached data source if possible to avoid too many client error
   // due to multiple instances of connection pools
   if (!useUrl && db) return db;
-  const settings = getDBConfig(useUrl);
+  const settings = global.getDBConfig(useUrl);
   db = new DataSource(require('../'), settings);
   db.log = function(a) {
     // console.log(a);
@@ -70,5 +70,3 @@ global.connectorCapabilities = {
   // see https://github.com/strongloop/loopback-connector-postgresql/issues/342
   supportsArrays: false,
 };
-
-global.sinon = require('sinon');
diff --git a/test/postgresql.autocreateschema.test.js b/test/postgresql.autocreateschema.test.js
@@ -10,7 +10,7 @@ let Another, Post, db;
 
 describe('Autocreate schema if not exists', function() {
   before(function() {
-    db = getDataSource();
+    db = global.getDataSource();
 
     Post = db.define('PostInCustomSchema', {
       created: {
diff --git a/test/postgresql.autoupdate.test.js b/test/postgresql.autoupdate.test.js
@@ -9,7 +9,7 @@ const _ = require('lodash');
 let ds, properties, SimpleEmployee, Emp1, Emp2;
 
 before(function() {
-  ds = getDataSource();
+  ds = global.getDataSource();
 });
 
 describe('autoupdate', function() {
diff --git a/test/postgresql.dbdefaults.test.js b/test/postgresql.dbdefaults.test.js
@@ -10,7 +10,7 @@ let InvalidDefault, Post, db;
 
 describe('database default field values', function() {
   before(function() {
-    db = getDataSource();
+    db = global.getDataSource();
 
     Post = db.define('PostWithDbDefaultValue', {
       created: {
diff --git a/test/postgresql.discover.test.js b/test/postgresql.discover.test.js
@@ -14,7 +14,7 @@ const DataSource = require('loopback-datasource-juggler').DataSource;
 let db, City;
 
 before(function() {
-  const config = getDBConfig();
+  const config = global.getDBConfig();
   config.database = 'strongloop';
   db = new DataSource(require('../'), config);
 });
diff --git a/test/postgresql.filterUndefined.test.js b/test/postgresql.filterUndefined.test.js
@@ -10,7 +10,7 @@ let Post, db;
 
 describe('filter undefined fields', function() {
   before(function() {
-    db = getDataSource();
+    db = global.getDataSource();
 
     Post = db.define('FilterUndefined', {
       defaultInt: {
diff --git a/test/postgresql.initialization.test.js b/test/postgresql.initialization.test.js
@@ -12,32 +12,32 @@ const should = require('should');
 
 // simple wrapper that uses JSON.parse(JSON.stringify()) as cheap clone
 function newConfig(withURL) {
-  return JSON.parse(JSON.stringify(getDBConfig(withURL)));
+  return JSON.parse(JSON.stringify(global.getDBConfig(withURL)));
 }
 
 describe('initialization', function() {
   it('honours user-defined pg-pool settings', function() {
-    var dataSource = new DataSource(connector, newConfig());
-    var pool = dataSource.connector.pg;
+    let dataSource = new DataSource(connector, newConfig());
+    let pool = dataSource.connector.pg;
     pool.options.max.should.not.equal(999);
 
     const settings = newConfig();
     settings.max = 999; // non-default value
-    var dataSource = new DataSource(connector, settings);
-    var pool = dataSource.connector.pg;
+    dataSource = new DataSource(connector, settings);
+    pool = dataSource.connector.pg;
     pool.options.max.should.equal(999);
   });
 
   it('honours user-defined url settings', function() {
     let settings = newConfig();
 
-    var dataSource = new DataSource(connector, settings);
-    var clientConfig = dataSource.connector.clientConfig;
+    let dataSource = new DataSource(connector, settings);
+    let clientConfig = dataSource.connector.clientConfig;
     should.not.exist(clientConfig.connectionString);
 
     settings = newConfig(true);
-    var dataSource = new DataSource(connector, settings);
-    var clientConfig = dataSource.connector.clientConfig;
+    dataSource = new DataSource(connector, settings);
+    clientConfig = dataSource.connector.clientConfig;
     clientConfig.connectionString.should.equal(settings.url);
   });
 
@@ -55,7 +55,7 @@ describe('initialization', function() {
 
 describe('postgresql connector errors', function() {
   it('Should complete these 4 queries without dying', function(done) {
-    const dataSource = getDataSource();
+    const dataSource = global.getDataSource();
     const db = dataSource.connector;
     const pool = db.pg;
     pool.options.max = 5;
diff --git a/test/postgresql.mapping.test.js b/test/postgresql.mapping.test.js
@@ -12,7 +12,7 @@ const async = require('async');
 let db;
 
 before(function() {
-  db = getSchema();
+  db = global.getSchema();
 });
 
 describe('Mapping models', function() {
diff --git a/test/postgresql.migration.test.js b/test/postgresql.migration.test.js
@@ -78,7 +78,7 @@ describe('migrations', function() {
 function setup(done) {
   require('./init.js');
 
-  db = getSchema();
+  db = global.getSchema();
 
   const UserDataWithIndexes = db.define('UserDataWithIndexes', {
     email: {type: String, null: false, index: true},
diff --git a/test/postgresql.test.js b/test/postgresql.test.js
@@ -6,6 +6,7 @@
 'use strict';
 const juggler = require('loopback-datasource-juggler');
 const CreateDS = juggler.DataSource;
+const sinon = require('sinon');
 
 require('./init');
 const async = require('async');
@@ -48,14 +49,14 @@ describe('lazyConnect', function() {
   });
 });
 
-var getDS = function(config) {
+function getDS(config) {
   const db = new CreateDS(require('../'), config);
   return db;
-};
+}
 
 describe('postgresql connector', function() {
   before(function() {
-    db = getDataSource();
+    db = global.getDataSource();
 
     Post = db.define('PostWithBoolean', {
       title: {type: String, length: 255, index: true},
@@ -73,7 +74,7 @@ describe('postgresql connector', function() {
 
   describe('Explicit datatype', function() {
     before(function(done) {
-      db = getDataSource();
+      db = global.getDataSource();
 
       Expense = db.define('Expense', {
         id: {
@@ -269,7 +270,7 @@ describe('postgresql connector', function() {
       });
     });
 
-  it('should escape number values to defect SQL injection in find',
+  it('should escape number values to defect SQL injection in find (where)',
     function(done) {
       Post.find({where: {id: '(SELECT 1+1)'}}, function(err, p) {
         should.exists(err);
@@ -285,7 +286,7 @@ describe('postgresql connector', function() {
       });
     });
 
-  it('should escape number values to defect SQL injection in find',
+  it('should escape number values to defect SQL injection in find (limit)',
     function(done) {
       Post.find({limit: '(SELECT 1+1)'}, function(err, p) {
         should.exists(err);
@@ -681,7 +682,7 @@ describe('postgresql connector', function() {
     let Customer;
 
     before(function(done) {
-      db = getDataSource();
+      db = global.getDataSource();
 
       Customer = db.define('Customer', {
         address: {
@@ -762,7 +763,7 @@ describe('Serial properties', function() {
   let db;
 
   before(function() {
-    db = getSchema();
+    db = global.getSchema();
   });
 
   it('should allow serial properties', function(done) {
@@ -819,7 +820,7 @@ describe('Serial properties', function() {
   });
 });
 
-var data = [
+const data = [
   {
     id: 1,
     description: 'Expense 1',
diff --git a/test/postgresql.timestamp.test.js b/test/postgresql.timestamp.test.js
@@ -10,7 +10,7 @@ let db, PostWithTimestamps;
 describe('Timestamps', function() {
   describe('type and precision', function() {
     before(function() {
-      db = getDataSource();
+      db = global.getDataSource();
 
       PostWithTimestamps = db.define('PostWithTimestamps', {
         timestampDefault: {
diff --git a/test/postgresql.transaction.test.js b/test/postgresql.transaction.test.js
@@ -13,7 +13,7 @@ let db, Post;
 
 describe('transactions', function() {
   before(function(done) {
-    db = getDataSource(true);
+    db = global.getDataSource(true);
     Post = db.define('PostTX', {
       title: {type: String, length: 255, index: true},
       content: {type: String},
@@ -69,7 +69,7 @@ describe('transactions', function() {
       let completed = 0;
       const concurrent = 20;
       for (let i = 0; i <= concurrent; i++) {
-        var post = {title: 'tb' + i, content: 'cb' + i};
+        const post = {title: 'tb' + i, content: 'cb' + i};
         const create = createPostInTx(post);
         Transaction.begin(db.connector, Transaction.SERIALIZABLE,
           function(err, tx) {
