@eggjs/dal-runtime 3.64.5 → 3.66.0
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/dist/src/BaseSqlMap.js +9 -9
- package/dist/src/DataSource.d.ts +8 -7
- package/dist/src/DataSource.js +21 -19
- package/dist/src/MySqlDataSource.d.ts +7 -2
- package/dist/src/MySqlDataSource.js +9 -4
- package/dist/src/TableSqlMap.d.ts +5 -1
- package/dist/src/TableSqlMap.js +17 -2
- package/package.json +6 -6
package/dist/src/BaseSqlMap.js
CHANGED
|
@@ -27,7 +27,7 @@ class BaseSqlMapGenerator {
|
|
|
27
27
|
let sql = `SELECT ${this.generateAllColumns(true)}
|
|
28
28
|
FROM \`${this.tableModel.name}\`
|
|
29
29
|
WHERE `;
|
|
30
|
-
sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{$${indexKey.propertyName}}}`)
|
|
30
|
+
sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{$${indexKey.propertyName} | param}}`)
|
|
31
31
|
.join(' AND ');
|
|
32
32
|
if (primary.keys.length === 1) {
|
|
33
33
|
result.push({
|
|
@@ -53,7 +53,7 @@ class BaseSqlMapGenerator {
|
|
|
53
53
|
FROM \`${this.tableModel.name}\`
|
|
54
54
|
WHERE `;
|
|
55
55
|
sql += index.keys.map(indexKey => {
|
|
56
|
-
const s = `\`${indexKey.columnName}\` {{ "IS" if $${indexKey.propertyName} == null else "=" }} {{$${indexKey.propertyName}}}`;
|
|
56
|
+
const s = `\`${indexKey.columnName}\` {{ "IS" if $${indexKey.propertyName} == null else "=" }} {{$${indexKey.propertyName} | param}}`;
|
|
57
57
|
return s;
|
|
58
58
|
})
|
|
59
59
|
.join(' AND ');
|
|
@@ -135,7 +135,7 @@ class BaseSqlMapGenerator {
|
|
|
135
135
|
,
|
|
136
136
|
{% endif %}
|
|
137
137
|
|
|
138
|
-
{{$${propertyName}}}
|
|
138
|
+
{{$${propertyName} | param}}
|
|
139
139
|
{% endif %}
|
|
140
140
|
`).trim());
|
|
141
141
|
}
|
|
@@ -176,7 +176,7 @@ class BaseSqlMapGenerator {
|
|
|
176
176
|
,
|
|
177
177
|
{% endif %}
|
|
178
178
|
|
|
179
|
-
{{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
|
|
179
|
+
{{ ($${propertyName} | param) if $${propertyName} !== undefined else '${now}' }}
|
|
180
180
|
`).trim());
|
|
181
181
|
}
|
|
182
182
|
}
|
|
@@ -218,7 +218,7 @@ class BaseSqlMapGenerator {
|
|
|
218
218
|
,
|
|
219
219
|
{% endif %}
|
|
220
220
|
|
|
221
|
-
\`${columnName}\` = {{$${propertyName}}}
|
|
221
|
+
\`${columnName}\` = {{$${propertyName} | param}}
|
|
222
222
|
{% endif %}
|
|
223
223
|
` :
|
|
224
224
|
`
|
|
@@ -229,12 +229,12 @@ class BaseSqlMapGenerator {
|
|
|
229
229
|
{% endif %}
|
|
230
230
|
|
|
231
231
|
\`${columnName}\` =
|
|
232
|
-
{{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
|
|
232
|
+
{{ ($${propertyName} | param) if $${propertyName} !== undefined else '${now}' }}
|
|
233
233
|
`;
|
|
234
234
|
kv.push(temp);
|
|
235
235
|
}
|
|
236
236
|
sql += kv.join('');
|
|
237
|
-
sql += `WHERE ${primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{primary.${indexKey.propertyName}}}`)
|
|
237
|
+
sql += `WHERE ${primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{primary.${indexKey.propertyName} | param}}`)
|
|
238
238
|
.join(' AND ')}`;
|
|
239
239
|
return sql;
|
|
240
240
|
}
|
|
@@ -247,7 +247,7 @@ class BaseSqlMapGenerator {
|
|
|
247
247
|
let sql = `DELETE
|
|
248
248
|
FROM \`${this.tableModel.name}\`
|
|
249
249
|
WHERE `;
|
|
250
|
-
sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{${indexKey.propertyName}}}`)
|
|
250
|
+
sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{${indexKey.propertyName} | param}}`)
|
|
251
251
|
.join(' AND ');
|
|
252
252
|
return sql;
|
|
253
253
|
}
|
|
@@ -307,4 +307,4 @@ class BaseSqlMapGenerator {
|
|
|
307
307
|
}
|
|
308
308
|
}
|
|
309
309
|
exports.BaseSqlMapGenerator = BaseSqlMapGenerator;
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
310
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BaseSqlMap.js","sourceRoot":"","sources":["../../src/BaseSqlMap.ts"],"names":[],"mappings":"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"}
|
package/dist/src/DataSource.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { TableModel } from '@eggjs/tegg/dal';
|
|
2
2
|
import type { DataSource as IDataSource, PaginateData, SqlType } from '@eggjs/tegg-types';
|
|
3
|
-
import { MysqlDataSource } from './MySqlDataSource';
|
|
3
|
+
import { EggQueryOptions, MysqlDataSource } from './MySqlDataSource';
|
|
4
4
|
import { TableSqlMap } from './TableSqlMap';
|
|
5
5
|
export interface ExecuteSql {
|
|
6
6
|
sql: string;
|
|
7
7
|
template: string;
|
|
8
8
|
sqlType: SqlType;
|
|
9
|
+
params: any[];
|
|
9
10
|
}
|
|
10
11
|
export declare class DataSource<T> implements IDataSource<T> {
|
|
11
12
|
#private;
|
|
@@ -19,10 +20,10 @@ export declare class DataSource<T> implements IDataSource<T> {
|
|
|
19
20
|
* @param data
|
|
20
21
|
*/
|
|
21
22
|
generateSql(sqlName: string, data: object): Promise<ExecuteSql>;
|
|
22
|
-
count(sqlName: string, data?: any): Promise<number>;
|
|
23
|
-
execute(sqlName: string, data?: any): Promise<Array<T>>;
|
|
24
|
-
executeRaw(sqlName: string, data?: any): Promise<Array<any>>;
|
|
25
|
-
executeScalar(sqlName: string, data?: any): Promise<T | null>;
|
|
26
|
-
executeRawScalar(sqlName: string, data?: any): Promise<any | null>;
|
|
27
|
-
paginate(sqlName: string, data: any, currentPage: number, perPageCount: number): Promise<PaginateData<T>>;
|
|
23
|
+
count(sqlName: string, data?: any, options?: EggQueryOptions): Promise<number>;
|
|
24
|
+
execute(sqlName: string, data?: any, options?: EggQueryOptions): Promise<Array<T>>;
|
|
25
|
+
executeRaw(sqlName: string, data?: any, options?: EggQueryOptions): Promise<Array<any>>;
|
|
26
|
+
executeScalar(sqlName: string, data?: any, options?: EggQueryOptions): Promise<T | null>;
|
|
27
|
+
executeRawScalar(sqlName: string, data?: any, options?: EggQueryOptions): Promise<any | null>;
|
|
28
|
+
paginate(sqlName: string, data: any, currentPage: number, perPageCount: number, options?: EggQueryOptions): Promise<PaginateData<T>>;
|
|
28
29
|
}
|
package/dist/src/DataSource.js
CHANGED
|
@@ -22,50 +22,52 @@ class DataSource {
|
|
|
22
22
|
* @param data
|
|
23
23
|
*/
|
|
24
24
|
async generateSql(sqlName, data) {
|
|
25
|
-
const sql = this.sqlMap.generate(sqlName, data, this.mysqlDataSource.timezone);
|
|
25
|
+
const { sql, params } = this.sqlMap.generate(sqlName, data, this.mysqlDataSource.timezone);
|
|
26
26
|
const sqlType = this.sqlMap.getType(sqlName);
|
|
27
27
|
const template = this.sqlMap.getTemplateString(sqlName);
|
|
28
28
|
return {
|
|
29
29
|
sql,
|
|
30
30
|
sqlType,
|
|
31
31
|
template,
|
|
32
|
+
params,
|
|
32
33
|
};
|
|
33
34
|
}
|
|
34
|
-
async count(sqlName, data) {
|
|
35
|
+
async count(sqlName, data, options) {
|
|
35
36
|
const newData = Object.assign({ $$count: true }, data);
|
|
36
37
|
const executeSql = await this.generateSql(sqlName, newData);
|
|
37
|
-
return await __classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this, executeSql.sql);
|
|
38
|
+
return await __classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this, executeSql.sql, executeSql.params, options);
|
|
38
39
|
}
|
|
39
|
-
async execute(sqlName, data) {
|
|
40
|
+
async execute(sqlName, data, options) {
|
|
40
41
|
const executeSql = await this.generateSql(sqlName, data);
|
|
41
|
-
const rows = await this.mysqlDataSource.query(executeSql.sql);
|
|
42
|
+
const rows = await this.mysqlDataSource.query(executeSql.sql, executeSql.params, options);
|
|
42
43
|
return rows.map(t => {
|
|
43
44
|
return TableModelInstanceBuilder_1.TableModelInstanceBuilder.buildInstance(this.tableModel, t);
|
|
44
45
|
});
|
|
45
46
|
}
|
|
46
|
-
async executeRaw(sqlName, data) {
|
|
47
|
+
async executeRaw(sqlName, data, options) {
|
|
47
48
|
const executeSql = await this.generateSql(sqlName, data);
|
|
48
|
-
return await this.mysqlDataSource.query(executeSql.sql);
|
|
49
|
+
return await this.mysqlDataSource.query(executeSql.sql, executeSql.params, options);
|
|
49
50
|
}
|
|
50
|
-
async executeScalar(sqlName, data) {
|
|
51
|
-
const ret = await this.execute(sqlName, data);
|
|
51
|
+
async executeScalar(sqlName, data, options) {
|
|
52
|
+
const ret = await this.execute(sqlName, data, options);
|
|
52
53
|
if (!Array.isArray(ret))
|
|
53
54
|
return ret || null;
|
|
54
55
|
return ret[0] || null;
|
|
55
56
|
}
|
|
56
|
-
async executeRawScalar(sqlName, data) {
|
|
57
|
-
const ret = await this.executeRaw(sqlName, data);
|
|
57
|
+
async executeRawScalar(sqlName, data, options) {
|
|
58
|
+
const ret = await this.executeRaw(sqlName, data, options);
|
|
58
59
|
if (!Array.isArray(ret))
|
|
59
60
|
return (ret || null);
|
|
60
61
|
return ret[0] || null;
|
|
61
62
|
}
|
|
62
|
-
async paginate(sqlName, data, currentPage, perPageCount) {
|
|
63
|
+
async paginate(sqlName, data, currentPage, perPageCount, options) {
|
|
63
64
|
const limit = `LIMIT ${(currentPage - 1) * perPageCount}, ${perPageCount}`;
|
|
64
|
-
const
|
|
65
|
-
const
|
|
65
|
+
const executeSql = await this.generateSql(sqlName, data);
|
|
66
|
+
const sql = executeSql.sql + ' ' + limit;
|
|
67
|
+
const countExecuteSql = await this.generateSql(sqlName, Object.assign({ $$count: true }, data));
|
|
66
68
|
const ret = await Promise.all([
|
|
67
|
-
this.mysqlDataSource.query(sql),
|
|
68
|
-
__classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this,
|
|
69
|
+
this.mysqlDataSource.query(sql, executeSql.params, options),
|
|
70
|
+
__classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this, countExecuteSql.sql, countExecuteSql.params, options),
|
|
69
71
|
]);
|
|
70
72
|
return {
|
|
71
73
|
total: Number(ret[1]),
|
|
@@ -75,9 +77,9 @@ class DataSource {
|
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
exports.DataSource = DataSource;
|
|
78
|
-
_DataSource_instances = new WeakSet(), _DataSource_paginateCount = async function _DataSource_paginateCount(baseSQL) {
|
|
80
|
+
_DataSource_instances = new WeakSet(), _DataSource_paginateCount = async function _DataSource_paginateCount(baseSQL, params, options) {
|
|
79
81
|
const sql = `${PAGINATE_COUNT_WRAPPER[0]}${baseSQL}${PAGINATE_COUNT_WRAPPER[1]}`;
|
|
80
|
-
const result = await this.mysqlDataSource.query(sql);
|
|
82
|
+
const result = await this.mysqlDataSource.query(sql, params, options);
|
|
81
83
|
return result[0].count;
|
|
82
84
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9EYXRhU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUlBLDJFQUF3RTtBQVN4RSxNQUFNLHNCQUFzQixHQUFHLENBQUUsaUNBQWlDLEVBQUUsUUFBUSxDQUFFLENBQUM7QUFFL0UsTUFBYSxVQUFVO0lBS3JCLFlBQVksVUFBeUIsRUFBRSxlQUFnQyxFQUFFLE1BQW1COztRQUMxRixJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQztRQUN2QyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN2QixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBZSxFQUFFLElBQVk7UUFDN0MsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUyxDQUFDLENBQUM7UUFDNUYsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDN0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN4RCxPQUFPO1lBQ0wsR0FBRztZQUNILE9BQU87WUFDUCxRQUFRO1lBQ1IsTUFBTTtTQUNQLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFlLEVBQUUsSUFBVSxFQUFFLE9BQXlCO1FBQ2hFLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdkQsTUFBTSxVQUFV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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { RDSClientOptions } from '@eggjs/rds';
|
|
1
|
+
import type { QueryOptions, RDSClientOptions } from '@eggjs/rds';
|
|
2
2
|
import Base from 'sdk-base';
|
|
3
3
|
import { Logger } from '@eggjs/tegg-types';
|
|
4
4
|
export interface DataSourceOptions extends RDSClientOptions {
|
|
@@ -7,6 +7,10 @@ export interface DataSourceOptions extends RDSClientOptions {
|
|
|
7
7
|
forkDb?: boolean;
|
|
8
8
|
initRetryTimes?: number;
|
|
9
9
|
logger?: Logger;
|
|
10
|
+
executeType?: 'execute' | 'query';
|
|
11
|
+
}
|
|
12
|
+
export interface EggQueryOptions extends QueryOptions {
|
|
13
|
+
executeType?: 'execute' | 'query';
|
|
10
14
|
}
|
|
11
15
|
export declare class MysqlDataSource extends Base {
|
|
12
16
|
#private;
|
|
@@ -16,8 +20,9 @@ export declare class MysqlDataSource extends Base {
|
|
|
16
20
|
readonly timezone?: string;
|
|
17
21
|
readonly rdsOptions: RDSClientOptions;
|
|
18
22
|
readonly forkDb?: boolean;
|
|
23
|
+
private readonly executeType;
|
|
19
24
|
constructor(options: DataSourceOptions);
|
|
20
25
|
protected _init(): Promise<void>;
|
|
21
|
-
query<T = any>(sql: string): Promise<T>;
|
|
26
|
+
query<T = any>(sql: string, params?: any[], options?: EggQueryOptions): Promise<T>;
|
|
22
27
|
beginTransactionScope<T>(scope: () => Promise<T>): Promise<T>;
|
|
23
28
|
}
|
|
@@ -29,13 +29,14 @@ class MysqlDataSource extends sdk_base_1.default {
|
|
|
29
29
|
_MysqlDataSource_instances.add(this);
|
|
30
30
|
_MysqlDataSource_initRetryTimes.set(this, void 0);
|
|
31
31
|
_MysqlDataSource_logger.set(this, void 0);
|
|
32
|
-
const { name, initSql, forkDb, initRetryTimes, logger, ...mysqlOptions } = options;
|
|
32
|
+
const { name, initSql, forkDb, initRetryTimes, logger, executeType, ...mysqlOptions } = options;
|
|
33
33
|
__classPrivateFieldSet(this, _MysqlDataSource_logger, logger, "f");
|
|
34
34
|
this.forkDb = forkDb;
|
|
35
35
|
this.initSql = initSql ?? 'SELECT 1 + 1';
|
|
36
36
|
__classPrivateFieldSet(this, _MysqlDataSource_initRetryTimes, initRetryTimes, "f");
|
|
37
37
|
this.name = name;
|
|
38
38
|
this.timezone = options.timezone;
|
|
39
|
+
this.executeType = executeType ?? 'query';
|
|
39
40
|
this.rdsOptions = Object.assign({}, DEFAULT_OPTIONS, mysqlOptions);
|
|
40
41
|
this.client = new rds_1.RDSClient(this.rdsOptions);
|
|
41
42
|
}
|
|
@@ -44,8 +45,12 @@ class MysqlDataSource extends sdk_base_1.default {
|
|
|
44
45
|
await __classPrivateFieldGet(this, _MysqlDataSource_instances, "m", _MysqlDataSource_doInit).call(this, 1);
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
|
-
async query(sql) {
|
|
48
|
-
|
|
48
|
+
async query(sql, params, options) {
|
|
49
|
+
const executeType = options?.executeType || this.executeType;
|
|
50
|
+
if (executeType === 'execute') {
|
|
51
|
+
return this.client.execute(sql, params, options);
|
|
52
|
+
}
|
|
53
|
+
return this.client.query(sql, params, options);
|
|
49
54
|
}
|
|
50
55
|
async beginTransactionScope(scope) {
|
|
51
56
|
return await this.client.beginTransactionScope(scope);
|
|
@@ -67,4 +72,4 @@ _MysqlDataSource_initRetryTimes = new WeakMap(), _MysqlDataSource_logger = new W
|
|
|
67
72
|
await __classPrivateFieldGet(this, _MysqlDataSource_instances, "m", _MysqlDataSource_doInit).call(this, tryTimes + 1);
|
|
68
73
|
}
|
|
69
74
|
};
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlTcWxEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL015U3FsRGF0YVNvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvQ0FBdUM7QUFFdkMsd0RBQTRCO0FBYTVCLE1BQU0sZUFBZSxHQUFxQjtJQUN4QyxpQkFBaUIsRUFBRSxJQUFJO0lBQ3ZCLGdCQUFnQixFQUFFLElBQUk7SUFDdEIsS0FBSyxFQUFFLElBQUk7Q0FDWixDQUFDO0FBTUYsTUFBYSxlQUFnQixTQUFRLGtCQUFJO0lBV3ZDLFlBQVksT0FBMEI7UUFDcEMsS0FBSyxDQUFDLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7O1FBTHhCLGtEQUF5QjtRQUN6QiwwQ0FBaUI7UUFLeEIsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQ2hHLHVCQUFBLElBQUksMkJBQVcsTUFBTSxNQUFBLENBQUM7UUFDdEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLElBQUksY0FBYyxDQUFDO1FBQ3pDLHVCQUFBLElBQUksbUNBQW1CLGNBQWMsTUFBQSxDQUFDO1FBQ3RDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQztRQUNqQyxJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsSUFBSSxPQUFPLENBQUM7UUFDMUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFDbkUsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQVMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVTLEtBQUssQ0FBQyxLQUFLO1FBQ25CLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sdUJBQUEsSUFBSSwyREFBUSxNQUFaLElBQUksRUFBUyxDQUFDLENBQUMsQ0FBQztRQUN4QixDQUFDO0lBQ0gsQ0FBQztJQWlCRCxLQUFLLENBQUMsS0FBSyxDQUFVLEdBQVcsRUFBRSxNQUFjLEVBQUUsT0FBeUI7UUFDekUsTUFBTSxXQUFXLEdBQUcsT0FBTyxFQUFFLFdBQVcsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDO1FBRTdELElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNuRCxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxLQUFLLENBQUMscUJBQXFCLENBQUksS0FBdUI7UUFDcEQsT0FBTyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDeEQsQ0FBQztDQUNGO0FBMURELDBDQTBEQztnS0EzQkMsS0FBSyxrQ0FBUyxRQUFnQjtJQUM1QixJQUFJLENBQUM7UUFDSCx1QkFBQSxJQUFJLCtCQUFRLEVBQUUsR0FBRyxDQUFDLEdBQUcsUUFBUSxpQ0FBaUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDM0UsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3RDLHVCQUFBLElBQUksK0JBQVEsRUFBRSxJQUFJLENBQUMsbUNBQW1DLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLGVBQWUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNsRyxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNYLHVCQUFBLElBQUksK0JBQVEsRUFBRSxJQUFJLENBQUMsbUNBQW1DLElBQUksQ0FBQyxJQUFJLGNBQWMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDNUYsSUFBSSxDQUFDLHVCQUFBLElBQUksdUNBQWdCLElBQUksUUFBUSxJQUFJLHVCQUFBLElBQUksdUNBQWdCLEVBQUUsQ0FBQztZQUM5RCxNQUFNLENBQUMsQ0FBQztRQUNWLENBQUM7UUFDRCxNQUFNLHVCQUFBLElBQUksMkRBQVEsTUFBWixJQUFJLEVBQVMsUUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ25DLENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -6,6 +6,10 @@ export interface SqlGenerator {
|
|
|
6
6
|
template: Template;
|
|
7
7
|
raw: string;
|
|
8
8
|
}
|
|
9
|
+
export interface GeneratedSql {
|
|
10
|
+
sql: string;
|
|
11
|
+
params: any[];
|
|
12
|
+
}
|
|
9
13
|
export declare class TableSqlMap {
|
|
10
14
|
#private;
|
|
11
15
|
readonly name: string;
|
|
@@ -13,7 +17,7 @@ export declare class TableSqlMap {
|
|
|
13
17
|
private readonly blocks;
|
|
14
18
|
private readonly sqlGenerator;
|
|
15
19
|
constructor(name: string, map: Record<string, SqlMap>);
|
|
16
|
-
generate(name: string, data: object, timezone: string):
|
|
20
|
+
generate(name: string, data: object, timezone: string): GeneratedSql;
|
|
17
21
|
getType(name: string): SqlType;
|
|
18
22
|
getTemplateString(name: string): string;
|
|
19
23
|
}
|
package/dist/src/TableSqlMap.js
CHANGED
|
@@ -10,6 +10,7 @@ exports.TableSqlMap = void 0;
|
|
|
10
10
|
const NunjucksUtil_1 = require("./NunjucksUtil");
|
|
11
11
|
const TemplateUtil_1 = require("./TemplateUtil");
|
|
12
12
|
const tegg_types_1 = require("@eggjs/tegg-types");
|
|
13
|
+
const SQL_PARAMS = '$$__sql_params';
|
|
13
14
|
class TableSqlMap {
|
|
14
15
|
constructor(name, map) {
|
|
15
16
|
_TableSqlMap_instances.add(this);
|
|
@@ -34,6 +35,13 @@ class TableSqlMap {
|
|
|
34
35
|
env.addFilter('toMultiLine', TemplateUtil_1.TemplateUtil.toMultiLine);
|
|
35
36
|
env.addFilter('toMultiPolygon', TemplateUtil_1.TemplateUtil.toMultiPolygon);
|
|
36
37
|
env.addFilter('toGeometryCollection', TemplateUtil_1.TemplateUtil.toGeometryCollection);
|
|
38
|
+
// Add param filter for parameterized queries
|
|
39
|
+
env.addFilter('param', function (value) {
|
|
40
|
+
if (this.ctx[SQL_PARAMS]) {
|
|
41
|
+
this.ctx[SQL_PARAMS].push(value);
|
|
42
|
+
}
|
|
43
|
+
return '?';
|
|
44
|
+
});
|
|
37
45
|
}
|
|
38
46
|
generate(name, data, timezone) {
|
|
39
47
|
const generator = this.sqlGenerator[name];
|
|
@@ -42,8 +50,15 @@ class TableSqlMap {
|
|
|
42
50
|
throw new Error(`No sql map named '${name}' in '${name}'.`);
|
|
43
51
|
}
|
|
44
52
|
const template = generator.template;
|
|
53
|
+
const params = [];
|
|
54
|
+
// Set timezone and params collector on env
|
|
45
55
|
template.env.timezone = timezone;
|
|
46
|
-
|
|
56
|
+
const context = {
|
|
57
|
+
...data,
|
|
58
|
+
[SQL_PARAMS]: params,
|
|
59
|
+
};
|
|
60
|
+
const sql = template.render(context);
|
|
61
|
+
return { sql, params };
|
|
47
62
|
}
|
|
48
63
|
getType(name) {
|
|
49
64
|
const generator = this.sqlGenerator[name];
|
|
@@ -92,4 +107,4 @@ _TableSqlMap_instances = new WeakSet(), _TableSqlMap_extract = function _TableSq
|
|
|
92
107
|
}
|
|
93
108
|
return ret;
|
|
94
109
|
};
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGVTcWxNYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVGFibGVTcWxNYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBRUEsaURBQStDO0FBQy9DLGlEQUE4QztBQUM5QyxrREFBNEM7QUFHNUMsTUFBTSxVQUFVLEdBQUcsZ0JBQWdCLENBQUM7QUFhcEMsTUFBYSxXQUFXO0lBTXRCLFlBQVksSUFBWSxFQUFFLEdBQTJCOztRQUNuRCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUVmLE1BQU0sR0FBRyxHQUFHLDRCQUFhLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLE1BQU0sU0FBUyxHQUFHLHVCQUFBLElBQUksb0RBQVMsTUFBYixJQUFJLEVBQVUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQztRQUMvQixJQUFJLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUM7UUFFM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDOUIscUJBQXFCO1lBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUM7Z0JBQUUsU0FBUztZQUMvQyxHQUFHLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkMsQ0FBQztRQUVELEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLDJCQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsR0FBRyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsMkJBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvQyxHQUFHLENBQUMsU0FBUyxD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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/dal-runtime",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.66.0",
|
|
4
4
|
"description": "tegg dal decorator",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"egg",
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"scripts": {
|
|
20
20
|
"test": "cross-env NODE_ENV=test NODE_OPTIONS='--no-deprecation' mocha",
|
|
21
21
|
"clean": "tsc -b --clean",
|
|
22
|
-
"tsc": "ut clean && tsc -p ./tsconfig.json",
|
|
23
|
-
"tsc:pub": "ut clean && tsc -p ./tsconfig.pub.json && ut cp:template",
|
|
22
|
+
"tsc": "ut run clean && tsc -p ./tsconfig.json",
|
|
23
|
+
"tsc:pub": "ut run clean && tsc -p ./tsconfig.pub.json && ut cp:template",
|
|
24
24
|
"cp:template": "rm -rf dist/src/templates && cp -r src/templates dist/src/templates",
|
|
25
25
|
"prepublishOnly": "ut tsc:pub"
|
|
26
26
|
},
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@eggjs/rds": "^1.0.0",
|
|
43
|
-
"@eggjs/tegg": "^3.
|
|
44
|
-
"@eggjs/tegg-types": "^3.
|
|
43
|
+
"@eggjs/tegg": "^3.66.0",
|
|
44
|
+
"@eggjs/tegg-types": "^3.66.0",
|
|
45
45
|
"js-beautify": "^1.15.1",
|
|
46
46
|
"lodash": "^4.17.21",
|
|
47
47
|
"nunjucks": "^3.2.4",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"ts-node": "^10.9.1",
|
|
63
63
|
"typescript": "^5.0.4"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "287812b3af9a8f7acb30a91d5d608ad7cdfb5878"
|
|
66
66
|
}
|