rez_core 4.0.60 → 4.0.62
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/package.json
CHANGED
|
@@ -41,28 +41,16 @@ export class FilterService {
|
|
|
41
41
|
|
|
42
42
|
if (whereClauses.length > 0) {
|
|
43
43
|
const clauseParts = whereClauses.map((clause) => {
|
|
44
|
-
let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
|
|
44
|
+
let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
|
|
45
45
|
|
|
46
46
|
Object.entries(clause.params).forEach(([key, val]) => {
|
|
47
47
|
if (Array.isArray(val)) {
|
|
48
|
-
// if
|
|
49
|
-
if (parsedQuery.includes(`= :${key}`)) {
|
|
50
|
-
parsedQuery = parsedQuery.replace(`= :${key}`, `IN (:${key})`);
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// generate (?, ?, ?) placeholders
|
|
48
|
+
// if it's an array → expand placeholders (?, ?, ?)
|
|
54
49
|
const placeholders = val.map(() => '?').join(', ');
|
|
55
|
-
parsedQuery = parsedQuery.replace(
|
|
56
|
-
|
|
57
|
-
placeholders,
|
|
58
|
-
);
|
|
59
|
-
|
|
60
|
-
values.push(...val);
|
|
50
|
+
parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
|
|
51
|
+
values.push(...val); // flatten values
|
|
61
52
|
} else {
|
|
62
|
-
parsedQuery = parsedQuery.replace(
|
|
63
|
-
new RegExp(`:\\b${key}\\b`, 'g'),
|
|
64
|
-
'?',
|
|
65
|
-
);
|
|
53
|
+
parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
|
|
66
54
|
values.push(val);
|
|
67
55
|
}
|
|
68
56
|
});
|
|
@@ -96,7 +84,6 @@ export class FilterService {
|
|
|
96
84
|
];
|
|
97
85
|
}
|
|
98
86
|
|
|
99
|
-
|
|
100
87
|
|
|
101
88
|
async applyFilterWrapper(dto: FilterRequestDto) {
|
|
102
89
|
const {
|