@stamhoofd/sql 2.17.3 → 2.20.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/SQL.d.ts +16 -12
- package/dist/src/SQL.d.ts.map +1 -1
- package/dist/src/SQL.js +7 -0
- package/dist/src/SQL.js.map +1 -1
- package/dist/src/SQLDelete.d.ts +1 -1
- package/dist/src/SQLJoin.d.ts +1 -1
- package/dist/src/SQLSelect.d.ts +1 -1
- package/dist/src/SQLSelect.js +1 -1
- package/dist/src/SQLSelect.js.map +1 -1
- package/dist/src/SQLWhere.d.ts +13 -3
- package/dist/src/SQLWhere.d.ts.map +1 -1
- package/dist/src/SQLWhere.js +57 -42
- package/dist/src/SQLWhere.js.map +1 -1
- package/dist/src/filters/SQLFilter.d.ts.map +1 -1
- package/dist/src/filters/SQLFilter.js +60 -17
- package/dist/src/filters/SQLFilter.js.map +1 -1
- package/dist/src/filters/SQLSorter.d.ts.map +1 -1
- package/dist/src/filters/SQLSorter.js +7 -0
- package/dist/src/filters/SQLSorter.js.map +1 -1
- package/package.json +2 -2
- package/src/SQL.ts +25 -16
- package/src/SQLSelect.ts +1 -1
- package/src/SQLWhere.ts +82 -53
- package/src/filters/SQLFilter.ts +77 -26
- package/src/filters/SQLSorter.ts +8 -0
package/dist/src/SQL.d.ts
CHANGED
|
@@ -2,8 +2,10 @@ import { SQLResultNamespacedRow } from "@simonbackx/simple-database";
|
|
|
2
2
|
import { SQLDelete } from "./SQLDelete";
|
|
3
3
|
import { SQLExpression } from "./SQLExpression";
|
|
4
4
|
import { SQLColumnExpression, SQLTableExpression, SQLWildcardSelectExpression } from "./SQLExpressions";
|
|
5
|
+
import { SQLJoin } from "./SQLJoin";
|
|
5
6
|
import { SQLJsonExtract, SQLJsonLength } from "./SQLJsonExpressions";
|
|
6
7
|
import { SQLSelect } from "./SQLSelect";
|
|
8
|
+
import { ParseWhereArguments, SQLWhere } from "./SQLWhere";
|
|
7
9
|
declare class StaticSQL {
|
|
8
10
|
wildcard(namespace?: string): SQLWildcardSelectExpression;
|
|
9
11
|
column(namespace: string, column: string): SQLColumnExpression;
|
|
@@ -13,19 +15,21 @@ declare class StaticSQL {
|
|
|
13
15
|
table(namespace: string, table: string): SQLTableExpression;
|
|
14
16
|
table(table: string): SQLTableExpression;
|
|
15
17
|
select(...columns: (SQLExpression | string)[]): InstanceType<typeof SQLSelect<SQLResultNamespacedRow>>;
|
|
18
|
+
where(...args: ParseWhereArguments): SQLWhere;
|
|
19
|
+
whereNot(...args: ParseWhereArguments): SQLWhere;
|
|
16
20
|
delete(): InstanceType<typeof SQLDelete>;
|
|
17
|
-
leftJoin(namespace: string, table: string):
|
|
18
|
-
leftJoin(table: string):
|
|
19
|
-
leftJoin(expression: SQLExpression):
|
|
20
|
-
rightJoin(namespace: string, table: string):
|
|
21
|
-
rightJoin(table: string):
|
|
22
|
-
rightJoin(expression: SQLExpression):
|
|
23
|
-
innerJoin(namespace: string, table: string):
|
|
24
|
-
innerJoin(table: string):
|
|
25
|
-
innerJoin(expression: SQLExpression):
|
|
26
|
-
join(namespace: string, table: string):
|
|
27
|
-
join(table: string):
|
|
28
|
-
join(expression: SQLExpression):
|
|
21
|
+
leftJoin(namespace: string, table: string): SQLJoin;
|
|
22
|
+
leftJoin(table: string): SQLJoin;
|
|
23
|
+
leftJoin(expression: SQLExpression): SQLJoin;
|
|
24
|
+
rightJoin(namespace: string, table: string): SQLJoin;
|
|
25
|
+
rightJoin(table: string): SQLJoin;
|
|
26
|
+
rightJoin(expression: SQLExpression): SQLJoin;
|
|
27
|
+
innerJoin(namespace: string, table: string): SQLJoin;
|
|
28
|
+
innerJoin(table: string): SQLJoin;
|
|
29
|
+
innerJoin(expression: SQLExpression): SQLJoin;
|
|
30
|
+
join(namespace: string, table: string): SQLJoin;
|
|
31
|
+
join(table: string): SQLJoin;
|
|
32
|
+
join(expression: SQLExpression): SQLJoin;
|
|
29
33
|
}
|
|
30
34
|
export declare const SQL: StaticSQL;
|
|
31
35
|
export {};
|
package/dist/src/SQL.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/SQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAgB,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/SQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAgB,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AACtH,OAAO,EAAE,OAAO,EAAe,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAiB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE1E,cAAM,SAAS;IACX,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM;IAI3B,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAC9D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAQ3C,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc;IAI9D,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,aAAa;IAI/D,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,kBAAkB;IAC3D,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB;IAQxC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC,aAAa,GAAC,MAAM,CAAC,EAAE,GAAG,YAAY,CAAC,OAAO,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAOpG,KAAK,CAAC,GAAG,IAAI,EAAE,mBAAmB,GAAG,QAAQ;IAI7C,QAAQ,CAAC,GAAG,IAAI,EAAE,mBAAmB,GAAG,QAAQ;IAIhD,MAAM,IAAI,YAAY,CAAC,OAAO,SAAS,CAAC;IAIxC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IACnD,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAChC,QAAQ,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO;IAK5C,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IACpD,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IACjC,SAAS,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO;IAK7C,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IACpD,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IACjC,SAAS,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO;IAK7C,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAC/C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAC5B,IAAI,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO;CAI3C;AAED,eAAO,MAAM,GAAG,WAAkB,CAAC"}
|
package/dist/src/SQL.js
CHANGED
|
@@ -6,6 +6,7 @@ const SQLExpressions_1 = require("./SQLExpressions");
|
|
|
6
6
|
const SQLJoin_1 = require("./SQLJoin");
|
|
7
7
|
const SQLJsonExpressions_1 = require("./SQLJsonExpressions");
|
|
8
8
|
const SQLSelect_1 = require("./SQLSelect");
|
|
9
|
+
const SQLWhere_1 = require("./SQLWhere");
|
|
9
10
|
class StaticSQL {
|
|
10
11
|
wildcard(namespace) {
|
|
11
12
|
return new SQLExpressions_1.SQLWildcardSelectExpression(namespace);
|
|
@@ -34,6 +35,12 @@ class StaticSQL {
|
|
|
34
35
|
}
|
|
35
36
|
return new SQLSelect_1.SQLSelect(...columns);
|
|
36
37
|
}
|
|
38
|
+
where(...args) {
|
|
39
|
+
return new SQLWhere_1.SQLEmptyWhere().and(...args);
|
|
40
|
+
}
|
|
41
|
+
whereNot(...args) {
|
|
42
|
+
return new SQLWhere_1.SQLEmptyWhere().andNot(...args);
|
|
43
|
+
}
|
|
37
44
|
delete() {
|
|
38
45
|
return new SQLDelete_1.SQLDelete();
|
|
39
46
|
}
|
package/dist/src/SQL.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/SQL.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAExC,qDAAsH;AACtH,uCAAiD;AACjD,6DAAqE;AACrE,2CAAoD;
|
|
1
|
+
{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/SQL.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAExC,qDAAsH;AACtH,uCAAiD;AACjD,6DAAqE;AACrE,2CAAoD;AACpD,yCAA0E;AAE1E,MAAM,SAAS;IACX,QAAQ,CAAC,SAAkB;QACvB,OAAO,IAAI,4CAA2B,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;IAID,MAAM,CAAC,iBAAyB,EAAE,MAAe;QAC7C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,IAAI,oCAAmB,CAAC,iBAAiB,CAAC,CAAA;QACrD,CAAC;QACD,OAAO,IAAI,oCAAmB,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC7D,CAAC;IAED,SAAS,CAAC,MAAqB,EAAE,IAAY;QACzC,OAAO,IAAI,mCAAc,CAAC,MAAM,EAAE,IAAI,6BAAY,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,UAAU,CAAC,MAAqB,EAAE,IAAa;QAC3C,OAAO,IAAI,kCAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,6BAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC/E,CAAC;IAID,KAAK,CAAC,gBAAwB,EAAE,KAAc;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,mCAAkB,CAAC,gBAAgB,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,IAAI,mCAAkB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,CAAC,GAAG,OAAiC;QACvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QACzC,CAAC;QACD,OAAO,IAAI,qBAAS,CAAC,GAAG,OAAO,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,IAAyB;QAC9B,OAAO,IAAI,wBAAa,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,QAAQ,CAAC,GAAG,IAAyB;QACjC,OAAO,IAAI,wBAAa,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,qBAAS,EAAE,CAAA;IAC1B,CAAC;IAKD,QAAQ,CAAC,6BAAmD,EAAE,KAAc;QACxE,OAAO,IAAI,iBAAO,CAAC,qBAAW,CAAC,IAAI,EAAE,IAAA,sBAAU,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAA;IAC1F,CAAC;IAKD,SAAS,CAAC,6BAAmD,EAAE,KAAc;QACzE,OAAO,IAAI,iBAAO,CAAC,qBAAW,CAAC,KAAK,EAAE,IAAA,sBAAU,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3F,CAAC;IAKD,SAAS,CAAC,6BAAmD,EAAE,KAAc;QACzE,OAAO,IAAI,iBAAO,CAAC,qBAAW,CAAC,KAAK,EAAE,IAAA,sBAAU,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3F,CAAC;IAKD,IAAI,CAAC,6BAAmD,EAAE,KAAc;QACpE,OAAO,IAAI,iBAAO,CAAC,qBAAW,CAAC,KAAK,EAAE,IAAA,sBAAU,EAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3F,CAAC;CACJ;AAEY,QAAA,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC"}
|
package/dist/src/SQLDelete.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ declare class EmptyClass {
|
|
|
6
6
|
declare const SQLDelete_base: {
|
|
7
7
|
new (...args: any[]): {
|
|
8
8
|
_where: SQLWhere | null;
|
|
9
|
-
|
|
9
|
+
readonly __where: SQLWhere;
|
|
10
10
|
where<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
|
11
11
|
andWhere<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
|
12
12
|
orWhere<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
package/dist/src/SQLJoin.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ declare class EmptyClass {
|
|
|
11
11
|
declare const SQLJoin_base: {
|
|
12
12
|
new (...args: any[]): {
|
|
13
13
|
_where: SQLWhere | null;
|
|
14
|
-
|
|
14
|
+
readonly __where: SQLWhere;
|
|
15
15
|
where<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
|
16
16
|
andWhere<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
|
17
17
|
orWhere<T>(this: T, ...args: import("./SQLWhere").ParseWhereArguments): T;
|
package/dist/src/SQLSelect.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare function parseTable(tableOrExpressiongOrNamespace: SQLExpression
|
|
|
7
7
|
declare const SQLSelect_base: {
|
|
8
8
|
new (...args: any[]): {
|
|
9
9
|
_where: import("./SQLWhere").SQLWhere | null;
|
|
10
|
-
|
|
10
|
+
readonly __where: import("./SQLWhere").SQLWhere;
|
|
11
11
|
where<T_1>(this: T_1, ...args: import("./SQLWhere").ParseWhereArguments): T_1;
|
|
12
12
|
andWhere<T_1>(this: T_1, ...args: import("./SQLWhere").ParseWhereArguments): T_1;
|
|
13
13
|
orWhere<T_1>(this: T_1, ...args: import("./SQLWhere").ParseWhereArguments): T_1;
|
package/dist/src/SQLSelect.js
CHANGED
|
@@ -90,7 +90,7 @@ class SQLSelect extends (0, SQLWhere_1.Whereable)((0, SQLOrderBy_1.Orderable)(Em
|
|
|
90
90
|
async fetch() {
|
|
91
91
|
const { query, params } = (0, SQLExpression_1.normalizeSQLQuery)(this.getSQL());
|
|
92
92
|
// when debugging: log all queries
|
|
93
|
-
|
|
93
|
+
console.log(query, params);
|
|
94
94
|
const [rows] = await simple_database_1.Database.select(query, params, { nestTables: true });
|
|
95
95
|
// Now map aggregated queries to the correct namespace
|
|
96
96
|
for (const row of rows) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLSelect.js","sourceRoot":"","sources":["../../src/SQLSelect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SQLSelect.js","sourceRoot":"","sources":["../../src/SQLSelect.ts"],"names":[],"mappings":"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"}
|
package/dist/src/SQLWhere.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export type ParseWhereArguments = [
|
|
|
14
14
|
export declare function Whereable<Sup extends Constructor<{}>>(Base: Sup): {
|
|
15
15
|
new (...args: any[]): {
|
|
16
16
|
_where: SQLWhere | null;
|
|
17
|
-
|
|
17
|
+
readonly __where: SQLWhere;
|
|
18
18
|
where<T>(this: T, ...args: ParseWhereArguments): T;
|
|
19
19
|
andWhere<T>(this: T, ...args: ParseWhereArguments): T;
|
|
20
20
|
orWhere<T>(this: T, ...args: ParseWhereArguments): T;
|
|
@@ -24,11 +24,20 @@ export declare function Whereable<Sup extends Constructor<{}>>(Base: Sup): {
|
|
|
24
24
|
};
|
|
25
25
|
} & Sup;
|
|
26
26
|
export declare abstract class SQLWhere implements SQLExpression {
|
|
27
|
-
and(...
|
|
28
|
-
or(...
|
|
27
|
+
and(...args: ParseWhereArguments): SQLWhere;
|
|
28
|
+
or(...args: ParseWhereArguments): SQLWhere;
|
|
29
|
+
andNot(...args: ParseWhereArguments): SQLWhere;
|
|
30
|
+
orNot(...args: ParseWhereArguments): SQLWhere;
|
|
29
31
|
get isSingle(): boolean;
|
|
30
32
|
abstract getSQL(options?: SQLExpressionOptions): SQLQuery;
|
|
31
33
|
}
|
|
34
|
+
export declare class SQLEmptyWhere extends SQLWhere {
|
|
35
|
+
and(...args: ParseWhereArguments): SQLWhere;
|
|
36
|
+
or(...args: ParseWhereArguments): SQLWhere;
|
|
37
|
+
andNot(...args: ParseWhereArguments): SQLWhere;
|
|
38
|
+
orNot(...args: ParseWhereArguments): SQLWhere;
|
|
39
|
+
getSQL(options?: SQLExpressionOptions): SQLQuery;
|
|
40
|
+
}
|
|
32
41
|
export declare enum SQLWhereSign {
|
|
33
42
|
Equal = "=",
|
|
34
43
|
Greater = ">",
|
|
@@ -41,6 +50,7 @@ export declare class SQLWhereEqual extends SQLWhere {
|
|
|
41
50
|
column: SQLExpression;
|
|
42
51
|
sign: SQLWhereSign;
|
|
43
52
|
value: SQLExpression;
|
|
53
|
+
static parseWhere(...[whereOrColumn, signOrValue, value]: ParseWhereArguments): SQLWhere;
|
|
44
54
|
constructor(column: SQLExpression, sign: SQLWhereSign, value: SQLExpression);
|
|
45
55
|
constructor(column: SQLExpression, value: SQLExpression);
|
|
46
56
|
clone(): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLWhere.d.ts","sourceRoot":"","sources":["../../src/SQLWhere.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAmC,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAiC,oBAAoB,EAAqC,MAAM,kBAAkB,CAAC;AAE1H,KAAK,WAAW,CAAC,CAAC,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAErD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,QAAQ;CAClB,GAAG;IACA,aAAa,EAAE,aAAa,GAAC,MAAM;IACnC,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,oBAAoB;CAC9B,GAAG;IACA,aAAa,EAAE,aAAa,GAAC,MAAM;IACnC,KAAK,EAAE,oBAAoB;CAC9B,CAAA;AAMD,wBAAgB,SAAS,CAAC,GAAG,SAAS,WAAW,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG;kBAjBvB,GAAG,EAAE;gBAmB9B,QAAQ,
|
|
1
|
+
{"version":3,"file":"SQLWhere.d.ts","sourceRoot":"","sources":["../../src/SQLWhere.ts"],"names":[],"mappings":"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"}
|
package/dist/src/SQLWhere.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SQLWhereNot = exports.SQLWhereOr = exports.SQLWhereAnd = exports.SQLWhereExists = exports.SQLWhereLike = exports.SQLWhereEqual = exports.SQLWhereSign = exports.SQLWhere = void 0;
|
|
3
|
+
exports.SQLWhereNot = exports.SQLWhereOr = exports.SQLWhereAnd = exports.SQLWhereExists = exports.SQLWhereLike = exports.SQLWhereEqual = exports.SQLWhereSign = exports.SQLEmptyWhere = exports.SQLWhere = void 0;
|
|
4
4
|
exports.Whereable = Whereable;
|
|
5
5
|
const SQLExpression_1 = require("./SQLExpression");
|
|
6
6
|
const SQLExpressions_1 = require("./SQLExpressions");
|
|
@@ -10,77 +10,83 @@ function assertWhereable(o) {
|
|
|
10
10
|
function Whereable(Base) {
|
|
11
11
|
return class extends Base {
|
|
12
12
|
_where = null;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
return whereOrColumn;
|
|
16
|
-
}
|
|
17
|
-
if (value !== undefined) {
|
|
18
|
-
return new SQLWhereEqual(typeof whereOrColumn === 'string' ? new SQLExpressions_1.SQLColumnExpression(whereOrColumn) : whereOrColumn, signOrValue, (0, SQLExpressions_1.readDynamicSQLExpression)(value));
|
|
19
|
-
}
|
|
20
|
-
return new SQLWhereEqual(typeof whereOrColumn === 'string' ? new SQLExpressions_1.SQLColumnExpression(whereOrColumn) : whereOrColumn, SQLWhereSign.Equal, (0, SQLExpressions_1.readDynamicSQLExpression)(signOrValue));
|
|
13
|
+
get __where() {
|
|
14
|
+
return this._where ?? new SQLEmptyWhere();
|
|
21
15
|
}
|
|
22
16
|
where(...args) {
|
|
23
17
|
const me = assertWhereable(this);
|
|
24
|
-
|
|
25
|
-
if (!me._where) {
|
|
26
|
-
me._where = w;
|
|
27
|
-
return me;
|
|
28
|
-
}
|
|
29
|
-
me._where = me._where.and(w);
|
|
18
|
+
me._where = me.__where.and(...args);
|
|
30
19
|
return me;
|
|
31
20
|
}
|
|
32
21
|
andWhere(...args) {
|
|
33
22
|
const me = assertWhereable(this);
|
|
34
|
-
|
|
23
|
+
me._where = me.__where.and(...args);
|
|
24
|
+
return me;
|
|
35
25
|
}
|
|
36
26
|
orWhere(...args) {
|
|
37
27
|
const me = assertWhereable(this);
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
me._where = w;
|
|
41
|
-
return this;
|
|
42
|
-
}
|
|
43
|
-
me._where = me._where.or(w);
|
|
44
|
-
return this;
|
|
28
|
+
me._where = me.__where.or(...args);
|
|
29
|
+
return me;
|
|
45
30
|
}
|
|
46
31
|
whereNot(...args) {
|
|
47
32
|
const me = assertWhereable(this);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
me._where = w;
|
|
51
|
-
return this;
|
|
52
|
-
}
|
|
53
|
-
me._where = me._where.and(w);
|
|
54
|
-
return this;
|
|
33
|
+
me._where = me.__where.andNot(...args);
|
|
34
|
+
return me;
|
|
55
35
|
}
|
|
56
36
|
andWhereNot(...args) {
|
|
57
37
|
const me = assertWhereable(this);
|
|
58
|
-
|
|
38
|
+
me._where = me.__where.andNot(...args);
|
|
39
|
+
return me;
|
|
59
40
|
}
|
|
60
41
|
orWhereNot(...args) {
|
|
61
42
|
const me = assertWhereable(this);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
me._where = w;
|
|
65
|
-
return this;
|
|
66
|
-
}
|
|
67
|
-
me._where = me._where.or(w);
|
|
68
|
-
return this;
|
|
43
|
+
me._where = me.__where.orNot(...args);
|
|
44
|
+
return me;
|
|
69
45
|
}
|
|
70
46
|
};
|
|
71
47
|
}
|
|
72
48
|
class SQLWhere {
|
|
73
|
-
and(...
|
|
74
|
-
return new SQLWhereAnd([this, ...
|
|
49
|
+
and(...args) {
|
|
50
|
+
return new SQLWhereAnd([this, SQLWhereEqual.parseWhere(...args)]);
|
|
51
|
+
}
|
|
52
|
+
or(...args) {
|
|
53
|
+
return new SQLWhereOr([this, SQLWhereEqual.parseWhere(...args)]);
|
|
54
|
+
}
|
|
55
|
+
andNot(...args) {
|
|
56
|
+
return new SQLWhereAnd([
|
|
57
|
+
this,
|
|
58
|
+
new SQLWhereNot(SQLWhereEqual.parseWhere(...args))
|
|
59
|
+
]);
|
|
75
60
|
}
|
|
76
|
-
|
|
77
|
-
return new SQLWhereOr([
|
|
61
|
+
orNot(...args) {
|
|
62
|
+
return new SQLWhereOr([
|
|
63
|
+
this,
|
|
64
|
+
new SQLWhereNot(SQLWhereEqual.parseWhere(...args))
|
|
65
|
+
]);
|
|
78
66
|
}
|
|
79
67
|
get isSingle() {
|
|
80
68
|
return false;
|
|
81
69
|
}
|
|
82
70
|
}
|
|
83
71
|
exports.SQLWhere = SQLWhere;
|
|
72
|
+
class SQLEmptyWhere extends SQLWhere {
|
|
73
|
+
and(...args) {
|
|
74
|
+
return SQLWhereEqual.parseWhere(...args);
|
|
75
|
+
}
|
|
76
|
+
or(...args) {
|
|
77
|
+
return SQLWhereEqual.parseWhere(...args);
|
|
78
|
+
}
|
|
79
|
+
andNot(...args) {
|
|
80
|
+
return new SQLWhereNot(SQLWhereEqual.parseWhere(...args));
|
|
81
|
+
}
|
|
82
|
+
orNot(...args) {
|
|
83
|
+
return new SQLWhereNot(SQLWhereEqual.parseWhere(...args));
|
|
84
|
+
}
|
|
85
|
+
getSQL(options) {
|
|
86
|
+
throw new Error('Empty where');
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
exports.SQLEmptyWhere = SQLEmptyWhere;
|
|
84
90
|
var SQLWhereSign;
|
|
85
91
|
(function (SQLWhereSign) {
|
|
86
92
|
SQLWhereSign["Equal"] = "=";
|
|
@@ -94,6 +100,15 @@ class SQLWhereEqual extends SQLWhere {
|
|
|
94
100
|
column;
|
|
95
101
|
sign = SQLWhereSign.Equal;
|
|
96
102
|
value;
|
|
103
|
+
static parseWhere(...[whereOrColumn, signOrValue, value]) {
|
|
104
|
+
if (signOrValue === undefined) {
|
|
105
|
+
return whereOrColumn;
|
|
106
|
+
}
|
|
107
|
+
if (value !== undefined) {
|
|
108
|
+
return new SQLWhereEqual(typeof whereOrColumn === 'string' ? new SQLExpressions_1.SQLColumnExpression(whereOrColumn) : whereOrColumn, signOrValue, (0, SQLExpressions_1.readDynamicSQLExpression)(value));
|
|
109
|
+
}
|
|
110
|
+
return new SQLWhereEqual(typeof whereOrColumn === 'string' ? new SQLExpressions_1.SQLColumnExpression(whereOrColumn) : whereOrColumn, SQLWhereSign.Equal, (0, SQLExpressions_1.readDynamicSQLExpression)(signOrValue));
|
|
111
|
+
}
|
|
97
112
|
constructor(column, signOrValue, value) {
|
|
98
113
|
super();
|
|
99
114
|
this.column = column;
|
package/dist/src/SQLWhere.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLWhere.js","sourceRoot":"","sources":["../../src/SQLWhere.ts"],"names":[],"mappings":";;;AAoBA,
|
|
1
|
+
{"version":3,"file":"SQLWhere.js","sourceRoot":"","sources":["../../src/SQLWhere.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLFilter.d.ts","sourceRoot":"","sources":["../../../src/filters/SQLFilter.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"SQLFilter.d.ts","sourceRoot":"","sources":["../../../src/filters/SQLFilter.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAqB,mBAAmB,EAAyB,cAAc,EAAoD,MAAM,mBAAmB,CAAC;AAEpK,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAmG,MAAM,aAAa,CAAC;AAExI,MAAM,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,oBAAoB,KAAK,QAAQ,GAAC,IAAI,CAAC;AAC1G,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAEpE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,oBAAoB,GAAG,QAAQ,CAGrG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,oBAAoB,GAAG,QAAQ,CAGpG;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,oBAAoB,GAAG,QAAQ,CAGrG;AA4ED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,YAAY,CAAC,OAAO,SAAS,CAAC,GAAG,aAAa,EAAE,WAAW,EAAE,oBAAoB,GAAG,iBAAiB,CAYhK;AAGD,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,oBAAoB,GAAG,iBAAiB,CAI7F;AAED,KAAK,0BAA0B,GAAG;IAAC,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,GAAC,IAAI,KAAK,cAAc,GAAC,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAC,CAAA;AAEvK,wBAAgB,iCAAiC,CAAC,aAAa,EAAE,aAAa,EAAE,EAAC,cAAc,EAAE,YAAoB,EAAE,WAAmB,EAAE,QAAgB,EAAC,GAAE,0BAA+B,GAAG,iBAAiB,CA2NjN;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE,OAAO,CAAC,EAAE,0BAA0B,GAAG,iBAAiB,CAGzI;AAED,eAAO,MAAM,sBAAsB,EAAE,oBAIpC,CAAA;AAuCD,eAAO,MAAM,kBAAkB,6BAAuB,CAAA"}
|
|
@@ -25,13 +25,55 @@ function notSQLFilterCompiler(filter, filters) {
|
|
|
25
25
|
const andRunner = andSQLFilterCompiler(filter, filters);
|
|
26
26
|
return new SQLWhere_1.SQLWhereNot(andRunner);
|
|
27
27
|
}
|
|
28
|
-
function
|
|
29
|
-
if (
|
|
30
|
-
|
|
28
|
+
function guardFilterCompareValue(val) {
|
|
29
|
+
if (val instanceof Date) {
|
|
30
|
+
return val;
|
|
31
|
+
}
|
|
32
|
+
if (typeof val === 'string') {
|
|
33
|
+
return val;
|
|
34
|
+
}
|
|
35
|
+
if (typeof val === 'number') {
|
|
36
|
+
return val;
|
|
37
|
+
}
|
|
38
|
+
if (typeof val === 'boolean') {
|
|
39
|
+
return val;
|
|
31
40
|
}
|
|
41
|
+
if (val === null) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
if (typeof val === 'object' && "$" in val) {
|
|
45
|
+
if (val["$"] === '$now') {
|
|
46
|
+
return val;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
throw new Error('Invalid compare value. Expected a string, number, boolean, date or null.');
|
|
32
50
|
}
|
|
33
|
-
function
|
|
34
|
-
if (
|
|
51
|
+
function doNormalizeValue(val) {
|
|
52
|
+
if (val instanceof Date) {
|
|
53
|
+
return val;
|
|
54
|
+
}
|
|
55
|
+
if (typeof val === 'string') {
|
|
56
|
+
return val.toLocaleLowerCase();
|
|
57
|
+
}
|
|
58
|
+
if (typeof val === 'boolean') {
|
|
59
|
+
return val === true ? 1 : 0;
|
|
60
|
+
}
|
|
61
|
+
if (val === null) {
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
if (typeof val === 'object' && "$" in val) {
|
|
65
|
+
const specialValue = val["$"];
|
|
66
|
+
switch (specialValue) {
|
|
67
|
+
case '$now':
|
|
68
|
+
return doNormalizeValue(new Date());
|
|
69
|
+
default:
|
|
70
|
+
throw new Error('Unsupported magic value ' + specialValue);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return val;
|
|
74
|
+
}
|
|
75
|
+
function guardScalar(s) {
|
|
76
|
+
if (typeof s !== 'string' && typeof s !== 'number' && typeof s !== 'boolean' && !(s instanceof Date) && s !== null) {
|
|
35
77
|
throw new Error('Invalid scalar value');
|
|
36
78
|
}
|
|
37
79
|
}
|
|
@@ -58,7 +100,11 @@ function createSQLFilterNamespace(definitions) {
|
|
|
58
100
|
};
|
|
59
101
|
}
|
|
60
102
|
function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJSONObject = false, isJSONValue = false, nullable = false } = {}) {
|
|
61
|
-
|
|
103
|
+
normalizeValue = normalizeValue ?? ((v) => v);
|
|
104
|
+
const norm = (val) => {
|
|
105
|
+
const n = doNormalizeValue(guardFilterCompareValue(val));
|
|
106
|
+
return normalizeValue(n);
|
|
107
|
+
};
|
|
62
108
|
const convertToExpression = isJSONValue ? SQLExpressions_1.scalarToSQLJSONExpression : SQLExpressions_1.scalarToSQLExpression;
|
|
63
109
|
return (filter, filters) => {
|
|
64
110
|
if (typeof filter === 'string' || typeof filter === 'number' || typeof filter === 'boolean' || filter === null || filter === undefined) {
|
|
@@ -71,7 +117,6 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
71
117
|
}
|
|
72
118
|
const f = filter;
|
|
73
119
|
if ('$eq' in f) {
|
|
74
|
-
guardScalar(f.$eq);
|
|
75
120
|
if (isJSONObject) {
|
|
76
121
|
const v = norm(f.$eq);
|
|
77
122
|
// if (typeof v === 'string') {
|
|
@@ -124,15 +169,13 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
124
169
|
return new SQLWhere_1.SQLWhereEqual(sqlExpression, SQLWhere_1.SQLWhereSign.Equal, new SQLExpressions_1.SQLArray(v));
|
|
125
170
|
}
|
|
126
171
|
if ('$neq' in f) {
|
|
127
|
-
guardScalar(f.$neq);
|
|
128
172
|
if (isJSONObject) {
|
|
129
|
-
const v = norm(f.$
|
|
173
|
+
const v = norm(f.$neq);
|
|
130
174
|
return new SQLWhere_1.SQLWhereNot(new SQLJsonExpressions_1.SQLJsonContains(sqlExpression, convertToExpression(JSON.stringify(v))));
|
|
131
175
|
}
|
|
132
176
|
return new SQLWhere_1.SQLWhereEqual(sqlExpression, SQLWhere_1.SQLWhereSign.NotEqual, convertToExpression(norm(f.$neq)));
|
|
133
177
|
}
|
|
134
178
|
if ('$gt' in f) {
|
|
135
|
-
guardScalar(f.$gt);
|
|
136
179
|
if (isJSONObject) {
|
|
137
180
|
throw new Error('Greater than is not supported in this place');
|
|
138
181
|
}
|
|
@@ -144,7 +187,6 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
144
187
|
return new SQLWhere_1.SQLWhereEqual(sqlExpression, SQLWhere_1.SQLWhereSign.Greater, convertToExpression(norm(f.$gt)));
|
|
145
188
|
}
|
|
146
189
|
if ('$gte' in f) {
|
|
147
|
-
guardScalar(f.$gte);
|
|
148
190
|
if (isJSONObject) {
|
|
149
191
|
throw new Error('Greater than is not supported in this place');
|
|
150
192
|
}
|
|
@@ -155,7 +197,6 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
155
197
|
return new SQLWhere_1.SQLWhereEqual(sqlExpression, SQLWhere_1.SQLWhereSign.GreaterEqual, convertToExpression(norm(f.$gte)));
|
|
156
198
|
}
|
|
157
199
|
if ('$lte' in f) {
|
|
158
|
-
guardScalar(f.$lte);
|
|
159
200
|
if (isJSONObject) {
|
|
160
201
|
throw new Error('Greater than is not supported in this place');
|
|
161
202
|
}
|
|
@@ -174,7 +215,6 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
174
215
|
return new SQLWhere_1.SQLWhereEqual(sqlExpression, SQLWhere_1.SQLWhereSign.LessEqual, convertToExpression(norm(f.$lte)));
|
|
175
216
|
}
|
|
176
217
|
if ('$lt' in f) {
|
|
177
|
-
guardScalar(f.$lt);
|
|
178
218
|
if (isJSONObject) {
|
|
179
219
|
throw new Error('Less than is not supported in this place');
|
|
180
220
|
}
|
|
@@ -193,15 +233,18 @@ function createSQLExpressionFilterCompiler(sqlExpression, { normalizeValue, isJS
|
|
|
193
233
|
return base;
|
|
194
234
|
}
|
|
195
235
|
if ('$contains' in f) {
|
|
196
|
-
|
|
236
|
+
const needle = norm(f.$contains);
|
|
237
|
+
if (typeof needle !== 'string') {
|
|
238
|
+
throw new Error('Invalid needle for contains filter');
|
|
239
|
+
}
|
|
197
240
|
if (isJSONObject) {
|
|
198
|
-
return new SQLWhere_1.SQLWhereEqual(new SQLJsonExpressions_1.SQLJsonSearch(sqlExpression, 'one', convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(
|
|
241
|
+
return new SQLWhere_1.SQLWhereEqual(new SQLJsonExpressions_1.SQLJsonSearch(sqlExpression, 'one', convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(needle) + '%')), SQLWhere_1.SQLWhereSign.NotEqual, new SQLExpressions_1.SQLNull());
|
|
199
242
|
}
|
|
200
243
|
if (isJSONValue) {
|
|
201
244
|
// We need to do case insensitive search, so need to convert the sqlExpression from utf8mb4 to varchar
|
|
202
|
-
return new SQLWhere_1.SQLWhereLike(new SQLExpressions_1.SQLCast(new SQLJsonExpressions_1.SQLJsonUnquote(sqlExpression), 'CHAR'), convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(
|
|
245
|
+
return new SQLWhere_1.SQLWhereLike(new SQLExpressions_1.SQLCast(new SQLJsonExpressions_1.SQLJsonUnquote(sqlExpression), 'CHAR'), convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(needle) + '%'));
|
|
203
246
|
}
|
|
204
|
-
return new SQLWhere_1.SQLWhereLike(sqlExpression, convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(
|
|
247
|
+
return new SQLWhere_1.SQLWhereLike(sqlExpression, convertToExpression('%' + SQLWhere_1.SQLWhereLike.escape(needle) + '%'));
|
|
205
248
|
}
|
|
206
249
|
throw new Error('Invalid filter ' + JSON.stringify(f));
|
|
207
250
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLFilter.js","sourceRoot":"","sources":["../../../src/filters/SQLFilter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SQLFilter.js","sourceRoot":"","sources":["../../../src/filters/SQLFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLSorter.d.ts","sourceRoot":"","sources":["../../../src/filters/SQLSorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"SQLSorter.d.ts","sourceRoot":"","sources":["../../../src/filters/SQLSorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGhE,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IAC3F,KAAK,CAAC,SAAS,EAAE,mBAAmB,GAAG,UAAU,CAAA;CACpD,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE9E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,GAAG,UAAU,CAwBhG"}
|
|
@@ -2,7 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.compileToSQLSorter = compileToSQLSorter;
|
|
4
4
|
const SQLOrderBy_1 = require("../SQLOrderBy");
|
|
5
|
+
const simple_errors_1 = require("@simonbackx/simple-errors");
|
|
5
6
|
function compileToSQLSorter(sortBy, definitions) {
|
|
7
|
+
if (sortBy.length === 0) {
|
|
8
|
+
throw new simple_errors_1.SimpleError({
|
|
9
|
+
code: 'empty_sort',
|
|
10
|
+
message: 'No sort passed'
|
|
11
|
+
});
|
|
12
|
+
}
|
|
6
13
|
const sorters = [];
|
|
7
14
|
for (const s of sortBy) {
|
|
8
15
|
const d = definitions[s.key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLSorter.js","sourceRoot":"","sources":["../../../src/filters/SQLSorter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"SQLSorter.js","sourceRoot":"","sources":["../../../src/filters/SQLSorter.ts"],"names":[],"mappings":";;AAYA,gDAwBC;AAjCD,8CAAgE;AAChE,6DAAwD;AAQxD,SAAgB,kBAAkB,CAAC,MAAgB,EAAE,WAA+B;IAChF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,2BAAW,CAAC;YAClB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,gBAAgB;SAC5B,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAiB,EAAE,CAAC;IAEjC,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QAChD,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACvC,CAAC;IAED,OAAO,uBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;AACtC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/sql",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.20.0",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"license": "UNLICENCED",
|
|
@@ -15,5 +15,5 @@
|
|
|
15
15
|
"publishConfig": {
|
|
16
16
|
"access": "public"
|
|
17
17
|
},
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "946c0ddcaa7cdc9b769d4dc9083a517fe7ad19f8"
|
|
19
19
|
}
|
package/src/SQL.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { SQLColumnExpression, SQLSafeValue, SQLTableExpression, SQLWildcardSelec
|
|
|
5
5
|
import { SQLJoin, SQLJoinType } from "./SQLJoin";
|
|
6
6
|
import { SQLJsonExtract, SQLJsonLength } from "./SQLJsonExpressions";
|
|
7
7
|
import { parseTable, SQLSelect } from "./SQLSelect";
|
|
8
|
+
import { ParseWhereArguments, SQLEmptyWhere, SQLWhere } from "./SQLWhere";
|
|
8
9
|
|
|
9
10
|
class StaticSQL {
|
|
10
11
|
wildcard(namespace?: string) {
|
|
@@ -44,35 +45,43 @@ class StaticSQL {
|
|
|
44
45
|
return new SQLSelect(...columns)
|
|
45
46
|
}
|
|
46
47
|
|
|
48
|
+
where(...args: ParseWhereArguments): SQLWhere {
|
|
49
|
+
return new SQLEmptyWhere().and(...args)
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
whereNot(...args: ParseWhereArguments): SQLWhere {
|
|
53
|
+
return new SQLEmptyWhere().andNot(...args)
|
|
54
|
+
}
|
|
55
|
+
|
|
47
56
|
delete(): InstanceType<typeof SQLDelete> {
|
|
48
57
|
return new SQLDelete()
|
|
49
58
|
}
|
|
50
59
|
|
|
51
|
-
leftJoin(namespace: string, table: string);
|
|
52
|
-
leftJoin(table: string);
|
|
53
|
-
leftJoin(expression: SQLExpression);
|
|
54
|
-
leftJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string) {
|
|
60
|
+
leftJoin(namespace: string, table: string): SQLJoin;
|
|
61
|
+
leftJoin(table: string): SQLJoin;
|
|
62
|
+
leftJoin(expression: SQLExpression): SQLJoin;
|
|
63
|
+
leftJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string): SQLJoin {
|
|
55
64
|
return new SQLJoin(SQLJoinType.Left, parseTable(tableOrExpressiongOrNamespace, table))
|
|
56
65
|
}
|
|
57
66
|
|
|
58
|
-
rightJoin(namespace: string, table: string);
|
|
59
|
-
rightJoin(table: string);
|
|
60
|
-
rightJoin(expression: SQLExpression);
|
|
61
|
-
rightJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string) {
|
|
67
|
+
rightJoin(namespace: string, table: string): SQLJoin;
|
|
68
|
+
rightJoin(table: string): SQLJoin;
|
|
69
|
+
rightJoin(expression: SQLExpression): SQLJoin;
|
|
70
|
+
rightJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string): SQLJoin {
|
|
62
71
|
return new SQLJoin(SQLJoinType.Right, parseTable(tableOrExpressiongOrNamespace, table))
|
|
63
72
|
}
|
|
64
73
|
|
|
65
|
-
innerJoin(namespace: string, table: string);
|
|
66
|
-
innerJoin(table: string);
|
|
67
|
-
innerJoin(expression: SQLExpression);
|
|
68
|
-
innerJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string) {
|
|
74
|
+
innerJoin(namespace: string, table: string): SQLJoin;
|
|
75
|
+
innerJoin(table: string): SQLJoin;
|
|
76
|
+
innerJoin(expression: SQLExpression): SQLJoin;
|
|
77
|
+
innerJoin(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string): SQLJoin {
|
|
69
78
|
return new SQLJoin(SQLJoinType.Inner, parseTable(tableOrExpressiongOrNamespace, table))
|
|
70
79
|
}
|
|
71
80
|
|
|
72
|
-
join(namespace: string, table: string);
|
|
73
|
-
join(table: string);
|
|
74
|
-
join(expression: SQLExpression);
|
|
75
|
-
join(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string) {
|
|
81
|
+
join(namespace: string, table: string): SQLJoin;
|
|
82
|
+
join(table: string): SQLJoin;
|
|
83
|
+
join(expression: SQLExpression): SQLJoin;
|
|
84
|
+
join(tableOrExpressiongOrNamespace: SQLExpression|string, table?: string): SQLJoin {
|
|
76
85
|
return new SQLJoin(SQLJoinType.Inner, parseTable(tableOrExpressiongOrNamespace, table))
|
|
77
86
|
}
|
|
78
87
|
}
|
package/src/SQLSelect.ts
CHANGED
|
@@ -124,7 +124,7 @@ export class SQLSelect<T = SQLResultNamespacedRow> extends Whereable(Orderable(E
|
|
|
124
124
|
const {query, params} = normalizeSQLQuery(this.getSQL())
|
|
125
125
|
|
|
126
126
|
// when debugging: log all queries
|
|
127
|
-
|
|
127
|
+
console.log(query, params);
|
|
128
128
|
const [rows] = await Database.select(query, params, {nestTables: true});
|
|
129
129
|
|
|
130
130
|
// Now map aggregated queries to the correct namespace
|
package/src/SQLWhere.ts
CHANGED
|
@@ -20,92 +20,75 @@ function assertWhereable(o: any): any {
|
|
|
20
20
|
|
|
21
21
|
export function Whereable<Sup extends Constructor<{}>>(Base: Sup) {
|
|
22
22
|
return class extends Base {
|
|
23
|
-
_where: SQLWhere|null = null
|
|
23
|
+
_where: SQLWhere | null = null
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
return whereOrColumn as SQLWhere;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
if (value !== undefined) {
|
|
31
|
-
return new SQLWhereEqual(
|
|
32
|
-
typeof whereOrColumn === 'string' ? new SQLColumnExpression(whereOrColumn) : whereOrColumn,
|
|
33
|
-
signOrValue as SQLWhereSign,
|
|
34
|
-
readDynamicSQLExpression(value)
|
|
35
|
-
)
|
|
36
|
-
}
|
|
37
|
-
return new SQLWhereEqual(
|
|
38
|
-
typeof whereOrColumn === 'string' ? new SQLColumnExpression(whereOrColumn) : whereOrColumn,
|
|
39
|
-
SQLWhereSign.Equal,
|
|
40
|
-
readDynamicSQLExpression(signOrValue)
|
|
41
|
-
)
|
|
25
|
+
get __where() {
|
|
26
|
+
return this._where ?? new SQLEmptyWhere();
|
|
42
27
|
}
|
|
43
28
|
|
|
44
|
-
|
|
45
29
|
where<T>(this: T, ...args: ParseWhereArguments): T {
|
|
46
30
|
const me = assertWhereable(this)
|
|
47
|
-
|
|
48
|
-
const w = me.parseWhere(...args);
|
|
49
|
-
if (!me._where) {
|
|
50
|
-
me._where = w;
|
|
51
|
-
return me;
|
|
52
|
-
}
|
|
53
|
-
me._where = me._where.and(w);
|
|
31
|
+
me._where = me.__where.and(...args)
|
|
54
32
|
return me;
|
|
55
33
|
}
|
|
56
34
|
|
|
57
35
|
andWhere<T>(this: T, ...args: ParseWhereArguments): T {
|
|
58
36
|
const me = assertWhereable(this)
|
|
59
|
-
|
|
37
|
+
me._where = me.__where.and(...args)
|
|
38
|
+
return me;
|
|
60
39
|
}
|
|
61
40
|
|
|
62
41
|
orWhere<T>(this: T, ...args: ParseWhereArguments): T {
|
|
63
42
|
const me = assertWhereable(this)
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
me._where = w;
|
|
67
|
-
return this;
|
|
68
|
-
}
|
|
69
|
-
me._where = me._where.or(w);
|
|
70
|
-
return this;
|
|
43
|
+
me._where = me.__where.or(...args)
|
|
44
|
+
return me;
|
|
71
45
|
}
|
|
72
46
|
|
|
73
47
|
whereNot<T>(this: T, ...args: ParseWhereArguments): T {
|
|
74
48
|
const me = assertWhereable(this)
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
me._where = w;
|
|
78
|
-
return this;
|
|
79
|
-
}
|
|
80
|
-
me._where = me._where.and(w);
|
|
81
|
-
return this;
|
|
49
|
+
me._where = me.__where.andNot(...args)
|
|
50
|
+
return me;
|
|
82
51
|
}
|
|
83
52
|
|
|
84
53
|
andWhereNot<T>(this: T, ...args: ParseWhereArguments): T {
|
|
85
54
|
const me = assertWhereable(this)
|
|
86
|
-
|
|
55
|
+
me._where = me.__where.andNot(...args)
|
|
56
|
+
return me;
|
|
87
57
|
}
|
|
88
58
|
|
|
89
59
|
orWhereNot<T>(this: T, ...args: ParseWhereArguments): T {
|
|
90
60
|
const me = assertWhereable(this)
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
me._where = w;
|
|
94
|
-
return this;
|
|
95
|
-
}
|
|
96
|
-
me._where = me._where.or(w);
|
|
97
|
-
return this;
|
|
61
|
+
me._where = me.__where.orNot(...args)
|
|
62
|
+
return me;
|
|
98
63
|
}
|
|
99
64
|
}
|
|
100
65
|
}
|
|
101
66
|
|
|
102
67
|
export abstract class SQLWhere implements SQLExpression {
|
|
103
|
-
and(...
|
|
104
|
-
return new SQLWhereAnd([this, ...
|
|
68
|
+
and(...args: ParseWhereArguments): SQLWhere {
|
|
69
|
+
return new SQLWhereAnd([this, SQLWhereEqual.parseWhere(...args)]);
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
or(...args: ParseWhereArguments): SQLWhere {
|
|
73
|
+
return new SQLWhereOr([this, SQLWhereEqual.parseWhere(...args)]);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
andNot(...args: ParseWhereArguments): SQLWhere {
|
|
77
|
+
return new SQLWhereAnd([
|
|
78
|
+
this,
|
|
79
|
+
new SQLWhereNot(
|
|
80
|
+
SQLWhereEqual.parseWhere(...args)
|
|
81
|
+
)
|
|
82
|
+
]);
|
|
105
83
|
}
|
|
106
84
|
|
|
107
|
-
|
|
108
|
-
return new SQLWhereOr([
|
|
85
|
+
orNot(...args: ParseWhereArguments): SQLWhere {
|
|
86
|
+
return new SQLWhereOr([
|
|
87
|
+
this,
|
|
88
|
+
new SQLWhereNot(
|
|
89
|
+
SQLWhereEqual.parseWhere(...args)
|
|
90
|
+
)
|
|
91
|
+
]);
|
|
109
92
|
}
|
|
110
93
|
|
|
111
94
|
get isSingle(): boolean {
|
|
@@ -115,6 +98,33 @@ export abstract class SQLWhere implements SQLExpression {
|
|
|
115
98
|
abstract getSQL(options?: SQLExpressionOptions): SQLQuery
|
|
116
99
|
}
|
|
117
100
|
|
|
101
|
+
export class SQLEmptyWhere extends SQLWhere {
|
|
102
|
+
and(...args: ParseWhereArguments): SQLWhere {
|
|
103
|
+
return SQLWhereEqual.parseWhere(...args)
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
or(...args: ParseWhereArguments): SQLWhere {
|
|
107
|
+
return SQLWhereEqual.parseWhere(...args)
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
andNot(...args: ParseWhereArguments): SQLWhere {
|
|
111
|
+
return new SQLWhereNot(
|
|
112
|
+
SQLWhereEqual.parseWhere(...args)
|
|
113
|
+
)
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
orNot(...args: ParseWhereArguments): SQLWhere {
|
|
117
|
+
return new SQLWhereNot(
|
|
118
|
+
SQLWhereEqual.parseWhere(...args)
|
|
119
|
+
)
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
getSQL(options?: SQLExpressionOptions): SQLQuery {
|
|
123
|
+
throw new Error('Empty where')
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
|
|
118
128
|
export enum SQLWhereSign {
|
|
119
129
|
Equal = '=',
|
|
120
130
|
Greater = '>',
|
|
@@ -128,6 +138,25 @@ export class SQLWhereEqual extends SQLWhere {
|
|
|
128
138
|
column: SQLExpression;
|
|
129
139
|
sign = SQLWhereSign.Equal
|
|
130
140
|
value: SQLExpression;
|
|
141
|
+
|
|
142
|
+
static parseWhere(...[whereOrColumn, signOrValue, value]: ParseWhereArguments): SQLWhere {
|
|
143
|
+
if (signOrValue === undefined) {
|
|
144
|
+
return whereOrColumn as SQLWhere;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
if (value !== undefined) {
|
|
148
|
+
return new SQLWhereEqual(
|
|
149
|
+
typeof whereOrColumn === 'string' ? new SQLColumnExpression(whereOrColumn) : whereOrColumn,
|
|
150
|
+
signOrValue as SQLWhereSign,
|
|
151
|
+
readDynamicSQLExpression(value)
|
|
152
|
+
)
|
|
153
|
+
}
|
|
154
|
+
return new SQLWhereEqual(
|
|
155
|
+
typeof whereOrColumn === 'string' ? new SQLColumnExpression(whereOrColumn) : whereOrColumn,
|
|
156
|
+
SQLWhereSign.Equal,
|
|
157
|
+
readDynamicSQLExpression(signOrValue)
|
|
158
|
+
)
|
|
159
|
+
}
|
|
131
160
|
|
|
132
161
|
constructor (column: SQLExpression, sign: SQLWhereSign, value: SQLExpression)
|
|
133
162
|
constructor (column: SQLExpression, value: SQLExpression)
|
package/src/filters/SQLFilter.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SimpleError } from "@simonbackx/simple-errors";
|
|
2
|
-
import { StamhoofdFilter } from "@stamhoofd/structures";
|
|
2
|
+
import { StamhoofdCompareValue, StamhoofdFilter } from "@stamhoofd/structures";
|
|
3
3
|
import { SQL } from "../SQL";
|
|
4
4
|
import { SQLExpression } from "../SQLExpression";
|
|
5
5
|
import { SQLArray, SQLCast, SQLColumnExpression, SQLNull, SQLSafeValue, SQLScalarValue, scalarToSQLExpression, scalarToSQLJSONExpression } from "../SQLExpressions";
|
|
@@ -25,17 +25,72 @@ export function notSQLFilterCompiler(filter: StamhoofdFilter, filters: SQLFilter
|
|
|
25
25
|
return new SQLWhereNot(andRunner)
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
function
|
|
29
|
-
if (
|
|
30
|
-
|
|
28
|
+
function guardFilterCompareValue(val: any): StamhoofdCompareValue {
|
|
29
|
+
if (val instanceof Date) {
|
|
30
|
+
return val
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (typeof val === 'string') {
|
|
34
|
+
return val
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (typeof val === 'number') {
|
|
38
|
+
return val
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (typeof val === 'boolean') {
|
|
42
|
+
return val;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (val === null) {
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
if (typeof val === 'object' && "$" in val) {
|
|
50
|
+
if (val["$"] === '$now') {
|
|
51
|
+
return val;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
throw new Error('Invalid compare value. Expected a string, number, boolean, date or null.')
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function doNormalizeValue(val: StamhoofdCompareValue): string|number|Date|null {
|
|
59
|
+
if (val instanceof Date) {
|
|
60
|
+
return val
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
if (typeof val === 'string') {
|
|
64
|
+
return val.toLocaleLowerCase()
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (typeof val === 'boolean') {
|
|
68
|
+
return val === true ? 1 : 0;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (val === null) {
|
|
72
|
+
return null;
|
|
31
73
|
}
|
|
32
74
|
|
|
75
|
+
if (typeof val === 'object' && "$" in val) {
|
|
76
|
+
const specialValue = val["$"];
|
|
77
|
+
|
|
78
|
+
switch (specialValue) {
|
|
79
|
+
case '$now':
|
|
80
|
+
return doNormalizeValue(new Date())
|
|
81
|
+
default:
|
|
82
|
+
throw new Error('Unsupported magic value ' + specialValue)
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
return val;
|
|
33
87
|
}
|
|
34
88
|
|
|
35
|
-
function
|
|
36
|
-
if (typeof s !== 'string' && typeof s !== 'number' && typeof s !== 'boolean' && !(s instanceof Date)) {
|
|
89
|
+
function guardScalar(s: any): asserts s is SQLScalarValue|null {
|
|
90
|
+
if (typeof s !== 'string' && typeof s !== 'number' && typeof s !== 'boolean' && !(s instanceof Date) && s !== null) {
|
|
37
91
|
throw new Error('Invalid scalar value')
|
|
38
92
|
}
|
|
93
|
+
|
|
39
94
|
}
|
|
40
95
|
|
|
41
96
|
function guardString(s: any): asserts s is string {
|
|
@@ -68,7 +123,11 @@ export function createSQLFilterNamespace(definitions: SQLFilterDefinitions): SQL
|
|
|
68
123
|
type SQLExpressionFilterOptions = {normalizeValue?: (v: SQLScalarValue|null) => SQLScalarValue|null, isJSONValue?: boolean, isJSONObject?: boolean, nullable?: boolean}
|
|
69
124
|
|
|
70
125
|
export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression, {normalizeValue, isJSONObject = false, isJSONValue = false, nullable = false}: SQLExpressionFilterOptions = {}): SQLFilterCompiler {
|
|
71
|
-
|
|
126
|
+
normalizeValue = normalizeValue ?? ((v) => v);
|
|
127
|
+
const norm = (val: any) => {
|
|
128
|
+
const n = doNormalizeValue(guardFilterCompareValue(val));
|
|
129
|
+
return normalizeValue(n);
|
|
130
|
+
}
|
|
72
131
|
const convertToExpression = isJSONValue ? scalarToSQLJSONExpression : scalarToSQLExpression
|
|
73
132
|
|
|
74
133
|
return (filter: StamhoofdFilter, filters: SQLFilterDefinitions) => {
|
|
@@ -83,11 +142,9 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
83
142
|
}
|
|
84
143
|
|
|
85
144
|
|
|
86
|
-
const f = filter
|
|
145
|
+
const f = filter;
|
|
87
146
|
|
|
88
147
|
if ('$eq' in f) {
|
|
89
|
-
guardScalar(f.$eq);
|
|
90
|
-
|
|
91
148
|
if (isJSONObject) {
|
|
92
149
|
const v = norm(f.$eq);
|
|
93
150
|
|
|
@@ -153,14 +210,12 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
153
210
|
new SQLWhereEqual(sqlExpression, SQLWhereSign.Equal, new SQLArray(remaining))
|
|
154
211
|
]);
|
|
155
212
|
}
|
|
156
|
-
return new SQLWhereEqual(sqlExpression, SQLWhereSign.Equal, new SQLArray(v));
|
|
213
|
+
return new SQLWhereEqual(sqlExpression, SQLWhereSign.Equal, new SQLArray(v as SQLScalarValue[]));
|
|
157
214
|
}
|
|
158
215
|
|
|
159
216
|
if ('$neq' in f) {
|
|
160
|
-
guardScalar(f.$neq);
|
|
161
|
-
|
|
162
217
|
if (isJSONObject) {
|
|
163
|
-
const v = norm(f.$
|
|
218
|
+
const v = norm(f.$neq);
|
|
164
219
|
|
|
165
220
|
return new SQLWhereNot(
|
|
166
221
|
new SQLJsonContains(
|
|
@@ -173,8 +228,6 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
173
228
|
}
|
|
174
229
|
|
|
175
230
|
if ('$gt' in f) {
|
|
176
|
-
guardScalar(f.$gt);
|
|
177
|
-
|
|
178
231
|
if (isJSONObject) {
|
|
179
232
|
throw new Error('Greater than is not supported in this place')
|
|
180
233
|
}
|
|
@@ -189,8 +242,6 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
189
242
|
}
|
|
190
243
|
|
|
191
244
|
if ('$gte' in f) {
|
|
192
|
-
guardScalar(f.$gte);
|
|
193
|
-
|
|
194
245
|
if (isJSONObject) {
|
|
195
246
|
throw new Error('Greater than is not supported in this place')
|
|
196
247
|
}
|
|
@@ -203,8 +254,6 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
203
254
|
}
|
|
204
255
|
|
|
205
256
|
if ('$lte' in f) {
|
|
206
|
-
guardScalar(f.$lte);
|
|
207
|
-
|
|
208
257
|
if (isJSONObject) {
|
|
209
258
|
throw new Error('Greater than is not supported in this place')
|
|
210
259
|
}
|
|
@@ -229,8 +278,6 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
229
278
|
|
|
230
279
|
|
|
231
280
|
if ('$lt' in f) {
|
|
232
|
-
guardScalar(f.$lt);
|
|
233
|
-
|
|
234
281
|
if (isJSONObject) {
|
|
235
282
|
throw new Error('Less than is not supported in this place')
|
|
236
283
|
}
|
|
@@ -254,7 +301,11 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
254
301
|
}
|
|
255
302
|
|
|
256
303
|
if ('$contains' in f) {
|
|
257
|
-
|
|
304
|
+
const needle = norm(f.$contains);
|
|
305
|
+
|
|
306
|
+
if (typeof needle !== 'string') {
|
|
307
|
+
throw new Error('Invalid needle for contains filter')
|
|
308
|
+
}
|
|
258
309
|
|
|
259
310
|
if (isJSONObject) {
|
|
260
311
|
return new SQLWhereEqual(
|
|
@@ -262,7 +313,7 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
262
313
|
sqlExpression,
|
|
263
314
|
'one',
|
|
264
315
|
convertToExpression(
|
|
265
|
-
'%'+SQLWhereLike.escape(
|
|
316
|
+
'%'+SQLWhereLike.escape(needle)+'%'
|
|
266
317
|
)
|
|
267
318
|
),
|
|
268
319
|
SQLWhereSign.NotEqual,
|
|
@@ -275,7 +326,7 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
275
326
|
return new SQLWhereLike(
|
|
276
327
|
new SQLCast(new SQLJsonUnquote(sqlExpression), 'CHAR'),
|
|
277
328
|
convertToExpression(
|
|
278
|
-
'%'+SQLWhereLike.escape(
|
|
329
|
+
'%'+SQLWhereLike.escape(needle)+'%'
|
|
279
330
|
)
|
|
280
331
|
);
|
|
281
332
|
}
|
|
@@ -283,7 +334,7 @@ export function createSQLExpressionFilterCompiler(sqlExpression: SQLExpression,
|
|
|
283
334
|
return new SQLWhereLike(
|
|
284
335
|
sqlExpression,
|
|
285
336
|
convertToExpression(
|
|
286
|
-
'%'+SQLWhereLike.escape(
|
|
337
|
+
'%'+SQLWhereLike.escape(needle)+'%'
|
|
287
338
|
)
|
|
288
339
|
);
|
|
289
340
|
}
|
package/src/filters/SQLSorter.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { PlainObject } from "@simonbackx/simple-encoding";
|
|
|
2
2
|
import { SortDefinition, SortList } from "@stamhoofd/structures";
|
|
3
3
|
|
|
4
4
|
import { SQLOrderBy, SQLOrderByDirection } from "../SQLOrderBy";
|
|
5
|
+
import { SimpleError } from "@simonbackx/simple-errors";
|
|
5
6
|
|
|
6
7
|
export type SQLSortDefinition<T, B extends PlainObject = PlainObject> = SortDefinition<T, B> & {
|
|
7
8
|
toSQL(direction: SQLOrderByDirection): SQLOrderBy
|
|
@@ -10,6 +11,13 @@ export type SQLSortDefinition<T, B extends PlainObject = PlainObject> = SortDefi
|
|
|
10
11
|
export type SQLSortDefinitions<T = any> = Record<string, SQLSortDefinition<T>>
|
|
11
12
|
|
|
12
13
|
export function compileToSQLSorter(sortBy: SortList, definitions: SQLSortDefinitions): SQLOrderBy {
|
|
14
|
+
if (sortBy.length === 0 ){
|
|
15
|
+
throw new SimpleError({
|
|
16
|
+
code: 'empty_sort',
|
|
17
|
+
message: 'No sort passed'
|
|
18
|
+
})
|
|
19
|
+
}
|
|
20
|
+
|
|
13
21
|
const sorters: SQLOrderBy[] = [];
|
|
14
22
|
|
|
15
23
|
for (const s of sortBy) {
|