From a78786fcbb85c4d7fd095a1b51ebf16cd8c12de8 Mon Sep 17 00:00:00 2001 From: Andrew Derbitov Date: Thu, 14 Feb 2019 13:33:31 +0300 Subject: [PATCH] Fix username & password use --- README.md | 1 + index.js | 16 ++++++++++++++++ package.json | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 06d8103..9ec2bf4 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ Exec by callback way: clickhouse.query(query).exec(function (err, rows) { ... }); +```` *** diff --git a/index.js b/index.js index 09bc92d..758c39f 100644 --- a/index.js +++ b/index.js @@ -599,11 +599,27 @@ class ClickHouse { } else if (query.match(/^insert/i)) { reqParams['url'] = me.url + '?query=' + encodeURIComponent(query + ' FORMAT TabSeparated') + '&' + querystring.stringify(configQS); + if (me.opts.username) { + reqParams['url'] = reqParams['url'] + '&user=' + me.opts.username; + } + + if (this.opts.password) { + reqParams['url'] = reqParams['url'] + '&password=' + me.opts.password; + } + if (data) { reqParams['body'] = me._getBodyForInsert(query, data); } } else { reqParams['url'] = me.url + '?query=' + encodeURIComponent(query) + '&' + querystring.stringify(configQS); + + if (me.opts.username) { + reqParams['url'] = reqParams['url'] + '&user=' + me.opts.username; + } + + if (this.opts.password) { + reqParams['url'] = reqParams['url'] + '&password=' + me.opts.password; + } } reqParams['headers'] = { diff --git a/package.json b/package.json index bba6473..14f3c61 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ } ], "name": "clickhouse", - "version": "1.2.14", + "version": "1.2.15", "repository": { "type": "git", "url": "https://github.com/TimonKK/clickhouse.git"