Merge pull request #134 from SEA99/master

test enhancement, some bug fixes

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .idea/*
 .vscode/
-test_config.json
+test_config.json
+*.code-workspace

README.md

@@ -199,6 +199,48 @@ const result = await rs.pipe(tf).pipe(ws).exec();
 ```
 ***
 
+insert array of objects:
+```javascript
+
+/*
+	CREATE TABLE IF NOT EXISTS test_array (
+				date Date,
+				str String,
+				arr Array(String),
+				arr2 Array(Date),
+				arr3 Array(UInt8),
+				id1 UUID
+			) ENGINE=MergeTree(date, date, 8192)
+*/
+		const rows = [
+			{
+				date: '2018-01-01',
+				str: 'Something1...',
+				arr: [],
+				arr2: ['1985-01-02', '1985-01-03'],
+				arr3: [1,2,3,4,5],
+				id1: '102a05cb-8aaf-4f11-a442-20c3558e4384'
+			},
+			
+			{
+				date: '2018-02-01',
+				str: 'Something2...',
+				arr: ['5670000000', 'Something3...'],
+				arr2: ['1985-02-02'],
+				arr3: [],
+				id1: 'c2103985-9a1e-4f4a-b288-b292b5209de1'
+			}
+		];
+		
+		await clickhouse.insert(
+			`insert into test_array 
+			(date, str, arr, arr2, 
+			 arr3, id1)`,
+			rows
+		).toPromise();
+```
+***
+
 Parameterized Values:
 ```javascript
 const rows = await clickhouse.query(

index.js

@@ -10,6 +10,7 @@ const stream2asynciter = require('stream2asynciter');
 const { URL } = require('url');
 const tsv = require('tsv');
 const uuidv4 = require('uuid/v4');
+const INSERT_FIELDS_MASK = /^INSERT\sINTO\s(.+?)\s*\(((\n|.)+?)\)/i;
 
 
 /**
@@ -39,7 +40,7 @@ var ESCAPE_STRING = {
 	TSV: function (value) {
 		return value
 			.replace(/\\/g, '\\\\')
-			.replace(/\\/g, '\\')
+			.replace(/\'/g, '\\\'')
 			.replace(/\t/g, '\\t')
 			.replace(/\n/g, '\\n');
 	},
@@ -420,7 +421,7 @@ class QueryCursor {
 		}
 		
 		if (isFirstElObject) {
-			let m = query.match(/INSERT INTO (.+?) \((.+?)\)/);
+			let m = query.match(INSERT_FIELDS_MASK);
 			if (m) {
 				fieldList = m[2].split(',').map(s => s.trim());
 			} else {
@@ -496,15 +497,7 @@ class QueryCursor {
 			//   when passed in the request.
 			Object.keys(data.params).forEach(k => {
 
-				let value = data.params[k].toString();
+				let value = encodeValue(false, data.params[k], 'TabSeparated');
-
-				if (Array.isArray(data.params[k])) {
-					value = '[' + value + ']'
-				} 
-				else {
-					const str = JSON.stringify(value);
-					value = str.substring(1,str.length-1);
-				}
 
 				url.searchParams.append(
 					`param_${k}`, value

test/test.js

@@ -515,7 +515,8 @@ describe('queries', () => {
 				str String,
 				arr Array(String),
 				arr2 Array(Date),
-				arr3 Array(UInt8)
+				arr3 Array(UInt8),
+				id1 UUID
 			) ENGINE=MergeTree(date, date, 8192)
 		`).toPromise();
 		expect(r).to.be.ok();
@@ -525,24 +526,30 @@ describe('queries', () => {
 				date: '2018-01-01',
 				str: 'Вам, проживающим за оргией оргию,',
 				arr: [],
-				arr2: ['1915-01-02', '1915-01-03'],
+				arr2: ['1985-01-02', '1985-01-03'],
-				arr3: [1,2,3,4,5]
+				arr3: [1,2,3,4,5],
+				id1: '102a05cb-8aaf-4f11-a442-20c3558e4384'
 			},
 			
 			{
 				date: '2018-02-01',
-				str: 'имеющим ванную и теплый клозет!',
+				str: 'It\'s apostrophe test.',
-				arr: ['5670000000', 'asdas dasf'],
+				arr: ['5670000000', 'asdas dasf. It\'s apostrophe test.'],
-				arr2: ['1915-02-02'],
+				arr2: ['1985-02-02'],
-				arr3: []
+				arr3: [],
+				id1: 'c2103985-9a1e-4f4a-b288-b292b5209de1'
 			}
 		];
 		
 		const r2 = await clickhouse.insert(
-			'INSERT INTO test_array (date, str, arr, arr2, arr3)',
+			`insert into test_array 
+			(date, str, arr, arr2, 
+			 arr3, id1)`,
 			rows
 		).toPromise();
 		expect(r2).to.be.ok();
+		const r3 = await clickhouse.query('SELECT * FROM test_array ORDER BY date').toPromise();		
+		expect(r3).to.eql(rows);
 	});
 
 	it('insert field as raw string', async () => {
@@ -562,7 +569,7 @@ describe('queries', () => {
 		
 		const rows = [
 			'(\'2018-01-01 10:00:00\',\'Вам, проживающим за оргией оргию,\',[],[\'1915-01-02 10:00:00\',\'1915-01-03 10:00:00\'],[1,2,3,4,5],unhex(\'60ed56e75bb93bd353267faa\'))',
-			'(\'2018-02-01 10:00:00\',\'имеющим ванную и теплый клозет!\',[\'5670000000\',\'asdas dasf\'],[\'1915-02-02 10:00:00\'],[],unhex(\'60ed56f4a88cd5dcb249d959\'))'
+			'(\'2018-02-01 10:00:00\',\'имеющим ванную и теплый клозет! It\'\'s apostrophe test.\',[\'5670000000\',\'asdas dasf\'],[\'1915-02-02 10:00:00\'],[],unhex(\'60ed56f4a88cd5dcb249d959\'))'
 		];
 		
 		const r2 = await clickhouse.insert(
@@ -711,8 +718,11 @@ describe('queries', () => {
 			str_value2 String, 
 			date_value Date, 
 			date_time_value DateTime, 
-			decimal_value Decimal(10,4) 
+			decimal_value Decimal(10,4),
-			) ENGINE=Memory`).toPromise();
+			arr Array(String),
+			arr2 Array(Date),
+			arr3 Array(UInt32)
+		) ENGINE=Memory`).toPromise();
 		expect(result1).to.be.ok();
 		
 		const row = {
@@ -722,9 +732,14 @@ describe('queries', () => {
 			date_value: '2022-08-18',
 			date_time_value: '2022-08-18 19:07:00',
 			decimal_value: 1234.678,
+			arr: ['asdfasdf', 'It\'s apostrophe test'],
+			arr2: ['2022-01-01', '2022-10-10'],
+			arr3: [12345, 54321],
 		};
-		const result2 = await clickhouse.insert(`INSERT INTO test_par_temp (int_value, str_value1, str_value2, date_value, date_time_value,	decimal_value)
+		const result2 = await clickhouse.insert(`INSERT INTO test_par_temp (int_value, str_value1, str_value2, date_value, date_time_value,	decimal_value,
-			VALUES ({int_value:UInt32}, {str_value1:String}, {str_value2:String}, {date_value:Date}, {date_time_value:DateTime}, {decimal_value: Decimal(10,4)})`, 
+			arr, arr2, arr3)
+			VALUES ({int_value:UInt32}, {str_value1:String}, {str_value2:String}, {date_value:Date}, {date_time_value:DateTime}, {decimal_value: Decimal(10,4)},
+			{arr:Array(String)},{arr2:Array(Date)},{arr3:Array(UInt32)})`, 
 			{params: {
 				...row,
 				decimal_value: row.decimal_value.toFixed(4)
@@ -735,6 +750,58 @@ describe('queries', () => {
 		const result3 = await clickhouse.query('SELECT * FROM test_par_temp').toPromise();		
 		expect(result3).to.eql([row]);
 	});
+
+	it('insert select', async () => {
+		const result = await clickhouse.query('DROP TABLE IF EXISTS test_par_temp').toPromise();
+		expect(result).to.be.ok();
+		
+		const result1 = await clickhouse.query(`CREATE TABLE test_par_temp (
+			int_value UInt32, 
+			str_value1 String, 
+			str_value2 String, 
+			date_value Date, 
+			date_time_value DateTime, 
+			decimal_value Decimal(10,4),
+			arr Array(String),
+			arr2 Array(Date),
+			arr3 Array(UInt32)
+		) ENGINE=Memory`).toPromise();
+		expect(result1).to.be.ok();
+		
+		const row = {
+			int_value: 12345,
+			str_value1: 'Test for "masked" characters. It workes, isn\'t it?',
+			str_value2: JSON.stringify({name:'It is "something".'}),
+			date_value: '2022-08-18',
+			date_time_value: '2022-08-18 19:07:00',
+			decimal_value: 1234.678,
+			arr: ['asdfasdf', 'It\'s apostrophe test'],
+			arr2: ['2022-01-01', '2022-10-10'],
+			arr3: [12345, 54321],
+		};
+		const result2 = await clickhouse.insert(`INSERT INTO test_par_temp (int_value, str_value1, str_value2, date_value, date_time_value,	decimal_value,
+			arr, arr2, arr3)
+			select {int_value:UInt32}, {str_value1:String}, {str_value2:String}, {date_value:Date}, {date_time_value:DateTime}, {decimal_value: Decimal(10,4)},
+			{arr:Array(String)},{arr2:Array(Date)},{arr3:Array(UInt32)}`, 
+			{params: {
+				...row,
+				decimal_value: row.decimal_value.toFixed(4)
+				}
+			}).toPromise();
+		expect(result2).to.be.ok();
+
+		const result3 = await clickhouse.query('SELECT * FROM test_par_temp').toPromise();		
+		expect(result3).to.eql([row]);
+
+		const result4 = await clickhouse.insert(`INSERT INTO test_par_temp (int_value, str_value1, str_value2, date_value, date_time_value,	decimal_value,
+			arr, arr2, arr3)
+			select 123456, 'awerqwerqwer', 'rweerwrrewr', '2022-08-25', '2022-08-25 02:00:01', '123.1234',
+			['aaa','bbb'],['2022-08-22','2022-08-23'],[1,2,3,4]`
+			).toPromise();
+		expect(result2).to.be.ok();
+		
+
+	});
 	
 });