@eggjs/dal-runtime 3.47.0 → 3.48.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/DataSource.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare class DataSource<T> implements IDataSource<T> {
|
|
|
18
18
|
* @param sqlName
|
|
19
19
|
* @param data
|
|
20
20
|
*/
|
|
21
|
-
generateSql(sqlName: string, data: object): ExecuteSql
|
|
21
|
+
generateSql(sqlName: string, data: object): Promise<ExecuteSql>;
|
|
22
22
|
count(sqlName: string, data?: any): Promise<number>;
|
|
23
23
|
execute(sqlName: string, data?: any): Promise<Array<T>>;
|
|
24
24
|
executeRaw(sqlName: string, data?: any): Promise<Array<any>>;
|
package/dist/src/DataSource.js
CHANGED
|
@@ -21,7 +21,7 @@ class DataSource {
|
|
|
21
21
|
* @param sqlName
|
|
22
22
|
* @param data
|
|
23
23
|
*/
|
|
24
|
-
generateSql(sqlName, data) {
|
|
24
|
+
async generateSql(sqlName, data) {
|
|
25
25
|
const sql = this.sqlMap.generate(sqlName, data, this.mysqlDataSource.timezone);
|
|
26
26
|
const sqlType = this.sqlMap.getType(sqlName);
|
|
27
27
|
const template = this.sqlMap.getTemplateString(sqlName);
|
|
@@ -33,18 +33,18 @@ class DataSource {
|
|
|
33
33
|
}
|
|
34
34
|
async count(sqlName, data) {
|
|
35
35
|
const newData = Object.assign({ $$count: true }, data);
|
|
36
|
-
const executeSql = this.generateSql(sqlName, newData);
|
|
36
|
+
const executeSql = await this.generateSql(sqlName, newData);
|
|
37
37
|
return await __classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this, executeSql.sql);
|
|
38
38
|
}
|
|
39
39
|
async execute(sqlName, data) {
|
|
40
|
-
const executeSql = this.generateSql(sqlName, data);
|
|
40
|
+
const executeSql = await this.generateSql(sqlName, data);
|
|
41
41
|
const rows = await this.mysqlDataSource.query(executeSql.sql);
|
|
42
42
|
return rows.map(t => {
|
|
43
43
|
return TableModelInstanceBuilder_1.TableModelInstanceBuilder.buildInstance(this.tableModel, t);
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
async executeRaw(sqlName, data) {
|
|
47
|
-
const executeSql = this.generateSql(sqlName, data);
|
|
47
|
+
const executeSql = await this.generateSql(sqlName, data);
|
|
48
48
|
return await this.mysqlDataSource.query(executeSql.sql);
|
|
49
49
|
}
|
|
50
50
|
async executeScalar(sqlName, data) {
|
|
@@ -61,8 +61,8 @@ class DataSource {
|
|
|
61
61
|
}
|
|
62
62
|
async paginate(sqlName, data, currentPage, perPageCount) {
|
|
63
63
|
const limit = `LIMIT ${(currentPage - 1) * perPageCount}, ${perPageCount}`;
|
|
64
|
-
const sql = this.generateSql(sqlName, data).sql + ' ' + limit;
|
|
65
|
-
const countSql = this.generateSql(sqlName, Object.assign({ $$count: true }, data)).sql;
|
|
64
|
+
const sql = (await this.generateSql(sqlName, data)).sql + ' ' + limit;
|
|
65
|
+
const countSql = (await this.generateSql(sqlName, Object.assign({ $$count: true }, data))).sql;
|
|
66
66
|
const ret = await Promise.all([
|
|
67
67
|
this.mysqlDataSource.query(sql),
|
|
68
68
|
__classPrivateFieldGet(this, _DataSource_instances, "m", _DataSource_paginateCount).call(this, countSql),
|
|
@@ -80,4 +80,4 @@ _DataSource_instances = new WeakSet(), _DataSource_paginateCount = async functio
|
|
|
80
80
|
const result = await this.mysqlDataSource.query(sql);
|
|
81
81
|
return result[0].count;
|
|
82
82
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9EYXRhU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUlBLDJFQUF3RTtBQVF4RSxNQUFNLHNCQUFzQixHQUFHLENBQUUsaUNBQWlDLEVBQUUsUUFBUSxDQUFFLENBQUM7QUFFL0UsTUFBYSxVQUFVO0lBS3JCLFlBQVksVUFBeUIsRUFBRSxlQUFnQyxFQUFFLE1BQW1COztRQUMxRixJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQztRQUN2QyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN2QixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBZSxFQUFFLElBQVk7UUFDN0MsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVMsQ0FBQyxDQUFDO1FBQ2hGLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEQsT0FBTztZQUNMLEdBQUc7WUFDSCxPQUFPO1lBQ1AsUUFBUTtTQUNULENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFlLEVBQUUsSUFBVTtRQUNyQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUs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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.48.0",
|
|
4
4
|
"description": "tegg dal decorator",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"egg",
|
|
@@ -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.48.0",
|
|
44
|
+
"@eggjs/tegg-types": "^3.48.0",
|
|
45
45
|
"js-beautify": "^1.15.1",
|
|
46
46
|
"lodash": "^4.17.21",
|
|
47
47
|
"nunjucks": "^3.2.4",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"ts-node": "^10.9.1",
|
|
62
62
|
"typescript": "^5.0.4"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "8acbcc4e472c95beb3955d3b75c9b458c9d32e0b"
|
|
65
65
|
}
|