prostgles-server 4.2.47 → 4.2.50
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/DboBuilder/QueryBuilder/getJoinQuery.d.ts +1 -2
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +9 -13
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts +75 -69
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +39 -11
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +0 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/prepareHaving.js +2 -2
- package/dist/DboBuilder/QueryBuilder/prepareHaving.js.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js +4 -4
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.js +1 -1
- package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +4 -6
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +7 -76
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts +6 -0
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/count.js +28 -0
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/find.d.ts +18 -0
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/find.js +121 -0
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/size.d.ts +6 -0
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/size.js +28 -0
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts +20 -0
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/subscribe.js +96 -0
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -0
- package/dist/DboBuilder/subscribe.d.ts +3 -3
- package/dist/PubSubManager/PubSubManager.d.ts +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +1 -1
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/pushSubData.js +1 -1
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +11 -17
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +56 -15
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +0 -1
- package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +2 -2
- package/lib/DboBuilder/QueryStreamer.ts +4 -4
- package/lib/DboBuilder/TableHandler/delete.ts +1 -1
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +15 -110
- package/lib/DboBuilder/ViewHandler/count.ts +32 -0
- package/lib/DboBuilder/{find.ts → ViewHandler/find.ts} +8 -8
- package/lib/DboBuilder/ViewHandler/size.ts +35 -0
- package/lib/DboBuilder/{subscribe.ts → ViewHandler/subscribe.ts} +5 -5
- package/lib/PubSubManager/PubSubManager.ts +1 -1
- package/lib/PubSubManager/pushSubData.ts +1 -1
- package/package.json +2 -2
- package/tests/client/package-lock.json +2442 -8
- package/tests/client/package.json +1 -1
- package/tests/isomorphicQueries.spec.ts +47 -10
- package/tests/server/package-lock.json +3 -3
- package/tests/manual_test/index.html +0 -74
- package/tests/manual_test/index.ts +0 -72
- package/tests/manual_test/init.sql +0 -88
- package/tests/manual_test/package.json +0 -30
- package/tests/manual_test/tsconfig.json +0 -21
|
@@ -3,7 +3,6 @@ import { ViewHandler } from "../ViewHandler/ViewHandler";
|
|
|
3
3
|
type Args = {
|
|
4
4
|
q1: NewQuery;
|
|
5
5
|
q2: NewQueryJoin;
|
|
6
|
-
depth: number;
|
|
7
6
|
selectParamsGroupBy: boolean;
|
|
8
7
|
};
|
|
9
8
|
/**
|
|
@@ -37,7 +36,7 @@ type GetJoinQueryResult = {
|
|
|
37
36
|
) target_table
|
|
38
37
|
ON ...condition
|
|
39
38
|
*/
|
|
40
|
-
export declare const getJoinQuery: (viewHandler: ViewHandler, { q1, q2
|
|
39
|
+
export declare const getJoinQuery: (viewHandler: ViewHandler, { q1, q2 }: Args) => GetJoinQueryResult;
|
|
41
40
|
export type SelectItemNested = SelectItem & {
|
|
42
41
|
query: string;
|
|
43
42
|
isJoinCol: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAe,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,
|
|
1
|
+
{"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAe,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,YAAa,MAAM;;;CAMzC,CAAA;AAED,eAAO,MAAM,mBAAmB,oCAAoC,CAAC;AACrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAY/D,KAAK,kBAAkB,GAAG;IACxB,WAAW,EAAE,MAAM,CAAC;IAEpB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,gBAAiB,WAAW,cAAc,IAAI,KAAG,kBAsFzE,CAAA;AAyED,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;CAAE,CAAC"}
|
|
@@ -43,7 +43,7 @@ const getJoinTable = (tableName, pathIndex, isLastTableAlias) => {
|
|
|
43
43
|
) target_table
|
|
44
44
|
ON ...condition
|
|
45
45
|
*/
|
|
46
|
-
const getJoinQuery = (viewHandler, { q1, q2
|
|
46
|
+
const getJoinQuery = (viewHandler, { q1, q2 }) => {
|
|
47
47
|
const paths = (0, parseJoinPath_1.parseJoinPath)({
|
|
48
48
|
rootTable: q1.table,
|
|
49
49
|
rawPath: q2.joinPath,
|
|
@@ -83,7 +83,6 @@ const getJoinQuery = (viewHandler, { q1, q2, depth }) => {
|
|
|
83
83
|
`SELECT `,
|
|
84
84
|
...(0, getSelectQuery_1.indentLines)([
|
|
85
85
|
...(isOrJoin ? [rootTableIdField] : requiredJoinFields),
|
|
86
|
-
// ...requiredJoinFields,
|
|
87
86
|
jsonAgg,
|
|
88
87
|
...rootNestedSort.map(d => d.nested.wrapperQuerySortItem)
|
|
89
88
|
], { appendCommas: true }),
|
|
@@ -94,18 +93,8 @@ const getJoinQuery = (viewHandler, { q1, q2, depth }) => {
|
|
|
94
93
|
`LEFT JOIN ${q1.table} ${getSelectQuery_1.ROOT_TABLE_ALIAS}`,
|
|
95
94
|
`ON ${joinCondition}`
|
|
96
95
|
] : []),
|
|
97
|
-
// `WHERE ${joinCondition}`,
|
|
98
96
|
`GROUP BY ${isOrJoin ? rootTableIdField : requiredJoinFields}`,
|
|
99
|
-
// `GROUP BY ${requiredJoinFields}`,
|
|
100
97
|
];
|
|
101
|
-
// const queryLines = [
|
|
102
|
-
// `${joinType} JOIN LATERAL (`,
|
|
103
|
-
// ...indentLines(wrappingQuery),
|
|
104
|
-
// `) ${targetTableAlias}`,
|
|
105
|
-
// isOrJoin?
|
|
106
|
-
// `ON ${targetTableAlias}.${ROOT_TABLE_ROW_NUM_ID} = ${rootTableIdField}` :
|
|
107
|
-
// `ON ${joinCondition}`
|
|
108
|
-
// ];
|
|
109
98
|
/**
|
|
110
99
|
* This is done to prevent join cte names clashing with actual table names
|
|
111
100
|
*/
|
|
@@ -152,6 +141,9 @@ const getInnerJoinQuery = ({ paths, q1, q2, targetTableAliasRaw, rootSelectItems
|
|
|
152
141
|
if (groupByFields.length) {
|
|
153
142
|
targetQueryExtraQueries.push(`GROUP BY ${groupByFields}`);
|
|
154
143
|
}
|
|
144
|
+
if (q2.having) {
|
|
145
|
+
targetQueryExtraQueries.push(`HAVING ${q2.having}`);
|
|
146
|
+
}
|
|
155
147
|
}
|
|
156
148
|
}
|
|
157
149
|
const isFirst = !i;
|
|
@@ -166,7 +158,11 @@ const getInnerJoinQuery = ({ paths, q1, q2, targetTableAliasRaw, rootSelectItems
|
|
|
166
158
|
}
|
|
167
159
|
return [
|
|
168
160
|
`INNER JOIN ${table.name} ${table.alias}`,
|
|
169
|
-
`ON ${(0, getTableJoinQuery_1.getJoinOnCondition)({
|
|
161
|
+
`ON ${(0, getTableJoinQuery_1.getJoinOnCondition)({
|
|
162
|
+
on: path.on,
|
|
163
|
+
leftAlias: prevTable.alias,
|
|
164
|
+
rightAlias: table.alias,
|
|
165
|
+
})}`,
|
|
170
166
|
...targetQueryExtraQueries
|
|
171
167
|
];
|
|
172
168
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AACpD,gEAA6E;AAC7E,iDAAiF;AACjF,qDAAwF;AAExF,wEAAsE;AACtE,8CAAoD;
|
|
1
|
+
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,22 +16,26 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
16
16
|
[x: string]: string | any[] | readonly any[];
|
|
17
17
|
};
|
|
18
18
|
} | ({
|
|
19
|
-
[x: string]: string | true | 1 |
|
|
19
|
+
[x: string]: string | true | 1 | {
|
|
20
|
+
[x: string]: string | any[] | readonly any[];
|
|
21
|
+
} | Record<string, true | 1 | (string | {
|
|
22
|
+
[x: string]: string | any[] | readonly any[];
|
|
23
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & {
|
|
20
24
|
select: ("" | "*" | {
|
|
21
25
|
"*": 1;
|
|
22
26
|
}) | {
|
|
23
27
|
[x: string]: {
|
|
24
28
|
[x: string]: string | any[] | readonly any[];
|
|
25
29
|
};
|
|
26
|
-
} | (any & Record<string, string | true | 1 |
|
|
27
|
-
$condition?: undefined;
|
|
28
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
29
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
30
|
-
}) | {
|
|
30
|
+
} | (any & Record<string, string | true | 1 | {
|
|
31
31
|
[x: string]: string | any[] | readonly any[];
|
|
32
32
|
} | Record<string, true | 1 | (string | {
|
|
33
33
|
[x: string]: string | any[] | readonly any[];
|
|
34
|
-
})> | Record<string, false | 0
|
|
34
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
35
|
+
$condition?: undefined;
|
|
36
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
37
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
38
|
+
})>) | {
|
|
35
39
|
[x: string]: string | true | 1;
|
|
36
40
|
$rowhash?: string | true | 1 | undefined;
|
|
37
41
|
} | {
|
|
@@ -39,6 +43,7 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
39
43
|
$rowhash?: false | 0 | undefined;
|
|
40
44
|
} | string[];
|
|
41
45
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
46
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
42
47
|
offset?: number | undefined;
|
|
43
48
|
limit?: number | undefined;
|
|
44
49
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
@@ -51,15 +56,15 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
51
56
|
[x: string]: {
|
|
52
57
|
[x: string]: string | any[] | readonly any[];
|
|
53
58
|
};
|
|
54
|
-
} | (any & Record<string, string | true | 1 |
|
|
55
|
-
$condition?: undefined;
|
|
56
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
57
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
58
|
-
}) | {
|
|
59
|
+
} | (any & Record<string, string | true | 1 | {
|
|
59
60
|
[x: string]: string | any[] | readonly any[];
|
|
60
61
|
} | Record<string, true | 1 | (string | {
|
|
61
62
|
[x: string]: string | any[] | readonly any[];
|
|
62
|
-
})> | Record<string, false | 0
|
|
63
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
64
|
+
$condition?: undefined;
|
|
65
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
66
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
67
|
+
})>) | {
|
|
63
68
|
[x: string]: string | true | 1;
|
|
64
69
|
$rowhash?: string | true | 1 | undefined;
|
|
65
70
|
} | {
|
|
@@ -67,32 +72,33 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
67
72
|
$rowhash?: false | 0 | undefined;
|
|
68
73
|
} | string[];
|
|
69
74
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
75
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
70
76
|
offset?: number | undefined;
|
|
71
77
|
limit?: number | undefined;
|
|
72
78
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
73
79
|
} & {
|
|
74
80
|
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
75
|
-
})
|
|
81
|
+
});
|
|
82
|
+
$rowhash?: (string | true | 1 | {
|
|
76
83
|
[x: string]: string | any[] | readonly any[];
|
|
77
84
|
} | Record<string, true | 1 | (string | {
|
|
78
85
|
[x: string]: string | any[] | readonly any[];
|
|
79
|
-
})> | Record<string, false | 0
|
|
80
|
-
$rowhash?: (string | true | 1 | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & {
|
|
86
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & {
|
|
81
87
|
select: ("" | "*" | {
|
|
82
88
|
"*": 1;
|
|
83
89
|
}) | {
|
|
84
90
|
[x: string]: {
|
|
85
91
|
[x: string]: string | any[] | readonly any[];
|
|
86
92
|
};
|
|
87
|
-
} | (any & Record<string, string | true | 1 |
|
|
88
|
-
$condition?: undefined;
|
|
89
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
90
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
91
|
-
}) | {
|
|
93
|
+
} | (any & Record<string, string | true | 1 | {
|
|
92
94
|
[x: string]: string | any[] | readonly any[];
|
|
93
95
|
} | Record<string, true | 1 | (string | {
|
|
94
96
|
[x: string]: string | any[] | readonly any[];
|
|
95
|
-
})> | Record<string, false | 0
|
|
97
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
98
|
+
$condition?: undefined;
|
|
99
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
100
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
101
|
+
})>) | {
|
|
96
102
|
[x: string]: string | true | 1;
|
|
97
103
|
$rowhash?: string | true | 1 | undefined;
|
|
98
104
|
} | {
|
|
@@ -100,6 +106,7 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
100
106
|
$rowhash?: false | 0 | undefined;
|
|
101
107
|
} | string[];
|
|
102
108
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
109
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
103
110
|
offset?: number | undefined;
|
|
104
111
|
limit?: number | undefined;
|
|
105
112
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
@@ -112,15 +119,15 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
112
119
|
[x: string]: {
|
|
113
120
|
[x: string]: string | any[] | readonly any[];
|
|
114
121
|
};
|
|
115
|
-
} | (any & Record<string, string | true | 1 |
|
|
116
|
-
$condition?: undefined;
|
|
117
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
118
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
119
|
-
}) | {
|
|
122
|
+
} | (any & Record<string, string | true | 1 | {
|
|
120
123
|
[x: string]: string | any[] | readonly any[];
|
|
121
124
|
} | Record<string, true | 1 | (string | {
|
|
122
125
|
[x: string]: string | any[] | readonly any[];
|
|
123
|
-
})> | Record<string, false | 0
|
|
126
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
127
|
+
$condition?: undefined;
|
|
128
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
129
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
130
|
+
})>) | {
|
|
124
131
|
[x: string]: string | true | 1;
|
|
125
132
|
$rowhash?: string | true | 1 | undefined;
|
|
126
133
|
} | {
|
|
@@ -128,17 +135,18 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
128
135
|
$rowhash?: false | 0 | undefined;
|
|
129
136
|
} | string[];
|
|
130
137
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
138
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
131
139
|
offset?: number | undefined;
|
|
132
140
|
limit?: number | undefined;
|
|
133
141
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
134
142
|
} & {
|
|
135
143
|
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
136
|
-
}) |
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
}
|
|
144
|
+
})) | undefined;
|
|
145
|
+
} & Record<string, string | true | 1 | {
|
|
146
|
+
[x: string]: string | any[] | readonly any[];
|
|
147
|
+
} | Record<string, true | 1 | (string | {
|
|
148
|
+
[x: string]: string | any[] | readonly any[];
|
|
149
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & {
|
|
142
150
|
select: ("" | "*" | {
|
|
143
151
|
"*": 1;
|
|
144
152
|
}) | {
|
|
@@ -146,33 +154,33 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
146
154
|
[x: string]: string | any[] | readonly any[];
|
|
147
155
|
};
|
|
148
156
|
} | ({
|
|
149
|
-
[x: string]: string | true | 1 |
|
|
150
|
-
$condition?: undefined;
|
|
151
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
152
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
153
|
-
}) | {
|
|
157
|
+
[x: string]: string | true | 1 | {
|
|
154
158
|
[x: string]: string | any[] | readonly any[];
|
|
155
159
|
} | Record<string, true | 1 | (string | {
|
|
156
160
|
[x: string]: string | any[] | readonly any[];
|
|
157
|
-
})> | Record<string, false | 0
|
|
158
|
-
$rowhash?: (string | true | 1 | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
161
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
159
162
|
$condition?: undefined;
|
|
160
163
|
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
161
164
|
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
162
|
-
})
|
|
165
|
+
});
|
|
166
|
+
$rowhash?: (string | true | 1 | {
|
|
163
167
|
[x: string]: string | any[] | readonly any[];
|
|
164
168
|
} | Record<string, true | 1 | (string | {
|
|
165
169
|
[x: string]: string | any[] | readonly any[];
|
|
166
|
-
})> | Record<string, false | 0>
|
|
167
|
-
|
|
168
|
-
$
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
}
|
|
170
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
171
|
+
$condition?: undefined;
|
|
172
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
173
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
174
|
+
})) | undefined;
|
|
175
|
+
} & Record<string, string | true | 1 | {
|
|
172
176
|
[x: string]: string | any[] | readonly any[];
|
|
173
177
|
} | Record<string, true | 1 | (string | {
|
|
174
178
|
[x: string]: string | any[] | readonly any[];
|
|
175
|
-
})> | Record<string, false | 0
|
|
179
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
180
|
+
$condition?: undefined;
|
|
181
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
182
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
183
|
+
})>) | {
|
|
176
184
|
[x: string]: string | true | 1;
|
|
177
185
|
$rowhash?: string | true | 1 | undefined;
|
|
178
186
|
} | {
|
|
@@ -180,6 +188,7 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
180
188
|
$rowhash?: false | 0 | undefined;
|
|
181
189
|
} | string[];
|
|
182
190
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
191
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
183
192
|
offset?: number | undefined;
|
|
184
193
|
limit?: number | undefined;
|
|
185
194
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
@@ -193,33 +202,33 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
193
202
|
[x: string]: string | any[] | readonly any[];
|
|
194
203
|
};
|
|
195
204
|
} | ({
|
|
196
|
-
[x: string]: string | true | 1 |
|
|
197
|
-
$condition?: undefined;
|
|
198
|
-
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
199
|
-
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
200
|
-
}) | {
|
|
205
|
+
[x: string]: string | true | 1 | {
|
|
201
206
|
[x: string]: string | any[] | readonly any[];
|
|
202
207
|
} | Record<string, true | 1 | (string | {
|
|
203
208
|
[x: string]: string | any[] | readonly any[];
|
|
204
|
-
})> | Record<string, false | 0
|
|
205
|
-
$rowhash?: (string | true | 1 | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
209
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
206
210
|
$condition?: undefined;
|
|
207
211
|
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
208
212
|
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
209
|
-
})
|
|
213
|
+
});
|
|
214
|
+
$rowhash?: (string | true | 1 | {
|
|
210
215
|
[x: string]: string | any[] | readonly any[];
|
|
211
216
|
} | Record<string, true | 1 | (string | {
|
|
212
217
|
[x: string]: string | any[] | readonly any[];
|
|
213
|
-
})> | Record<string, false | 0>
|
|
214
|
-
|
|
215
|
-
$
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
}
|
|
218
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
219
|
+
$condition?: undefined;
|
|
220
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
221
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
222
|
+
})) | undefined;
|
|
223
|
+
} & Record<string, string | true | 1 | {
|
|
219
224
|
[x: string]: string | any[] | readonly any[];
|
|
220
225
|
} | Record<string, true | 1 | (string | {
|
|
221
226
|
[x: string]: string | any[] | readonly any[];
|
|
222
|
-
})> | Record<string, false | 0
|
|
227
|
+
})> | Record<string, false | 0> | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
228
|
+
$condition?: undefined;
|
|
229
|
+
}) | (Partial<Record<"$innerJoin" | "$leftJoin", RawJoinPath>> & any & {
|
|
230
|
+
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
231
|
+
})>) | {
|
|
223
232
|
[x: string]: string | true | 1;
|
|
224
233
|
$rowhash?: string | true | 1 | undefined;
|
|
225
234
|
} | {
|
|
@@ -227,16 +236,13 @@ export declare function getNewQuery(_this: ViewHandler, filter: Filter, selectPa
|
|
|
227
236
|
$rowhash?: false | 0 | undefined;
|
|
228
237
|
} | string[];
|
|
229
238
|
filter?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
239
|
+
having?: import("prostgles-types").FullFilter<void, void> | undefined;
|
|
230
240
|
offset?: number | undefined;
|
|
231
241
|
limit?: number | undefined;
|
|
232
242
|
orderBy?: import("prostgles-types")._OrderBy<import("prostgles-types").AnyObject> | undefined;
|
|
233
243
|
} & {
|
|
234
244
|
$condition?: import("prostgles-types").JoinCondition[] | undefined;
|
|
235
|
-
}) | {
|
|
236
|
-
[x: string]: string | any[] | readonly any[];
|
|
237
|
-
} | Record<string, true | 1 | (string | {
|
|
238
|
-
[x: string]: string | any[] | readonly any[];
|
|
239
|
-
})> | Record<string, false | 0>>) | {
|
|
245
|
+
})>) | {
|
|
240
246
|
[x: string]: string | true | 1;
|
|
241
247
|
$rowhash?: string | true | 1 | undefined;
|
|
242
248
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,WAAW,EAA2C,MAAM,iBAAiB,CAAC;AACjI,OAAO,EAAE,MAAM,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,WAAW,EAA2C,MAAM,iBAAiB,CAAC;AACjI,OAAO,EAAE,MAAM,EAAE,WAAW,EAAuB,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,QAAQ,EAAmC,MAAM,gBAAgB,CAAC;AAkE3E,wBAAsB,WAAW,CAC/B,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA2C,EACvD,aAAa,kBAAO,EACpB,UAAU,EAAE,SAAS,GAAG,SAAS,EACjC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,QAAQ,CAAC,CA2JnB"}
|
|
@@ -8,6 +8,15 @@ const Functions_1 = require("./Functions");
|
|
|
8
8
|
const QueryBuilder_1 = require("./QueryBuilder");
|
|
9
9
|
const prepareHaving_1 = require("./prepareHaving");
|
|
10
10
|
const JOIN_KEYS = ["$innerJoin", "$leftJoin"];
|
|
11
|
+
const JOIN_PARAM_KEYS = (0, prostgles_types_1.getKeys)({
|
|
12
|
+
$condition: 1,
|
|
13
|
+
filter: 1,
|
|
14
|
+
having: 1,
|
|
15
|
+
limit: 1,
|
|
16
|
+
offset: 1,
|
|
17
|
+
orderBy: 1,
|
|
18
|
+
select: 1
|
|
19
|
+
});
|
|
11
20
|
const parseJoinSelect = (joinParams) => {
|
|
12
21
|
if (!joinParams) {
|
|
13
22
|
return {
|
|
@@ -31,8 +40,7 @@ const parseJoinSelect = (joinParams) => {
|
|
|
31
40
|
}
|
|
32
41
|
else if (joinKey) {
|
|
33
42
|
/* Full option join { field_name: db.innerJoin.table_name(filter, select) } */
|
|
34
|
-
const
|
|
35
|
-
const invalidParams = Object.keys(joinParams).filter(k => ![...JOIN_PARAMS, ...JOIN_KEYS].includes(k));
|
|
43
|
+
const invalidParams = Object.keys(joinParams).filter(k => ![...JOIN_PARAM_KEYS, ...JOIN_KEYS].includes(k));
|
|
36
44
|
if (invalidParams.length) {
|
|
37
45
|
throw "Invalid join params: " + invalidParams.join(", ");
|
|
38
46
|
}
|
|
@@ -73,7 +81,8 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
73
81
|
});
|
|
74
82
|
await sBuilder.parseUserSelect(userSelect, async (fTable, _joinParams, throwErr) => {
|
|
75
83
|
const j_selectParams = {};
|
|
76
|
-
let j_filter = {}, j_isLeftJoin = true,
|
|
84
|
+
let j_filter = {}, j_isLeftJoin = true, j_tableRules;
|
|
85
|
+
const j_alias = fTable;
|
|
77
86
|
const parsedJoin = parseJoinSelect(_joinParams);
|
|
78
87
|
if (!parsedJoin.type) {
|
|
79
88
|
throwErr(parsedJoin.error);
|
|
@@ -88,21 +97,19 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
88
97
|
});
|
|
89
98
|
if (parsedJoin.params === "*") {
|
|
90
99
|
j_selectParams.select = "*";
|
|
91
|
-
j_alias = fTable;
|
|
92
100
|
}
|
|
93
101
|
else if (parsedJoin.type === "detailed") {
|
|
94
102
|
const joinParams = parsedJoin.params;
|
|
95
103
|
j_isLeftJoin = !!joinParams.$leftJoin;
|
|
96
|
-
j_alias = fTable;
|
|
97
104
|
j_selectParams.select = joinParams.select || "*";
|
|
98
105
|
j_filter = joinParams.filter || {};
|
|
99
106
|
j_selectParams.limit = joinParams.limit;
|
|
100
107
|
j_selectParams.offset = joinParams.offset;
|
|
101
108
|
j_selectParams.orderBy = joinParams.orderBy;
|
|
109
|
+
j_selectParams.having = joinParams.having;
|
|
102
110
|
}
|
|
103
111
|
else {
|
|
104
112
|
j_selectParams.select = parsedJoin.params;
|
|
105
|
-
j_alias = fTable;
|
|
106
113
|
}
|
|
107
114
|
const jTable = parsedJoin.type === "simple" ? fTable : (typeof j_path === "string" ? j_path : j_path?.at(-1)?.table);
|
|
108
115
|
if (!jTable) {
|
|
@@ -153,8 +160,6 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
153
160
|
const where = filterOpts.where;
|
|
154
161
|
const validatedRules = _this.getValidatedRules(tableRules, localParams);
|
|
155
162
|
const resQuery = {
|
|
156
|
-
/** Why was this the case? */
|
|
157
|
-
// allFields: allowedSelectFields,
|
|
158
163
|
allFields: _this.column_names.slice(0),
|
|
159
164
|
select,
|
|
160
165
|
table: _this.name,
|
|
@@ -168,14 +173,37 @@ async function getNewQuery(_this, filter, selectParams = {}, param3_unused = nul
|
|
|
168
173
|
filterFieldNames: tableRules ? _this.parseFieldFilter(tableRules?.select?.filterFields) : _this.column_names.slice(0),
|
|
169
174
|
}),
|
|
170
175
|
isLeftJoin: false,
|
|
171
|
-
limit:
|
|
176
|
+
limit: prepareLimitQuery(selectParams.limit, validatedRules),
|
|
172
177
|
orderByItems: (0, prepareSortItems_1.prepareSortItems)(selectParams.orderBy, allowedOrderByFields, selectParams.alias, select, joinQueries),
|
|
173
|
-
offset:
|
|
178
|
+
offset: prepareOffsetQuery(selectParams.offset)
|
|
174
179
|
};
|
|
175
180
|
if (resQuery.select.some(s => s.type === "aggregation") && resQuery.joins?.length) {
|
|
176
|
-
throw `Root query aggregation AND nested joins not allowed
|
|
181
|
+
throw new Error(`Root query aggregation AND nested joins not allowed`);
|
|
177
182
|
}
|
|
178
183
|
return resQuery;
|
|
179
184
|
}
|
|
180
185
|
exports.getNewQuery = getNewQuery;
|
|
186
|
+
const prepareOffsetQuery = (offset) => {
|
|
187
|
+
if (Number.isInteger(offset)) {
|
|
188
|
+
return offset;
|
|
189
|
+
}
|
|
190
|
+
return 0;
|
|
191
|
+
};
|
|
192
|
+
const prepareLimitQuery = (limit = null, p) => {
|
|
193
|
+
if (limit !== undefined && limit !== null && !Number.isInteger(limit)) {
|
|
194
|
+
throw "Unexpected LIMIT. Must be null or an integer";
|
|
195
|
+
}
|
|
196
|
+
let _limit = limit;
|
|
197
|
+
/* If no limit then set as the lesser of (100, maxLimit) */
|
|
198
|
+
if (_limit !== null && !Number.isInteger(_limit) && p.select.maxLimit !== null) {
|
|
199
|
+
_limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0];
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
/* If a limit higher than maxLimit specified throw error */
|
|
203
|
+
if (Number.isInteger(p.select.maxLimit) && _limit !== null && _limit > p.select.maxLimit) {
|
|
204
|
+
throw `Unexpected LIMIT ${_limit}. Must be less than the published maxLimit: ` + p.select.maxLimit;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
return _limit;
|
|
208
|
+
};
|
|
181
209
|
//# sourceMappingURL=getNewQuery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAiI;AAIjI,gEAA6D;AAC7D,sEAAmE;AACnE,2CAAyD;AACzD,iDAA2E;AAC3E,mDAAgD;AAEhD,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,WAAW,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD;;GAEG;AACH,eAAO,MAAM,qBAAqB,+BAAyC,CAAC;AAC5E,eAAO,MAAM,gBAAgB,8BAAwC,CAAC;AAEtE;;;KAGK;AACL,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,CAAC,EAAE,QAAQ,EACX,KAAK,oBAAI,EACT,mBAAmB,EAAE,OAAO,GAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"getSelectQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD;;GAEG;AACH,eAAO,MAAM,qBAAqB,+BAAyC,CAAC;AAC5E,eAAO,MAAM,gBAAgB,8BAAwC,CAAC;AAEtE;;;KAGK;AACL,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,CAAC,EAAE,QAAQ,EACX,KAAK,oBAAI,EACT,mBAAmB,EAAE,OAAO,GAC3B,MAAM,CAqER;AAGD,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAA;AACD,eAAO,MAAM,WAAW,WAAY,CAAC,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,EAAE,gDAAkE,eAAe,KAAQ,MAAM,EAW/J,CAAA;AAGD,eAAO,MAAM,mBAAmB,MAAO,QAAQ,WAA6B,CAAC;AAG7E,eAAO,MAAM,cAAc,MAAO,QAAQ,wBAAwB,OAAO,aAmBxE,CAAA"}
|
|
@@ -19,7 +19,6 @@ function getSelectQuery(viewHandler, q, depth = 0, selectParamsGroupBy) {
|
|
|
19
19
|
const parsed = (0, getJoinQuery_1.getJoinQuery)(viewHandler, {
|
|
20
20
|
q1: { ...q, tableAlias: exports.ROOT_TABLE_ALIAS },
|
|
21
21
|
q2: { ...q2 },
|
|
22
|
-
depth: depth + 1,
|
|
23
22
|
selectParamsGroupBy
|
|
24
23
|
});
|
|
25
24
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":";;;AACA,8CAAoD;AACpD,qDAAoD;AAGpD,iDAA8C;AAE9C;;GAEG;AACU,QAAA,qBAAqB,GAAG,6BAAsC,CAAC;AAC/D,QAAA,gBAAgB,GAAG,4BAAqC,CAAC;AAEtE;;;KAGK;AACL,SAAgB,cAAc,CAC5B,WAAwB,EACxB,CAAW,EACX,KAAK,GAAG,CAAC,EACT,mBAA4B;IAG5B,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAgB,CAAC,EAAE,MAAM,EAAE,IAAA,wBAAM,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAE/H,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,2BAAY,EACzB,WAAW,EACX;YACE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,wBAAgB,EAAE;YAC1C,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;YACb,
|
|
1
|
+
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ const Filtering_1 = require("../../Filtering");
|
|
|
6
6
|
const prepareHaving = ({ having, select, tableAlias, filterFieldNames }) => {
|
|
7
7
|
if (!having || (0, prostgles_types_1.isEmpty)(having))
|
|
8
8
|
return "";
|
|
9
|
-
const selectedItem = select
|
|
10
|
-
|
|
9
|
+
// const selectedItem = select
|
|
10
|
+
// .find(s => s.alias);
|
|
11
11
|
const havingStr = (0, Filtering_1.parseFilterItem)({
|
|
12
12
|
filter: having,
|
|
13
13
|
select,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareHaving.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/prepareHaving.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAG1C,+CAAkD;AAQ3C,MAAM,aAAa,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAQ,EAAE,EAAE;IACtF,IAAG,CAAC,MAAM,IAAI,IAAA,yBAAO,EAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACzC,
|
|
1
|
+
{"version":3,"file":"prepareHaving.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/prepareHaving.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAG1C,+CAAkD;AAQ3C,MAAM,aAAa,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAQ,EAAE,EAAE;IACtF,IAAG,CAAC,MAAM,IAAI,IAAA,yBAAO,EAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACzC,8BAA8B;IAC9B,yBAAyB;IACzB,MAAM,SAAS,GAAG,IAAA,2BAAe,EAAC;QAChC,MAAM,EAAE,MAAM;QACd,MAAM;QACN,UAAU;QACV,kBAAkB,EAAE,gBAAgB;KACrC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAA;AAXY,QAAA,aAAa,iBAWzB"}
|