Merge pull request #435 from strongloop/update-deps

Drop support for Node.js 8.x + update dependencies to latest

Author: bajtos

.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "globals": "getSchema",
+  "timeout": "15000",
+  "exit": true
+}

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "8"
   - "10"
   - "12"
   - "14"
@@ -19,4 +18,4 @@ before_install:
   - mysql -e "use mysql; update user set authentication_string=PASSWORD('test') where User='test'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
   - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost' WITH GRANT OPTION;FLUSH PRIVILEGES;"
   - mysql -e "GRANT SUPER ON *.* TO 'test'@'localhost' IDENTIFIED BY 'test';FLUSH PRIVILEGES;"
-  
+

example/app.js

@@ -4,11 +4,11 @@
 // License text available at https://opensource.org/licenses/MIT
 
 'use strict';
-var DataSource = require('loopback-datasource-juggler').DataSource;
+const DataSource = require('loopback-datasource-juggler').DataSource;
 
-var config = require('rc')('loopback', {dev: {mysql: {}}}).dev.mysql;
+const config = require('rc')('loopback', {dev: {mysql: {}}}).dev.mysql;
 
-var ds = new DataSource(require('../'), config);
+const ds = new DataSource(require('../'), config);
 
 function show(err, models) {
   if (err) {
@@ -35,7 +35,7 @@ ds.discoverForeignKeys('inventory', show);
 ds.discoverExportedForeignKeys('location', show);
 
 ds.discoverAndBuildModels('weapon', {owner: 'strongloop', visited: {}, associations: true}, function(err, models) {
-  for (var m in models) {
+  for (const m in models) {
     models[m].all(show);
   }
 });

index.js

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 'use strict';
-var SG = require('strong-globalize');
+const SG = require('strong-globalize');
 SG.SetRootDir(__dirname);
 
 module.exports = require('./lib/mysql.js');

lib/discovery.js

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 'use strict';
-var g = require('strong-globalize')();
+const g = require('strong-globalize')();
 
 module.exports = mixinDiscovery;
 
@@ -13,20 +13,20 @@ module.exports = mixinDiscovery;
  * @param {Object} mysql mysql driver
  */
 function mixinDiscovery(MySQL, mysql) {
-  var async = require('async');
+  const async = require('async');
 
   function paginateSQL(sql, orderBy, options) {
     options = options || {};
-    var limitClause = '';
+    let limitClause = '';
     if (options.offset || options.skip || options.limit) {
       // Offset starts from 0
-      var offset = Number(options.offset || options.skip || 0);
+      let offset = Number(options.offset || options.skip || 0);
       if (isNaN(offset)) {
         offset = 0;
       }
       limitClause = ' LIMIT ' + offset;
       if (options.limit) {
-        var limit = Number(options.limit);
+        let limit = Number(options.limit);
         if (isNaN(limit)) {
           limit = 0;
         }
@@ -45,7 +45,7 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {String} The SQL statement
    */
   MySQL.prototype.buildQuerySchemas = function(options) {
-    var sql = 'SELECT catalog_name as "catalog",' +
+    const sql = 'SELECT catalog_name as "catalog",' +
       ' schema_name as "schema"' +
       ' FROM information_schema.schemata';
     return paginateSQL(sql, 'schema_name', options);
@@ -57,8 +57,8 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {string} The sql statement
    */
   MySQL.prototype.buildQueryTables = function(options) {
-    var sqlTables = null;
-    var schema = options.owner || options.schema;
+    let sqlTables = null;
+    const schema = options.owner || options.schema;
 
     if (options.all && !schema) {
       sqlTables = paginateSQL('SELECT \'table\' AS "type",' +
@@ -87,9 +87,9 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {string} The sql statement
    */
   MySQL.prototype.buildQueryViews = function(options) {
-    var sqlViews = null;
+    let sqlViews = null;
     if (options.views) {
-      var schema = options.owner || options.schema;
+      const schema = options.owner || options.schema;
 
       if (options.all && !schema) {
         sqlViews = paginateSQL('SELECT \'view\' AS "type",' +
@@ -155,7 +155,7 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {String} The sql statement
    */
   MySQL.prototype.buildQueryColumns = function(schema, table) {
-    var sql = null;
+    let sql = null;
     if (schema) {
       sql = paginateSQL('SELECT table_schema AS "owner",' +
         ' table_name AS "tableName",' +
@@ -206,7 +206,7 @@ function mixinDiscovery(MySQL, mysql) {
   // http://docs.oracle.com/javase/6/docs/api/java/sql/DatabaseMetaData.html
   // #getPrimaryKeys(java.lang.String, java.lang.String, java.lang.String)
   MySQL.prototype.buildQueryPrimaryKeys = function(schema, table) {
-    var sql = 'SELECT table_schema AS "owner",' +
+    let sql = 'SELECT table_schema AS "owner",' +
       ' table_name AS "tableName",' +
       ' column_name AS "columnName",' +
       ' ordinal_position AS "keySeq",' +
@@ -239,7 +239,7 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {string}
    */
   MySQL.prototype.buildQueryForeignKeys = function(schema, table) {
-    var sql =
+    let sql =
       'SELECT table_schema AS "fkOwner",' +
       ' constraint_name AS "fkName",' +
       ' table_name AS "fkTableName",' +
@@ -276,7 +276,7 @@ function mixinDiscovery(MySQL, mysql) {
    * @returns {string}
    */
   MySQL.prototype.buildQueryExportedForeignKeys = function(schema, table) {
-    var sql = 'SELECT a.constraint_name AS "fkName",' +
+    let sql = 'SELECT a.constraint_name AS "fkName",' +
       ' a.table_schema AS "fkOwner",' +
       ' a.table_name AS "fkTableName",' +
       ' a.column_name AS "fkColumnName",' +
@@ -306,11 +306,11 @@ function mixinDiscovery(MySQL, mysql) {
    */
 
   MySQL.prototype.buildPropertyType = function(columnDefinition, options) {
-    var mysqlType = columnDefinition.dataType;
-    var columnType = columnDefinition.columnType;
-    var dataLength = columnDefinition.dataLength;
+    const mysqlType = columnDefinition.dataType;
+    const columnType = columnDefinition.columnType;
+    const dataLength = columnDefinition.dataLength;
 
-    var type = mysqlType.toUpperCase();
+    const type = mysqlType.toUpperCase();
     switch (type) {
       case 'CHAR':
         if (!options.treatCHAR1AsString && columnType === 'char(1)') {
@@ -379,13 +379,13 @@ function mixinDiscovery(MySQL, mysql) {
   // http://dev.mysql.com/doc/refman/5.7/en/numeric-type-overview.html
   // Currently default is the inverse of the recommendation for backward compatibility.
   MySQL.prototype.setDefaultOptions = function(options) {
-    var defaultOptions = {
+    const defaultOptions = {
       treatCHAR1AsString: false,
       treatBIT1AsBit: true,
       treatTINYINT1AsTinyInt: true,
     };
 
-    for (var opt in defaultOptions) {
+    for (const opt in defaultOptions) {
       if (defaultOptions.hasOwnProperty(opt) && !options.hasOwnProperty(opt)) {
         options[opt] = defaultOptions[opt];
       }

lib/enumFactory.js

@@ -4,11 +4,11 @@
 // License text available at https://opensource.org/licenses/MIT
 
 'use strict';
-var g = require('strong-globalize')();
+const g = require('strong-globalize')();
 
-var EnumFactory = function() {
+const EnumFactory = function() {
   if (arguments.length > 0) {
-    var Enum = function Enum(arg) {
+    const Enum = function Enum(arg) {
       if (typeof arg === 'number' && arg % 1 == 0) {
         return Enum._values[arg];
       } else if (Enum[arg]) {
@@ -21,11 +21,11 @@ var EnumFactory = function() {
         return '';
       }
     };
-    var dxList = [];
+    const dxList = [];
     // Want empty value to be at index 0 to match MySQL Enum values and
     // MySQL non-strict behavior.
     dxList.push('');
-    for (var arg in arguments) {
+    for (let arg in arguments) {
       arg = String(arguments[arg]);
       Object.defineProperty(Enum, arg.toUpperCase(), {
         configurable: false,
@@ -55,8 +55,8 @@ var EnumFactory = function() {
 };
 
 function stringified(anEnum) {
-  var s = [];
-  for (var i in anEnum._values) {
+  const s = [];
+  for (const i in anEnum._values) {
     if (anEnum._values[i] != '') {
       s.push("'" + anEnum._values[i] + "'");
     }