rez_core 5.0.211 → 5.0.212
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/.idea/250218_ether_core.iml +12 -0
- package/.idea/codeStyles/Project.xml +59 -0
- package/.idea/codeStyles/codeStyleConfig.xml +5 -0
- package/.idea/modules.xml +8 -0
- package/.idea/vcs.xml +6 -0
- package/dist/module/filter/service/filter.service.js +6 -2
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/filter/service/filter.service.ts +46 -10
package/package.json
CHANGED
|
@@ -37,33 +37,69 @@ export class FilterService {
|
|
|
37
37
|
) {
|
|
38
38
|
if (!column) return [];
|
|
39
39
|
|
|
40
|
+
// let whereSQL = '';
|
|
41
|
+
// const values: any[] = [];
|
|
42
|
+
// let paramIndex = 1; // PostgreSQL placeholders start at $1
|
|
43
|
+
|
|
44
|
+
// if (whereClauses.length > 0) {
|
|
45
|
+
// const clauseParts = whereClauses.map((clause) => {
|
|
46
|
+
// let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
|
|
47
|
+
|
|
48
|
+
// Object.entries(clause.params).forEach(([key, val]) => {
|
|
49
|
+
// if (Array.isArray(val)) {
|
|
50
|
+
// // Create ($1,$2,$3)
|
|
51
|
+
// const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
|
|
52
|
+
|
|
53
|
+
// parsedQuery = parsedQuery.replace(
|
|
54
|
+
// new RegExp(`:${key}`, 'g'),
|
|
55
|
+
// `(${placeholders})`,
|
|
56
|
+
// );
|
|
57
|
+
|
|
58
|
+
// values.push(...val.map((v) => String(v)));
|
|
59
|
+
// } else {
|
|
60
|
+
// // Create $1
|
|
61
|
+
// const placeholder = `$${paramIndex++}`;
|
|
62
|
+
|
|
63
|
+
// parsedQuery = parsedQuery.replace(
|
|
64
|
+
// new RegExp(`:${key}`, 'g'),
|
|
65
|
+
// placeholder,
|
|
66
|
+
// );
|
|
67
|
+
|
|
68
|
+
// values.push(String(val));
|
|
69
|
+
// }
|
|
70
|
+
// });
|
|
71
|
+
|
|
72
|
+
// return parsedQuery;
|
|
73
|
+
// });
|
|
74
|
+
|
|
75
|
+
// whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
|
|
76
|
+
// }
|
|
77
|
+
|
|
40
78
|
let whereSQL = '';
|
|
41
79
|
const values: any[] = [];
|
|
42
|
-
let paramIndex = 1;
|
|
80
|
+
let paramIndex = 1;
|
|
43
81
|
|
|
44
82
|
if (whereClauses.length > 0) {
|
|
45
83
|
const clauseParts = whereClauses.map((clause) => {
|
|
46
|
-
let parsedQuery = clause.query.replace(/\be\./g, '');
|
|
84
|
+
let parsedQuery = clause.query.replace(/\be\./g, '');
|
|
47
85
|
|
|
48
86
|
Object.entries(clause.params).forEach(([key, val]) => {
|
|
49
87
|
if (Array.isArray(val)) {
|
|
50
88
|
// Create ($1,$2,$3)
|
|
51
89
|
const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
|
|
52
90
|
|
|
53
|
-
parsedQuery = parsedQuery
|
|
54
|
-
new RegExp(
|
|
55
|
-
`(${placeholders})
|
|
56
|
-
);
|
|
91
|
+
parsedQuery = parsedQuery
|
|
92
|
+
.replace(new RegExp(`:...${key}`, 'g'), `(${placeholders})`)
|
|
93
|
+
.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
|
|
57
94
|
|
|
58
95
|
values.push(...val.map((v) => String(v)));
|
|
59
96
|
} else {
|
|
60
97
|
// Create $1
|
|
61
98
|
const placeholder = `$${paramIndex++}`;
|
|
62
99
|
|
|
63
|
-
parsedQuery = parsedQuery
|
|
64
|
-
new RegExp(
|
|
65
|
-
placeholder
|
|
66
|
-
);
|
|
100
|
+
parsedQuery = parsedQuery
|
|
101
|
+
.replace(new RegExp(`:...${key}`, 'g'), placeholder)
|
|
102
|
+
.replace(new RegExp(`:${key}`, 'g'), placeholder);
|
|
67
103
|
|
|
68
104
|
values.push(String(val));
|
|
69
105
|
}
|