[misc] connection.end() immediate resolution on socket QUIT packet send.

mariadb-corporation · Sep 19, 2018 · 6df9209 · 6df9209
1 parent 1c65cc7
commit 6df9209
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/lib/connection-callback.js b/lib/connection-callback.js
@@ -65,7 +65,7 @@ function ConnectionCallback(options) {
       throw new Errors.createError(
         "missing callback parameter",
         false,
-        this.getInfo(),
+        this.info,
         "HY000",
         Errors.ER_MISSING_PARAMETER
       );
@@ -81,7 +81,7 @@ function ConnectionCallback(options) {
             Errors.createError(
               "Connection closed",
               true,
-              this.getInfo(),
+              this.info,
               "08S01",
               Errors.ER_CONNECTION_ALREADY_CLOSED
             )

diff --git a/lib/connection.js b/lib/connection.js
@@ -231,9 +231,9 @@ function Connection(options) {
           let sock = _socket;
           _clear();
           _status = Status.CLOSED;
-          setImmediate(resolve);
           sock.destroy();
           _receiveQueue.clear();
+          resolve();
         };
         const quitCmd = new Quit(ended, ended);
         _sendQueue.push(quitCmd);
@@ -396,10 +396,6 @@ function Connection(options) {
     );
   };
 
-  this.getInfo = () => {
-    return info;
-  };
-
   /**
    * Change option "debug" during connection.
    * @param val   debug value
@@ -979,6 +975,7 @@ function Connection(options) {
       return info ? info.threadId : undefined;
     }
   });
+
 }
 
 util.inherits(Connection, EventEmitter);

diff --git a/test/integration/datatype/test-enum.js b/test/integration/datatype/test-enum.js
@@ -0,0 +1,27 @@
+"use strict";
+
+const base = require("../../base.js");
+const { assert } = require("chai");
+
+describe("enum", () => {
+  it("enum type verification", done => {
+    shareConn.query(
+      "CREATE TEMPORARY TABLE fruits (\n" +
+        "  id INT NOT NULL auto_increment PRIMARY KEY,\n" +
+        "  fruit ENUM('apple','orange','pear'),\n" +
+        "  bushels INT)"
+    );
+    shareConn.query("INSERT INTO fruits (fruit,bushels) VALUES (?, ?)", ["pear", 20]);
+    shareConn.query("INSERT INTO fruits (fruit,bushels) VALUES (?, ?)", ["apple", 100]);
+    shareConn
+      .query("SELECT * FROM fruits")
+      .then(rows => {
+        assert.deepEqual(rows, [
+          { id: 1, fruit: "pear", bushels: 20 },
+          { id: 2, fruit: "apple", bushels: 100 }
+        ]);
+        done();
+      })
+      .catch(done);
+  });
+});
diff --git a/test/integration/datatype/test-geometry.js b/test/integration/datatype/test-geometry.js
@@ -49,7 +49,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("Point Insert", function (done) {
+  it("Point Insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -136,7 +136,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("LineString insert", function (done) {
+  it("LineString insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -234,7 +234,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("Polygon insert", function (done) {
+  it("Polygon insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -335,7 +335,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("MultiPoint insert", function (done) {
+  it("MultiPoint insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -426,7 +426,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("Multi-line insert", function (done) {
+  it("Multi-line insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -540,7 +540,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("Multi-polygon insert", function (done) {
+  it("Multi-polygon insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();
 
@@ -755,7 +755,7 @@ describe("geometry data type", () => {
       .catch(done);
   });
 
-  it("Geometry collection insert", function (done) {
+  it("Geometry collection insert", function(done) {
     //mysql < 8 doesn't permit sending empty data
     if (!shareConn.isMariaDB() && !shareConn.hasMinVersion(8, 0, 0)) this.skip();