prostgles-server 4.2.640 → 4.2.642
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/debug/column-definitions-build.log +4 -0
- package/debug/column-definitions-test-server.log +3256 -0
- package/debug/column-definitions-tests-build.log +0 -0
- package/debug/diff-review-build.log +4 -0
- package/debug/diff-review-test-server.log +551 -0
- package/debug/diff-review-tests-build.log +0 -0
- package/debug/nested-aggregate-build.log +4 -0
- package/debug/nested-aggregate-test-compile.log +0 -0
- package/debug/nested-aggregate-test-server.log +586 -0
- package/debug/sort-query-build.log +4 -0
- package/debug/sort-query-tests-build.log +0 -0
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +4 -3
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +3 -2
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts +19 -6
- package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts.map +1 -1
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +5 -4
- package/lib/DboBuilder/dboBuilderUtils.ts +7 -2
- package/lib/TableConfig/TableRowFromColumnDefinitions.ts +110 -33
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AAEpD,gEAA6D;AAG7D,qDAAwF;AAExF,wEAAsE;AACtE,8CAAuE;AACvE,yDAAsD;AAQtD;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,IAAA,wBAAM,EAAC,iBAAiB,GAAG,OAAO,CAAC,CAAC;IAClD,OAAO;QACL,KAAK;QACL,UAAU,EAAE,GAAG,IAAA,wBAAM,EAAC,OAAO,CAAC,OAAO,KAAK,EAAE;KAC7C,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEW,QAAA,mBAAmB,GAAG,iCAAiC,CAAC;AACrE;;GAEG;AACU,QAAA,uBAAuB,GAAG,uBAAuB,CAAC;AAE/D,MAAM,YAAY,GAAG,CACnB,SAAiB,EACjB,SAAiB,EACjB,gBAAoC,EACpC,EAAE;IACF,MAAM,QAAQ,GAAG,gBAAgB,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;IACnE,OAAO;QACL,kEAAkE;QAClE,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,IAAA,wBAAM,EAAC,QAAQ,CAAC;QACvB,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAWF;;;;;;;;;;GAUG;AACI,MAAM,YAAY,GAAG,CAAC,WAAwB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAQ,EAAsB,EAAE;IAC7F,MAAM,KAAK,GAAG,IAAA,6BAAa,EAAC;QAC1B,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG;QACvB,OAAO,EAAE,EAAE,CAAC,QAAQ;QACpB,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,IAAI;QACtB,wBAAwB,EAAE,IAAI;KAC/B,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,mBAAmB,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAA,wBAAM,EAAC,mBAAmB,CAAC,CAAC;IAErD,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;IACrC,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACzE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAC3D,CAAC;IACF,MAAM,WAAW,GAAG,IAAA,gCAAmB,EAAC,EAAE,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzF,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,qBAAqB,CAAC;QAC9D,CAAC,EAAE,EAAE;QACL,mBAAmB,EAAE,YAAY,CAC/B,kBAAkB,CAAC,KAAK,EACxB,CAAC,EACD,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CACrD,CAAC,QAAQ;QACV,WAAW,EAAE,wBAAwB;
|
|
1
|
+
{"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ export type PGConstraint = {
|
|
|
43
43
|
relname: string;
|
|
44
44
|
};
|
|
45
45
|
export declare const getConstraints: (db: DB, schema: ProstglesInitOptions["schemaFilter"]) => Promise<PGConstraint[]>;
|
|
46
|
-
export declare const prepareOrderByQuery: (items: SortItem[], tableAlias?: string) => string[];
|
|
46
|
+
export declare const prepareOrderByQuery: (items: SortItem[], tableAlias?: string, getExpression?: (key: string) => string | undefined) => string[];
|
|
47
47
|
export declare const getCanExecute: (db: DB) => Promise<boolean>;
|
|
48
48
|
export declare const QUERY_ID_PREFIX = "-- prostgles query id: ";
|
|
49
49
|
export declare const withUserRLS: (localParams: LocalParams | undefined, query: string, inTransaction?: boolean) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dboBuilderUtils.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,eAAO,MAAM,gBAAgB,GAAI,UAAU,GAAG,6BAM7C,CAAC;AAEF,KAAK,uCAAuC,GACxC;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;CACtB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACtD,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAaN,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,uCAAuC,GAC5C,SAAS,CAyCX;AACD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,uCAAuC,kBAI9C;AAED,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,OAAO,EACH,GAAG,GACH,GAAG,GACH,GAAG,CAAC;IAER;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,IAAI,EAAE,EACN,QAAQ,oBAAoB,CAAC,cAAc,CAAC,KAC3C,OAAO,CAAC,YAAY,EAAE,CAcxB,CAAC;AAEF,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"dboBuilderUtils.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,eAAO,MAAM,gBAAgB,GAAI,UAAU,GAAG,6BAM7C,CAAC;AAEF,KAAK,uCAAuC,GACxC;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;CACtB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACtD,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAaN,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,uCAAuC,GAC5C,SAAS,CAyCX;AACD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,EACb,IAAI,EAAE,uCAAuC,kBAI9C;AAED,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,OAAO,EACH,GAAG,GACH,GAAG,GACH,GAAG,CAAC;IAER;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,IAAI,EAAE,EACN,QAAQ,oBAAoB,CAAC,cAAc,CAAC,KAC3C,OAAO,CAAC,YAAY,EAAE,CAcxB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,QAAQ,EAAE,EACjB,aAAa,MAAM,EACnB,gBAAgB,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,KAClD,MAAM,EAgBR,CAAC;AAEF,eAAO,MAAM,aAAa,GAAU,IAAI,EAAE,qBASzC,CAAC;AAEF,eAAO,MAAM,eAAe,4BAA4B,CAAC;AAEzD,eAAO,MAAM,WAAW,GACtB,aAAa,WAAW,GAAG,SAAS,EACpC,OAAO,MAAM,EACb,uBAAqB,WAgBtB,CAAC"}
|
|
@@ -76,7 +76,7 @@ const getConstraints = async (db, schema) => {
|
|
|
76
76
|
`, { schemaNames });
|
|
77
77
|
};
|
|
78
78
|
exports.getConstraints = getConstraints;
|
|
79
|
-
const prepareOrderByQuery = (items, tableAlias) => {
|
|
79
|
+
const prepareOrderByQuery = (items, tableAlias, getExpression) => {
|
|
80
80
|
if (!items.length)
|
|
81
81
|
return [];
|
|
82
82
|
return [
|
|
@@ -88,7 +88,8 @@ const prepareOrderByQuery = (items, tableAlias) => {
|
|
|
88
88
|
if (d.type === "query" && d.nested) {
|
|
89
89
|
return d.fieldQuery;
|
|
90
90
|
}
|
|
91
|
-
|
|
91
|
+
const expression = getExpression?.(d.key) ?? (0, asNameAlias_1.asNameAlias)(d.key, tableAlias);
|
|
92
|
+
return `${expression} ${orderType} ${nullOrder}`;
|
|
92
93
|
})
|
|
93
94
|
.join(", "),
|
|
94
95
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dboBuilderUtils.js","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dboBuilderUtils.js","sourceRoot":"","sources":["../../lib/DboBuilder/dboBuilderUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,21 +7,34 @@ type ColumnDefinition = string | {
|
|
|
7
7
|
nullable?: boolean;
|
|
8
8
|
};
|
|
9
9
|
/** Row types for the column definitions used by managed tables. */
|
|
10
|
-
export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> =
|
|
10
|
+
export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> = InsertRow<{
|
|
11
|
+
[K in keyof T]: T[K] extends string ? NormalizeSQL<Uppercase<T[K]>> : T[K];
|
|
12
|
+
}>;
|
|
13
|
+
type InsertRow<T extends Record<string, ColumnDefinition>> = Omit<TableRow<T>, GeneratedColumnNames<T>> & Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
|
|
11
14
|
type TableRow<T extends Record<string, ColumnDefinition>> = {
|
|
12
|
-
[K in keyof T]: T[K] extends {
|
|
15
|
+
[K in keyof T]: T[K] extends ({
|
|
13
16
|
jsonbSchema: infer S extends JSONB.JSONBSchema;
|
|
14
|
-
} ? JSONB.GetType<S> | (T[K] extends {
|
|
17
|
+
}) ? JSONB.GetType<S> | (T[K] extends {
|
|
15
18
|
nullable: true;
|
|
16
19
|
} ? null : never) : T[K] extends {
|
|
17
20
|
enum: readonly (infer V)[];
|
|
18
21
|
} ? V | (T[K] extends {
|
|
19
22
|
nullable: true;
|
|
20
|
-
} ? null : never) : ColumnValue<T[K]> | (T[K] extends
|
|
23
|
+
} ? null : never) : ColumnValue<T[K]> | (T[K] extends string ? ColumnIsRequired<T[K]> extends true ? never : null : never);
|
|
21
24
|
};
|
|
25
|
+
type ColumnIsRequired<T extends string> = ReadType<T>[0] extends SerialType ? true : ` ${Unquoted<T>} ` extends (`${string} NOT NULL ${string}` | `${string} PRIMARY KEY ${string}` | `${string} GENERATED ${string} AS IDENTITY ${string}`) ? true : false;
|
|
22
26
|
type GeneratedColumnNames<T extends Record<string, ColumnDefinition>> = {
|
|
23
|
-
[K in keyof T]: T[K] extends string ? T[K] extends
|
|
27
|
+
[K in keyof T]: T[K] extends string ? ReadType<T[K]>[0] extends SerialType ? K : ` ${Unquoted<T[K]>} ` extends (`${string} DEFAULT ${string}` | `${string} GENERATED ${string}`) ? K : never : never;
|
|
24
28
|
}[keyof T];
|
|
25
|
-
type
|
|
29
|
+
type SerialType = "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "BIGSERIAL" | "SERIAL8";
|
|
30
|
+
type ColumnValue<T> = T extends string ? T extends `DOUBLE PRECISION${infer Rest}` ? ColumnValue<`FLOAT8${Rest}`> : ReadType<T> extends [infer Name extends string, infer Rest extends string] ? ArrayValue<ScalarValue<Name>, Trim<Rest>> : never : never;
|
|
31
|
+
type ScalarValue<T> = T extends "BYTEA" ? Buffer : T extends "JSON" | "JSONB" ? Record<string, unknown> : T extends "BOOL" | "BOOLEAN" ? boolean : T extends ("SMALLINT" | "INT2" | "INT" | "INTEGER" | "INT4" | "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "REAL" | "FLOAT" | "FLOAT4" | "FLOAT8") ? number : T extends "BIGINT" | "INT8" | "BIGSERIAL" | "SERIAL8" | "NUMERIC" | "DECIMAL" | "DEC" ? string | number : string;
|
|
32
|
+
/** Only consume modifiers/array dimensions immediately following the type. */
|
|
33
|
+
type ArrayValue<Value, Rest extends string> = Rest extends `(${string})${infer Tail}` ? ArrayValue<Value, Trim<Tail>> : Rest extends `[${string}]${infer Tail}` ? ArrayValue<(Value | null)[], Trim<Tail>> : Rest extends "ARRAY" | `ARRAY ${string}` | `ARRAY[${string}` ? Rest extends `ARRAY${infer Tail}` ? Trim<Tail> extends `[${string}` ? ArrayValue<Value, Trim<Tail>> : (Value | null)[] : never : Value;
|
|
34
|
+
type ReadType<T extends string, Name extends string = ""> = T extends `${" " | "(" | "["}${string}` ? [Name, T] : T extends `${infer Char}${infer Rest}` ? ReadType<Rest, `${Name}${Char}`> : [Name, ""];
|
|
35
|
+
type Trim<T extends string> = T extends ` ${infer Rest}` ? Trim<Rest> : T extends `${infer Rest} ` ? Trim<Rest> : T;
|
|
36
|
+
type NormalizeSQL<T extends string> = T extends `${infer Start}\n${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start}\r${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start}\t${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start} ${infer End}` ? NormalizeSQL<`${Start} ${End}`> : Trim<T>;
|
|
37
|
+
/** Quoted values and identifiers do not declare defaults or constraints. */
|
|
38
|
+
type Unquoted<T extends string> = T extends `${infer Start}'${string}'${infer End}` ? Unquoted<`${Start}${End}`> : T extends `${infer Start}"${string}"${infer End}` ? Unquoted<`${Start}${End}`> : T;
|
|
26
39
|
export {};
|
|
27
40
|
//# sourceMappingURL=TableRowFromColumnDefinitions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,KAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC1D;IAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE3D,mEAAmE;AACnE,MAAM,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,6 @@ export const getJoinQuery = (viewHandler: ViewHandler, { q1, q2 }: Args): GetJoi
|
|
|
94
94
|
paths.length === 1 ? targetTableAliasRaw : undefined,
|
|
95
95
|
).rawAlias,
|
|
96
96
|
_joinFields: firstJoinTableJoinFields,
|
|
97
|
-
jsonAggSort,
|
|
98
97
|
});
|
|
99
98
|
|
|
100
99
|
const joinType = q2.isLeftJoin ? "LEFT" : "INNER";
|
|
@@ -286,7 +285,6 @@ type GetSelectFieldsArgs = {
|
|
|
286
285
|
q: NewQueryJoin;
|
|
287
286
|
firstJoinTableAlias: string;
|
|
288
287
|
_joinFields: string[];
|
|
289
|
-
jsonAggSort: string;
|
|
290
288
|
};
|
|
291
289
|
|
|
292
290
|
export type SelectItemNested = SelectItemValidated & {
|
|
@@ -297,7 +295,6 @@ const getNestedSelectFields = ({
|
|
|
297
295
|
q,
|
|
298
296
|
firstJoinTableAlias,
|
|
299
297
|
_joinFields,
|
|
300
|
-
jsonAggSort,
|
|
301
298
|
}: GetSelectFieldsArgs) => {
|
|
302
299
|
const targetTableAlias = q.tableAlias || q.table;
|
|
303
300
|
|
|
@@ -325,7 +322,11 @@ const getNestedSelectFields = ({
|
|
|
325
322
|
|
|
326
323
|
const getQuery = (tableAlias?: string) => {
|
|
327
324
|
const partitionBy = `PARTITION BY ${requiredJoinFields.map((f) => asNameAlias(f, tableAlias)).join(", ")}`;
|
|
328
|
-
|
|
325
|
+
// Output aliases are not available inside a window expression in this SELECT.
|
|
326
|
+
const orderBy = prepareOrderByQuery(q.orderByItems, targetTableAlias.raw, (key) =>
|
|
327
|
+
selectedFields.find((field) => field.alias === key)?.getQuery(targetTableAlias.raw),
|
|
328
|
+
).join(", ");
|
|
329
|
+
return `ROW_NUMBER() OVER(${partitionBy} ${orderBy}) AS ${NESTED_ROWID_FIELD_NAME}`;
|
|
329
330
|
};
|
|
330
331
|
|
|
331
332
|
if (q.limit) {
|
|
@@ -148,7 +148,11 @@ export const getConstraints = async (
|
|
|
148
148
|
);
|
|
149
149
|
};
|
|
150
150
|
|
|
151
|
-
export const prepareOrderByQuery = (
|
|
151
|
+
export const prepareOrderByQuery = (
|
|
152
|
+
items: SortItem[],
|
|
153
|
+
tableAlias?: string,
|
|
154
|
+
getExpression?: (key: string) => string | undefined,
|
|
155
|
+
): string[] => {
|
|
152
156
|
if (!items.length) return [];
|
|
153
157
|
return [
|
|
154
158
|
"ORDER BY " +
|
|
@@ -159,7 +163,8 @@ export const prepareOrderByQuery = (items: SortItem[], tableAlias?: string): str
|
|
|
159
163
|
if (d.type === "query" && d.nested) {
|
|
160
164
|
return d.fieldQuery;
|
|
161
165
|
}
|
|
162
|
-
|
|
166
|
+
const expression = getExpression?.(d.key) ?? asNameAlias(d.key, tableAlias);
|
|
167
|
+
return `${expression} ${orderType} ${nullOrder}`;
|
|
163
168
|
})
|
|
164
169
|
.join(", "),
|
|
165
170
|
];
|
|
@@ -6,44 +6,121 @@ type ColumnDefinition =
|
|
|
6
6
|
| { jsonbSchema: JSONB.JSONBSchema; nullable?: boolean };
|
|
7
7
|
|
|
8
8
|
/** Row types for the column definitions used by managed tables. */
|
|
9
|
-
export type TableRowFromColumnDefinitions<
|
|
10
|
-
T extends
|
|
11
|
-
|
|
9
|
+
export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> = InsertRow<{
|
|
10
|
+
[K in keyof T]: T[K] extends string ? NormalizeSQL<Uppercase<T[K]>> : T[K];
|
|
11
|
+
}>;
|
|
12
|
+
|
|
13
|
+
type InsertRow<T extends Record<string, ColumnDefinition>> = Omit<
|
|
14
|
+
TableRow<T>,
|
|
15
|
+
GeneratedColumnNames<T>
|
|
16
|
+
> &
|
|
12
17
|
Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
|
|
13
18
|
|
|
14
19
|
type TableRow<T extends Record<string, ColumnDefinition>> = {
|
|
15
|
-
[K in keyof T]: T[K] extends
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
[K in keyof T]: T[K] extends (
|
|
21
|
+
{
|
|
22
|
+
jsonbSchema: infer S extends JSONB.JSONBSchema;
|
|
23
|
+
}
|
|
24
|
+
) ?
|
|
25
|
+
JSONB.GetType<S> | (T[K] extends { nullable: true } ? null : never)
|
|
26
|
+
: T[K] extends { enum: readonly (infer V)[] } ?
|
|
27
|
+
V | (T[K] extends { nullable: true } ? null : never)
|
|
28
|
+
: | ColumnValue<T[K]>
|
|
29
|
+
| (T[K] extends string ?
|
|
30
|
+
ColumnIsRequired<T[K]> extends true ?
|
|
31
|
+
never
|
|
32
|
+
: null
|
|
33
|
+
: never);
|
|
26
34
|
};
|
|
27
35
|
|
|
36
|
+
type ColumnIsRequired<T extends string> =
|
|
37
|
+
ReadType<T>[0] extends SerialType ? true
|
|
38
|
+
: ` ${Unquoted<T>} ` extends (
|
|
39
|
+
|
|
40
|
+
| `${string} NOT NULL ${string}`
|
|
41
|
+
| `${string} PRIMARY KEY ${string}`
|
|
42
|
+
| `${string} GENERATED ${string} AS IDENTITY ${string}`
|
|
43
|
+
) ?
|
|
44
|
+
true
|
|
45
|
+
: false;
|
|
46
|
+
|
|
28
47
|
type GeneratedColumnNames<T extends Record<string, ColumnDefinition>> = {
|
|
29
|
-
[K in keyof T]: T[K] extends string
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
48
|
+
[K in keyof T]: T[K] extends string ?
|
|
49
|
+
ReadType<T[K]>[0] extends SerialType ? K
|
|
50
|
+
: ` ${Unquoted<T[K]>} ` extends (
|
|
51
|
+
`${string} DEFAULT ${string}` | `${string} GENERATED ${string}`
|
|
52
|
+
) ?
|
|
53
|
+
K
|
|
54
|
+
: never
|
|
55
|
+
: never;
|
|
37
56
|
}[keyof T];
|
|
38
57
|
|
|
39
|
-
type
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
58
|
+
type SerialType = "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "BIGSERIAL" | "SERIAL8";
|
|
59
|
+
|
|
60
|
+
type ColumnValue<T> =
|
|
61
|
+
T extends string ?
|
|
62
|
+
T extends `DOUBLE PRECISION${infer Rest}` ? ColumnValue<`FLOAT8${Rest}`>
|
|
63
|
+
: ReadType<T> extends [infer Name extends string, infer Rest extends string] ?
|
|
64
|
+
ArrayValue<ScalarValue<Name>, Trim<Rest>>
|
|
65
|
+
: never
|
|
66
|
+
: never;
|
|
67
|
+
|
|
68
|
+
type ScalarValue<T> =
|
|
69
|
+
T extends "BYTEA" ? Buffer
|
|
70
|
+
: T extends "JSON" | "JSONB" ? Record<string, unknown>
|
|
71
|
+
: T extends "BOOL" | "BOOLEAN" ? boolean
|
|
72
|
+
: T extends (
|
|
73
|
+
|
|
74
|
+
| "SMALLINT"
|
|
75
|
+
| "INT2"
|
|
76
|
+
| "INT"
|
|
77
|
+
| "INTEGER"
|
|
78
|
+
| "INT4"
|
|
79
|
+
| "SMALLSERIAL"
|
|
80
|
+
| "SERIAL2"
|
|
81
|
+
| "SERIAL"
|
|
82
|
+
| "SERIAL4"
|
|
83
|
+
| "REAL"
|
|
84
|
+
| "FLOAT"
|
|
85
|
+
| "FLOAT4"
|
|
86
|
+
| "FLOAT8"
|
|
87
|
+
) ?
|
|
88
|
+
number
|
|
89
|
+
: T extends "BIGINT" | "INT8" | "BIGSERIAL" | "SERIAL8" | "NUMERIC" | "DECIMAL" | "DEC" ?
|
|
90
|
+
string | number
|
|
91
|
+
: string;
|
|
92
|
+
|
|
93
|
+
/** Only consume modifiers/array dimensions immediately following the type. */
|
|
94
|
+
type ArrayValue<Value, Rest extends string> =
|
|
95
|
+
Rest extends `(${string})${infer Tail}` ? ArrayValue<Value, Trim<Tail>>
|
|
96
|
+
: Rest extends `[${string}]${infer Tail}` ? ArrayValue<(Value | null)[], Trim<Tail>>
|
|
97
|
+
: Rest extends "ARRAY" | `ARRAY ${string}` | `ARRAY[${string}` ?
|
|
98
|
+
Rest extends `ARRAY${infer Tail}` ?
|
|
99
|
+
Trim<Tail> extends `[${string}` ?
|
|
100
|
+
ArrayValue<Value, Trim<Tail>>
|
|
101
|
+
: (Value | null)[]
|
|
102
|
+
: never
|
|
103
|
+
: Value;
|
|
104
|
+
|
|
105
|
+
type ReadType<T extends string, Name extends string = ""> =
|
|
106
|
+
T extends `${" " | "(" | "["}${string}` ? [Name, T]
|
|
107
|
+
: T extends `${infer Char}${infer Rest}` ? ReadType<Rest, `${Name}${Char}`>
|
|
108
|
+
: [Name, ""];
|
|
109
|
+
|
|
110
|
+
type Trim<T extends string> =
|
|
111
|
+
T extends ` ${infer Rest}` ? Trim<Rest>
|
|
112
|
+
: T extends `${infer Rest} ` ? Trim<Rest>
|
|
113
|
+
: T;
|
|
114
|
+
|
|
115
|
+
type NormalizeSQL<T extends string> =
|
|
116
|
+
T extends `${infer Start}\n${infer End}` ? NormalizeSQL<`${Start} ${End}`>
|
|
117
|
+
: T extends `${infer Start}\r${infer End}` ? NormalizeSQL<`${Start} ${End}`>
|
|
118
|
+
: T extends `${infer Start}\t${infer End}` ? NormalizeSQL<`${Start} ${End}`>
|
|
119
|
+
: T extends `${infer Start} ${infer End}` ? NormalizeSQL<`${Start} ${End}`>
|
|
120
|
+
: Trim<T>;
|
|
121
|
+
|
|
122
|
+
/** Quoted values and identifiers do not declare defaults or constraints. */
|
|
123
|
+
type Unquoted<T extends string> =
|
|
124
|
+
T extends `${infer Start}'${string}'${infer End}` ? Unquoted<`${Start}${End}`>
|
|
125
|
+
: T extends `${infer Start}"${string}"${infer End}` ? Unquoted<`${Start}${End}`>
|
|
126
|
+
: T;
|