mariadb - npm Package Compare versions

Comparing version 2.1.3 to 2.1.4

CHANGELOG.md

 # Change Log
+## [2.1.4](https://github.com/MariaDB/mariadb-connector-nodejs/tree/2.1.4) (02 Dec. 2019)
+[Full Changelog](https://github.com/MariaDB/mariadb-connector-nodejs/compare/2.1.3...2.1.4)
+
+* CONJS-112 use pool reset only for corrected COM_RESET_CONNECTION
+* CONJS-111 missing pool event definition
+* dependencies update
+
+
 ## [2.1.3](https://github.com/MariaDB/mariadb-connector-nodejs/tree/2.1.3) (14 Nov. 2019)
@@ -3,0 +11,0 @@ [Full Changelog](https://github.com/MariaDB/mariadb-connector-nodejs/compare/2.1.2...2.1.3)

lib/cmd/batch-rewrite.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/change-user.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/column-definition.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/common-text-cmd.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/handshake/auth/pam-password-auth.js

@@ -0,0 +0,0 @@ const PluginAuth = require('./plugin-auth');

lib/cmd/handshake/client-capabilities.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/handshake/client-handshake-response.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/resultset.js

@@ -0,0 +0,0 @@ 'use strict';

lib/cmd/stream.js

@@ -12,3 +12,10 @@ 'use strict';
   constructor(cmdOpts, connOpts, sql, values, socket) {
-    super(() => {}, () => {}, cmdOpts, connOpts, sql, values);
+    super(
+      () => {},
+      () => {},
+      cmdOpts,
+      connOpts,
+      sql,
+      values
+    );
     this.socket = socket;
@@ -15,0 +22,0 @@ this.inStream = new Readable({

lib/config/connection-options.js

@@ -0,0 +0,0 @@ 'use strict';

lib/connection-callback.js

@@ -0,0 +0,0 @@ 'use strict';

lib/connection.js

@@ -493,3 +493,10 @@ 'use strict';
     } else {
-      cmd = new Query(() => {}, () => {}, _cmdOpts, opts, _sql, _values);
+      cmd = new Query(
+        () => {},
+        () => {},
+        _cmdOpts,
+        opts,
+        _sql,
+        _values
+      );
     }
@@ -546,3 +553,10 @@ cmd.handleNewRows = row => {
     } else {
-      cmd = new fct(() => {}, () => {}, _cmdOpts, opts, _sql, _values);
+      cmd = new fct(
+        () => {},
+        () => {},
+        _cmdOpts,
+        opts,
+        _sql,
+        _values
+      );
     }
@@ -897,3 +911,3 @@ cmd.handleNewRows = row => {
       let err = packet.readError(info);
-      if (err.fatal && (_status !== Status.CLOSING && _status !== Status.CLOSED)) {
+      if (err.fatal && _status !== Status.CLOSING && _status !== Status.CLOSED) {
         this.emit('error', err);
@@ -900,0 +914,0 @@ this.end();

lib/const/collations.js

@@ -0,0 +0,0 @@ 'use strict';

lib/const/error-code.js

@@ -0,0 +0,0 @@ 'use strict';

lib/io/packet-node-encoded.js

@@ -0,0 +0,0 @@ 'use strict';

lib/io/packet-node-iconv.js

@@ -0,0 +0,0 @@ 'use strict';

lib/io/packet-output-stream.js

@@ -0,0 +0,0 @@ 'use strict';

lib/misc/errors.js

@@ -0,0 +0,0 @@ 'use strict';

lib/misc/parse.js

@@ -205,3 +205,3 @@ const Errors = require('../misc/errors');
           while (
-            ((car = sql.charAt(idx++)) !== '' && (car >= '0' && car <= '9')) ||
+            ((car = sql.charAt(idx++)) !== '' && car >= '0' && car <= '9') ||
             (car >= 'A' && car <= 'Z') ||
@@ -417,3 +417,4 @@ (car >= 'a' && car <= 'z') ||
             idx > 1 &&
-            (sql.charAt(idx - 2) > ' ' && '();><=-+,'.indexOf(sql.charAt(idx - 2)) === -1)
+            sql.charAt(idx - 2) > ' ' &&
+            '();><=-+,'.indexOf(sql.charAt(idx - 2)) === -1
           ) {
@@ -633,3 +634,3 @@ break;
           while (
-            ((car = sql.charAt(idx++)) !== '' && (car >= '0' && car <= '9')) ||
+            ((car = sql.charAt(idx++)) !== '' && car >= '0' && car <= '9') ||
             (car >= 'A' && car <= 'Z') ||
@@ -806,3 +807,3 @@ (car >= 'a' && car <= 'z') ||
           while (
-            ((car = sql.charAt(idx++)) !== '' && (car >= '0' && car <= '9')) ||
+            ((car = sql.charAt(idx++)) !== '' && car >= '0' && car <= '9') ||
             (car >= 'A' && car <= 'Z') ||
@@ -866,3 +867,4 @@ (car >= 'a' && car <= 'z') ||
             idx > 1 &&
-            (sql.charAt(idx - 2) > ' ' && '();><=-+,'.indexOf(sql.charAt(idx - 2)) === -1)
+            sql.charAt(idx - 2) > ' ' &&
+            '();><=-+,'.indexOf(sql.charAt(idx - 2)) === -1
           ) {
@@ -869,0 +871,0 @@ break;

lib/misc/utils.js

@@ -0,0 +0,0 @@ 'use strict';

lib/pool-base.js

@@ -0,0 +0,0 @@ 'use strict';

lib/pool-callback.js

@@ -83,7 +83,11 @@ 'use strict';
               //if server permit it, reset the connection, or rollback only if not
+              // COM_RESET_CONNECTION exist since mysql 5.7.3 and mariadb 10.2.4
+              // but not possible to use it with mysql waiting for https://bugs.mysql.com/bug.php?id=97633 correction.
+              // and mariadb only since https://jira.mariadb.org/browse/MDEV-18281
               let revertFunction = conn.rollback;
               if (
                 options.resetAfterUse &&
-                ((conn.info.isMariaDB() && conn.info.hasMinVersion(10, 2, 4)) ||
-                  (!conn.info.isMariaDB() && conn.info.hasMinVersion(5, 7, 3)))
+                conn.info.isMariaDB() &&
+                ((conn.info.serverVersion.minor === 2 && conn.info.hasMinVersion(10, 2, 22)) ||
+                  conn.info.hasMinVersion(10, 3, 13))
               ) {
@@ -90,0 +94,0 @@ revertFunction = conn.reset;

lib/pool-cluster.js

@@ -0,0 +0,0 @@ 'use strict';

lib/pool-promise.js

@@ -64,8 +64,13 @@ 'use strict';
           }
+
           //if server permit it, reset the connection, or rollback only if not
+          // COM_RESET_CONNECTION exist since mysql 5.7.3 and mariadb 10.2.4
+          // but not possible to use it with mysql waiting for https://bugs.mysql.com/bug.php?id=97633 correction.
+          // and mariadb only since https://jira.mariadb.org/browse/MDEV-18281
           let revertFunction = conn.rollback;
           if (
             options.resetAfterUse &&
-            ((conn.info.isMariaDB() && conn.info.hasMinVersion(10, 2, 4)) ||
-              (!conn.info.isMariaDB() && conn.info.hasMinVersion(5, 7, 3)))
+            conn.info.isMariaDB() &&
+            ((conn.info.serverVersion.minor === 2 && conn.info.hasMinVersion(10, 2, 22)) ||
+              conn.info.hasMinVersion(10, 3, 13))
           ) {
@@ -72,0 +77,0 @@ revertFunction = conn.reset;

package.json

 {
   "name": "mariadb",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "fast mariadb/mysql connector.",
@@ -49,11 +49,11 @@ "main": "promise.js",
     "@types/geojson": "^7946.0.7",
-    "@types/node": "^12.7.5",
+    "@types/node": "^12.12.11",
     "denque": "^1.4.1",
     "iconv-lite": "^0.5.0",
     "long": "^4.0.0",
-    "moment-timezone": "^0.5.26"
+    "moment-timezone": "^0.5.27"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.1.0",
-    "@typescript-eslint/parser": "^2.1.0",
+    "@typescript-eslint/eslint-plugin": "^2.8.0",
+    "@typescript-eslint/parser": "^2.8.0",
     "benchmark": "^2.1.4",
@@ -65,11 +65,11 @@ "chai": "^4.2.0",
     "error-stack-parser": "^2.0.3",
-    "eslint": "^6.3.0",
-    "eslint-config-prettier": "^6.2.0",
-    "eslint-plugin-markdown": "^1.0.0",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.7.0",
+    "eslint-plugin-markdown": "^1.0.1",
     "eslint-plugin-prettier": "^3.1.0",
-    "mocha": "^6.2.0",
+    "mocha": "^6.2.2",
     "mocha-lcov-reporter": "^1.3.0",
     "nyc": "^14.1.1",
-    "prettier": "^1.18.2",
-    "typescript": "^3.5.3"
+    "prettier": "^1.19.1",
+    "typescript": "^3.7.2"
   },
@@ -76,0 +76,0 @@ "bugs": {

types/index.d.ts

@@ -579,2 +579,7 @@ // Type definitions for mariadb 2.0
   escapeId(identifier: string): string;
+
+  on(ev: 'acquire', callback: (conn: Connection) => void): Pool;
+  on(ev: 'connection', callback: (conn: Connection) => void): Pool;
+  on(ev: 'enqueue', callback: () => void): Pool;
+  on(ev: 'release', callback: (conn: Connection) => void): Pool;
 }
@@ -581,0 +586,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

12932

increased by0.27%

Worsened metrics

Total package byte prevSize

488145

decreased by-0.62%

Dependency changes

• Updated@types/node@^12.12.11

• Updatedmoment-timezone@^0.5.27