Merge pull request #66 from evle/master

fix issue #56
apla · Sep 13, 2020 · d953208 · d953208
2 parents d660165 + 2384959
commit d953208
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/clickhouse.js b/src/clickhouse.js
@@ -284,7 +284,7 @@ ClickHouse.prototype.query = function (chQuery, options, cb) {
 	var formatEnding = '';
 
 	// format should be added for data queries
-	if (chQuery.match (/^(?:SELECT|SHOW|DESC|DESCRIBE|EXISTS\s+TABLE)/i)) {
+	if (chQuery.match (/^(?:SELECT|WITH|SHOW|DESC|DESCRIBE|EXISTS\s+TABLE)/i)) {
 		if (!options.format)
 			options.format = options.dataObjects ? 'JSON' : 'JSONCompact';
 	} else if (chQuery.match (/^INSERT/i)) {

diff --git a/test/04-select.js b/test/04-select.js
@@ -220,4 +220,15 @@ describe ("select data from database", function () {
 			stream.destroy ();
 		});
 	});
+
+	it("select query with WITH clause will produces result formatted ", function (done) {
+		var ch = new ClickHouse({ host: host, port: port, format: "JSON" });
+		ch.query("WITH 10 as pagesize SELECT 1", { syncParser: true }, function (err, result) {
+			assert(!err);
+			assert(result.meta, "result should be Object with `data` key to represent rows");
+			assert(result.data, "result should be Object with `meta` key to represent column info");
+			assert(Object.prototype.toString.call(result.data[0]) === '[object Object]', "data should be formatted JSON" )
+			done();
+		});
+	})
 });