@getstrata/core 0.5.3 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/database/query.d.ts +2 -2
- package/dist/entries/auth/guard.js +6 -8
- package/dist/entries/database.js +6 -8
- package/dist/entries/http/webErrorResponse.js +6 -8
- package/dist/entries/http.js +6 -8
- package/dist/entries/queue/createAppQueue.js +6 -8
- package/dist/entries/queue/publicQueue.js +6 -8
- package/dist/entries/queue/queueMetrics.js +6 -8
- package/dist/entries/view.js +6 -8
- package/dist/index.js +6 -8
- package/package.json +1 -1
|
@@ -12,12 +12,12 @@ declare function buildWhereClause<TEntity extends object>(tableName: string, whe
|
|
|
12
12
|
clause: string;
|
|
13
13
|
params: unknown[];
|
|
14
14
|
};
|
|
15
|
-
declare function buildAdvancedWhereClause<TEntity extends object>(tableName: string, where?: QueryWhere<TEntity>, whereNodes?: readonly WhereNode<TEntity>[]): {
|
|
15
|
+
declare function buildAdvancedWhereClause<TEntity extends object>(tableName: string, where?: QueryWhere<TEntity>, whereNodes?: readonly WhereNode<TEntity>[], params?: unknown[]): {
|
|
16
16
|
clause: string;
|
|
17
17
|
params: unknown[];
|
|
18
18
|
};
|
|
19
19
|
declare function resolveSoftDeleteColumn<TEntity>(table: TableDefinition<TEntity>): string | null;
|
|
20
|
-
declare function buildQueryWhereClause<TEntity extends object>(table: TableDefinition<TEntity>, options?: Pick<QueryOptions<TEntity>, "where" | "withTrashed" | "onlyTrashed">, whereNodes?: readonly WhereNode<TEntity>[]): {
|
|
20
|
+
declare function buildQueryWhereClause<TEntity extends object>(table: TableDefinition<TEntity>, options?: Pick<QueryOptions<TEntity>, "where" | "withTrashed" | "onlyTrashed">, whereNodes?: readonly WhereNode<TEntity>[], params?: unknown[]): {
|
|
21
21
|
clause: string;
|
|
22
22
|
params: unknown[];
|
|
23
23
|
};
|
|
@@ -508,8 +508,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
508
508
|
}
|
|
509
509
|
return result;
|
|
510
510
|
}
|
|
511
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
512
|
-
const params = [];
|
|
511
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
513
512
|
const nodes = [];
|
|
514
513
|
if (Object.keys(where).length > 0) {
|
|
515
514
|
nodes.push({ kind: "and", where });
|
|
@@ -544,18 +543,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
544
543
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
545
544
|
}
|
|
546
545
|
}
|
|
547
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
548
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
546
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
547
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
549
548
|
const softDeleteClauses = [];
|
|
550
549
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
551
550
|
if (softDeleteClauses.length === 0) {
|
|
552
|
-
return { clause, params };
|
|
551
|
+
return { clause, params: whereParams };
|
|
553
552
|
}
|
|
554
553
|
const base = clause.replace(/^ WHERE /, "");
|
|
555
554
|
const scope = softDeleteClauses.join(" AND ");
|
|
556
555
|
return {
|
|
557
556
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
558
|
-
params
|
|
557
|
+
params: whereParams
|
|
559
558
|
};
|
|
560
559
|
}
|
|
561
560
|
function isQueryOrder(value) {
|
|
@@ -659,8 +658,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
659
658
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
660
659
|
const params = [];
|
|
661
660
|
const columns = buildSelectList(table, options.select, params);
|
|
662
|
-
const { clause
|
|
663
|
-
params.push(...whereParams);
|
|
661
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
664
662
|
const joins = buildJoinClause(options.joins);
|
|
665
663
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
666
664
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
package/dist/entries/database.js
CHANGED
|
@@ -306,8 +306,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
306
306
|
}
|
|
307
307
|
return result;
|
|
308
308
|
}
|
|
309
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
310
|
-
const params = [];
|
|
309
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
311
310
|
const nodes = [];
|
|
312
311
|
if (Object.keys(where).length > 0) {
|
|
313
312
|
nodes.push({ kind: "and", where });
|
|
@@ -342,18 +341,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
342
341
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
343
342
|
}
|
|
344
343
|
}
|
|
345
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
346
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
344
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
345
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
347
346
|
const softDeleteClauses = [];
|
|
348
347
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
349
348
|
if (softDeleteClauses.length === 0) {
|
|
350
|
-
return { clause, params };
|
|
349
|
+
return { clause, params: whereParams };
|
|
351
350
|
}
|
|
352
351
|
const base = clause.replace(/^ WHERE /, "");
|
|
353
352
|
const scope = softDeleteClauses.join(" AND ");
|
|
354
353
|
return {
|
|
355
354
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
356
|
-
params
|
|
355
|
+
params: whereParams
|
|
357
356
|
};
|
|
358
357
|
}
|
|
359
358
|
function isQueryOrder(value) {
|
|
@@ -457,8 +456,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
457
456
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
458
457
|
const params = [];
|
|
459
458
|
const columns = buildSelectList(table, options.select, params);
|
|
460
|
-
const { clause
|
|
461
|
-
params.push(...whereParams);
|
|
459
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
462
460
|
const joins = buildJoinClause(options.joins);
|
|
463
461
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
464
462
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
|
@@ -530,8 +530,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
530
530
|
}
|
|
531
531
|
return result;
|
|
532
532
|
}
|
|
533
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
534
|
-
const params = [];
|
|
533
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
535
534
|
const nodes = [];
|
|
536
535
|
if (Object.keys(where).length > 0) {
|
|
537
536
|
nodes.push({ kind: "and", where });
|
|
@@ -566,18 +565,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
566
565
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
567
566
|
}
|
|
568
567
|
}
|
|
569
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
570
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
568
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
569
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
571
570
|
const softDeleteClauses = [];
|
|
572
571
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
573
572
|
if (softDeleteClauses.length === 0) {
|
|
574
|
-
return { clause, params };
|
|
573
|
+
return { clause, params: whereParams };
|
|
575
574
|
}
|
|
576
575
|
const base = clause.replace(/^ WHERE /, "");
|
|
577
576
|
const scope = softDeleteClauses.join(" AND ");
|
|
578
577
|
return {
|
|
579
578
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
580
|
-
params
|
|
579
|
+
params: whereParams
|
|
581
580
|
};
|
|
582
581
|
}
|
|
583
582
|
function isQueryOrder(value) {
|
|
@@ -681,8 +680,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
681
680
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
682
681
|
const params = [];
|
|
683
682
|
const columns = buildSelectList(table, options.select, params);
|
|
684
|
-
const { clause
|
|
685
|
-
params.push(...whereParams);
|
|
683
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
686
684
|
const joins = buildJoinClause(options.joins);
|
|
687
685
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
688
686
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
package/dist/entries/http.js
CHANGED
|
@@ -530,8 +530,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
530
530
|
}
|
|
531
531
|
return result;
|
|
532
532
|
}
|
|
533
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
534
|
-
const params = [];
|
|
533
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
535
534
|
const nodes = [];
|
|
536
535
|
if (Object.keys(where).length > 0) {
|
|
537
536
|
nodes.push({ kind: "and", where });
|
|
@@ -566,18 +565,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
566
565
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
567
566
|
}
|
|
568
567
|
}
|
|
569
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
570
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
568
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
569
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
571
570
|
const softDeleteClauses = [];
|
|
572
571
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
573
572
|
if (softDeleteClauses.length === 0) {
|
|
574
|
-
return { clause, params };
|
|
573
|
+
return { clause, params: whereParams };
|
|
575
574
|
}
|
|
576
575
|
const base = clause.replace(/^ WHERE /, "");
|
|
577
576
|
const scope = softDeleteClauses.join(" AND ");
|
|
578
577
|
return {
|
|
579
578
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
580
|
-
params
|
|
579
|
+
params: whereParams
|
|
581
580
|
};
|
|
582
581
|
}
|
|
583
582
|
function isQueryOrder(value) {
|
|
@@ -681,8 +680,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
681
680
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
682
681
|
const params = [];
|
|
683
682
|
const columns = buildSelectList(table, options.select, params);
|
|
684
|
-
const { clause
|
|
685
|
-
params.push(...whereParams);
|
|
683
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
686
684
|
const joins = buildJoinClause(options.joins);
|
|
687
685
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
688
686
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
|
@@ -771,8 +771,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
771
771
|
}
|
|
772
772
|
return result;
|
|
773
773
|
}
|
|
774
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
775
|
-
const params = [];
|
|
774
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
776
775
|
const nodes = [];
|
|
777
776
|
if (Object.keys(where).length > 0) {
|
|
778
777
|
nodes.push({ kind: "and", where });
|
|
@@ -807,18 +806,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
807
806
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
808
807
|
}
|
|
809
808
|
}
|
|
810
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
811
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
809
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
810
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
812
811
|
const softDeleteClauses = [];
|
|
813
812
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
814
813
|
if (softDeleteClauses.length === 0) {
|
|
815
|
-
return { clause, params };
|
|
814
|
+
return { clause, params: whereParams };
|
|
816
815
|
}
|
|
817
816
|
const base = clause.replace(/^ WHERE /, "");
|
|
818
817
|
const scope = softDeleteClauses.join(" AND ");
|
|
819
818
|
return {
|
|
820
819
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
821
|
-
params
|
|
820
|
+
params: whereParams
|
|
822
821
|
};
|
|
823
822
|
}
|
|
824
823
|
function isQueryOrder(value) {
|
|
@@ -922,8 +921,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
922
921
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
923
922
|
const params = [];
|
|
924
923
|
const columns = buildSelectList(table, options.select, params);
|
|
925
|
-
const { clause
|
|
926
|
-
params.push(...whereParams);
|
|
924
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
927
925
|
const joins = buildJoinClause(options.joins);
|
|
928
926
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
929
927
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
|
@@ -306,8 +306,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
306
306
|
}
|
|
307
307
|
return result;
|
|
308
308
|
}
|
|
309
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
310
|
-
const params = [];
|
|
309
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
311
310
|
const nodes = [];
|
|
312
311
|
if (Object.keys(where).length > 0) {
|
|
313
312
|
nodes.push({ kind: "and", where });
|
|
@@ -342,18 +341,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
342
341
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
343
342
|
}
|
|
344
343
|
}
|
|
345
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
346
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
344
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
345
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
347
346
|
const softDeleteClauses = [];
|
|
348
347
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
349
348
|
if (softDeleteClauses.length === 0) {
|
|
350
|
-
return { clause, params };
|
|
349
|
+
return { clause, params: whereParams };
|
|
351
350
|
}
|
|
352
351
|
const base = clause.replace(/^ WHERE /, "");
|
|
353
352
|
const scope = softDeleteClauses.join(" AND ");
|
|
354
353
|
return {
|
|
355
354
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
356
|
-
params
|
|
355
|
+
params: whereParams
|
|
357
356
|
};
|
|
358
357
|
}
|
|
359
358
|
function isQueryOrder(value) {
|
|
@@ -457,8 +456,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
457
456
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
458
457
|
const params = [];
|
|
459
458
|
const columns = buildSelectList(table, options.select, params);
|
|
460
|
-
const { clause
|
|
461
|
-
params.push(...whereParams);
|
|
459
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
462
460
|
const joins = buildJoinClause(options.joins);
|
|
463
461
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
464
462
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
|
@@ -781,8 +781,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
781
781
|
}
|
|
782
782
|
return result;
|
|
783
783
|
}
|
|
784
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
785
|
-
const params = [];
|
|
784
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
786
785
|
const nodes = [];
|
|
787
786
|
if (Object.keys(where).length > 0) {
|
|
788
787
|
nodes.push({ kind: "and", where });
|
|
@@ -817,18 +816,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
817
816
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
818
817
|
}
|
|
819
818
|
}
|
|
820
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
821
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
819
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
820
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
822
821
|
const softDeleteClauses = [];
|
|
823
822
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
824
823
|
if (softDeleteClauses.length === 0) {
|
|
825
|
-
return { clause, params };
|
|
824
|
+
return { clause, params: whereParams };
|
|
826
825
|
}
|
|
827
826
|
const base = clause.replace(/^ WHERE /, "");
|
|
828
827
|
const scope = softDeleteClauses.join(" AND ");
|
|
829
828
|
return {
|
|
830
829
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
831
|
-
params
|
|
830
|
+
params: whereParams
|
|
832
831
|
};
|
|
833
832
|
}
|
|
834
833
|
function isQueryOrder(value) {
|
|
@@ -932,8 +931,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
932
931
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
933
932
|
const params = [];
|
|
934
933
|
const columns = buildSelectList(table, options.select, params);
|
|
935
|
-
const { clause
|
|
936
|
-
params.push(...whereParams);
|
|
934
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
937
935
|
const joins = buildJoinClause(options.joins);
|
|
938
936
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
939
937
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
package/dist/entries/view.js
CHANGED
|
@@ -515,8 +515,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
515
515
|
}
|
|
516
516
|
return result;
|
|
517
517
|
}
|
|
518
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
519
|
-
const params = [];
|
|
518
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
520
519
|
const nodes = [];
|
|
521
520
|
if (Object.keys(where).length > 0) {
|
|
522
521
|
nodes.push({ kind: "and", where });
|
|
@@ -551,18 +550,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
551
550
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
552
551
|
}
|
|
553
552
|
}
|
|
554
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
555
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
553
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
554
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
556
555
|
const softDeleteClauses = [];
|
|
557
556
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
558
557
|
if (softDeleteClauses.length === 0) {
|
|
559
|
-
return { clause, params };
|
|
558
|
+
return { clause, params: whereParams };
|
|
560
559
|
}
|
|
561
560
|
const base = clause.replace(/^ WHERE /, "");
|
|
562
561
|
const scope = softDeleteClauses.join(" AND ");
|
|
563
562
|
return {
|
|
564
563
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
565
|
-
params
|
|
564
|
+
params: whereParams
|
|
566
565
|
};
|
|
567
566
|
}
|
|
568
567
|
function isQueryOrder(value) {
|
|
@@ -666,8 +665,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
666
665
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
667
666
|
const params = [];
|
|
668
667
|
const columns = buildSelectList(table, options.select, params);
|
|
669
|
-
const { clause
|
|
670
|
-
params.push(...whereParams);
|
|
668
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
671
669
|
const joins = buildJoinClause(options.joins);
|
|
672
670
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
673
671
|
const havingClause = buildHavingClause(table.name, options.having, params);
|
package/dist/index.js
CHANGED
|
@@ -508,8 +508,7 @@ function buildWhereGroupClause(tableName, nodes, params) {
|
|
|
508
508
|
}
|
|
509
509
|
return result;
|
|
510
510
|
}
|
|
511
|
-
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = []) {
|
|
512
|
-
const params = [];
|
|
511
|
+
function buildAdvancedWhereClause(tableName, where = {}, whereNodes = [], params = []) {
|
|
513
512
|
const nodes = [];
|
|
514
513
|
if (Object.keys(where).length > 0) {
|
|
515
514
|
nodes.push({ kind: "and", where });
|
|
@@ -544,18 +543,18 @@ function appendSoftDeleteScope(table, options, clauses) {
|
|
|
544
543
|
clauses.push(`${qualifiedColumn} IS NULL`);
|
|
545
544
|
}
|
|
546
545
|
}
|
|
547
|
-
function buildQueryWhereClause(table, options = {}, whereNodes = []) {
|
|
548
|
-
const { clause, params } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes);
|
|
546
|
+
function buildQueryWhereClause(table, options = {}, whereNodes = [], params = []) {
|
|
547
|
+
const { clause, params: whereParams } = buildAdvancedWhereClause(table.name, options.where ?? {}, whereNodes, params);
|
|
549
548
|
const softDeleteClauses = [];
|
|
550
549
|
appendSoftDeleteScope(table, options, softDeleteClauses);
|
|
551
550
|
if (softDeleteClauses.length === 0) {
|
|
552
|
-
return { clause, params };
|
|
551
|
+
return { clause, params: whereParams };
|
|
553
552
|
}
|
|
554
553
|
const base = clause.replace(/^ WHERE /, "");
|
|
555
554
|
const scope = softDeleteClauses.join(" AND ");
|
|
556
555
|
return {
|
|
557
556
|
clause: base ? ` WHERE (${base}) AND ${scope}` : ` WHERE ${scope}`,
|
|
558
|
-
params
|
|
557
|
+
params: whereParams
|
|
559
558
|
};
|
|
560
559
|
}
|
|
561
560
|
function isQueryOrder(value) {
|
|
@@ -659,8 +658,7 @@ function getDefinedColumnEntries(table, values, options = {}) {
|
|
|
659
658
|
function buildSelectQuery(table, options = {}, whereNodes = []) {
|
|
660
659
|
const params = [];
|
|
661
660
|
const columns = buildSelectList(table, options.select, params);
|
|
662
|
-
const { clause
|
|
663
|
-
params.push(...whereParams);
|
|
661
|
+
const { clause } = buildQueryWhereClause(table, options, whereNodes, params);
|
|
664
662
|
const joins = buildJoinClause(options.joins);
|
|
665
663
|
const groupBy = buildGroupByClause(table.name, options.groupBy);
|
|
666
664
|
const havingClause = buildHavingClause(table.name, options.having, params);
|