@payloadcms/drizzle 3.0.0-canary.96477cf → 3.0.0-canary.98e0119
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/countGlobalVersions.d.ts +3 -0
- package/dist/countGlobalVersions.d.ts.map +1 -0
- package/dist/countGlobalVersions.js +27 -0
- package/dist/countGlobalVersions.js.map +1 -0
- package/dist/countVersions.d.ts +3 -0
- package/dist/countVersions.d.ts.map +1 -0
- package/dist/countVersions.js +27 -0
- package/dist/countVersions.js.map +1 -0
- package/dist/create.d.ts.map +1 -1
- package/dist/create.js +2 -1
- package/dist/create.js.map +1 -1
- package/dist/createGlobalVersion.d.ts +1 -1
- package/dist/createGlobalVersion.d.ts.map +1 -1
- package/dist/createGlobalVersion.js +4 -1
- package/dist/createGlobalVersion.js.map +1 -1
- package/dist/createVersion.d.ts +1 -1
- package/dist/createVersion.d.ts.map +1 -1
- package/dist/createVersion.js +4 -4
- package/dist/createVersion.js.map +1 -1
- package/dist/deleteOne.d.ts.map +1 -1
- package/dist/deleteOne.js +2 -1
- package/dist/deleteOne.js.map +1 -1
- package/dist/exports/postgres.d.ts +2 -1
- package/dist/exports/postgres.d.ts.map +1 -1
- package/dist/exports/postgres.js +2 -1
- package/dist/exports/postgres.js.map +1 -1
- package/dist/find/buildFindManyArgs.d.ts +4 -2
- package/dist/find/buildFindManyArgs.d.ts.map +1 -1
- package/dist/find/buildFindManyArgs.js +40 -21
- package/dist/find/buildFindManyArgs.js.map +1 -1
- package/dist/find/findMany.d.ts +2 -1
- package/dist/find/findMany.d.ts.map +1 -1
- package/dist/find/findMany.js +7 -5
- package/dist/find/findMany.js.map +1 -1
- package/dist/find/traverseFields.d.ts +13 -3
- package/dist/find/traverseFields.d.ts.map +1 -1
- package/dist/find/traverseFields.js +320 -105
- package/dist/find/traverseFields.js.map +1 -1
- package/dist/find.d.ts.map +1 -1
- package/dist/find.js +3 -2
- package/dist/find.js.map +1 -1
- package/dist/findGlobal.d.ts.map +1 -1
- package/dist/findGlobal.js +2 -1
- package/dist/findGlobal.js.map +1 -1
- package/dist/findGlobalVersions.d.ts.map +1 -1
- package/dist/findGlobalVersions.js +3 -2
- package/dist/findGlobalVersions.js.map +1 -1
- package/dist/findOne.d.ts +1 -1
- package/dist/findOne.d.ts.map +1 -1
- package/dist/findOne.js +2 -1
- package/dist/findOne.js.map +1 -1
- package/dist/findVersions.d.ts.map +1 -1
- package/dist/findVersions.js +3 -2
- package/dist/findVersions.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +3 -0
- package/dist/migrate.js.map +1 -1
- package/dist/migrateFresh.d.ts.map +1 -1
- package/dist/migrateFresh.js +3 -0
- package/dist/migrateFresh.js.map +1 -1
- package/dist/migrateReset.js +1 -1
- package/dist/migrateReset.js.map +1 -1
- package/dist/postgres/countDistinct.d.ts.map +1 -1
- package/dist/postgres/countDistinct.js +2 -3
- package/dist/postgres/countDistinct.js.map +1 -1
- package/dist/postgres/createDatabase.d.ts +14 -0
- package/dist/postgres/createDatabase.d.ts.map +1 -0
- package/dist/postgres/createDatabase.js +76 -0
- package/dist/postgres/createDatabase.js.map +1 -0
- package/dist/postgres/createExtensions.d.ts +3 -0
- package/dist/postgres/createExtensions.d.ts.map +1 -0
- package/dist/postgres/createExtensions.js +16 -0
- package/dist/postgres/createExtensions.js.map +1 -0
- package/dist/postgres/createJSONQuery/index.d.ts +2 -9
- package/dist/postgres/createJSONQuery/index.d.ts.map +1 -1
- package/dist/postgres/createJSONQuery/index.js +34 -46
- package/dist/postgres/createJSONQuery/index.js.map +1 -1
- package/dist/postgres/createMigration.d.ts.map +1 -1
- package/dist/postgres/createMigration.js +1 -5
- package/dist/postgres/createMigration.js.map +1 -1
- package/dist/postgres/defaultSnapshot.d.ts.map +1 -1
- package/dist/postgres/defaultSnapshot.js +4 -1
- package/dist/postgres/defaultSnapshot.js.map +1 -1
- package/dist/postgres/schema/build.d.ts +3 -1
- package/dist/postgres/schema/build.d.ts.map +1 -1
- package/dist/postgres/schema/build.js +29 -3
- package/dist/postgres/schema/build.js.map +1 -1
- package/dist/postgres/schema/createIndex.d.ts +2 -3
- package/dist/postgres/schema/createIndex.d.ts.map +1 -1
- package/dist/postgres/schema/createIndex.js +3 -3
- package/dist/postgres/schema/createIndex.js.map +1 -1
- package/dist/postgres/schema/geometryColumn.d.ts +12 -0
- package/dist/postgres/schema/geometryColumn.d.ts.map +1 -0
- package/dist/postgres/schema/geometryColumn.js +18 -0
- package/dist/postgres/schema/geometryColumn.js.map +1 -0
- package/dist/postgres/schema/traverseFields.d.ts +3 -1
- package/dist/postgres/schema/traverseFields.d.ts.map +1 -1
- package/dist/postgres/schema/traverseFields.js +272 -262
- package/dist/postgres/schema/traverseFields.js.map +1 -1
- package/dist/postgres/schema/withDefault.d.ts.map +1 -1
- package/dist/postgres/schema/withDefault.js +3 -0
- package/dist/postgres/schema/withDefault.js.map +1 -1
- package/dist/postgres/types.d.ts +19 -3
- package/dist/postgres/types.d.ts.map +1 -1
- package/dist/postgres/types.js.map +1 -1
- package/dist/queries/addJoinTable.d.ts +11 -0
- package/dist/queries/addJoinTable.d.ts.map +1 -0
- package/dist/queries/addJoinTable.js +13 -0
- package/dist/queries/addJoinTable.js.map +1 -0
- package/dist/queries/buildOrderBy.d.ts +2 -2
- package/dist/queries/buildOrderBy.d.ts.map +1 -1
- package/dist/queries/buildOrderBy.js +32 -28
- package/dist/queries/buildOrderBy.js.map +1 -1
- package/dist/queries/buildQuery.d.ts +4 -3
- package/dist/queries/buildQuery.d.ts.map +1 -1
- package/dist/queries/buildQuery.js.map +1 -1
- package/dist/queries/getTableColumnFromPath.d.ts +1 -2
- package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
- package/dist/queries/getTableColumnFromPath.js +218 -221
- package/dist/queries/getTableColumnFromPath.js.map +1 -1
- package/dist/queries/operatorMap.d.ts.map +1 -1
- package/dist/queries/operatorMap.js +0 -4
- package/dist/queries/operatorMap.js.map +1 -1
- package/dist/queries/parseParams.d.ts.map +1 -1
- package/dist/queries/parseParams.js +38 -5
- package/dist/queries/parseParams.js.map +1 -1
- package/dist/queries/sanitizeQueryValue.d.ts.map +1 -1
- package/dist/queries/sanitizeQueryValue.js +12 -4
- package/dist/queries/sanitizeQueryValue.js.map +1 -1
- package/dist/queryDrafts.d.ts.map +1 -1
- package/dist/queryDrafts.js +5 -4
- package/dist/queryDrafts.js.map +1 -1
- package/dist/transform/read/traverseFields.d.ts.map +1 -1
- package/dist/transform/read/traverseFields.js +24 -18
- package/dist/transform/read/traverseFields.js.map +1 -1
- package/dist/transform/write/traverseFields.d.ts.map +1 -1
- package/dist/transform/write/traverseFields.js +16 -2
- package/dist/transform/write/traverseFields.js.map +1 -1
- package/dist/types.d.ts +5 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/update.d.ts.map +1 -1
- package/dist/update.js +2 -1
- package/dist/update.js.map +1 -1
- package/dist/updateGlobal.d.ts +1 -1
- package/dist/updateGlobal.d.ts.map +1 -1
- package/dist/updateGlobal.js +2 -1
- package/dist/updateGlobal.js.map +1 -1
- package/dist/updateGlobalVersion.d.ts +1 -1
- package/dist/updateGlobalVersion.d.ts.map +1 -1
- package/dist/updateGlobalVersion.js +2 -1
- package/dist/updateGlobalVersion.js.map +1 -1
- package/dist/updateVersion.d.ts +1 -1
- package/dist/updateVersion.d.ts.map +1 -1
- package/dist/updateVersion.js +2 -1
- package/dist/updateVersion.js.map +1 -1
- package/dist/upsertRow/index.d.ts +1 -1
- package/dist/upsertRow/index.d.ts.map +1 -1
- package/dist/upsertRow/index.js +4 -3
- package/dist/upsertRow/index.js.map +1 -1
- package/dist/upsertRow/types.d.ts +3 -1
- package/dist/upsertRow/types.d.ts.map +1 -1
- package/dist/upsertRow/types.js.map +1 -1
- package/dist/utilities/buildIndexName.d.ts +7 -0
- package/dist/utilities/buildIndexName.d.ts.map +1 -0
- package/dist/utilities/buildIndexName.js +14 -0
- package/dist/utilities/buildIndexName.js.map +1 -0
- package/dist/utilities/getNameFromDrizzleTable.d.ts +3 -0
- package/dist/utilities/getNameFromDrizzleTable.d.ts.map +1 -0
- package/dist/utilities/getNameFromDrizzleTable.js +6 -0
- package/dist/utilities/getNameFromDrizzleTable.js.map +1 -0
- package/dist/utilities/pushDevSchema.d.ts.map +1 -1
- package/dist/utilities/pushDevSchema.js +5 -0
- package/dist/utilities/pushDevSchema.js.map +1 -1
- package/license.md +22 -0
- package/package.json +14 -7
- package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.d.ts +0 -2
- package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.d.ts.map +0 -1
- package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.js +0 -16
- package/dist/postgres/createJSONQuery/convertPathToJSONTraversal.js.map +0 -1
- package/dist/postgres/createJSONQuery/formatJSONPathSegment.d.ts +0 -2
- package/dist/postgres/createJSONQuery/formatJSONPathSegment.d.ts.map +0 -1
- package/dist/postgres/createJSONQuery/formatJSONPathSegment.js +0 -5
- package/dist/postgres/createJSONQuery/formatJSONPathSegment.js.map +0 -1
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import type { asc, desc, SQL } from 'drizzle-orm';
|
|
2
2
|
import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
|
|
3
|
-
import type { Field, Where } from 'payload';
|
|
3
|
+
import type { Field, Sort, Where } from 'payload';
|
|
4
4
|
import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
|
|
5
5
|
export type BuildQueryJoinAliases = {
|
|
6
6
|
condition: SQL;
|
|
7
7
|
table: GenericTable | PgTableWithColumns<any>;
|
|
8
|
+
type?: 'innerJoin' | 'leftJoin' | 'rightJoin';
|
|
8
9
|
}[];
|
|
9
10
|
type BuildQueryArgs = {
|
|
10
11
|
adapter: DrizzleAdapter;
|
|
11
12
|
fields: Field[];
|
|
12
13
|
joins?: BuildQueryJoinAliases;
|
|
13
14
|
locale?: string;
|
|
14
|
-
sort?:
|
|
15
|
+
sort?: Sort;
|
|
15
16
|
tableName: string;
|
|
16
17
|
where: Where;
|
|
17
18
|
};
|
|
@@ -20,7 +21,7 @@ export type BuildQueryResult = {
|
|
|
20
21
|
orderBy: {
|
|
21
22
|
column: GenericColumn;
|
|
22
23
|
order: typeof asc | typeof desc;
|
|
23
|
-
};
|
|
24
|
+
}[];
|
|
24
25
|
selectFields: Record<string, GenericColumn>;
|
|
25
26
|
where: SQL;
|
|
26
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,EAAE,CAAA;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AACD,QAAA,MAAM,UAAU,+EAQb,cAAc,KAAG,gBAmCnB,CAAA;AAED,eAAe,UAAU,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n condition: SQL\n table: GenericTable | PgTableWithColumns<any>\n}[]\n\ntype BuildQueryArgs = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins?: BuildQueryJoinAliases\n locale?: string\n sort?:
|
|
1
|
+
{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { asc, desc, SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Sort, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { buildOrderBy } from './buildOrderBy.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n condition: SQL\n table: GenericTable | PgTableWithColumns<any>\n type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}[]\n\ntype BuildQueryArgs = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins?: BuildQueryJoinAliases\n locale?: string\n sort?: Sort\n tableName: string\n where: Where\n}\n\nexport type BuildQueryResult = {\n joins: BuildQueryJoinAliases\n orderBy: {\n column: GenericColumn\n order: typeof asc | typeof desc\n }[]\n selectFields: Record<string, GenericColumn>\n where: SQL\n}\nconst buildQuery = function buildQuery({\n adapter,\n fields,\n joins = [],\n locale,\n sort,\n tableName,\n where: incomingWhere,\n}: BuildQueryArgs): BuildQueryResult {\n const selectFields: Record<string, GenericColumn> = {\n id: adapter.tables[tableName].id,\n }\n\n const orderBy = buildOrderBy({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n sort,\n tableName,\n })\n\n let where: SQL\n\n if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n where = parseParams({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n tableName,\n where: incomingWhere,\n })\n }\n\n return {\n joins,\n orderBy,\n selectFields,\n where,\n }\n}\n\nexport default buildQuery\n"],"names":["buildOrderBy","parseParams","buildQuery","adapter","fields","joins","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","orderBy","Object","keys","length"],"mappings":"AAMA,SAASA,YAAY,QAAQ,oBAAmB;AAChD,SAASC,WAAW,QAAQ,mBAAkB;AA2B9C,MAAMC,aAAa,SAASA,WAAW,EACrCC,OAAO,EACPC,MAAM,EACNC,QAAQ,EAAE,EACVC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIT,QAAQU,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IAEA,MAAME,UAAUd,aAAa;QAC3BG;QACAC;QACAC;QACAC;QACAK;QACAJ;QACAC;IACF;IAEA,IAAIC;IAEJ,IAAIC,iBAAiBK,OAAOC,IAAI,CAACN,eAAeO,MAAM,GAAG,GAAG;QAC1DR,QAAQR,YAAY;YAClBE;YACAC;YACAC;YACAC;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLL;QACAS;QACAH;QACAF;IACF;AACF;AAEA,eAAeP,WAAU"}
|
|
@@ -40,7 +40,6 @@ type Args = {
|
|
|
40
40
|
* If creating a new table name for arrays and blocks, this suffix should be appended to the table name
|
|
41
41
|
*/
|
|
42
42
|
tableNameSuffix?: string;
|
|
43
|
-
useAlias?: boolean;
|
|
44
43
|
/**
|
|
45
44
|
* The raw value of the query before sanitization
|
|
46
45
|
*/
|
|
@@ -51,6 +50,6 @@ type Args = {
|
|
|
51
50
|
* Adds tables to `join`
|
|
52
51
|
* @returns TableColumn
|
|
53
52
|
*/
|
|
54
|
-
export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix,
|
|
53
|
+
export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix, value, }: Args) => TableColumn;
|
|
55
54
|
export {};
|
|
56
55
|
//# sourceMappingURL=getTableColumnFromPath.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAG5F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAM7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAM5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;KACxB,EAAE,CAAA;IACH,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,kBAAkB,CAAA;IACzB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WAopBT,CAAA"}
|
|
@@ -4,12 +4,13 @@ import { fieldAffectsData, tabHasName } from 'payload/shared';
|
|
|
4
4
|
import toSnakeCase from 'to-snake-case';
|
|
5
5
|
import { validate as uuidValidate } from 'uuid';
|
|
6
6
|
import { isPolymorphicRelationship } from '../utilities/isPolymorphicRelationship.js';
|
|
7
|
+
import { addJoinTable } from './addJoinTable.js';
|
|
7
8
|
import { getTableAlias } from './getTableAlias.js';
|
|
8
9
|
/**
|
|
9
10
|
* Transforms path to table and column name or to a list of OR columns
|
|
10
11
|
* Adds tables to `join`
|
|
11
12
|
* @returns TableColumn
|
|
12
|
-
*/ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '',
|
|
13
|
+
*/ export const getTableColumnFromPath = ({ adapter, aliasTable, collectionPath, columnPrefix = '', constraintPath: incomingConstraintPath, constraints = [], fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix = '', value })=>{
|
|
13
14
|
const fieldPath = incomingSegments[0];
|
|
14
15
|
let locale = incomingLocale;
|
|
15
16
|
const rootTableName = incomingRootTableName || tableName;
|
|
@@ -42,199 +43,27 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
switch(field.type){
|
|
45
|
-
case 'tabs':
|
|
46
|
-
{
|
|
47
|
-
return getTableColumnFromPath({
|
|
48
|
-
adapter,
|
|
49
|
-
aliasTable,
|
|
50
|
-
collectionPath,
|
|
51
|
-
columnPrefix,
|
|
52
|
-
constraintPath,
|
|
53
|
-
constraints,
|
|
54
|
-
fields: field.tabs.map((tab)=>({
|
|
55
|
-
...tab,
|
|
56
|
-
type: 'tab'
|
|
57
|
-
})),
|
|
58
|
-
joins,
|
|
59
|
-
locale,
|
|
60
|
-
pathSegments: pathSegments.slice(1),
|
|
61
|
-
rootTableName,
|
|
62
|
-
selectFields,
|
|
63
|
-
tableName: newTableName,
|
|
64
|
-
tableNameSuffix,
|
|
65
|
-
useAlias,
|
|
66
|
-
value
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
case 'tab':
|
|
70
|
-
{
|
|
71
|
-
if (tabHasName(field)) {
|
|
72
|
-
return getTableColumnFromPath({
|
|
73
|
-
adapter,
|
|
74
|
-
aliasTable,
|
|
75
|
-
collectionPath,
|
|
76
|
-
columnPrefix: `${columnPrefix}${field.name}_`,
|
|
77
|
-
constraintPath: `${constraintPath}${field.name}.`,
|
|
78
|
-
constraints,
|
|
79
|
-
fields: field.fields,
|
|
80
|
-
joins,
|
|
81
|
-
locale,
|
|
82
|
-
pathSegments: pathSegments.slice(1),
|
|
83
|
-
rootTableName,
|
|
84
|
-
selectFields,
|
|
85
|
-
tableName: newTableName,
|
|
86
|
-
tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
|
|
87
|
-
useAlias,
|
|
88
|
-
value
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
return getTableColumnFromPath({
|
|
92
|
-
adapter,
|
|
93
|
-
aliasTable,
|
|
94
|
-
collectionPath,
|
|
95
|
-
columnPrefix,
|
|
96
|
-
constraintPath,
|
|
97
|
-
constraints,
|
|
98
|
-
fields: field.fields,
|
|
99
|
-
joins,
|
|
100
|
-
locale,
|
|
101
|
-
pathSegments: pathSegments.slice(1),
|
|
102
|
-
rootTableName,
|
|
103
|
-
selectFields,
|
|
104
|
-
tableName: newTableName,
|
|
105
|
-
tableNameSuffix,
|
|
106
|
-
useAlias,
|
|
107
|
-
value
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
case 'group':
|
|
111
|
-
{
|
|
112
|
-
if (locale && field.localized && adapter.payload.config.localization) {
|
|
113
|
-
newTableName = `${tableName}${adapter.localesSuffix}`;
|
|
114
|
-
joins.push({
|
|
115
|
-
condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
|
|
116
|
-
table: adapter.tables[newTableName]
|
|
117
|
-
});
|
|
118
|
-
if (locale !== 'all') {
|
|
119
|
-
constraints.push({
|
|
120
|
-
columnName: '_locale',
|
|
121
|
-
table: adapter.tables[newTableName],
|
|
122
|
-
value: locale
|
|
123
|
-
});
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
return getTableColumnFromPath({
|
|
127
|
-
adapter,
|
|
128
|
-
aliasTable,
|
|
129
|
-
collectionPath,
|
|
130
|
-
columnPrefix: `${columnPrefix}${field.name}_`,
|
|
131
|
-
constraintPath: `${constraintPath}${field.name}.`,
|
|
132
|
-
constraints,
|
|
133
|
-
fields: field.fields,
|
|
134
|
-
joins,
|
|
135
|
-
locale,
|
|
136
|
-
pathSegments: pathSegments.slice(1),
|
|
137
|
-
rootTableName,
|
|
138
|
-
selectFields,
|
|
139
|
-
tableName: newTableName,
|
|
140
|
-
tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
|
|
141
|
-
useAlias,
|
|
142
|
-
value
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
case 'select':
|
|
146
|
-
{
|
|
147
|
-
if (field.hasMany) {
|
|
148
|
-
const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
|
|
149
|
-
if (locale && field.localized && adapter.payload.config.localization) {
|
|
150
|
-
joins.push({
|
|
151
|
-
condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale)),
|
|
152
|
-
table: adapter.tables[newTableName]
|
|
153
|
-
});
|
|
154
|
-
if (locale !== 'all') {
|
|
155
|
-
constraints.push({
|
|
156
|
-
columnName: '_locale',
|
|
157
|
-
table: adapter.tables[newTableName],
|
|
158
|
-
value: locale
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
} else {
|
|
162
|
-
joins.push({
|
|
163
|
-
condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
|
|
164
|
-
table: adapter.tables[newTableName]
|
|
165
|
-
});
|
|
166
|
-
}
|
|
167
|
-
return {
|
|
168
|
-
columnName: 'value',
|
|
169
|
-
constraints,
|
|
170
|
-
field,
|
|
171
|
-
table: adapter.tables[newTableName]
|
|
172
|
-
};
|
|
173
|
-
}
|
|
174
|
-
break;
|
|
175
|
-
}
|
|
176
|
-
case 'text':
|
|
177
|
-
case 'number':
|
|
178
|
-
{
|
|
179
|
-
if (field.hasMany) {
|
|
180
|
-
let tableType = 'texts';
|
|
181
|
-
let columnName = 'text';
|
|
182
|
-
if (field.type === 'number') {
|
|
183
|
-
tableType = 'numbers';
|
|
184
|
-
columnName = 'number';
|
|
185
|
-
}
|
|
186
|
-
newTableName = `${rootTableName}_${tableType}`;
|
|
187
|
-
const joinConstraints = [
|
|
188
|
-
eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),
|
|
189
|
-
like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
|
|
190
|
-
];
|
|
191
|
-
if (locale && field.localized && adapter.payload.config.localization) {
|
|
192
|
-
joins.push({
|
|
193
|
-
condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),
|
|
194
|
-
table: adapter.tables[newTableName]
|
|
195
|
-
});
|
|
196
|
-
if (locale !== 'all') {
|
|
197
|
-
constraints.push({
|
|
198
|
-
columnName: 'locale',
|
|
199
|
-
table: adapter.tables[newTableName],
|
|
200
|
-
value: locale
|
|
201
|
-
});
|
|
202
|
-
}
|
|
203
|
-
} else {
|
|
204
|
-
joins.push({
|
|
205
|
-
condition: and(...joinConstraints),
|
|
206
|
-
table: adapter.tables[newTableName]
|
|
207
|
-
});
|
|
208
|
-
}
|
|
209
|
-
return {
|
|
210
|
-
columnName,
|
|
211
|
-
constraints,
|
|
212
|
-
field,
|
|
213
|
-
table: adapter.tables[newTableName]
|
|
214
|
-
};
|
|
215
|
-
}
|
|
216
|
-
break;
|
|
217
|
-
}
|
|
218
46
|
case 'array':
|
|
219
47
|
{
|
|
220
48
|
newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
|
|
221
49
|
const arrayParentTable = aliasTable || adapter.tables[tableName];
|
|
222
50
|
constraintPath = `${constraintPath}${field.name}.%.`;
|
|
223
51
|
if (locale && field.localized && adapter.payload.config.localization) {
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
});
|
|
52
|
+
const conditions = [
|
|
53
|
+
eq(arrayParentTable.id, adapter.tables[newTableName]._parentID)
|
|
54
|
+
];
|
|
228
55
|
if (locale !== 'all') {
|
|
229
|
-
|
|
230
|
-
columnName: '_locale',
|
|
231
|
-
table: adapter.tables[newTableName],
|
|
232
|
-
value: locale
|
|
233
|
-
});
|
|
56
|
+
conditions.push(eq(adapter.tables[newTableName]._locale, locale));
|
|
234
57
|
}
|
|
58
|
+
addJoinTable({
|
|
59
|
+
condition: and(...conditions),
|
|
60
|
+
joins,
|
|
61
|
+
table: adapter.tables[newTableName]
|
|
62
|
+
});
|
|
235
63
|
} else {
|
|
236
|
-
|
|
64
|
+
addJoinTable({
|
|
237
65
|
condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),
|
|
66
|
+
joins,
|
|
238
67
|
table: adapter.tables[newTableName]
|
|
239
68
|
});
|
|
240
69
|
}
|
|
@@ -250,7 +79,6 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
250
79
|
rootTableName,
|
|
251
80
|
selectFields,
|
|
252
81
|
tableName: newTableName,
|
|
253
|
-
useAlias,
|
|
254
82
|
value
|
|
255
83
|
});
|
|
256
84
|
}
|
|
@@ -307,7 +135,6 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
307
135
|
rootTableName,
|
|
308
136
|
selectFields: blockSelectFields,
|
|
309
137
|
tableName: newTableName,
|
|
310
|
-
useAlias,
|
|
311
138
|
value
|
|
312
139
|
});
|
|
313
140
|
} catch (error) {
|
|
@@ -323,17 +150,16 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
323
150
|
...blockSelectFields
|
|
324
151
|
};
|
|
325
152
|
if (field.localized && adapter.payload.config.localization) {
|
|
153
|
+
const conditions = [
|
|
154
|
+
eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID)
|
|
155
|
+
];
|
|
156
|
+
if (locale !== 'all') {
|
|
157
|
+
conditions.push(eq(adapter.tables[newTableName]._locale, locale));
|
|
158
|
+
}
|
|
326
159
|
joins.push({
|
|
327
|
-
condition: and(
|
|
160
|
+
condition: and(...conditions),
|
|
328
161
|
table: adapter.tables[newTableName]
|
|
329
162
|
});
|
|
330
|
-
if (locale) {
|
|
331
|
-
constraints.push({
|
|
332
|
-
columnName: '_locale',
|
|
333
|
-
table: adapter.tables[newTableName],
|
|
334
|
-
value: locale
|
|
335
|
-
});
|
|
336
|
-
}
|
|
337
163
|
} else {
|
|
338
164
|
joins.push({
|
|
339
165
|
condition: eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID),
|
|
@@ -354,6 +180,81 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
354
180
|
}
|
|
355
181
|
break;
|
|
356
182
|
}
|
|
183
|
+
case 'group':
|
|
184
|
+
{
|
|
185
|
+
if (locale && field.localized && adapter.payload.config.localization) {
|
|
186
|
+
newTableName = `${tableName}${adapter.localesSuffix}`;
|
|
187
|
+
let condition = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
|
|
188
|
+
if (locale !== 'all') {
|
|
189
|
+
condition = and(condition, eq(adapter.tables[newTableName]._locale, locale));
|
|
190
|
+
}
|
|
191
|
+
addJoinTable({
|
|
192
|
+
condition,
|
|
193
|
+
joins,
|
|
194
|
+
table: adapter.tables[newTableName]
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
return getTableColumnFromPath({
|
|
198
|
+
adapter,
|
|
199
|
+
aliasTable,
|
|
200
|
+
collectionPath,
|
|
201
|
+
columnPrefix: `${columnPrefix}${field.name}_`,
|
|
202
|
+
constraintPath: `${constraintPath}${field.name}.`,
|
|
203
|
+
constraints,
|
|
204
|
+
fields: field.fields,
|
|
205
|
+
joins,
|
|
206
|
+
locale,
|
|
207
|
+
pathSegments: pathSegments.slice(1),
|
|
208
|
+
rootTableName,
|
|
209
|
+
selectFields,
|
|
210
|
+
tableName: newTableName,
|
|
211
|
+
tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
|
|
212
|
+
value
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
case 'number':
|
|
216
|
+
case 'text':
|
|
217
|
+
{
|
|
218
|
+
if (field.hasMany) {
|
|
219
|
+
let tableType = 'texts';
|
|
220
|
+
let columnName = 'text';
|
|
221
|
+
if (field.type === 'number') {
|
|
222
|
+
tableType = 'numbers';
|
|
223
|
+
columnName = 'number';
|
|
224
|
+
}
|
|
225
|
+
newTableName = `${rootTableName}_${tableType}`;
|
|
226
|
+
const joinConstraints = [
|
|
227
|
+
eq(adapter.tables[rootTableName].id, adapter.tables[newTableName].parent),
|
|
228
|
+
like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
|
|
229
|
+
];
|
|
230
|
+
if (locale && field.localized && adapter.payload.config.localization) {
|
|
231
|
+
const conditions = [
|
|
232
|
+
...joinConstraints
|
|
233
|
+
];
|
|
234
|
+
if (locale !== 'all') {
|
|
235
|
+
conditions.push(eq(adapter.tables[newTableName]._locale, locale));
|
|
236
|
+
}
|
|
237
|
+
addJoinTable({
|
|
238
|
+
condition: and(...conditions),
|
|
239
|
+
joins,
|
|
240
|
+
table: adapter.tables[newTableName]
|
|
241
|
+
});
|
|
242
|
+
} else {
|
|
243
|
+
addJoinTable({
|
|
244
|
+
condition: and(...joinConstraints),
|
|
245
|
+
joins,
|
|
246
|
+
table: adapter.tables[newTableName]
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
return {
|
|
250
|
+
columnName,
|
|
251
|
+
constraints,
|
|
252
|
+
field,
|
|
253
|
+
table: adapter.tables[newTableName]
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
break;
|
|
257
|
+
}
|
|
357
258
|
case 'relationship':
|
|
358
259
|
case 'upload':
|
|
359
260
|
{
|
|
@@ -367,17 +268,17 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
367
268
|
});
|
|
368
269
|
// Join in the relationships table
|
|
369
270
|
if (locale && field.localized && adapter.payload.config.localization) {
|
|
271
|
+
const conditions = [
|
|
272
|
+
eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
|
|
273
|
+
like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)
|
|
274
|
+
];
|
|
275
|
+
if (locale !== 'all') {
|
|
276
|
+
conditions.push(eq(aliasRelationshipTable.locale, locale));
|
|
277
|
+
}
|
|
370
278
|
joins.push({
|
|
371
|
-
condition: and(
|
|
279
|
+
condition: and(...conditions),
|
|
372
280
|
table: aliasRelationshipTable
|
|
373
281
|
});
|
|
374
|
-
if (locale !== 'all') {
|
|
375
|
-
constraints.push({
|
|
376
|
-
columnName: 'locale',
|
|
377
|
-
table: aliasRelationshipTable,
|
|
378
|
-
value: locale
|
|
379
|
-
});
|
|
380
|
-
}
|
|
381
282
|
} else {
|
|
382
283
|
// Join in the relationships table
|
|
383
284
|
joins.push({
|
|
@@ -488,7 +389,6 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
488
389
|
rootTableName: newTableName,
|
|
489
390
|
selectFields,
|
|
490
391
|
tableName: newTableName,
|
|
491
|
-
useAlias,
|
|
492
392
|
value
|
|
493
393
|
});
|
|
494
394
|
} else if (pathSegments.length > 1 && !(pathSegments.length === 2 && pathSegments[1] === 'id')) {
|
|
@@ -504,12 +404,20 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
504
404
|
adapter,
|
|
505
405
|
tableName: `${rootTableName}${adapter.localesSuffix}`
|
|
506
406
|
});
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
407
|
+
const condtions = [
|
|
408
|
+
eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id)
|
|
409
|
+
];
|
|
410
|
+
if (locale !== 'all') {
|
|
411
|
+
condtions.push(eq(aliasLocaleTable._locale, locale));
|
|
412
|
+
}
|
|
413
|
+
const localesTable = adapter.tables[`${rootTableName}${adapter.localesSuffix}`];
|
|
414
|
+
addJoinTable({
|
|
415
|
+
condition: and(...condtions),
|
|
416
|
+
joins,
|
|
417
|
+
table: localesTable
|
|
510
418
|
});
|
|
511
419
|
joins.push({
|
|
512
|
-
condition: eq(
|
|
420
|
+
condition: eq(localesTable[columnName], newAliasTable.id),
|
|
513
421
|
table: newAliasTable
|
|
514
422
|
});
|
|
515
423
|
} else {
|
|
@@ -530,12 +438,106 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
530
438
|
pathSegments: pathSegments.slice(1),
|
|
531
439
|
selectFields,
|
|
532
440
|
tableName: newTableName,
|
|
533
|
-
useAlias,
|
|
534
441
|
value
|
|
535
442
|
});
|
|
536
443
|
}
|
|
537
444
|
break;
|
|
538
445
|
}
|
|
446
|
+
case 'select':
|
|
447
|
+
{
|
|
448
|
+
if (field.hasMany) {
|
|
449
|
+
const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
|
|
450
|
+
if (locale && field.localized && adapter.payload.config.localization) {
|
|
451
|
+
const conditions = [
|
|
452
|
+
eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
|
|
453
|
+
eq(adapter.tables[newTableName]._locale, locale)
|
|
454
|
+
];
|
|
455
|
+
if (locale !== 'all') {
|
|
456
|
+
conditions.push(eq(adapter.tables[newTableName]._locale, locale));
|
|
457
|
+
}
|
|
458
|
+
addJoinTable({
|
|
459
|
+
condition: and(...conditions),
|
|
460
|
+
joins,
|
|
461
|
+
table: adapter.tables[newTableName]
|
|
462
|
+
});
|
|
463
|
+
} else {
|
|
464
|
+
addJoinTable({
|
|
465
|
+
condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
|
|
466
|
+
joins,
|
|
467
|
+
table: adapter.tables[newTableName]
|
|
468
|
+
});
|
|
469
|
+
}
|
|
470
|
+
return {
|
|
471
|
+
columnName: 'value',
|
|
472
|
+
constraints,
|
|
473
|
+
field,
|
|
474
|
+
table: adapter.tables[newTableName]
|
|
475
|
+
};
|
|
476
|
+
}
|
|
477
|
+
break;
|
|
478
|
+
}
|
|
479
|
+
case 'tab':
|
|
480
|
+
{
|
|
481
|
+
if (tabHasName(field)) {
|
|
482
|
+
return getTableColumnFromPath({
|
|
483
|
+
adapter,
|
|
484
|
+
aliasTable,
|
|
485
|
+
collectionPath,
|
|
486
|
+
columnPrefix: `${columnPrefix}${field.name}_`,
|
|
487
|
+
constraintPath: `${constraintPath}${field.name}.`,
|
|
488
|
+
constraints,
|
|
489
|
+
fields: field.fields,
|
|
490
|
+
joins,
|
|
491
|
+
locale,
|
|
492
|
+
pathSegments: pathSegments.slice(1),
|
|
493
|
+
rootTableName,
|
|
494
|
+
selectFields,
|
|
495
|
+
tableName: newTableName,
|
|
496
|
+
tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,
|
|
497
|
+
value
|
|
498
|
+
});
|
|
499
|
+
}
|
|
500
|
+
return getTableColumnFromPath({
|
|
501
|
+
adapter,
|
|
502
|
+
aliasTable,
|
|
503
|
+
collectionPath,
|
|
504
|
+
columnPrefix,
|
|
505
|
+
constraintPath,
|
|
506
|
+
constraints,
|
|
507
|
+
fields: field.fields,
|
|
508
|
+
joins,
|
|
509
|
+
locale,
|
|
510
|
+
pathSegments: pathSegments.slice(1),
|
|
511
|
+
rootTableName,
|
|
512
|
+
selectFields,
|
|
513
|
+
tableName: newTableName,
|
|
514
|
+
tableNameSuffix,
|
|
515
|
+
value
|
|
516
|
+
});
|
|
517
|
+
}
|
|
518
|
+
case 'tabs':
|
|
519
|
+
{
|
|
520
|
+
return getTableColumnFromPath({
|
|
521
|
+
adapter,
|
|
522
|
+
aliasTable,
|
|
523
|
+
collectionPath,
|
|
524
|
+
columnPrefix,
|
|
525
|
+
constraintPath,
|
|
526
|
+
constraints,
|
|
527
|
+
fields: field.tabs.map((tab)=>({
|
|
528
|
+
...tab,
|
|
529
|
+
type: 'tab'
|
|
530
|
+
})),
|
|
531
|
+
joins,
|
|
532
|
+
locale,
|
|
533
|
+
pathSegments: pathSegments.slice(1),
|
|
534
|
+
rootTableName,
|
|
535
|
+
selectFields,
|
|
536
|
+
tableName: newTableName,
|
|
537
|
+
tableNameSuffix,
|
|
538
|
+
value
|
|
539
|
+
});
|
|
540
|
+
}
|
|
539
541
|
default:
|
|
540
542
|
{
|
|
541
543
|
break;
|
|
@@ -548,22 +550,17 @@ import { getTableAlias } from './getTableAlias.js';
|
|
|
548
550
|
// so it is not picked up below to be used as targetTable
|
|
549
551
|
const parentTable = aliasTable || adapter.tables[tableName];
|
|
550
552
|
newTableName = `${tableName}${adapter.localesSuffix}`;
|
|
551
|
-
newTable =
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
553
|
+
newTable = adapter.tables[newTableName];
|
|
554
|
+
let condition = eq(parentTable.id, newTable._parentID);
|
|
555
|
+
if (locale !== 'all') {
|
|
556
|
+
condition = and(condition, eq(newTable._locale, locale));
|
|
557
|
+
}
|
|
558
|
+
addJoinTable({
|
|
559
|
+
condition,
|
|
560
|
+
joins,
|
|
557
561
|
table: newTable
|
|
558
562
|
});
|
|
559
563
|
aliasTable = undefined;
|
|
560
|
-
if (locale !== 'all') {
|
|
561
|
-
constraints.push({
|
|
562
|
-
columnName: '_locale',
|
|
563
|
-
table: newTable,
|
|
564
|
-
value: locale
|
|
565
|
-
});
|
|
566
|
-
}
|
|
567
564
|
}
|
|
568
565
|
const targetTable = aliasTable || newTable;
|
|
569
566
|
selectFields[`${newTableName}.${columnPrefix}${field.name}`] = targetTable[`${columnPrefix}${field.name}`];
|