mirror of
https://github.com/lingble/clickhouse.git
synced 2025-11-02 12:08:04 +00:00
Merge pull request #126 from 0ss/@salah/remove-lodash
refactor: remove `lodash`
This commit is contained in:
67
index.js
67
index.js
@@ -1,7 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
const zlib = require('zlib');
|
||||
const _ = require('lodash');
|
||||
const request = require('request');
|
||||
const { Transform, Readable, } = require('stream');
|
||||
const JSONStream = require('JSONStream');
|
||||
@@ -359,10 +358,10 @@ class QueryCursor {
|
||||
this.query = query;
|
||||
this.data = data;
|
||||
|
||||
this.opts = _.merge({}, opts, {
|
||||
this.opts = {...opts,
|
||||
format: this.connection.opts.format,
|
||||
raw: this.connection.opts.raw
|
||||
});
|
||||
}
|
||||
|
||||
// Sometime needs to override format by query
|
||||
const formatFromQuery = ClickHouse.getFormatFromQuery(this.query);
|
||||
@@ -453,15 +452,15 @@ class QueryCursor {
|
||||
database,
|
||||
} = me.connection.opts;
|
||||
|
||||
const params = _.merge({
|
||||
const params = {
|
||||
headers: {
|
||||
'Content-Type': 'text/plain'
|
||||
},
|
||||
}, reqParams);
|
||||
...reqParams};
|
||||
|
||||
const configQS = _.merge({}, config, {
|
||||
const configQS ={ ...config,
|
||||
query_id: me.queryId,
|
||||
});
|
||||
};
|
||||
|
||||
if (me.connection.opts.isSessionPerQuery) {
|
||||
configQS.session_id = uuidv4();
|
||||
@@ -595,12 +594,13 @@ class QueryCursor {
|
||||
|
||||
me._request = request.post(reqParams, (err, res) => {
|
||||
if (me.isDebug) {
|
||||
console.log('QueryCursor.exec: result', me.query, err, _.pick(res, [
|
||||
'statusCode',
|
||||
'body',
|
||||
'statusMessage',
|
||||
'headers'
|
||||
]));
|
||||
const { statusCode, body, statusMessage, headers } = res;
|
||||
console.log('QueryCursor.exec: result', me.query, err, {
|
||||
statusCode,
|
||||
body,
|
||||
statusMessage,
|
||||
headers
|
||||
});
|
||||
}
|
||||
|
||||
if (err) {
|
||||
@@ -756,10 +756,10 @@ class QueryCursor {
|
||||
rs.emit('error', err);
|
||||
})
|
||||
.on('header', header => {
|
||||
metaData = _.merge({}, header);
|
||||
metaData = header
|
||||
})
|
||||
.on('footer', footer => {
|
||||
rs.emit('meta', _.merge(metaData, footer));
|
||||
rs.emit('meta', {...metaData, ...footer});
|
||||
})
|
||||
.on('data', function (data) {
|
||||
rs.emit('data', data);
|
||||
@@ -828,26 +828,25 @@ class QueryCursor {
|
||||
|
||||
class ClickHouse {
|
||||
constructor(opts = {}) {
|
||||
this.opts = _.merge(
|
||||
{
|
||||
debug: false,
|
||||
database: DATABASE,
|
||||
password: '',
|
||||
basicAuth: null,
|
||||
isUseGzip: false,
|
||||
config: {
|
||||
session_timeout : 60,
|
||||
output_format_json_quote_64bit_integers : 0,
|
||||
enable_http_compression : 0
|
||||
},
|
||||
format: FORMAT_NAMES.JSON,
|
||||
raw: false,
|
||||
isSessionPerQuery: false,
|
||||
trimQuery: false,
|
||||
usePost: false,
|
||||
this.opts = {
|
||||
debug: false,
|
||||
database: DATABASE,
|
||||
password: '',
|
||||
basicAuth: null,
|
||||
isUseGzip: false,
|
||||
config: {
|
||||
session_timeout : 60,
|
||||
output_format_json_quote_64bit_integers : 0,
|
||||
enable_http_compression : 0
|
||||
},
|
||||
opts
|
||||
);
|
||||
format: FORMAT_NAMES.JSON,
|
||||
raw: false,
|
||||
isSessionPerQuery: false,
|
||||
trimQuery: false,
|
||||
usePost: false,
|
||||
...opts
|
||||
|
||||
}
|
||||
|
||||
|
||||
let url = opts.url || opts.host || URI,
|
||||
|
||||
Reference in New Issue
Block a user