Skip to content

Commit ebdcab7

Browse files
slvrtrnslvrtrn
committed
Disable semicolons in prettier config
1 parent 113ffdb commit ebdcab7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1177
-1190
lines changed

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"singleQuote": true
2+
"singleQuote": true,
3+
"semi": false
34
}

‎__tests__/global.integration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const TestDatabaseEnvKey = 'CLICKHOUSE_TEST_DATABASE';
1+
export const TestDatabaseEnvKey = 'CLICKHOUSE_TEST_DATABASE'

‎__tests__/integration/abort_request.test.ts

+77-77
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
1-
import Stream from 'stream';
2-
import { AbortController } from 'node-abort-controller';
3-
import { type ClickHouseClient, type ResponseJSON } from '../../src';
4-
import { createTable, createTestClient, guid } from '../utils';
5-
import { TestEnv } from '../utils';
1+
import Stream from 'stream'
2+
import { AbortController } from 'node-abort-controller'
3+
import { type ClickHouseClient, type ResponseJSON } from '../../src'
4+
import { createTable, createTestClient, guid } from '../utils'
5+
import { TestEnv } from '../utils'
66

77
describe('abort request', () => {
8-
let client: ClickHouseClient;
8+
let client: ClickHouseClient
99
beforeAll(function () {
1010
// FIXME: Jest does not seem to have it
1111
// if (process.env.browser) {
1212
// this.skip();
1313
// }
14-
});
14+
})
1515

1616
beforeEach(() => {
17-
client = createTestClient();
18-
});
17+
client = createTestClient()
18+
})
1919

2020
afterEach(async () => {
21-
await client.close();
22-
});
21+
await client.close()
22+
})
2323

2424
describe('select', () => {
2525
it('cancels a select query before it is sent', async () => {
26-
const controller = new AbortController();
26+
const controller = new AbortController()
2727
const selectPromise = client.select({
2828
query: 'SELECT sleep(3)',
2929
format: 'CSV',
3030
abort_signal: controller.signal as AbortSignal,
31-
});
32-
controller.abort();
31+
})
32+
controller.abort()
3333

3434
await expect(selectPromise).rejects.toEqual(
3535
expect.objectContaining({
3636
message: expect.stringMatching('The request was aborted'),
3737
})
38-
);
39-
});
38+
)
39+
})
4040

4141
it('cancels a select query after it is sent', async () => {
42-
const controller = new AbortController();
42+
const controller = new AbortController()
4343
const selectPromise = client.select({
4444
query: 'SELECT sleep(3)',
4545
format: 'CSV',
4646
abort_signal: controller.signal as AbortSignal,
47-
});
47+
})
4848

4949
setTimeout(() => {
50-
controller.abort();
51-
}, 50);
50+
controller.abort()
51+
}, 50)
5252

5353
await expect(selectPromise).rejects.toEqual(
5454
expect.objectContaining({
5555
message: expect.stringMatching('The request was aborted'),
5656
})
57-
);
58-
});
57+
)
58+
})
5959

6060
it('cancels a select query while reading response', async () => {
61-
const controller = new AbortController();
61+
const controller = new AbortController()
6262
const selectPromise = client
6363
.select({
6464
query: 'SELECT * from system.numbers',
6565
format: 'JSONCompactEachRow',
6666
abort_signal: controller.signal as AbortSignal,
6767
})
6868
.then(async (rows) => {
69-
const stream = rows.asStream();
69+
const stream = rows.asStream()
7070
for await (const chunk of stream) {
71-
const [[number]] = chunk.json();
71+
const [[number]] = chunk.json()
7272
// abort when reach number 3
7373
if (number === '3') {
74-
controller.abort();
74+
controller.abort()
7575
}
7676
}
77-
});
77+
})
7878

7979
// There is no assertion against an error message.
8080
// A race condition on events might lead to
8181
// Request Aborted or ERR_STREAM_PREMATURE_CLOSE errors.
82-
await expect(selectPromise).rejects.toThrowError();
83-
});
82+
await expect(selectPromise).rejects.toThrowError()
83+
})
8484

8585
it('cancels a select query while reading response by closing response stream', async () => {
8686
const selectPromise = client
@@ -89,48 +89,48 @@ describe('abort request', () => {
8989
format: 'JSONCompactEachRow',
9090
})
9191
.then(async function (rows) {
92-
const stream = rows.asStream();
92+
const stream = rows.asStream()
9393
for await (const chunk of stream) {
94-
const [[number]] = chunk.json();
94+
const [[number]] = chunk.json()
9595
// abort when reach number 3
9696
if (number === '3') {
97-
stream.destroy();
97+
stream.destroy()
9898
}
9999
}
100-
});
101-
expect(await selectPromise).toEqual(undefined);
102-
});
100+
})
101+
expect(await selectPromise).toEqual(undefined)
102+
})
103103

104104
// FIXME: it does not work with ClickHouse Cloud.
105105
// Active queries never contain the long running query unlike local setup.
106106
it.skip('ClickHouse server must cancel query on abort', async () => {
107-
const controller = new AbortController();
107+
const controller = new AbortController()
108108

109-
const longRunningQuery = `SELECT sleep(3), '${guid()}'`;
110-
console.log(`Long running query: ${longRunningQuery}`);
109+
const longRunningQuery = `SELECT sleep(3), '${guid()}'`
110+
console.log(`Long running query: ${longRunningQuery}`)
111111
void client.select({
112112
query: longRunningQuery,
113113
abort_signal: controller.signal as AbortSignal,
114114
format: 'JSONCompactEachRow',
115-
});
115+
})
116116

117117
await assertActiveQueries(client, (queries) => {
118-
console.log(`Active queries: ${JSON.stringify(queries, null, 2)}`);
119-
return queries.some((q) => q.query.includes(longRunningQuery));
120-
});
118+
console.log(`Active queries: ${JSON.stringify(queries, null, 2)}`)
119+
return queries.some((q) => q.query.includes(longRunningQuery))
120+
})
121121

122-
controller.abort();
122+
controller.abort()
123123

124124
await assertActiveQueries(client, (queries) =>
125125
queries.every((q) => !q.query.includes(longRunningQuery))
126-
);
127-
});
128-
});
126+
)
127+
})
128+
})
129129

130130
describe('insert', () => {
131-
let tableName: string;
131+
let tableName: string
132132
beforeEach(async () => {
133-
tableName = `abort_request_insert_test_${guid()}`;
133+
tableName = `abort_request_insert_test_${guid()}`
134134
await createTable(client, (env) => {
135135
switch (env) {
136136
// ENGINE can be omitted in the cloud statements:
@@ -140,75 +140,75 @@ describe('abort request', () => {
140140
CREATE TABLE ${tableName}
141141
(id UInt64)
142142
ORDER BY (id)
143-
`;
143+
`
144144
case TestEnv.LocalSingleNode:
145145
return `
146146
CREATE TABLE ${tableName}
147147
(id UInt64)
148148
ENGINE MergeTree()
149149
ORDER BY (id)
150-
`;
150+
`
151151
case TestEnv.LocalCluster:
152152
return `
153153
CREATE TABLE ${tableName} ON CLUSTER '{cluster}'
154154
(id UInt64)
155155
ENGINE ReplicatedMergeTree('/clickhouse/{cluster}/tables/{database}/{table}/{shard}', '{replica}')
156156
ORDER BY (id)
157-
`;
157+
`
158158
}
159-
});
160-
});
159+
})
160+
})
161161

162162
it('cancels an insert query before it is sent', async () => {
163-
const controller = new AbortController();
164-
const stream = getStubStream();
163+
const controller = new AbortController()
164+
const stream = getStubStream()
165165
const insertPromise = client.insert({
166166
table: tableName,
167167
values: stream,
168168
abort_signal: controller.signal as AbortSignal,
169-
});
170-
controller.abort();
169+
})
170+
controller.abort()
171171

172172
await expect(insertPromise).rejects.toEqual(
173173
expect.objectContaining({
174174
message: expect.stringMatching('The request was aborted'),
175175
})
176-
);
177-
});
176+
)
177+
})
178178

179179
it('cancels an insert query before it is sent by closing a stream', async () => {
180-
const stream = getStubStream();
181-
stream.push(null);
180+
const stream = getStubStream()
181+
stream.push(null)
182182

183183
expect(
184184
await client.insert({
185185
table: tableName,
186186
values: stream,
187187
})
188-
).toEqual(undefined);
189-
});
188+
).toEqual(undefined)
189+
})
190190

191191
it('cancels an insert query after it is sent', async () => {
192-
const controller = new AbortController();
193-
const stream = getStubStream();
192+
const controller = new AbortController()
193+
const stream = getStubStream()
194194
const insertPromise = client.insert({
195195
table: tableName,
196196
values: stream,
197197
abort_signal: controller.signal as AbortSignal,
198-
});
198+
})
199199

200200
setTimeout(() => {
201-
controller.abort();
202-
}, 50);
201+
controller.abort()
202+
}, 50)
203203

204204
await expect(insertPromise).rejects.toEqual(
205205
expect.objectContaining({
206206
message: expect.stringMatching('The request was aborted'),
207207
})
208-
);
209-
});
210-
});
211-
});
208+
)
209+
})
210+
})
211+
})
212212

213213
async function assertActiveQueries(
214214
client: ClickHouseClient,
@@ -219,15 +219,15 @@ async function assertActiveQueries(
219219
const rows = await client.select({
220220
query: 'SELECT query FROM system.processes',
221221
format: 'JSON',
222-
});
222+
})
223223

224-
const queries = await rows.json<ResponseJSON<{ query: string }>>();
224+
const queries = await rows.json<ResponseJSON<{ query: string }>>()
225225

226226
if (assertQueries(queries.data)) {
227-
break;
227+
break
228228
}
229229

230-
await new Promise((res) => setTimeout(res, 100));
230+
await new Promise((res) => setTimeout(res, 100))
231231
}
232232
}
233233

@@ -237,5 +237,5 @@ function getStubStream(): Stream.Readable {
237237
read() {
238238
/* stub */
239239
},
240-
});
240+
})
241241
}

‎__tests__/integration/auth.test.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { type ClickHouseClient } from '../../src';
2-
import { createTestClient } from '../utils';
1+
import { type ClickHouseClient } from '../../src'
2+
import { createTestClient } from '../utils'
33

44
describe('authentication', () => {
5-
let client: ClickHouseClient;
5+
let client: ClickHouseClient
66
afterEach(async () => {
7-
await client.close();
8-
});
7+
await client.close()
8+
})
99

1010
it('provides authentication error details', async () => {
1111
client = createTestClient({
1212
username: 'gibberish',
1313
password: 'gibberish',
14-
});
14+
})
1515

1616
await expect(
1717
client.select({
@@ -23,6 +23,6 @@ describe('authentication', () => {
2323
type: 'AUTHENTICATION_FAILED',
2424
message: expect.stringMatching('Authentication failed'),
2525
})
26-
);
27-
});
28-
});
26+
)
27+
})
28+
})

0 commit comments

Comments
 (0)