@steedos/odata-v4-typeorm 2.2.55-beta.9 → 2.3.0-beta.4
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/lib/createFilter.js +0 -7
- package/lib/createFilter.js.map +1 -1
- package/lib/createQuery.js +0 -7
- package/lib/createQuery.js.map +1 -1
- package/lib/executeQuery.js +0 -13
- package/lib/executeQuery.js.map +1 -1
- package/lib/visitor.js +4 -11
- package/lib/visitor.js.map +1 -1
- package/package.json +4 -4
package/lib/createFilter.js
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createFilter = void 0;
|
|
4
|
-
/*
|
|
5
|
-
* @Author: baozhoutao@steedos.com
|
|
6
|
-
* @Date: 2022-05-19 11:38:30
|
|
7
|
-
* @LastEditors: baozhoutao@steedos.com
|
|
8
|
-
* @LastEditTime: 2022-07-10 15:53:44
|
|
9
|
-
* @Description:
|
|
10
|
-
*/
|
|
11
4
|
const visitor_1 = require("./visitor");
|
|
12
5
|
const odata_v4_parser_1 = require("@steedos/odata-v4-parser");
|
|
13
6
|
const odata_v4_sql_1 = require("@steedos/odata-v4-sql");
|
package/lib/createFilter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFilter.js","sourceRoot":"","sources":["../src/createFilter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createFilter.js","sourceRoot":"","sources":["../src/createFilter.ts"],"names":[],"mappings":";;;AAOA,uCAAoD;AAGpD,8DAAgD;AAChD,wDAA8C;AAY9C,SAAgB,YAAY,CAAC,WAA2B,EAAE,UAAsB,EAAE;IAChF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAC;QAChB,OAAO,CAAC,IAAI,GAAG,sBAAO,CAAC,MAAM,CAAC;KAC/B;IACD,IAAI,GAAG,GAAiB,CAAC,OAAO,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAA,wBAAM,EAAS,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACrG,MAAM,OAAO,GAAG,IAAI,wBAAO,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;IAC5B,OAAO,IAAI,CAAC;AAEd,CAAC;AAVD,oCAUC"}
|
package/lib/createQuery.js
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createQuery = void 0;
|
|
4
|
-
/*
|
|
5
|
-
* @Author: baozhoutao@steedos.com
|
|
6
|
-
* @Date: 2022-05-19 11:38:30
|
|
7
|
-
* @LastEditors: baozhoutao@steedos.com
|
|
8
|
-
* @LastEditTime: 2022-07-10 15:54:03
|
|
9
|
-
* @Description:
|
|
10
|
-
*/
|
|
11
4
|
const visitor_1 = require("./visitor");
|
|
12
5
|
const odata_v4_parser_1 = require("@steedos/odata-v4-parser");
|
|
13
6
|
const odata_v4_sql_1 = require("@steedos/odata-v4-sql");
|
package/lib/createQuery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuery.js","sourceRoot":"","sources":["../src/createQuery.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"createQuery.js","sourceRoot":"","sources":["../src/createQuery.ts"],"names":[],"mappings":";;;AAOA,uCAAoD;AAEpD,8DAA+C;AAC/C,wDAA8C;AAa9C,SAAgB,WAAW,CAAC,UAA0B,EAAE,UAAsB,EAAE;IAC9E,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO,CAAC,IAAI,GAAG,sBAAO,CAAC,MAAM,CAAC;KAC/B;IACD,IAAI,GAAG,GAAiB,CAAC,OAAO,UAAU,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAA,uBAAK,EAAS,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACjG,OAAO,IAAI,wBAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;AAClD,CAAC;AAND,kCAMC"}
|
package/lib/executeQuery.js
CHANGED
|
@@ -54,7 +54,6 @@ const processIncludes = (queryBuilder, odataQuery, alias) => {
|
|
|
54
54
|
const executeQueryByQueryBuilder = (inputQueryBuilder, query, options, returnSql = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
55
55
|
const alias = inputQueryBuilder.expressionMap.mainAlias.name;
|
|
56
56
|
options.alias = alias;
|
|
57
|
-
//const filter = createFilter(query.$filter, {alias: alias});
|
|
58
57
|
let odataQuery = {};
|
|
59
58
|
if (query) {
|
|
60
59
|
const odataString = queryToOdataString(query);
|
|
@@ -75,11 +74,8 @@ const executeQueryByQueryBuilder = (inputQueryBuilder, query, options, returnSql
|
|
|
75
74
|
query.$top = 100;
|
|
76
75
|
}
|
|
77
76
|
if (queryRunner && isPaging && [odata_v4_sql_1.SQLLang.MsSql, odata_v4_sql_1.SQLLang.Oracle].indexOf(options.type) >= 0) {
|
|
78
|
-
// 老版本的SqlServer/Oracle数据库不支持OFFSET FETCH 的语法来翻页，只能单独处理
|
|
79
|
-
// SqlServer 2012版本号options.version为11.0.3128.0，这以下的版本，比如2008/2005都不支持OFFSET FETCH 的语法来翻页
|
|
80
77
|
const oldVersionMsSql = options.type === odata_v4_sql_1.SQLLang.MsSql && options.version && parseInt(options.version) < 11;
|
|
81
78
|
const tooOldVersionMsSql = oldVersionMsSql && parseInt(options.version) < 9;
|
|
82
|
-
// Oracle 12c版本号options.version为12.2...，这以下的版本，比如10.2都不支持OFFSET FETCH 的语法来翻页
|
|
83
79
|
const oldVersionOracle = options.type === odata_v4_sql_1.SQLLang.Oracle && options.version && parseInt(options.version) < 12;
|
|
84
80
|
if (oldVersionMsSql || oldVersionOracle) {
|
|
85
81
|
let selectFields = "*";
|
|
@@ -172,8 +168,6 @@ const executeQueryByQueryBuilder = (inputQueryBuilder, query, options, returnSql
|
|
|
172
168
|
yield queryRunner.release();
|
|
173
169
|
}
|
|
174
170
|
if (queryBuilder.connection.driver.options.type === "sqljs") {
|
|
175
|
-
// this.connection.driver instanceof SqljsDriver
|
|
176
|
-
// SqljsDriver is not export from typeorm,so we user driver.options.type to check the SqljsDriver instance
|
|
177
171
|
yield queryBuilder.connection.driver.autoSave();
|
|
178
172
|
}
|
|
179
173
|
}
|
|
@@ -209,10 +203,8 @@ const executeQueryByQueryBuilder = (inputQueryBuilder, query, options, returnSql
|
|
|
209
203
|
return queryBuilder.getMany();
|
|
210
204
|
});
|
|
211
205
|
const executeQuery = (repositoryOrQueryBuilder, query, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
212
|
-
// options = options || {};
|
|
213
206
|
const alias = options.alias || '';
|
|
214
207
|
let queryBuilder = null;
|
|
215
|
-
// check that input object is query builder
|
|
216
208
|
if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
|
|
217
209
|
queryBuilder = repositoryOrQueryBuilder;
|
|
218
210
|
}
|
|
@@ -226,7 +218,6 @@ exports.executeQuery = executeQuery;
|
|
|
226
218
|
const executeCountQueryByQueryBuilder = (inputQueryBuilder, query, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
227
219
|
const alias = inputQueryBuilder.expressionMap.mainAlias.name;
|
|
228
220
|
options.alias = alias;
|
|
229
|
-
//const filter = createFilter(query.$filter, {alias: alias});
|
|
230
221
|
let odataQuery = {};
|
|
231
222
|
if (query) {
|
|
232
223
|
const odataString = queryToOdataString(query);
|
|
@@ -246,10 +237,8 @@ const executeCountQueryByQueryBuilder = (inputQueryBuilder, query, options) => _
|
|
|
246
237
|
return yield queryBuilder.getCount();
|
|
247
238
|
});
|
|
248
239
|
const executeCountQuery = (repositoryOrQueryBuilder, query, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
249
|
-
// options = options || {};
|
|
250
240
|
const alias = options.alias || '';
|
|
251
241
|
let queryBuilder = null;
|
|
252
|
-
// check that input object is query builder
|
|
253
242
|
if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
|
|
254
243
|
queryBuilder = repositoryOrQueryBuilder;
|
|
255
244
|
}
|
|
@@ -261,10 +250,8 @@ const executeCountQuery = (repositoryOrQueryBuilder, query, options) => __awaite
|
|
|
261
250
|
});
|
|
262
251
|
exports.executeCountQuery = executeCountQuery;
|
|
263
252
|
const getExecuteQuerySQL = (repositoryOrQueryBuilder, query, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
264
|
-
// options = options || {};
|
|
265
253
|
const alias = options.alias || '';
|
|
266
254
|
let queryBuilder = null;
|
|
267
|
-
// check that input object is query builder
|
|
268
255
|
if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
|
|
269
256
|
queryBuilder = repositoryOrQueryBuilder;
|
|
270
257
|
}
|
package/lib/executeQuery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeQuery.js","sourceRoot":"","sources":["../src/executeQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA4C;AAE5C,wDAAgD;AAChD,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhC,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,EAAE;IAC3B,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACpB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAU,EAAE;IAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,GAAG,IAAI,KAAK,EAAE;QACrB,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,IAAI,MAAM,KAAK,EAAE,EAAE;gBACjB,MAAM,IAAI,GAAG,CAAC;aACf;YACD,MAAM,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;SAClC;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,YAAiB,EAAE,UAAe,EAAE,KAAa,EAAE,EAAE;IAC5E,IAAI,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACzD,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjC,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,EACpD,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAC7D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAC7B,CAAC;YAEF,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,GAAG,EAAE;gBACvC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAC7G,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACzB,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAClE,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,eAAe,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;aACrF;QACH,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAO,iBAAiB,EAAE,KAAK,EAAE,OAAmB,EAAE,YAAqB,KAAK,EAAE,EAAE;IACrH,MAAM,KAAK,GAAG,iBAAiB,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;IAC7D,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"executeQuery.js","sourceRoot":"","sources":["../src/executeQuery.ts"],"names":[],"mappings":"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"}
|
package/lib/visitor.js
CHANGED
|
@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TypeOrmVisitor = void 0;
|
|
4
4
|
const odata_v4_literal_1 = require("odata-v4-literal");
|
|
5
5
|
const visitor_1 = require("@steedos/odata-v4-sql/lib/visitor");
|
|
6
|
-
// import {SqlOptions} from './index';
|
|
7
6
|
class TypeOrmVisitor extends visitor_1.Visitor {
|
|
8
7
|
constructor(options) {
|
|
9
8
|
super(options);
|
|
10
|
-
//parameters:any[] = [];
|
|
11
9
|
this.includes = [];
|
|
12
|
-
this.alias = '';
|
|
10
|
+
this.alias = '';
|
|
13
11
|
if (!options.type) {
|
|
14
12
|
this.type = visitor_1.SQLLang.Oracle;
|
|
15
13
|
}
|
|
@@ -47,7 +45,6 @@ class TypeOrmVisitor extends visitor_1.Visitor {
|
|
|
47
45
|
sql += ` OFFSET ${this.skip}`;
|
|
48
46
|
break;
|
|
49
47
|
}
|
|
50
|
-
// 给sql语句中字段名称增加中括号，防止字段名称使用了数据库的关键字
|
|
51
48
|
sql = sql.replace(/(\b\w+\b)\.(\b\w+\b)/g, '[$1].[$2]');
|
|
52
49
|
return sql;
|
|
53
50
|
}
|
|
@@ -94,7 +91,7 @@ class TypeOrmVisitor extends visitor_1.Visitor {
|
|
|
94
91
|
}
|
|
95
92
|
VisitSelectItem(node, context) {
|
|
96
93
|
let item = node.raw.replace(/\//g, '.');
|
|
97
|
-
this.select += this.getIdentifier(item, context.identifier);
|
|
94
|
+
this.select += this.getIdentifier(item, context.identifier);
|
|
98
95
|
}
|
|
99
96
|
VisitODataIdentifier(node, context) {
|
|
100
97
|
if (context.identifier && context.identifier.endsWith('.')) {
|
|
@@ -104,10 +101,10 @@ class TypeOrmVisitor extends visitor_1.Visitor {
|
|
|
104
101
|
this[context.target] += node.value.name;
|
|
105
102
|
}
|
|
106
103
|
else {
|
|
107
|
-
const ident = this.getIdentifier(node.value.name, context);
|
|
104
|
+
const ident = this.getIdentifier(node.value.name, context);
|
|
108
105
|
this[context.target] += ident;
|
|
109
106
|
}
|
|
110
|
-
context.identifier =
|
|
107
|
+
context.identifier = node.value.name;
|
|
111
108
|
}
|
|
112
109
|
getIdentifier(originalIdentifier, context) {
|
|
113
110
|
let alias = '';
|
|
@@ -175,7 +172,6 @@ class TypeOrmVisitor extends visitor_1.Visitor {
|
|
|
175
172
|
}
|
|
176
173
|
}
|
|
177
174
|
VisitLiteral(node, context) {
|
|
178
|
-
// 如果是in 查询,则使用 += 拼接where条件
|
|
179
175
|
if (this.options.useParameters && node.value != 'Edm.Array') {
|
|
180
176
|
let name = `p${this.parameterSeed++}`;
|
|
181
177
|
let value = odata_v4_literal_1.Literal.convert(node.value, node.raw);
|
|
@@ -183,9 +179,6 @@ class TypeOrmVisitor extends visitor_1.Visitor {
|
|
|
183
179
|
if (context.literal != null) {
|
|
184
180
|
this.parameters.set(name, value);
|
|
185
181
|
}
|
|
186
|
-
// this.where += `:${name}`;
|
|
187
|
-
// 因为useParameters为true，所以这里不可以把where追加为:p1这种格式，因为asOracleSql、asPostgreSql等用了正则替换?占位的方式重新设置:p{index}值
|
|
188
|
-
// 如果把where追加为:p1这种格式，已知的问题是VisitMethodCallExpression函数中的包括contains在内的所有method都只能写在过滤条件的最前面，而不可以写在后面的位置
|
|
189
182
|
this.where += `?`;
|
|
190
183
|
}
|
|
191
184
|
else
|
package/lib/visitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/odata-v4-typeorm",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.3.0-beta.4",
|
|
5
5
|
"description": "OData to TYPEORM query compiler",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"typings": "lib/index",
|
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://github.com/steedos/odata-v4-typeorm#readme",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@steedos/odata-v4-parser": "2.
|
|
33
|
-
"@steedos/odata-v4-sql": "2.
|
|
32
|
+
"@steedos/odata-v4-parser": "2.3.0-beta.4",
|
|
33
|
+
"@steedos/odata-v4-sql": "2.3.0-beta.4",
|
|
34
34
|
"odata-v4-literal": "^0.1.0"
|
|
35
35
|
},
|
|
36
36
|
"publishConfig": {
|
|
37
37
|
"access": "public"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "04dec60fc62988742fcf63181d26f584f5995196"
|
|
40
40
|
}
|