Merge branch 'master' of github.com:sidorares/node-mysql2

Author: sidorares

.gitignore

@@ -8,6 +8,7 @@ lib-cov
 *.gz
 .DS_Store
 .idea/
+.vscode/
 .npmrc
 mysqldata/
 

benchmarks/run-unit.js

@@ -119,7 +119,8 @@ function compile(fields, options, config) {
           return _this.packet.parseGeometryValue();
         },
         readNext: function() {
-          return _this.${readCode};
+          const packet = _this.packet;
+          return ${readCode};
         }
       };`);
     }

lib/parsers/text_parser.js

@@ -11,7 +11,7 @@
     "lint:code": "eslint index.js promise.js \"lib/**/*.js\" \"test/**/*.js\" \"benchmarks/**/*.js\"",
     "lint:docs": "eslint Contributing.md \"documentation/**/*.md\" \"examples/*.js\"",
     "test": "node ./test/run.js",
-    "benchmark": "./benchmarks/run-unit.js",
+    "benchmark": "node ./benchmarks/benchmark.js",
     "prettier": "prettier --single-quote --trailing-comma none --write \"{lib,examples,test}/**/*.js\"",
     "prettier:docs": "prettier --single-quote --trailing-comma none --write README.md documentation/*",
     "precommit": "lint-staged",

package.json

@@ -4,6 +4,9 @@ const common = require('../../common');
 const connection = common.createConnection();
 const assert = require('assert');
 
+connection.query('CREATE TEMPORARY TABLE json_test (json_test JSON)');
+connection.query('INSERT INTO json_test VALUES (?)', JSON.stringify({ test: 42 }));
+
 connection.query(
   {
     sql: 'select "foo uppercase" as foo',
@@ -46,4 +49,31 @@ connection.query(
   }
 );
 
+
+connection.query(
+  {
+    sql: 'SELECT * from json_test',
+    typeCast: function(_field, next) {
+      return next();
+    }
+  },
+  (err, _rows) => {
+    assert.ifError(err);
+    assert.equal(_rows[0].json_test.test, 42);
+  }
+);
+
+connection.execute(
+  {
+    sql: 'SELECT * from json_test',
+    typeCast: function(_field, next) {
+      return next();
+    }
+  },
+  (err, _rows) => {
+    assert.ifError(err);
+    assert.equal(_rows[0].json_test.test, 42);
+  }
+);
+
 connection.end();