fdb2 1.0.33 → 1.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -2
- package/dist/public/explorer.css +152 -272
- package/dist/public/explorer.js +354 -465
- package/dist/public/index.js +3 -1
- package/dist/public/layout.css +265 -54
- package/dist/public/layout.js +184 -19
- package/dist/public/vue.js +1 -1
- package/dist/server/core/db-api.js +5 -0
- package/dist/server/core/db-api.js.map +1 -1
- package/dist/server/core/db-api.ts +5 -0
- package/dist/server/core/dialect.d.ts +1 -1
- package/dist/server/core/dialect.d.ts.map +1 -1
- package/dist/server/core/dialect.js +21 -1
- package/dist/server/core/dialect.js.map +1 -1
- package/dist/server/core/dialect.ts +23 -2
- package/dist/server/service/connection.service.d.ts.map +1 -1
- package/dist/server/service/connection.service.js +17 -1
- package/dist/server/service/connection.service.js.map +1 -1
- package/dist/server/service/connection.service.ts +17 -1
- package/dist/server/service/database/clickhouse-connection.d.ts +44 -0
- package/dist/server/service/database/clickhouse-connection.d.ts.map +1 -0
- package/dist/server/service/database/clickhouse-connection.js +210 -0
- package/dist/server/service/database/clickhouse-connection.js.map +1 -0
- package/dist/server/service/database/clickhouse-connection.ts +182 -0
- package/dist/server/service/database/clickhouse.service.d.ts +138 -0
- package/dist/server/service/database/clickhouse.service.d.ts.map +1 -0
- package/dist/server/service/database/clickhouse.service.js +794 -0
- package/dist/server/service/database/clickhouse.service.js.map +1 -0
- package/dist/server/service/database/clickhouse.service.ts +853 -0
- package/dist/server/service/database/database.service.d.ts +42 -0
- package/dist/server/service/database/database.service.d.ts.map +1 -1
- package/dist/server/service/database/database.service.js +37 -0
- package/dist/server/service/database/database.service.js.map +1 -1
- package/dist/server/service/database/database.service.ts +37 -0
- package/dist/server/service/database/index.d.ts +1 -0
- package/dist/server/service/database/index.d.ts.map +1 -1
- package/dist/server/service/database/index.js +3 -1
- package/dist/server/service/database/index.js.map +1 -1
- package/dist/server/service/database/index.ts +1 -0
- package/package.json +1 -4
|
@@ -145,7 +145,23 @@ const DIALECTS = {
|
|
|
145
145
|
serviceClass: 'SAPHANADatabaseService'
|
|
146
146
|
},
|
|
147
147
|
'sap-hana': { type: 'sap' },
|
|
148
|
-
saphana: { type: 'sap' }
|
|
148
|
+
saphana: { type: 'sap' },
|
|
149
|
+
clickhouse: {
|
|
150
|
+
type: 'clickhouse',
|
|
151
|
+
label: 'ClickHouse',
|
|
152
|
+
defaultPort: 8123,
|
|
153
|
+
features: {
|
|
154
|
+
supportSchemas: false,
|
|
155
|
+
supportProcedures: false,
|
|
156
|
+
supportViews: true,
|
|
157
|
+
supportTriggers: false,
|
|
158
|
+
supportFullTextSearch: true,
|
|
159
|
+
supportJson: true
|
|
160
|
+
},
|
|
161
|
+
serviceFile: 'clickhouse',
|
|
162
|
+
serviceClass: 'ClickHouseService'
|
|
163
|
+
},
|
|
164
|
+
'click-house': { type: 'clickhouse' }
|
|
149
165
|
};
|
|
150
166
|
function normalizeDialectType(type) {
|
|
151
167
|
if (!type)
|
|
@@ -189,6 +205,7 @@ function kindParamStyle(type) {
|
|
|
189
205
|
case 'mssql':
|
|
190
206
|
case 'mongodb':
|
|
191
207
|
case 'sap':
|
|
208
|
+
case 'clickhouse':
|
|
192
209
|
return 'inline';
|
|
193
210
|
default:
|
|
194
211
|
return '?';
|
|
@@ -203,6 +220,7 @@ function resolveKind(type) {
|
|
|
203
220
|
case 'cockroachdb': return 'cockroachdb';
|
|
204
221
|
case 'mongodb': return 'mongodb';
|
|
205
222
|
case 'sap': return 'sap';
|
|
223
|
+
case 'clickhouse': return 'clickhouse';
|
|
206
224
|
default: return 'mysql';
|
|
207
225
|
}
|
|
208
226
|
}
|
|
@@ -215,6 +233,7 @@ function resolveServiceFile(type) {
|
|
|
215
233
|
case 'cockroachdb': return 'cockroachdb';
|
|
216
234
|
case 'mongodb': return 'mongodb';
|
|
217
235
|
case 'sap': return 'sap';
|
|
236
|
+
case 'clickhouse': return 'clickhouse';
|
|
218
237
|
default: return 'mysql';
|
|
219
238
|
}
|
|
220
239
|
}
|
|
@@ -227,6 +246,7 @@ function resolveServiceClass(type) {
|
|
|
227
246
|
case 'cockroachdb': return 'CockroachDBService';
|
|
228
247
|
case 'mongodb': return 'MongoDBService';
|
|
229
248
|
case 'sap': return 'SAPHANADatabaseService';
|
|
249
|
+
case 'clickhouse': return 'ClickHouseService';
|
|
230
250
|
default: return 'MySQLService';
|
|
231
251
|
}
|
|
232
252
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../../server/core/dialect.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;
|
|
1
|
+
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../../server/core/dialect.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,8 @@ export type DialectKind =
|
|
|
12
12
|
| 'mssql'
|
|
13
13
|
| 'cockroachdb'
|
|
14
14
|
| 'mongodb'
|
|
15
|
-
| 'sap'
|
|
15
|
+
| 'sap'
|
|
16
|
+
| 'clickhouse';
|
|
16
17
|
|
|
17
18
|
export interface DialectFeature {
|
|
18
19
|
supportSchemas: boolean;
|
|
@@ -173,7 +174,23 @@ const DIALECTS: Record<string, Partial<DialectInfo> & { type: string }> = {
|
|
|
173
174
|
serviceClass: 'SAPHANADatabaseService'
|
|
174
175
|
},
|
|
175
176
|
'sap-hana': { type: 'sap' },
|
|
176
|
-
saphana: { type: 'sap' }
|
|
177
|
+
saphana: { type: 'sap' },
|
|
178
|
+
clickhouse: {
|
|
179
|
+
type: 'clickhouse',
|
|
180
|
+
label: 'ClickHouse',
|
|
181
|
+
defaultPort: 8123,
|
|
182
|
+
features: {
|
|
183
|
+
supportSchemas: false,
|
|
184
|
+
supportProcedures: false,
|
|
185
|
+
supportViews: true,
|
|
186
|
+
supportTriggers: false,
|
|
187
|
+
supportFullTextSearch: true,
|
|
188
|
+
supportJson: true
|
|
189
|
+
},
|
|
190
|
+
serviceFile: 'clickhouse',
|
|
191
|
+
serviceClass: 'ClickHouseService'
|
|
192
|
+
},
|
|
193
|
+
'click-house': { type: 'clickhouse' }
|
|
177
194
|
};
|
|
178
195
|
|
|
179
196
|
export function normalizeDialectType(type: string): string | null {
|
|
@@ -219,6 +236,7 @@ function kindParamStyle(type: string): '?' | '$' | 'inline' {
|
|
|
219
236
|
case 'mssql':
|
|
220
237
|
case 'mongodb':
|
|
221
238
|
case 'sap':
|
|
239
|
+
case 'clickhouse':
|
|
222
240
|
return 'inline';
|
|
223
241
|
default:
|
|
224
242
|
return '?';
|
|
@@ -234,6 +252,7 @@ function resolveKind(type: string): DialectKind {
|
|
|
234
252
|
case 'cockroachdb': return 'cockroachdb';
|
|
235
253
|
case 'mongodb': return 'mongodb';
|
|
236
254
|
case 'sap': return 'sap';
|
|
255
|
+
case 'clickhouse': return 'clickhouse';
|
|
237
256
|
default: return 'mysql';
|
|
238
257
|
}
|
|
239
258
|
}
|
|
@@ -247,6 +266,7 @@ function resolveServiceFile(type: string): string {
|
|
|
247
266
|
case 'cockroachdb': return 'cockroachdb';
|
|
248
267
|
case 'mongodb': return 'mongodb';
|
|
249
268
|
case 'sap': return 'sap';
|
|
269
|
+
case 'clickhouse': return 'clickhouse';
|
|
250
270
|
default: return 'mysql';
|
|
251
271
|
}
|
|
252
272
|
}
|
|
@@ -260,6 +280,7 @@ function resolveServiceClass(type: string): string {
|
|
|
260
280
|
case 'cockroachdb': return 'CockroachDBService';
|
|
261
281
|
case 'mongodb': return 'MongoDBService';
|
|
262
282
|
case 'sap': return 'SAPHANADatabaseService';
|
|
283
|
+
case 'clickhouse': return 'ClickHouseService';
|
|
263
284
|
default: return 'MySQLService';
|
|
264
285
|
}
|
|
265
286
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.d.ts","sourceRoot":"","sources":["../../../server/service/connection.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG7D;;;GAGG;AACH,qBAAa,iBAAiB;IAE5B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC;;OAEG;IACH,OAAO,CAAC,iBAAiB,CAAsC;;IAM/D;;OAEG;IACG,IAAI;IAIV;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAatD;;OAEG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKrE;;OAEG;IACG,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB5E;;OAEG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmBjG;;OAEG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjD;;OAEG;IACG,cAAc,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAWpE;;OAEG;IACG,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA2C7E;;OAEG;IACG,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE;;OAEG;IACG,wBAAwB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAenE;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;OAEG;YACW,uBAAuB;
|
|
1
|
+
{"version":3,"file":"connection.service.d.ts","sourceRoot":"","sources":["../../../server/service/connection.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG7D;;;GAGG;AACH,qBAAa,iBAAiB;IAE5B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC;;OAEG;IACH,OAAO,CAAC,iBAAiB,CAAsC;;IAM/D;;OAEG;IACG,IAAI;IAIV;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAatD;;OAEG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKrE;;OAEG;IACG,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB5E;;OAEG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmBjG;;OAEG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjD;;OAEG;IACG,cAAc,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAWpE;;OAEG;IACG,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA2C7E;;OAEG;IACG,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE;;OAEG;IACG,wBAAwB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAenE;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;OAEG;YACW,uBAAuB;IAUrC;;;OAGG;IACG,yBAAyB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IAkB1F;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA4EzB;;OAEG;YACW,eAAe;IAkB7B;;OAEG;IACH,OAAO,CAAC,UAAU;CAGnB"}
|
|
@@ -244,6 +244,11 @@ class ConnectionService {
|
|
|
244
244
|
* 创建TypeORM数据源
|
|
245
245
|
*/
|
|
246
246
|
async createTypeORMDataSource(connectionConfig) {
|
|
247
|
+
// ClickHouse 没有官方 TypeORM 驱动,使用自带的 HTTP 连接封装
|
|
248
|
+
if ((connectionConfig.type || '').toLowerCase() === 'clickhouse') {
|
|
249
|
+
const { ClickHouseConnection } = require('./database/clickhouse-connection');
|
|
250
|
+
return new ClickHouseConnection(connectionConfig);
|
|
251
|
+
}
|
|
247
252
|
const connectionOptions = this.getTypeORMOptions(connectionConfig);
|
|
248
253
|
return new typeorm_1.DataSource(connectionOptions).initialize();
|
|
249
254
|
}
|
|
@@ -253,7 +258,14 @@ class ConnectionService {
|
|
|
253
258
|
*/
|
|
254
259
|
async createTemporaryConnection(connectionOptions) {
|
|
255
260
|
try {
|
|
256
|
-
|
|
261
|
+
// ClickHouse 使用自带连接封装
|
|
262
|
+
if ((connectionOptions.type || '').toLowerCase() === 'clickhouse') {
|
|
263
|
+
const { ClickHouseConnection } = require('./database/clickhouse-connection');
|
|
264
|
+
return new ClickHouseConnection(connectionOptions);
|
|
265
|
+
}
|
|
266
|
+
// 显式指定 mysql2 驱动,避免 TypeORM 默认 "mysql"(老包)在全局安装环境下
|
|
267
|
+
// 解析到遗留 mysql 包导致 caching_sha2_password 认证失败
|
|
268
|
+
const dataSource = new typeorm_1.DataSource({ ...connectionOptions, connectorPackage: 'mysql2' });
|
|
257
269
|
await dataSource.initialize();
|
|
258
270
|
return dataSource;
|
|
259
271
|
}
|
|
@@ -275,6 +287,10 @@ class ConnectionService {
|
|
|
275
287
|
database: connectionConfig.database,
|
|
276
288
|
synchronize: false,
|
|
277
289
|
logging: false,
|
|
290
|
+
// 强制使用 mysql2 驱动:TypeORM 默认 connectorPackage 是 "mysql"(老包),
|
|
291
|
+
// 全局安装时 Node 会解析到系统中全局遗留的 mysql 包,该老包不支持 MySQL 8 的
|
|
292
|
+
// caching_sha2_password,导致 ER_NOT_SUPPORTED_AUTH_MODE。显式指定 mysql2 可彻底规避。
|
|
293
|
+
connectorPackage: 'mysql2',
|
|
278
294
|
// 关键配置:开启多语句执行
|
|
279
295
|
extra: {
|
|
280
296
|
multipleStatements: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../server/service/connection.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../server/service/connection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -233,6 +233,11 @@ export class ConnectionService {
|
|
|
233
233
|
* 创建TypeORM数据源
|
|
234
234
|
*/
|
|
235
235
|
private async createTypeORMDataSource(connectionConfig: ConnectionEntity): Promise<DataSource> {
|
|
236
|
+
// ClickHouse 没有官方 TypeORM 驱动,使用自带的 HTTP 连接封装
|
|
237
|
+
if ((connectionConfig.type || '').toLowerCase() === 'clickhouse') {
|
|
238
|
+
const { ClickHouseConnection } = require('./database/clickhouse-connection');
|
|
239
|
+
return new ClickHouseConnection(connectionConfig) as unknown as DataSource;
|
|
240
|
+
}
|
|
236
241
|
const connectionOptions = this.getTypeORMOptions(connectionConfig);
|
|
237
242
|
return new DataSource(connectionOptions).initialize();
|
|
238
243
|
}
|
|
@@ -243,7 +248,14 @@ export class ConnectionService {
|
|
|
243
248
|
*/
|
|
244
249
|
async createTemporaryConnection(connectionOptions: DataSourceOptions): Promise<DataSource> {
|
|
245
250
|
try {
|
|
246
|
-
|
|
251
|
+
// ClickHouse 使用自带连接封装
|
|
252
|
+
if ((connectionOptions.type as any || '').toLowerCase() === 'clickhouse') {
|
|
253
|
+
const { ClickHouseConnection } = require('./database/clickhouse-connection');
|
|
254
|
+
return new ClickHouseConnection(connectionOptions) as unknown as DataSource;
|
|
255
|
+
}
|
|
256
|
+
// 显式指定 mysql2 驱动,避免 TypeORM 默认 "mysql"(老包)在全局安装环境下
|
|
257
|
+
// 解析到遗留 mysql 包导致 caching_sha2_password 认证失败
|
|
258
|
+
const dataSource = new DataSource({ ...connectionOptions, connectorPackage: 'mysql2' } as any);
|
|
247
259
|
await dataSource.initialize();
|
|
248
260
|
return dataSource;
|
|
249
261
|
} catch (error) {
|
|
@@ -265,6 +277,10 @@ export class ConnectionService {
|
|
|
265
277
|
database: connectionConfig.database,
|
|
266
278
|
synchronize: false,
|
|
267
279
|
logging: false,
|
|
280
|
+
// 强制使用 mysql2 驱动:TypeORM 默认 connectorPackage 是 "mysql"(老包),
|
|
281
|
+
// 全局安装时 Node 会解析到系统中全局遗留的 mysql 包,该老包不支持 MySQL 8 的
|
|
282
|
+
// caching_sha2_password,导致 ER_NOT_SUPPORTED_AUTH_MODE。显式指定 mysql2 可彻底规避。
|
|
283
|
+
connectorPackage: 'mysql2',
|
|
268
284
|
// 关键配置:开启多语句执行
|
|
269
285
|
extra: {
|
|
270
286
|
multipleStatements: true
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ClickHouse 连接封装
|
|
3
|
+
* ClickHouse 没有官方 TypeORM 驱动,这里直接使用其 HTTP 接口(默认端口 8123)。
|
|
4
|
+
* 该对象对外暴露与 TypeORM DataSource 类似的最小接口:
|
|
5
|
+
* query(sql, params?) / options / isInitialized / destroy()
|
|
6
|
+
* 以便复用现有 BaseDatabaseService 体系。
|
|
7
|
+
*/
|
|
8
|
+
export declare class ClickHouseConnection {
|
|
9
|
+
options: any;
|
|
10
|
+
isInitialized: boolean;
|
|
11
|
+
private baseUrl;
|
|
12
|
+
private auth?;
|
|
13
|
+
private defaultDatabase;
|
|
14
|
+
private timeout;
|
|
15
|
+
constructor(connectionConfig: any);
|
|
16
|
+
/**
|
|
17
|
+
* 执行 SQL。
|
|
18
|
+
* - 读查询(SELECT/SHOW/DESCRIBE/EXPLAIN/WITH)返回解析后的行数组(JSONEachRow)。
|
|
19
|
+
* - 其它(DDL/DML)返回空数组。
|
|
20
|
+
*/
|
|
21
|
+
query(sql: string, params?: any[]): Promise<any>;
|
|
22
|
+
/**
|
|
23
|
+
* 解析 JSONEachRow 单行。
|
|
24
|
+
* ClickHouse 可能输出 NaN/Infinity(非法 JSON),解析失败时回退为原始字符串。
|
|
25
|
+
*/
|
|
26
|
+
private static safeParse;
|
|
27
|
+
/**
|
|
28
|
+
* 执行查询并返回原始文本(用于导出 CSV/原生格式)。
|
|
29
|
+
*/
|
|
30
|
+
queryRaw(sql: string, format?: string): Promise<string>;
|
|
31
|
+
destroy(): Promise<void>;
|
|
32
|
+
private databasePath;
|
|
33
|
+
private post;
|
|
34
|
+
/** 将 SQL 中的 ? 占位符按顺序替换为安全字面量(仅用于服务内部兜底) */
|
|
35
|
+
private static fillParams;
|
|
36
|
+
/**
|
|
37
|
+
* 转义 ClickHouse 字符串字面量。
|
|
38
|
+
* ClickHouse 字符串中以反斜杠作为转义符:\\ 表示反斜杠,\' 表示单引号,
|
|
39
|
+
* 不能使用 SQL 标准的双写单引号('')。
|
|
40
|
+
*/
|
|
41
|
+
static escapeLiteral(value: any): string;
|
|
42
|
+
private static escapeString;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=clickhouse-connection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clickhouse-connection.d.ts","sourceRoot":"","sources":["../../../../server/service/database/clickhouse-connection.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,qBAAa,oBAAoB;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,aAAa,UAAQ;IAC5B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,OAAO,CAAS;gBAEZ,gBAAgB,EAAE,GAAG;IA0BjC;;;;OAIG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAsBtD;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS;IAgBxB;;OAEG;IACG,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,IAAI;IA0CZ,2CAA2C;IAC3C,OAAO,CAAC,MAAM,CAAC,UAAU;IAQzB;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAcxC,OAAO,CAAC,MAAM,CAAC,YAAY;CAG5B"}
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.ClickHouseConnection = void 0;
|
|
37
|
+
const http = __importStar(require("http"));
|
|
38
|
+
const https = __importStar(require("https"));
|
|
39
|
+
const url = __importStar(require("url"));
|
|
40
|
+
/**
|
|
41
|
+
* ClickHouse 连接封装
|
|
42
|
+
* ClickHouse 没有官方 TypeORM 驱动,这里直接使用其 HTTP 接口(默认端口 8123)。
|
|
43
|
+
* 该对象对外暴露与 TypeORM DataSource 类似的最小接口:
|
|
44
|
+
* query(sql, params?) / options / isInitialized / destroy()
|
|
45
|
+
* 以便复用现有 BaseDatabaseService 体系。
|
|
46
|
+
*/
|
|
47
|
+
class ClickHouseConnection {
|
|
48
|
+
options;
|
|
49
|
+
isInitialized = true;
|
|
50
|
+
baseUrl;
|
|
51
|
+
auth;
|
|
52
|
+
defaultDatabase;
|
|
53
|
+
timeout;
|
|
54
|
+
constructor(connectionConfig) {
|
|
55
|
+
const config = connectionConfig || {};
|
|
56
|
+
const secure = !!(config.options && (config.options.secure || config.options.ssl));
|
|
57
|
+
const proto = secure ? 'https' : 'http';
|
|
58
|
+
const host = config.host || 'localhost';
|
|
59
|
+
const port = config.port || 8123;
|
|
60
|
+
this.baseUrl = `${proto}://${host}:${port}`;
|
|
61
|
+
this.defaultDatabase = config.database && config.database !== 'default' ? config.database : 'default';
|
|
62
|
+
this.timeout = Number((config.options && config.options.requestTimeout) || 30000);
|
|
63
|
+
this.options = {
|
|
64
|
+
type: 'clickhouse',
|
|
65
|
+
host,
|
|
66
|
+
port,
|
|
67
|
+
username: config.username,
|
|
68
|
+
password: config.password,
|
|
69
|
+
database: config.database || this.defaultDatabase,
|
|
70
|
+
...(config.options || {})
|
|
71
|
+
};
|
|
72
|
+
// ClickHouse 默认用户为 default;即使未填用户名也应携带鉴权头
|
|
73
|
+
const username = config.username || 'default';
|
|
74
|
+
const token = Buffer.from(`${username}:${config.password || ''}`).toString('base64');
|
|
75
|
+
this.auth = `Basic ${token}`;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* 执行 SQL。
|
|
79
|
+
* - 读查询(SELECT/SHOW/DESCRIBE/EXPLAIN/WITH)返回解析后的行数组(JSONEachRow)。
|
|
80
|
+
* - 其它(DDL/DML)返回空数组。
|
|
81
|
+
*/
|
|
82
|
+
async query(sql, params) {
|
|
83
|
+
let finalSql = sql;
|
|
84
|
+
if (params && params.length) {
|
|
85
|
+
finalSql = ClickHouseConnection.fillParams(sql, params);
|
|
86
|
+
}
|
|
87
|
+
const isRead = /^\s*(select|with|show|describe|desc|explain|exists|use)\b/i.test(finalSql);
|
|
88
|
+
if (isRead) {
|
|
89
|
+
// 去掉结尾分号,避免 "...; FORMAT ..." 语法错误
|
|
90
|
+
const cleanSql = finalSql.replace(/;\s*$/, '');
|
|
91
|
+
// 使用 JSONStringsEachRow:所有值均以字符串返回,避免 UInt64 等超出 JS 安全整数范围导致精度丢失
|
|
92
|
+
const text = await this.post(`${cleanSql} FORMAT JSONStringsEachRow`);
|
|
93
|
+
if (!text || !text.trim())
|
|
94
|
+
return [];
|
|
95
|
+
return text
|
|
96
|
+
.split('\n')
|
|
97
|
+
.map((line) => line.trim())
|
|
98
|
+
.filter((line) => line.length > 0)
|
|
99
|
+
.map((line) => ClickHouseConnection.safeParse(line));
|
|
100
|
+
}
|
|
101
|
+
await this.post(finalSql);
|
|
102
|
+
return [];
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* 解析 JSONEachRow 单行。
|
|
106
|
+
* ClickHouse 可能输出 NaN/Infinity(非法 JSON),解析失败时回退为原始字符串。
|
|
107
|
+
*/
|
|
108
|
+
static safeParse(line) {
|
|
109
|
+
try {
|
|
110
|
+
return JSON.parse(line);
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
try {
|
|
114
|
+
const normalized = line
|
|
115
|
+
.replace(/:\s*NaN/g, ': null')
|
|
116
|
+
.replace(/:\s*Infinity/g, ': null')
|
|
117
|
+
.replace(/:\s*-Infinity/g, ': null');
|
|
118
|
+
return JSON.parse(normalized);
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
return line;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* 执行查询并返回原始文本(用于导出 CSV/原生格式)。
|
|
127
|
+
*/
|
|
128
|
+
async queryRaw(sql, format = 'CSVWithNames') {
|
|
129
|
+
return this.post(`${sql.replace(/;\s*$/, '')} FORMAT ${format}`);
|
|
130
|
+
}
|
|
131
|
+
async destroy() {
|
|
132
|
+
this.isInitialized = false;
|
|
133
|
+
}
|
|
134
|
+
databasePath() {
|
|
135
|
+
return `/?database=${encodeURIComponent(this.defaultDatabase)}`;
|
|
136
|
+
}
|
|
137
|
+
post(body) {
|
|
138
|
+
return new Promise((resolve, reject) => {
|
|
139
|
+
const parsed = url.parse(this.baseUrl);
|
|
140
|
+
const data = Buffer.from(body, 'utf8');
|
|
141
|
+
const headers = {
|
|
142
|
+
'Content-Type': 'text/plain; charset=utf-8',
|
|
143
|
+
'Content-Length': data.length
|
|
144
|
+
};
|
|
145
|
+
if (this.auth)
|
|
146
|
+
headers['Authorization'] = this.auth;
|
|
147
|
+
const lib = parsed.protocol === 'https:' ? https : http;
|
|
148
|
+
const req = lib.request({
|
|
149
|
+
hostname: parsed.hostname,
|
|
150
|
+
port: parsed.port,
|
|
151
|
+
path: this.databasePath(),
|
|
152
|
+
method: 'POST',
|
|
153
|
+
headers
|
|
154
|
+
}, (res) => {
|
|
155
|
+
const chunks = [];
|
|
156
|
+
res.on('data', (c) => chunks.push(c));
|
|
157
|
+
res.on('end', () => {
|
|
158
|
+
const text = Buffer.concat(chunks).toString('utf8');
|
|
159
|
+
const status = res.statusCode || 0;
|
|
160
|
+
if (status >= 400) {
|
|
161
|
+
reject(new Error(`ClickHouse 错误 (${status}): ${text.trim()}`));
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
resolve(text);
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
req.on('error', (err) => reject(err));
|
|
169
|
+
req.setTimeout(this.timeout, () => {
|
|
170
|
+
req.destroy(new Error(`ClickHouse 请求超时(${this.timeout}ms)`));
|
|
171
|
+
});
|
|
172
|
+
req.write(data);
|
|
173
|
+
req.end();
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
/** 将 SQL 中的 ? 占位符按顺序替换为安全字面量(仅用于服务内部兜底) */
|
|
177
|
+
static fillParams(sql, params) {
|
|
178
|
+
let i = 0;
|
|
179
|
+
return sql.replace(/\?/g, () => {
|
|
180
|
+
const v = params[i++];
|
|
181
|
+
return ClickHouseConnection.escapeLiteral(v);
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* 转义 ClickHouse 字符串字面量。
|
|
186
|
+
* ClickHouse 字符串中以反斜杠作为转义符:\\ 表示反斜杠,\' 表示单引号,
|
|
187
|
+
* 不能使用 SQL 标准的双写单引号('')。
|
|
188
|
+
*/
|
|
189
|
+
static escapeLiteral(value) {
|
|
190
|
+
if (value === null || value === undefined)
|
|
191
|
+
return 'NULL';
|
|
192
|
+
if (typeof value === 'number')
|
|
193
|
+
return String(value);
|
|
194
|
+
if (typeof value === 'boolean')
|
|
195
|
+
return value ? 'true' : 'false';
|
|
196
|
+
if (value instanceof Date) {
|
|
197
|
+
const s = value.toISOString().slice(0, 19).replace('T', ' ');
|
|
198
|
+
return `'${ClickHouseConnection.escapeString(s)}'`;
|
|
199
|
+
}
|
|
200
|
+
if (typeof value === 'object') {
|
|
201
|
+
return `'${ClickHouseConnection.escapeString(JSON.stringify(value))}'`;
|
|
202
|
+
}
|
|
203
|
+
return `'${ClickHouseConnection.escapeString(String(value))}'`;
|
|
204
|
+
}
|
|
205
|
+
static escapeString(s) {
|
|
206
|
+
return s.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
exports.ClickHouseConnection = ClickHouseConnection;
|
|
210
|
+
//# sourceMappingURL=clickhouse-connection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clickhouse-connection.js","sourceRoot":"","sources":["../../../../server/service/database/clickhouse-connection.ts"],"names":[],"mappings":"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"}
|