@eggjs/dal-runtime 4.0.0-beta.9 → 4.0.1-beta.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/README.md +1 -1
- package/dist/BaseSqlMap.d.ts +17 -14
- package/dist/BaseSqlMap.js +178 -233
- package/dist/CodeGenerator.d.ts +16 -13
- package/dist/CodeGenerator.js +118 -138
- package/dist/DaoLoader.d.ts +7 -3
- package/dist/DaoLoader.js +16 -14
- package/dist/DataSource.d.ts +31 -26
- package/dist/DataSource.js +73 -80
- package/dist/DatabaseForker.d.ts +15 -11
- package/dist/DatabaseForker.js +48 -49
- package/dist/MySqlDataSource.d.ts +30 -21
- package/dist/MySqlDataSource.js +56 -60
- package/dist/NunjucksConverter.d.ts +75 -72
- package/dist/NunjucksConverter.js +90 -93
- package/dist/NunjucksUtil.d.ts +8 -4
- package/dist/NunjucksUtil.js +55 -65
- package/dist/SqlGenerator.d.ts +12 -8
- package/dist/SqlGenerator.js +224 -392
- package/dist/SqlMapLoader.d.ts +13 -9
- package/dist/SqlMapLoader.js +23 -18
- package/dist/SqlUtil.d.ts +5 -2
- package/dist/SqlUtil.js +185 -213
- package/dist/TableModelInstanceBuilder.d.ts +9 -5
- package/dist/TableModelInstanceBuilder.js +25 -23
- package/dist/TableSqlMap.d.ts +19 -17
- package/dist/TableSqlMap.js +96 -90
- package/dist/TemplateUtil.d.ts +21 -18
- package/dist/TemplateUtil.js +74 -85
- package/dist/index.d.ts +15 -15
- package/dist/index.js +16 -16
- package/package.json +36 -39
package/README.md
CHANGED
package/dist/BaseSqlMap.d.ts
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import { TableModel } from
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
2
|
+
import { GenerateSqlMap, Logger, SqlMap } from "@eggjs/tegg-types";
|
|
3
|
+
|
|
4
|
+
//#region src/BaseSqlMap.d.ts
|
|
5
|
+
declare class BaseSqlMapGenerator {
|
|
6
|
+
private readonly tableModel;
|
|
7
|
+
private readonly logger;
|
|
8
|
+
constructor(tableModel: TableModel, logger: Logger);
|
|
9
|
+
generateAllColumns(countIf: boolean): string;
|
|
10
|
+
generateFindByPrimary(): Array<GenerateSqlMap>;
|
|
11
|
+
generateFindByIndexes(): GenerateSqlMap[];
|
|
12
|
+
generateInsert(): string;
|
|
13
|
+
generateUpdate(): string | undefined;
|
|
14
|
+
generateDelete(): string | undefined;
|
|
15
|
+
load(): Record<string, SqlMap>;
|
|
15
16
|
}
|
|
17
|
+
//#endregion
|
|
18
|
+
export { BaseSqlMapGenerator };
|
package/dist/BaseSqlMap.js
CHANGED
|
@@ -1,89 +1,76 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
|
-
import { TableModel } from '@eggjs/dal-decorator';
|
|
3
|
-
import { ColumnType, IndexType, SqlType } from '@eggjs/tegg-types';
|
|
4
1
|
import { TemplateUtil } from "./TemplateUtil.js";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
2
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
3
|
+
import { ColumnType, IndexType, SqlType } from "@eggjs/tegg-types";
|
|
4
|
+
import _ from "lodash";
|
|
5
|
+
|
|
6
|
+
//#region src/BaseSqlMap.ts
|
|
7
|
+
var BaseSqlMapGenerator = class {
|
|
8
|
+
tableModel;
|
|
9
|
+
logger;
|
|
10
|
+
constructor(tableModel, logger) {
|
|
11
|
+
this.tableModel = tableModel;
|
|
12
|
+
this.logger = logger;
|
|
13
|
+
}
|
|
14
|
+
generateAllColumns(countIf) {
|
|
15
|
+
const str = this.tableModel.columns.map((t) => `\`${t.columnName}\``).join(",");
|
|
16
|
+
return countIf ? `{% if $$count == true %}0{% else %}${str}{% endif %}` : str;
|
|
17
|
+
}
|
|
18
|
+
generateFindByPrimary() {
|
|
19
|
+
const result = [];
|
|
20
|
+
const primary = this.tableModel.getPrimary();
|
|
21
|
+
if (!primary) {
|
|
22
|
+
this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键,无法生成主键查询语句。`);
|
|
23
|
+
return result;
|
|
24
|
+
}
|
|
25
|
+
let sql = `SELECT ${this.generateAllColumns(true)}
|
|
23
26
|
FROM \`${this.tableModel.name}\`
|
|
24
27
|
WHERE `;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const sqlMaps = [];
|
|
44
|
-
for (const index of this.tableModel.indices) {
|
|
45
|
-
if (index.type === IndexType.PRIMARY)
|
|
46
|
-
continue;
|
|
47
|
-
let sql = `SELECT ${this.generateAllColumns(true)}
|
|
28
|
+
sql += primary.keys.map((indexKey) => `\`${indexKey.columnName}\` = {{$${indexKey.propertyName} | param}}`).join(" AND ");
|
|
29
|
+
if (primary.keys.length === 1) result.push({
|
|
30
|
+
type: SqlType.SELECT,
|
|
31
|
+
name: `findBy${_.upperFirst(primary.keys[0].propertyName)}`,
|
|
32
|
+
sql
|
|
33
|
+
});
|
|
34
|
+
result.push({
|
|
35
|
+
name: "findByPrimary",
|
|
36
|
+
type: SqlType.SELECT,
|
|
37
|
+
sql
|
|
38
|
+
});
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
41
|
+
generateFindByIndexes() {
|
|
42
|
+
const sqlMaps = [];
|
|
43
|
+
for (const index of this.tableModel.indices) {
|
|
44
|
+
if (index.type === IndexType.PRIMARY) continue;
|
|
45
|
+
let sql = `SELECT ${this.generateAllColumns(true)}
|
|
48
46
|
FROM \`${this.tableModel.name}\`
|
|
49
47
|
WHERE `;
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
if (column.propertyName !== 'gmtCreate' && column.propertyName !== 'gmtModified') {
|
|
77
|
-
// Add filter for Spatial Type
|
|
78
|
-
// - toPoint
|
|
79
|
-
// - toLine
|
|
80
|
-
// - toPolygon
|
|
81
|
-
// - toGeometry
|
|
82
|
-
// - toMultiPoint
|
|
83
|
-
// - toMultiLine
|
|
84
|
-
// - toMultiPolygon
|
|
85
|
-
// - toGeometryCollection
|
|
86
|
-
keys.push((`
|
|
48
|
+
sql += index.keys.map((indexKey) => {
|
|
49
|
+
return `\`${indexKey.columnName}\` {{ "IS" if $${indexKey.propertyName} == null else "=" }} {{$${indexKey.propertyName} | param}}`;
|
|
50
|
+
}).join(" AND ");
|
|
51
|
+
const tempName = _.upperFirst(_.camelCase(index.keys.length === 1 ? index.keys[0].propertyName : index.name));
|
|
52
|
+
sqlMaps.push({
|
|
53
|
+
name: `findBy${tempName}`,
|
|
54
|
+
type: SqlType.SELECT,
|
|
55
|
+
sql
|
|
56
|
+
});
|
|
57
|
+
sqlMaps.push({
|
|
58
|
+
name: `findOneBy${tempName}`,
|
|
59
|
+
type: SqlType.SELECT,
|
|
60
|
+
sql: `${sql} LIMIT 0, 1`
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return sqlMaps;
|
|
64
|
+
}
|
|
65
|
+
generateInsert() {
|
|
66
|
+
let sql = `INSERT INTO \`${this.tableModel.name}\` `;
|
|
67
|
+
sql += "{% set ___first = true %}";
|
|
68
|
+
const keys = [];
|
|
69
|
+
const values = [];
|
|
70
|
+
for (const column of this.tableModel.columns) {
|
|
71
|
+
const { propertyName, columnName, type } = column;
|
|
72
|
+
if (column.propertyName !== "gmtCreate" && column.propertyName !== "gmtModified") {
|
|
73
|
+
keys.push(`
|
|
87
74
|
{% if $${propertyName} !== undefined %}
|
|
88
75
|
{% if ___first %}
|
|
89
76
|
{% set ___first = false %}
|
|
@@ -93,10 +80,10 @@ export class BaseSqlMapGenerator {
|
|
|
93
80
|
|
|
94
81
|
\`${columnName}\`
|
|
95
82
|
{% endif %}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
83
|
+
`.trim());
|
|
84
|
+
if (TemplateUtil.isSpatialType(column)) {
|
|
85
|
+
const filter = TemplateUtil.getSpatialFilter(column.type.type);
|
|
86
|
+
values.push(`
|
|
100
87
|
{% if $${propertyName} !== undefined %}
|
|
101
88
|
{% if ___first %}
|
|
102
89
|
{% set ___first = false %}
|
|
@@ -106,10 +93,8 @@ export class BaseSqlMapGenerator {
|
|
|
106
93
|
|
|
107
94
|
{{$${propertyName} | ${filter}}}
|
|
108
95
|
{% endif %}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
else if (column.type.type === ColumnType.JSON) {
|
|
112
|
-
values.push((`
|
|
96
|
+
`.trim());
|
|
97
|
+
} else if (column.type.type === ColumnType.JSON) values.push(`
|
|
113
98
|
{% if $${propertyName} !== undefined %}
|
|
114
99
|
{% if ___first %}
|
|
115
100
|
{% set ___first = false %}
|
|
@@ -119,10 +104,8 @@ export class BaseSqlMapGenerator {
|
|
|
119
104
|
|
|
120
105
|
{{$${propertyName} | toJson}}
|
|
121
106
|
{% endif %}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
else {
|
|
125
|
-
values.push((`
|
|
107
|
+
`.trim());
|
|
108
|
+
else values.push(`
|
|
126
109
|
{% if $${propertyName} !== undefined %}
|
|
127
110
|
{% if ___first %}
|
|
128
111
|
{% set ___first = false %}
|
|
@@ -130,32 +113,16 @@ export class BaseSqlMapGenerator {
|
|
|
130
113
|
,
|
|
131
114
|
{% endif %}
|
|
132
115
|
|
|
133
|
-
{{$${propertyName}}}
|
|
116
|
+
{{$${propertyName} | param}}
|
|
134
117
|
{% endif %}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
// datetime/timestamp Now()
|
|
144
|
-
if (type.type === ColumnType.INT) {
|
|
145
|
-
// 秒级时间戳
|
|
146
|
-
now = 'UNIX_TIMESTAMP()';
|
|
147
|
-
}
|
|
148
|
-
else if (type.type === ColumnType.BIGINT) {
|
|
149
|
-
// 毫秒级时间戳
|
|
150
|
-
now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
|
|
151
|
-
}
|
|
152
|
-
else if (type.type === ColumnType.DATETIME || type.type === ColumnType.TIMESTAMP) {
|
|
153
|
-
now = type.precision ? `NOW(${type.precision})` : 'NOW()';
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
this.logger.warn(`unknown type ${type.type} for ${propertyName}`);
|
|
157
|
-
}
|
|
158
|
-
keys.push((`
|
|
118
|
+
`.trim());
|
|
119
|
+
} else {
|
|
120
|
+
let now;
|
|
121
|
+
if (type.type === ColumnType.INT) now = "UNIX_TIMESTAMP()";
|
|
122
|
+
else if (type.type === ColumnType.BIGINT) now = "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)";
|
|
123
|
+
else if (type.type === ColumnType.DATETIME || type.type === ColumnType.TIMESTAMP) now = type.precision ? `NOW(${type.precision})` : "NOW()";
|
|
124
|
+
else this.logger.warn(`unknown type ${type.type} for ${propertyName}`);
|
|
125
|
+
keys.push(`
|
|
159
126
|
{% if ___first %}
|
|
160
127
|
{% set ___first = false %}
|
|
161
128
|
{% else %}
|
|
@@ -163,49 +130,39 @@ export class BaseSqlMapGenerator {
|
|
|
163
130
|
{% endif %}
|
|
164
131
|
|
|
165
132
|
\`${columnName}\`
|
|
166
|
-
|
|
167
|
-
|
|
133
|
+
`.trim());
|
|
134
|
+
values.push(`
|
|
168
135
|
{% if ___first %}
|
|
169
136
|
{% set ___first = false %}
|
|
170
137
|
{% else %}
|
|
171
138
|
,
|
|
172
139
|
{% endif %}
|
|
173
140
|
|
|
174
|
-
{{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
else if (type.type === ColumnType.BIGINT) {
|
|
200
|
-
// 毫秒级时间戳
|
|
201
|
-
now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
|
|
202
|
-
}
|
|
203
|
-
else if (type.type === ColumnType.TIMESTAMP || type.type === ColumnType.DATETIME) {
|
|
204
|
-
now = type.precision ? `NOW(${type.precision})` : 'NOW()';
|
|
205
|
-
}
|
|
206
|
-
// 若无更新时间字段,则自动更新该字段
|
|
207
|
-
const temp = propertyName !== 'gmtModified' ?
|
|
208
|
-
`
|
|
141
|
+
{{ ($${propertyName} | param) if $${propertyName} !== undefined else '${now}' }}
|
|
142
|
+
`.trim());
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
sql += `(${keys.join("")})`;
|
|
146
|
+
sql += "{% set ___first = true %}";
|
|
147
|
+
sql += `VALUES(${values.join("")});`;
|
|
148
|
+
return sql;
|
|
149
|
+
}
|
|
150
|
+
generateUpdate() {
|
|
151
|
+
const primary = this.tableModel.getPrimary();
|
|
152
|
+
if (!primary) {
|
|
153
|
+
this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键,无法生成主键更新语句。`);
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
let sql = `UPDATE \`${this.tableModel.name}\` SET`;
|
|
157
|
+
sql += "{% set ___first = true %}";
|
|
158
|
+
const kv = [];
|
|
159
|
+
for (const column of this.tableModel.columns) {
|
|
160
|
+
const { type, propertyName, columnName } = column;
|
|
161
|
+
let now;
|
|
162
|
+
if (type.type === ColumnType.INT) now = "UNIX_TIMESTAMP()";
|
|
163
|
+
else if (type.type === ColumnType.BIGINT) now = "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)";
|
|
164
|
+
else if (type.type === ColumnType.TIMESTAMP || type.type === ColumnType.DATETIME) now = type.precision ? `NOW(${type.precision})` : "NOW()";
|
|
165
|
+
const temp = propertyName !== "gmtModified" ? `
|
|
209
166
|
{% if $${propertyName} !== undefined %}
|
|
210
167
|
{% if ___first %}
|
|
211
168
|
{% set ___first = false %}
|
|
@@ -213,10 +170,9 @@ export class BaseSqlMapGenerator {
|
|
|
213
170
|
,
|
|
214
171
|
{% endif %}
|
|
215
172
|
|
|
216
|
-
\`${columnName}\` = {{$${propertyName}}}
|
|
173
|
+
\`${columnName}\` = {{$${propertyName} | param}}
|
|
217
174
|
{% endif %}
|
|
218
|
-
` :
|
|
219
|
-
`
|
|
175
|
+
` : `
|
|
220
176
|
{% if ___first %}
|
|
221
177
|
{% set ___first = false %}
|
|
222
178
|
{% else %}
|
|
@@ -224,81 +180,70 @@ export class BaseSqlMapGenerator {
|
|
|
224
180
|
{% endif %}
|
|
225
181
|
|
|
226
182
|
\`${columnName}\` =
|
|
227
|
-
{{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
|
|
183
|
+
{{ ($${propertyName} | param) if $${propertyName} !== undefined else '${now}' }}
|
|
228
184
|
`;
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
let sql = `DELETE
|
|
185
|
+
kv.push(temp);
|
|
186
|
+
}
|
|
187
|
+
sql += kv.join("");
|
|
188
|
+
sql += `WHERE ${primary.keys.map((indexKey) => `\`${indexKey.columnName}\` = {{primary.${indexKey.propertyName} | param}}`).join(" AND ")}`;
|
|
189
|
+
return sql;
|
|
190
|
+
}
|
|
191
|
+
generateDelete() {
|
|
192
|
+
const primary = this.tableModel.getPrimary();
|
|
193
|
+
if (!primary) {
|
|
194
|
+
this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键,无法生成主键删除语句。`);
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
let sql = `DELETE
|
|
243
198
|
FROM \`${this.tableModel.name}\`
|
|
244
199
|
WHERE `;
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
for (const sqlMap of sqlMaps) {
|
|
296
|
-
map[sqlMap.name] = {
|
|
297
|
-
type: sqlMap.type,
|
|
298
|
-
sql: sqlMap.sql,
|
|
299
|
-
};
|
|
300
|
-
}
|
|
301
|
-
return map;
|
|
302
|
-
}
|
|
303
|
-
}
|
|
304
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BaseSqlMap.js","sourceRoot":"","sources":["../src/BaseSqlMap.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,OAAO,mBAAmB;IAI9B,YAAY,UAAsB,EAAE,MAAc;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kBAAkB,CAAC,OAAgB;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,UAAU,IAAI,CAAC;aAChE,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,OAAO,CAAC,CAAC,CAAC,sCAAsC,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC;IAChF,CAAC;IAED,qBAAqB;QACnB,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,qBAAqB,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,GAAG,GAAG,UAAU,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;wBAC7B,IAAI,CAAC,UAAU,CAAC,IAAI;sBACtB,CAAC;QAEnB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,UAAU,WAAW,QAAQ,CAAC,YAAY,IAAI,CAAC;aAC9F,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,IAAI,EAAE,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE;gBAC3D,GAAG;aACJ,CAAC,CAAC;QACL,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,GAAG;SACJ,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kBAAkB;IAClB,qBAAqB;QACnB,MAAM,OAAO,GAA0B,EAAE,CAAC;QAC1C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO;gBAAE,SAAS;YAE/C,IAAI,GAAG,GAAG,UAAU,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;0BAC7B,IAAI,CAAC,UAAU,CAAC,IAAI;wBACtB,CAAC;YAEnB,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAC/B,MAAM,CAAC,GAAG,KAAK,QAAQ,CAAC,UAAU,kBAAkB,QAAQ,CAAC,YAAY,2BAA2B,QAAQ,CAAC,YAAY,IAAI,CAAC;gBAC9H,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;iBACC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEjB,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9G,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,QAAQ,EAAE;gBACzB,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,YAAY,QAAQ,EAAE;gBAC5B,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,GAAG,EAAE,GAAG,GAAG,aAAa;aACzB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,cAAc;QACZ,IAAI,GAAG,GAAG,iBAAiB,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC;QACrD,GAAG,IAAI,2BAA2B,CAAC;QAEnC,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAClD,IAAI,MAAM,CAAC,YAAY,KAAK,WAAW,IAAI,MAAM,CAAC,YAAY,KAAK,aAAa,EAAE,CAAC;gBACjF,8BAA8B;gBAC9B,YAAY;gBACZ,WAAW;gBACX,cAAc;gBACd,eAAe;gBACf,iBAAiB;gBACjB,gBAAgB;gBAChB,mBAAmB;gBACnB,yBAAyB;gBACzB,IAAI,CAAC,IAAI,CAAC,CAAC;iBACF,YAAY;;;;;;;cAOf,UAAU;;SAEf,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEX,IAAI,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/D,MAAM,CAAC,IAAI,CAAC,CAAC;iBACN,YAAY;;;;;;;eAOd,YAAY,MAAM,MAAM;;SAE9B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACX,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;oBAChD,MAAM,CAAC,IAAI,CAAC,CAAC;iBACN,YAAY;;;;;;;eAOd,YAAY;;SAElB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACX,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,CAAC;iBACN,YAAY;;;;;;;eAOd,YAAY;;SAElB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACX,CAAC;YAGH,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,CAAC;gBACR,0CAA0C;gBAC1C,sBAAsB;gBACtB,mDAAmD;gBACnD,2BAA2B;gBAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC;oBACjC,QAAQ;oBACR,GAAG,GAAG,kBAAkB,CAAC;gBAC3B,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;oBAC3C,SAAS;oBACT,GAAG,GAAG,0CAA0C,CAAC;gBACnD,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,SAAS,EAAE,CAAC;oBACnF,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,QAAQ,YAAY,EAAE,CAAC,CAAC;gBACpE,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,CAAC;;;;;;;YAOP,UAAU;SACb,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEX,MAAM,CAAC,IAAI,CAAC,CAAC;;;;;;;cAOP,YAAY,QAAQ,YAAY,wBAAwB,GAAG;SAChE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACb,CAAC;QACH,CAAC;QAED,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;QAC5B,GAAG,IAAI,2BAA2B,CAAC;QACnC,GAAG,IAAI,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;QAErC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,qBAAqB,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,IAAI,GAAG,GAAG,YAAY,IAAI,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC;QACnD,GAAG,IAAI,2BAA2B,CAAC;QACnC,MAAM,EAAE,GAAa,EAAE,CAAC;QACxB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;YAClD,IAAI,GAAG,CAAC;YACR,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC;gBACjC,QAAQ;gBACR,GAAG,GAAG,kBAAkB,CAAC;YAC3B,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC3C,SAAS;gBACT,GAAG,GAAG,0CAA0C,CAAC;YACnD,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACnF,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5D,CAAC;YAED,oBAAoB;YACpB,MAAM,IAAI,GAAG,YAAY,KAAK,aAAa,CAAC,CAAC;gBAE3C;eACO,YAAY;;;;;;;YAOf,UAAU,WAAW,YAAY;;OAEtC,CAAC,CAAC;gBAED;;;;;;;UAOE,UAAU;YACR,YAAY,QAAQ,YAAY,wBAAwB,GAAG;OAChE,CAAC;YACF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,GAAG,IAAI,SAAS,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,UAAU,kBAAkB,QAAQ,CAAC,YAAY,IAAI,CAAC;aAC9G,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAEnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,qBAAqB,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,IAAI,GAAG,GAAG;wBACU,IAAI,CAAC,UAAU,CAAC,IAAI;sBACtB,CAAC;QAEnB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,UAAU,UAAU,QAAQ,CAAC,YAAY,IAAI,CAAC;aAC7F,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI;QACF,MAAM,GAAG,GAA2B,EAAE,CAAC;QAEvC,GAAG,CAAC,UAAU,GAAG;YACf,IAAI,EAAE,OAAO,CAAC,KAAK;YACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;SACxC,CAAC;QAGF,MAAM,OAAO,GAA0B;YACrC;;;;;eAKG;YACH,GAAG,IAAI,CAAC,qBAAqB,EAAE;YAC/B;;;;;eAKG;YACH,GAAG,IAAI,CAAC,qBAAqB,EAAE;YAC/B;;eAEG;YACH;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;aACT;YACnB;;eAEG;YACH;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;aACT;YACnB;;eAEG;YACH;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO,CAAC,MAAM;gBACpB,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;aACT;SACpB,CAAC;QACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;gBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,GAAG,EAAE,MAAM,CAAC,GAAG;aAChB,CAAC;QACJ,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
|
|
200
|
+
sql += primary.keys.map((indexKey) => `\`${indexKey.columnName}\` = {{${indexKey.propertyName} | param}}`).join(" AND ");
|
|
201
|
+
return sql;
|
|
202
|
+
}
|
|
203
|
+
load() {
|
|
204
|
+
const map = {};
|
|
205
|
+
map.allColumns = {
|
|
206
|
+
type: SqlType.BLOCK,
|
|
207
|
+
content: this.generateAllColumns(false)
|
|
208
|
+
};
|
|
209
|
+
const sqlMaps = [
|
|
210
|
+
...this.generateFindByPrimary(),
|
|
211
|
+
...this.generateFindByIndexes(),
|
|
212
|
+
(
|
|
213
|
+
/**
|
|
214
|
+
* 插入
|
|
215
|
+
*/
|
|
216
|
+
{
|
|
217
|
+
name: "insert",
|
|
218
|
+
type: SqlType.INSERT,
|
|
219
|
+
sql: this.generateInsert()
|
|
220
|
+
}),
|
|
221
|
+
(
|
|
222
|
+
/**
|
|
223
|
+
* 主键更新
|
|
224
|
+
*/
|
|
225
|
+
{
|
|
226
|
+
name: "update",
|
|
227
|
+
type: SqlType.UPDATE,
|
|
228
|
+
sql: this.generateUpdate()
|
|
229
|
+
}),
|
|
230
|
+
(
|
|
231
|
+
/**
|
|
232
|
+
* 主键删除
|
|
233
|
+
*/
|
|
234
|
+
{
|
|
235
|
+
name: "delete",
|
|
236
|
+
type: SqlType.DELETE,
|
|
237
|
+
sql: this.generateDelete()
|
|
238
|
+
})
|
|
239
|
+
];
|
|
240
|
+
for (const sqlMap of sqlMaps) map[sqlMap.name] = {
|
|
241
|
+
type: sqlMap.type,
|
|
242
|
+
sql: sqlMap.sql
|
|
243
|
+
};
|
|
244
|
+
return map;
|
|
245
|
+
}
|
|
246
|
+
};
|
|
247
|
+
|
|
248
|
+
//#endregion
|
|
249
|
+
export { BaseSqlMapGenerator };
|
package/dist/CodeGenerator.d.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
2
|
+
import { CodeGeneratorOptions, Templates } from "@eggjs/tegg-types";
|
|
3
|
+
|
|
4
|
+
//#region src/CodeGenerator.d.ts
|
|
5
|
+
declare class CodeGenerator {
|
|
6
|
+
private readonly moduleDir;
|
|
7
|
+
private readonly moduleName;
|
|
8
|
+
private readonly teggPkg;
|
|
9
|
+
private readonly dalPkg;
|
|
10
|
+
constructor(options: CodeGeneratorOptions);
|
|
11
|
+
private njkEnv;
|
|
12
|
+
createNunjucksEnv(): void;
|
|
13
|
+
genCode(tplName: Templates, filePath: string, tableModel: TableModel): string;
|
|
14
|
+
generate(tableModel: TableModel): Promise<void>;
|
|
14
15
|
}
|
|
16
|
+
//#endregion
|
|
17
|
+
export { CodeGenerator };
|