fix: squashed

Author: aaqilniz

CHANGES.md

@@ -1,3 +1,15 @@
+2024-01-10, Version 7.0.6
+=========================
+
+ * chore: update dependency loopback-datasource-juggler to ^5.0.5 (renovate[bot])
+
+ * chore: update dependency loopback-connector to ^6.1.1 (renovate[bot])
+
+ * chore: update dependency @commitlint/config-conventional to ^18.4.4 (renovate[bot])
+
+ * chore: update dependency eslint to ^8.56.0 (renovate[bot])
+
+
 2023-12-07, Version 7.0.5
 =========================
 

lib/discovery.js

@@ -298,6 +298,15 @@ function mixinDiscovery(MySQL, mysql) {
     return sql;
   };
 
+  /**
+   * Build query to determine is strict mode
+   */
+
+  MySQL.prototype.buildQueryIsStrict = function() {
+    return 'SELECT @@GLOBAL.sql_mode LIKE \'%STRICT%\' AS globalStrictMode,' +
+    '@@SESSION.sql_mode LIKE \'%STRICT%\' AS sessionStrictMode;';
+  };
+
   /**
    * Discover foreign keys that reference to the primary key of this table
    * @param {String} table The table name

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-connector-mysql",
-  "version": "7.0.5",
+  "version": "7.0.6",
   "description": "MySQL connector for loopback-datasource-juggler",
   "engines": {
     "node": ">=18"
@@ -24,16 +24,16 @@
     "async": "^3.2.5",
     "debug": "^4.3.4",
     "lodash": "^4.17.21",
-    "loopback-connector": "^6.1.0",
+    "loopback-connector": "^6.1.1",
     "mysql2": "^3.6.3",
     "patch-package": "^8.0.0",
     "strong-globalize": "^6.0.6"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.4",
     "eslint": "^8.56.0",
     "eslint-config-loopback": "^13.1.0",
-    "loopback-datasource-juggler": "^5.0.4",
+    "loopback-datasource-juggler": "^5.0.5",
     "mocha": "^10.2.0",
     "rc": "^1.2.8",
     "should": "^13.2.3",

package.json

@@ -6,6 +6,7 @@
 'use strict';
 process.env.NODE_ENV = 'test';
 const should = require('should');
+const async = require('async');
 
 const assert = require('assert');
 const DataSource = require('loopback-datasource-juggler').DataSource;
@@ -542,3 +543,25 @@ describe('Discover and build models', function() {
     });
   });
 });
+
+describe('Discover schema with strict mode on', function() {
+  let schema;
+  before(function(done) {
+    async.series([
+      db.execute('SET GLOBAL sql_mode = \'STRICT_ALL_TABLES\';'),
+      db.discoverSchema('INVENTORY', {owner: 'STRONGLOOP'}, function(err, schema_) {
+        schema = schema_;
+        done(err);
+      }),
+    ]);
+  });
+  it('should return an LDL schema for INVENTORY with strict mode on', function() {
+    assert.strictEqual(schema.name, 'Inventory');
+    Object.keys(schema.properties).forEach(property => {
+      if (schema.properties.length) {
+        assert.strictEqual(property.jsonSchema.maxLength, property.length);
+      }
+    });
+    async.series([db.execute('SET GLOBAL sql_mode = \'\';')]);
+  });
+});

test/mysql.discover.test.js

@@ -254,3 +254,11 @@ USE `STRONGLOOP`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 -- Dump completed on 2016-08-09 19:14:01
+
+--
+-- Current Database: `STRONGLOOP`
+--
+
+/*!40000 DROP DATABASE IF EXISTS `STRONGLOOP-STRICT`*/;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `STRONGLOOP-STRICT` /*!40100 DEFAULT CHARACTER SET utf8 */;