@payloadcms/drizzle 3.0.0-canary.c696728 → 3.0.0-canary.c96fa61

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.
Files changed (183) hide show
  1. package/dist/countGlobalVersions.d.ts +3 -0
  2. package/dist/countGlobalVersions.d.ts.map +1 -0
  3. package/dist/countGlobalVersions.js +27 -0
  4. package/dist/countGlobalVersions.js.map +1 -0
  5. package/dist/countVersions.d.ts +3 -0
  6. package/dist/countVersions.d.ts.map +1 -0
  7. package/dist/countVersions.js +27 -0
  8. package/dist/countVersions.js.map +1 -0
  9. package/dist/create.d.ts.map +1 -1
  10. package/dist/create.js +2 -1
  11. package/dist/create.js.map +1 -1
  12. package/dist/createGlobalVersion.d.ts +1 -1
  13. package/dist/createGlobalVersion.d.ts.map +1 -1
  14. package/dist/createGlobalVersion.js +4 -1
  15. package/dist/createGlobalVersion.js.map +1 -1
  16. package/dist/createVersion.d.ts +1 -1
  17. package/dist/createVersion.d.ts.map +1 -1
  18. package/dist/createVersion.js +4 -4
  19. package/dist/createVersion.js.map +1 -1
  20. package/dist/deleteOne.d.ts.map +1 -1
  21. package/dist/deleteOne.js +2 -1
  22. package/dist/deleteOne.js.map +1 -1
  23. package/dist/exports/postgres.d.ts +2 -0
  24. package/dist/exports/postgres.d.ts.map +1 -1
  25. package/dist/exports/postgres.js +2 -0
  26. package/dist/exports/postgres.js.map +1 -1
  27. package/dist/find/buildFindManyArgs.d.ts +4 -2
  28. package/dist/find/buildFindManyArgs.d.ts.map +1 -1
  29. package/dist/find/buildFindManyArgs.js +40 -21
  30. package/dist/find/buildFindManyArgs.js.map +1 -1
  31. package/dist/find/findMany.d.ts +2 -1
  32. package/dist/find/findMany.d.ts.map +1 -1
  33. package/dist/find/findMany.js +7 -5
  34. package/dist/find/findMany.js.map +1 -1
  35. package/dist/find/traverseFields.d.ts +13 -3
  36. package/dist/find/traverseFields.d.ts.map +1 -1
  37. package/dist/find/traverseFields.js +304 -89
  38. package/dist/find/traverseFields.js.map +1 -1
  39. package/dist/find.d.ts.map +1 -1
  40. package/dist/find.js +3 -2
  41. package/dist/find.js.map +1 -1
  42. package/dist/findGlobal.d.ts.map +1 -1
  43. package/dist/findGlobal.js +2 -1
  44. package/dist/findGlobal.js.map +1 -1
  45. package/dist/findGlobalVersions.d.ts.map +1 -1
  46. package/dist/findGlobalVersions.js +3 -2
  47. package/dist/findGlobalVersions.js.map +1 -1
  48. package/dist/findOne.d.ts +1 -1
  49. package/dist/findOne.d.ts.map +1 -1
  50. package/dist/findOne.js +2 -1
  51. package/dist/findOne.js.map +1 -1
  52. package/dist/findVersions.d.ts.map +1 -1
  53. package/dist/findVersions.js +3 -2
  54. package/dist/findVersions.js.map +1 -1
  55. package/dist/index.d.ts +5 -0
  56. package/dist/index.d.ts.map +1 -1
  57. package/dist/index.js +5 -0
  58. package/dist/index.js.map +1 -1
  59. package/dist/migrate.d.ts.map +1 -1
  60. package/dist/migrate.js +3 -0
  61. package/dist/migrate.js.map +1 -1
  62. package/dist/migrateFresh.d.ts.map +1 -1
  63. package/dist/migrateFresh.js +3 -0
  64. package/dist/migrateFresh.js.map +1 -1
  65. package/dist/migrateReset.js +1 -1
  66. package/dist/migrateReset.js.map +1 -1
  67. package/dist/postgres/countDistinct.d.ts.map +1 -1
  68. package/dist/postgres/countDistinct.js +2 -3
  69. package/dist/postgres/countDistinct.js.map +1 -1
  70. package/dist/postgres/createDatabase.d.ts +14 -0
  71. package/dist/postgres/createDatabase.d.ts.map +1 -0
  72. package/dist/postgres/createDatabase.js +76 -0
  73. package/dist/postgres/createDatabase.js.map +1 -0
  74. package/dist/postgres/createExtensions.d.ts +3 -0
  75. package/dist/postgres/createExtensions.d.ts.map +1 -0
  76. package/dist/postgres/createExtensions.js +16 -0
  77. package/dist/postgres/createExtensions.js.map +1 -0
  78. package/dist/postgres/defaultSnapshot.d.ts.map +1 -1
  79. package/dist/postgres/defaultSnapshot.js +4 -1
  80. package/dist/postgres/defaultSnapshot.js.map +1 -1
  81. package/dist/postgres/init.d.ts.map +1 -1
  82. package/dist/postgres/init.js +10 -1
  83. package/dist/postgres/init.js.map +1 -1
  84. package/dist/postgres/schema/build.d.ts +3 -1
  85. package/dist/postgres/schema/build.d.ts.map +1 -1
  86. package/dist/postgres/schema/build.js +29 -3
  87. package/dist/postgres/schema/build.js.map +1 -1
  88. package/dist/postgres/schema/createIndex.d.ts +2 -3
  89. package/dist/postgres/schema/createIndex.d.ts.map +1 -1
  90. package/dist/postgres/schema/createIndex.js +3 -3
  91. package/dist/postgres/schema/createIndex.js.map +1 -1
  92. package/dist/postgres/schema/geometryColumn.d.ts +12 -0
  93. package/dist/postgres/schema/geometryColumn.d.ts.map +1 -0
  94. package/dist/postgres/schema/geometryColumn.js +18 -0
  95. package/dist/postgres/schema/geometryColumn.js.map +1 -0
  96. package/dist/postgres/schema/traverseFields.d.ts +3 -1
  97. package/dist/postgres/schema/traverseFields.d.ts.map +1 -1
  98. package/dist/postgres/schema/traverseFields.js +39 -29
  99. package/dist/postgres/schema/traverseFields.js.map +1 -1
  100. package/dist/postgres/schema/withDefault.d.ts.map +1 -1
  101. package/dist/postgres/schema/withDefault.js +3 -0
  102. package/dist/postgres/schema/withDefault.js.map +1 -1
  103. package/dist/postgres/types.d.ts +35 -6
  104. package/dist/postgres/types.d.ts.map +1 -1
  105. package/dist/postgres/types.js.map +1 -1
  106. package/dist/queries/addJoinTable.d.ts +11 -0
  107. package/dist/queries/addJoinTable.d.ts.map +1 -0
  108. package/dist/queries/addJoinTable.js +13 -0
  109. package/dist/queries/addJoinTable.js.map +1 -0
  110. package/dist/queries/buildOrderBy.d.ts +2 -2
  111. package/dist/queries/buildOrderBy.d.ts.map +1 -1
  112. package/dist/queries/buildOrderBy.js +32 -27
  113. package/dist/queries/buildOrderBy.js.map +1 -1
  114. package/dist/queries/buildQuery.d.ts +4 -3
  115. package/dist/queries/buildQuery.d.ts.map +1 -1
  116. package/dist/queries/buildQuery.js.map +1 -1
  117. package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
  118. package/dist/queries/getTableColumnFromPath.js +80 -70
  119. package/dist/queries/getTableColumnFromPath.js.map +1 -1
  120. package/dist/queries/operatorMap.d.ts.map +1 -1
  121. package/dist/queries/operatorMap.js +0 -4
  122. package/dist/queries/operatorMap.js.map +1 -1
  123. package/dist/queries/parseParams.d.ts.map +1 -1
  124. package/dist/queries/parseParams.js +29 -0
  125. package/dist/queries/parseParams.js.map +1 -1
  126. package/dist/queries/sanitizeQueryValue.d.ts +2 -1
  127. package/dist/queries/sanitizeQueryValue.d.ts.map +1 -1
  128. package/dist/queries/sanitizeQueryValue.js +21 -5
  129. package/dist/queries/sanitizeQueryValue.js.map +1 -1
  130. package/dist/queryDrafts.d.ts.map +1 -1
  131. package/dist/queryDrafts.js +5 -4
  132. package/dist/queryDrafts.js.map +1 -1
  133. package/dist/transform/read/traverseFields.d.ts.map +1 -1
  134. package/dist/transform/read/traverseFields.js +41 -7
  135. package/dist/transform/read/traverseFields.js.map +1 -1
  136. package/dist/transform/write/traverseFields.d.ts.map +1 -1
  137. package/dist/transform/write/traverseFields.js +17 -2
  138. package/dist/transform/write/traverseFields.js.map +1 -1
  139. package/dist/types.d.ts +2 -1
  140. package/dist/types.d.ts.map +1 -1
  141. package/dist/types.js.map +1 -1
  142. package/dist/update.d.ts.map +1 -1
  143. package/dist/update.js +2 -1
  144. package/dist/update.js.map +1 -1
  145. package/dist/updateGlobal.d.ts +1 -1
  146. package/dist/updateGlobal.d.ts.map +1 -1
  147. package/dist/updateGlobal.js +2 -1
  148. package/dist/updateGlobal.js.map +1 -1
  149. package/dist/updateGlobalVersion.d.ts +1 -1
  150. package/dist/updateGlobalVersion.d.ts.map +1 -1
  151. package/dist/updateGlobalVersion.js +2 -1
  152. package/dist/updateGlobalVersion.js.map +1 -1
  153. package/dist/updateVersion.d.ts +1 -1
  154. package/dist/updateVersion.d.ts.map +1 -1
  155. package/dist/updateVersion.js +2 -1
  156. package/dist/updateVersion.js.map +1 -1
  157. package/dist/upsertRow/index.d.ts +1 -1
  158. package/dist/upsertRow/index.d.ts.map +1 -1
  159. package/dist/upsertRow/index.js +4 -3
  160. package/dist/upsertRow/index.js.map +1 -1
  161. package/dist/upsertRow/types.d.ts +3 -1
  162. package/dist/upsertRow/types.d.ts.map +1 -1
  163. package/dist/upsertRow/types.js.map +1 -1
  164. package/dist/utilities/buildIndexName.d.ts +7 -0
  165. package/dist/utilities/buildIndexName.d.ts.map +1 -0
  166. package/dist/utilities/buildIndexName.js +14 -0
  167. package/dist/utilities/buildIndexName.js.map +1 -0
  168. package/dist/utilities/executeSchemaHooks.d.ts +24 -0
  169. package/dist/utilities/executeSchemaHooks.d.ts.map +1 -0
  170. package/dist/utilities/executeSchemaHooks.js +21 -0
  171. package/dist/utilities/executeSchemaHooks.js.map +1 -0
  172. package/dist/utilities/extendDrizzleTable.d.ts +19 -0
  173. package/dist/utilities/extendDrizzleTable.d.ts.map +1 -0
  174. package/dist/utilities/extendDrizzleTable.js +38 -0
  175. package/dist/utilities/extendDrizzleTable.js.map +1 -0
  176. package/dist/utilities/getNameFromDrizzleTable.d.ts +3 -0
  177. package/dist/utilities/getNameFromDrizzleTable.d.ts.map +1 -0
  178. package/dist/utilities/getNameFromDrizzleTable.js +6 -0
  179. package/dist/utilities/getNameFromDrizzleTable.js.map +1 -0
  180. package/dist/utilities/pushDevSchema.d.ts.map +1 -1
  181. package/dist/utilities/pushDevSchema.js +5 -0
  182. package/dist/utilities/pushDevSchema.js.map +1 -1
  183. package/package.json +7 -7
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/postgres/types.ts"],"sourcesContent":["import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'\nimport type {\n ColumnBaseConfig,\n ColumnDataType,\n DrizzleConfig,\n Relation,\n Relations,\n SQL,\n} from 'drizzle-orm'\nimport type { NodePgDatabase } from 'drizzle-orm/node-postgres'\nimport type {\n ForeignKeyBuilder,\n IndexBuilder,\n PgColumn,\n PgEnum,\n pgEnum,\n PgInsertOnConflictDoUpdateConfig,\n PgSchema,\n PgTableWithColumns,\n UniqueConstraintBuilder,\n} from 'drizzle-orm/pg-core'\nimport type { PgTableFn } from 'drizzle-orm/pg-core/table'\nimport type { Payload, PayloadRequest } from 'payload'\nimport type { QueryResult } from 'pg'\n\nimport type { Operators } from '../index.js'\nimport type { BuildQueryJoinAliases, DrizzleAdapter, TransactionPg } from '../types.js'\n\nexport type BaseExtraConfig = Record<\n string,\n (cols: GenericColumns) => ForeignKeyBuilder | IndexBuilder | UniqueConstraintBuilder\n>\n\nexport type RelationMap = Map<\n string,\n {\n localized: boolean\n relationName?: string\n target: string\n type: 'many' | 'one'\n }\n>\n\nexport type GenericColumn = PgColumn<\n ColumnBaseConfig<ColumnDataType, string>,\n Record<string, unknown>\n>\n\nexport type GenericColumns = {\n [x: string]: GenericColumn\n}\n\nexport type GenericTable = PgTableWithColumns<{\n columns: GenericColumns\n dialect: string\n name: string\n schema: string\n}>\n\nexport type GenericEnum = PgEnum<[string, ...string[]]>\n\nexport type GenericRelation = Relations<string, Record<string, Relation<string>>>\n\nexport type PostgresDB = NodePgDatabase<Record<string, unknown>>\n\nexport type CountDistinct = (args: {\n db: PostgresDB | TransactionPg\n joins: BuildQueryJoinAliases\n tableName: string\n where: SQL\n}) => Promise<number>\n\nexport type DeleteWhere = (args: {\n db: PostgresDB | TransactionPg\n tableName: string\n where: SQL\n}) => Promise<void>\n\nexport type DropDatabase = (args: { adapter: BasePostgresAdapter }) => Promise<void>\n\nexport type Execute<T> = (args: {\n db?: PostgresDB | TransactionPg\n drizzle?: PostgresDB\n raw?: string\n sql?: SQL<unknown>\n}) => Promise<QueryResult<Record<string, T>>>\n\nexport type Insert = (args: {\n db: PostgresDB | TransactionPg\n onConflictDoUpdate?: PgInsertOnConflictDoUpdateConfig<any>\n tableName: string\n values: Record<string, unknown> | Record<string, unknown>[]\n}) => Promise<Record<string, unknown>[]>\n\ntype Schema =\n | {\n enum: typeof pgEnum\n table: PgTableFn\n }\n | PgSchema\n\nexport type BasePostgresAdapter = {\n countDistinct: CountDistinct\n defaultDrizzleSnapshot: DrizzleSnapshotJSON\n deleteWhere: DeleteWhere\n drizzle: PostgresDB\n dropDatabase: DropDatabase\n enums: Record<string, GenericEnum>\n execute: Execute<unknown>\n /**\n * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n * Used for returning properly formed errors from unique fields\n */\n fieldConstraints: Record<string, Record<string, string>>\n idType: 'serial' | 'uuid'\n initializing: Promise<void>\n insert: Insert\n localesSuffix?: string\n logger: DrizzleConfig['logger']\n operators: Operators\n pgSchema?: Schema\n prodMigrations?: {\n down: (args: MigrateDownArgs) => Promise<void>\n name: string\n up: (args: MigrateUpArgs) => Promise<void>\n }[]\n push: boolean\n rejectInitializing: () => void\n relations: Record<string, GenericRelation>\n relationshipsSuffix?: string\n resolveInitializing: () => void\n schemaName?: string\n sessions: {\n [id: string]: {\n db: PostgresDB | TransactionPg\n reject: () => Promise<void>\n resolve: () => Promise<void>\n }\n }\n tableNameMap: Map<string, string>\n tables: Record<string, GenericTable>\n versionsSuffix?: string\n} & PostgresDrizzleAdapter\n\nexport type PostgresDrizzleAdapter = Omit<\n DrizzleAdapter,\n | 'countDistinct'\n | 'deleteWhere'\n | 'drizzle'\n | 'dropDatabase'\n | 'execute'\n | 'insert'\n | 'operators'\n | 'relations'\n>\n\nexport type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar'\n\nexport type MigrateUpArgs = { payload: Payload; req?: Partial<PayloadRequest> }\nexport type MigrateDownArgs = { payload: Payload; req?: Partial<PayloadRequest> }\n"],"names":[],"mappings":"AA+JA,WAAiF"}
1
+ {"version":3,"sources":["../../src/postgres/types.ts"],"sourcesContent":["import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'\nimport type {\n ColumnBaseConfig,\n ColumnDataType,\n DrizzleConfig,\n Relation,\n Relations,\n SQL,\n} from 'drizzle-orm'\nimport type { NodePgDatabase } from 'drizzle-orm/node-postgres'\nimport type {\n ForeignKeyBuilder,\n IndexBuilder,\n PgColumn,\n PgEnum,\n pgEnum,\n PgInsertOnConflictDoUpdateConfig,\n PgSchema,\n PgTableWithColumns,\n UniqueConstraintBuilder,\n} from 'drizzle-orm/pg-core'\nimport type { PgTableFn } from 'drizzle-orm/pg-core/table'\nimport type { Payload, PayloadRequest } from 'payload'\nimport type { ClientConfig, QueryResult } from 'pg'\n\nimport type { extendDrizzleTable, Operators } from '../index.js'\nimport type { BuildQueryJoinAliases, DrizzleAdapter, TransactionPg } from '../types.js'\n\nexport type BaseExtraConfig = Record<\n string,\n (cols: GenericColumns) => ForeignKeyBuilder | IndexBuilder | UniqueConstraintBuilder\n>\n\nexport type RelationMap = Map<\n string,\n {\n localized: boolean\n relationName?: string\n target: string\n type: 'many' | 'one'\n }\n>\n\nexport type GenericColumn = PgColumn<\n ColumnBaseConfig<ColumnDataType, string>,\n Record<string, unknown>\n>\n\nexport type GenericColumns = {\n [x: string]: GenericColumn\n}\n\nexport type GenericTable = PgTableWithColumns<{\n columns: GenericColumns\n dialect: string\n name: string\n schema: string\n}>\n\nexport type GenericEnum = PgEnum<[string, ...string[]]>\n\nexport type GenericRelation = Relations<string, Record<string, Relation<string>>>\n\nexport type PostgresDB = NodePgDatabase<Record<string, unknown>>\n\nexport type CountDistinct = (args: {\n db: PostgresDB | TransactionPg\n joins: BuildQueryJoinAliases\n tableName: string\n where: SQL\n}) => Promise<number>\n\nexport type DeleteWhere = (args: {\n db: PostgresDB | TransactionPg\n tableName: string\n where: SQL\n}) => Promise<void>\n\nexport type DropDatabase = (args: { adapter: BasePostgresAdapter }) => Promise<void>\n\nexport type Execute<T> = (args: {\n db?: PostgresDB | TransactionPg\n drizzle?: PostgresDB\n raw?: string\n sql?: SQL<unknown>\n}) => Promise<QueryResult<Record<string, T>>>\n\nexport type Insert = (args: {\n db: PostgresDB | TransactionPg\n onConflictDoUpdate?: PgInsertOnConflictDoUpdateConfig<any>\n tableName: string\n values: Record<string, unknown> | Record<string, unknown>[]\n}) => Promise<Record<string, unknown>[]>\n\nexport type CreateDatabase = (args?: {\n /**\n * Name of a database, defaults to the current one\n */\n name?: string\n /**\n * Schema to create in addition to 'public'. Defaults from adapter.schemaName if exists.\n */\n schemaName?: string\n}) => Promise<boolean>\n\ntype Schema =\n | {\n enum: typeof pgEnum\n table: PgTableFn<string>\n }\n | PgSchema\n\ntype PostgresSchema = {\n enums: Record<string, GenericEnum>\n relations: Record<string, GenericRelation>\n tables: Record<string, PgTableWithColumns<any>>\n}\n\ntype PostgresSchemaHookArgs = {\n adapter: PostgresDrizzleAdapter\n extendTable: typeof extendDrizzleTable\n schema: PostgresSchema\n}\n\nexport type PostgresSchemaHook = (\n args: PostgresSchemaHookArgs,\n) => PostgresSchema | Promise<PostgresSchema>\n\nexport type BasePostgresAdapter = {\n afterSchemaInit: PostgresSchemaHook[]\n beforeSchemaInit: PostgresSchemaHook[]\n countDistinct: CountDistinct\n createDatabase: CreateDatabase\n createExtensions: () => Promise<void>\n defaultDrizzleSnapshot: DrizzleSnapshotJSON\n deleteWhere: DeleteWhere\n disableCreateDatabase: boolean\n drizzle: PostgresDB\n dropDatabase: DropDatabase\n enums: Record<string, GenericEnum>\n execute: Execute<unknown>\n extensions: Record<string, boolean>\n /**\n * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n * Used for returning properly formed errors from unique fields\n */\n fieldConstraints: Record<string, Record<string, string>>\n idType: 'serial' | 'uuid'\n initializing: Promise<void>\n insert: Insert\n localesSuffix?: string\n logger: DrizzleConfig['logger']\n operators: Operators\n pgSchema: Schema\n poolOptions?: ClientConfig\n prodMigrations?: {\n down: (args: MigrateDownArgs) => Promise<void>\n name: string\n up: (args: MigrateUpArgs) => Promise<void>\n }[]\n push: boolean\n rejectInitializing: () => void\n relations: Record<string, GenericRelation>\n relationshipsSuffix?: string\n resolveInitializing: () => void\n schemaName?: string\n sessions: {\n [id: string]: {\n db: PostgresDB | TransactionPg\n reject: () => Promise<void>\n resolve: () => Promise<void>\n }\n }\n tableNameMap: Map<string, string>\n tables: Record<string, GenericTable>\n tablesFilter?: string[]\n versionsSuffix?: string\n} & PostgresDrizzleAdapter\n\nexport type PostgresDrizzleAdapter = Omit<\n DrizzleAdapter,\n | 'countDistinct'\n | 'deleteWhere'\n | 'drizzle'\n | 'dropDatabase'\n | 'execute'\n | 'insert'\n | 'operators'\n | 'relations'\n>\n\nexport type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar'\n\nexport type MigrateUpArgs = { payload: Payload; req: PayloadRequest }\nexport type MigrateDownArgs = { payload: Payload; req: PayloadRequest }\n"],"names":[],"mappings":"AAkMA,WAAuE"}
@@ -0,0 +1,11 @@
1
+ import type { SQL } from 'drizzle-orm';
2
+ import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
3
+ import type { GenericTable } from '../types.js';
4
+ import type { BuildQueryJoinAliases } from './buildQuery.js';
5
+ export declare const addJoinTable: ({ type, condition, joins, table, }: {
6
+ condition: SQL;
7
+ joins: BuildQueryJoinAliases;
8
+ table: GenericTable | PgTableWithColumns<any>;
9
+ type?: "innerJoin" | "leftJoin" | "rightJoin";
10
+ }) => void;
11
+ //# sourceMappingURL=addJoinTable.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"addJoinTable.d.ts","sourceRoot":"","sources":["../../src/queries/addJoinTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAI5D,eAAO,MAAM,YAAY,uCAKtB;IACD,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,qBAAqB,CAAA;IAC5B,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,CAAA;CAC9C,SAMA,CAAA"}
@@ -0,0 +1,13 @@
1
+ import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js';
2
+ export const addJoinTable = ({ type, condition, joins, table })=>{
3
+ const name = getNameFromDrizzleTable(table);
4
+ if (!joins.some((eachJoin)=>getNameFromDrizzleTable(eachJoin.table) === name)) {
5
+ joins.push({
6
+ type,
7
+ condition,
8
+ table
9
+ });
10
+ }
11
+ };
12
+
13
+ //# sourceMappingURL=addJoinTable.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/queries/addJoinTable.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\n\nimport type { GenericTable } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'\n\nexport const addJoinTable = ({\n type,\n condition,\n joins,\n table,\n}: {\n condition: SQL\n joins: BuildQueryJoinAliases\n table: GenericTable | PgTableWithColumns<any>\n type?: 'innerJoin' | 'leftJoin' | 'rightJoin'\n}) => {\n const name = getNameFromDrizzleTable(table)\n\n if (!joins.some((eachJoin) => getNameFromDrizzleTable(eachJoin.table) === name)) {\n joins.push({ type, condition, table })\n }\n}\n"],"names":["getNameFromDrizzleTable","addJoinTable","type","condition","joins","table","name","some","eachJoin","push"],"mappings":"AAMA,SAASA,uBAAuB,QAAQ,0CAAyC;AAEjF,OAAO,MAAMC,eAAe,CAAC,EAC3BC,IAAI,EACJC,SAAS,EACTC,KAAK,EACLC,KAAK,EAMN;IACC,MAAMC,OAAON,wBAAwBK;IAErC,IAAI,CAACD,MAAMG,IAAI,CAAC,CAACC,WAAaR,wBAAwBQ,SAASH,KAAK,MAAMC,OAAO;QAC/EF,MAAMK,IAAI,CAAC;YAAEP;YAAMC;YAAWE;QAAM;IACtC;AACF,EAAC"}
@@ -1,4 +1,4 @@
1
- import type { Field } from 'payload';
1
+ import type { Field, Sort } from 'payload';
2
2
  import type { DrizzleAdapter, GenericColumn } from '../types.js';
3
3
  import type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js';
4
4
  type Args = {
@@ -7,7 +7,7 @@ type Args = {
7
7
  joins: BuildQueryJoinAliases;
8
8
  locale?: string;
9
9
  selectFields: Record<string, GenericColumn>;
10
- sort?: string;
10
+ sort?: Sort;
11
11
  tableName: string;
12
12
  };
13
13
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAmDnC,CAAA"}
1
+ {"version":3,"file":"buildOrderBy.d.ts","sourceRoot":"","sources":["../../src/queries/buildOrderBy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,uEAQtB,IAAI,KAAG,gBAAgB,CAAC,SAAS,CAoDnC,CAAA"}
@@ -3,48 +3,53 @@ import { getTableColumnFromPath } from './getTableColumnFromPath.js';
3
3
  /**
4
4
  * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary
5
5
  */ export const buildOrderBy = ({ adapter, fields, joins, locale, selectFields, sort, tableName })=>{
6
- const orderBy = {
7
- column: null,
8
- order: null
9
- };
10
- if (sort) {
11
- let sortPath;
12
- if (sort[0] === '-') {
13
- sortPath = sort.substring(1);
14
- orderBy.order = desc;
6
+ const orderBy = [];
7
+ if (!sort) {
8
+ const createdAt = adapter.tables[tableName]?.createdAt;
9
+ if (createdAt) {
10
+ sort = '-createdAt';
11
+ } else {
12
+ sort = '-id';
13
+ }
14
+ }
15
+ if (typeof sort === 'string') {
16
+ sort = [
17
+ sort
18
+ ];
19
+ }
20
+ for (const sortItem of sort){
21
+ let sortProperty;
22
+ let sortDirection;
23
+ if (sortItem[0] === '-') {
24
+ sortProperty = sortItem.substring(1);
25
+ sortDirection = 'desc';
15
26
  } else {
16
- sortPath = sort;
17
- orderBy.order = asc;
27
+ sortProperty = sortItem;
28
+ sortDirection = 'asc';
18
29
  }
19
30
  try {
20
31
  const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
21
32
  adapter,
22
- collectionPath: sortPath,
33
+ collectionPath: sortProperty,
23
34
  fields,
24
35
  joins,
25
36
  locale,
26
- pathSegments: sortPath.replace(/__/g, '.').split('.'),
37
+ pathSegments: sortProperty.replace(/__/g, '.').split('.'),
27
38
  selectFields,
28
39
  tableName,
29
- value: sortPath
40
+ value: sortProperty
30
41
  });
31
- orderBy.column = sortTable?.[sortTableColumnName];
42
+ if (sortTable?.[sortTableColumnName]) {
43
+ orderBy.push({
44
+ column: sortTable[sortTableColumnName],
45
+ order: sortDirection === 'asc' ? asc : desc
46
+ });
47
+ selectFields[sortTableColumnName] = sortTable[sortTableColumnName];
48
+ }
32
49
  } catch (err) {
33
50
  // continue
34
51
  }
35
52
  }
36
- if (!orderBy?.column) {
37
- orderBy.order = desc;
38
- const createdAt = adapter.tables[tableName]?.createdAt;
39
- if (createdAt) {
40
- orderBy.column = createdAt;
41
- } else {
42
- orderBy.column = adapter.tables[tableName].id;
43
- }
44
- }
45
- if (orderBy.column) {
46
- selectFields.sort = orderBy.column;
47
- }
48
53
  return orderBy;
49
54
  };
50
55
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins: BuildQueryJoinAliases\n locale?: string\n selectFields: Record<string, GenericColumn>\n sort?: string\n tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n sort,\n tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n const orderBy: BuildQueryResult['orderBy'] = {\n column: null,\n order: null,\n }\n\n if (sort) {\n let sortPath\n\n if (sort[0] === '-') {\n sortPath = sort.substring(1)\n orderBy.order = desc\n } else {\n sortPath = sort\n orderBy.order = asc\n }\n\n try {\n const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n adapter,\n collectionPath: sortPath,\n fields,\n joins,\n locale,\n pathSegments: sortPath.replace(/__/g, '.').split('.'),\n selectFields,\n tableName,\n value: sortPath,\n })\n orderBy.column = sortTable?.[sortTableColumnName]\n } catch (err) {\n // continue\n }\n }\n\n if (!orderBy?.column) {\n orderBy.order = desc\n const createdAt = adapter.tables[tableName]?.createdAt\n\n if (createdAt) {\n orderBy.column = createdAt\n } else {\n orderBy.column = adapter.tables[tableName].id\n }\n }\n\n if (orderBy.column) {\n selectFields.sort = orderBy.column\n }\n\n return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","err","createdAt","tables","id"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC;QAC3CC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIJ,MAAM;QACR,IAAIK;QAEJ,IAAIL,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBK,WAAWL,KAAKM,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGZ;QAClB,OAAO;YACLa,WAAWL;YACXE,QAAQE,KAAK,GAAGb;QAClB;QAEA,IAAI;YACF,MAAM,EAAEgB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGjB,uBAAuB;gBACnFE;gBACAgB,gBAAgBN;gBAChBT;gBACAC;gBACAC;gBACAc,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDf;gBACAE;gBACAc,OAAOV;YACT;YACAH,QAAQC,MAAM,GAAGO,WAAW,CAACF,oBAAoB;QACnD,EAAE,OAAOQ,KAAK;QACZ,WAAW;QACb;IACF;IAEA,IAAI,CAACd,SAASC,QAAQ;QACpBD,QAAQE,KAAK,GAAGZ;QAChB,MAAMyB,YAAYtB,QAAQuB,MAAM,CAACjB,UAAU,EAAEgB;QAE7C,IAAIA,WAAW;YACbf,QAAQC,MAAM,GAAGc;QACnB,OAAO;YACLf,QAAQC,MAAM,GAAGR,QAAQuB,MAAM,CAACjB,UAAU,CAACkB,EAAE;QAC/C;IACF;IAEA,IAAIjB,QAAQC,MAAM,EAAE;QAClBJ,aAAaC,IAAI,GAAGE,QAAQC,MAAM;IACpC;IAEA,OAAOD;AACT,EAAC"}
1
+ {"version":3,"sources":["../../src/queries/buildOrderBy.ts"],"sourcesContent":["import type { Field, Sort } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\n\ntype Args = {\n adapter: DrizzleAdapter\n fields: Field[]\n joins: BuildQueryJoinAliases\n locale?: string\n selectFields: Record<string, GenericColumn>\n sort?: Sort\n tableName: string\n}\n\n/**\n * Gets the order by column and direction constructed from the sort argument adds the column to the select fields and joins if necessary\n */\nexport const buildOrderBy = ({\n adapter,\n fields,\n joins,\n locale,\n selectFields,\n sort,\n tableName,\n}: Args): BuildQueryResult['orderBy'] => {\n const orderBy: BuildQueryResult['orderBy'] = []\n\n if (!sort) {\n const createdAt = adapter.tables[tableName]?.createdAt\n if (createdAt) {\n sort = '-createdAt'\n } else {\n sort = '-id'\n }\n }\n\n if (typeof sort === 'string') {\n sort = [sort]\n }\n\n for (const sortItem of sort) {\n let sortProperty: string\n let sortDirection: 'asc' | 'desc'\n if (sortItem[0] === '-') {\n sortProperty = sortItem.substring(1)\n sortDirection = 'desc'\n } else {\n sortProperty = sortItem\n sortDirection = 'asc'\n }\n try {\n const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n adapter,\n collectionPath: sortProperty,\n fields,\n joins,\n locale,\n pathSegments: sortProperty.replace(/__/g, '.').split('.'),\n selectFields,\n tableName,\n value: sortProperty,\n })\n if (sortTable?.[sortTableColumnName]) {\n orderBy.push({\n column: sortTable[sortTableColumnName],\n order: sortDirection === 'asc' ? asc : desc,\n })\n\n selectFields[sortTableColumnName] = sortTable[sortTableColumnName]\n }\n } catch (err) {\n // continue\n }\n }\n\n return orderBy\n}\n"],"names":["asc","desc","getTableColumnFromPath","buildOrderBy","adapter","fields","joins","locale","selectFields","sort","tableName","orderBy","createdAt","tables","sortItem","sortProperty","sortDirection","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","push","column","order","err"],"mappings":"AAEA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAKvC,SAASC,sBAAsB,QAAQ,8BAA6B;AAYpE;;CAEC,GACD,OAAO,MAAMC,eAAe,CAAC,EAC3BC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,UAAuC,EAAE;IAE/C,IAAI,CAACF,MAAM;QACT,MAAMG,YAAYR,QAAQS,MAAM,CAACH,UAAU,EAAEE;QAC7C,IAAIA,WAAW;YACbH,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,KAAK,MAAMK,YAAYL,KAAM;QAC3B,IAAIM;QACJ,IAAIC;QACJ,IAAIF,QAAQ,CAAC,EAAE,KAAK,KAAK;YACvBC,eAAeD,SAASG,SAAS,CAAC;YAClCD,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAI;YACF,MAAM,EAAEE,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGnB,uBAAuB;gBACnFE;gBACAkB,gBAAgBP;gBAChBV;gBACAC;gBACAC;gBACAgB,cAAcR,aAAaS,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACrDjB;gBACAE;gBACAgB,OAAOX;YACT;YACA,IAAIM,WAAW,CAACF,oBAAoB,EAAE;gBACpCR,QAAQgB,IAAI,CAAC;oBACXC,QAAQP,SAAS,CAACF,oBAAoB;oBACtCU,OAAOb,kBAAkB,QAAQhB,MAAMC;gBACzC;gBAEAO,YAAY,CAACW,oBAAoB,GAAGE,SAAS,CAACF,oBAAoB;YACpE;QACF,EAAE,OAAOW,KAAK;QACZ,WAAW;QACb;IACF;IAEA,OAAOnB;AACT,EAAC"}
@@ -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?: string;
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;AAE3C,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;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,MAAM,CAAA;IACb,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,CAAA;IACD,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
+ {"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?: string\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;AA0B9C,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"}
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"}
@@ -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;AAK5D,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,WAipBT,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,6 +4,7 @@ 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
@@ -108,17 +109,15 @@ import { getTableAlias } from './getTableAlias.js';
108
109
  {
109
110
  if (locale && field.localized && adapter.payload.config.localization) {
110
111
  newTableName = `${tableName}${adapter.localesSuffix}`;
111
- joins.push({
112
- condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),
113
- table: adapter.tables[newTableName]
114
- });
112
+ let condition = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
115
113
  if (locale !== 'all') {
116
- constraints.push({
117
- columnName: '_locale',
118
- table: adapter.tables[newTableName],
119
- value: locale
120
- });
114
+ condition = and(condition, eq(adapter.tables[newTableName]._locale, locale));
121
115
  }
116
+ addJoinTable({
117
+ condition,
118
+ joins,
119
+ table: adapter.tables[newTableName]
120
+ });
122
121
  }
123
122
  return getTableColumnFromPath({
124
123
  adapter,
@@ -143,20 +142,22 @@ import { getTableAlias } from './getTableAlias.js';
143
142
  if (field.hasMany) {
144
143
  const newTableName = adapter.tableNameMap.get(`${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`);
145
144
  if (locale && field.localized && adapter.payload.config.localization) {
146
- joins.push({
147
- condition: and(eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent), eq(adapter.tables[newTableName]._locale, locale)),
148
- table: adapter.tables[newTableName]
149
- });
145
+ const conditions = [
146
+ eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
147
+ eq(adapter.tables[newTableName]._locale, locale)
148
+ ];
150
149
  if (locale !== 'all') {
151
- constraints.push({
152
- columnName: '_locale',
153
- table: adapter.tables[newTableName],
154
- value: locale
155
- });
150
+ conditions.push(eq(adapter.tables[newTableName]._locale, locale));
156
151
  }
152
+ addJoinTable({
153
+ condition: and(...conditions),
154
+ joins,
155
+ table: adapter.tables[newTableName]
156
+ });
157
157
  } else {
158
- joins.push({
158
+ addJoinTable({
159
159
  condition: eq(adapter.tables[tableName].id, adapter.tables[newTableName].parent),
160
+ joins,
160
161
  table: adapter.tables[newTableName]
161
162
  });
162
163
  }
@@ -185,20 +186,21 @@ import { getTableAlias } from './getTableAlias.js';
185
186
  like(adapter.tables[newTableName].path, `${constraintPath}${field.name}`)
186
187
  ];
187
188
  if (locale && field.localized && adapter.payload.config.localization) {
188
- joins.push({
189
- condition: and(...joinConstraints, eq(adapter.tables[newTableName]._locale, locale)),
190
- table: adapter.tables[newTableName]
191
- });
189
+ const conditions = [
190
+ ...joinConstraints
191
+ ];
192
192
  if (locale !== 'all') {
193
- constraints.push({
194
- columnName: 'locale',
195
- table: adapter.tables[newTableName],
196
- value: locale
197
- });
193
+ conditions.push(eq(adapter.tables[newTableName]._locale, locale));
198
194
  }
195
+ addJoinTable({
196
+ condition: and(...conditions),
197
+ joins,
198
+ table: adapter.tables[newTableName]
199
+ });
199
200
  } else {
200
- joins.push({
201
+ addJoinTable({
201
202
  condition: and(...joinConstraints),
203
+ joins,
202
204
  table: adapter.tables[newTableName]
203
205
  });
204
206
  }
@@ -217,20 +219,21 @@ import { getTableAlias } from './getTableAlias.js';
217
219
  const arrayParentTable = aliasTable || adapter.tables[tableName];
218
220
  constraintPath = `${constraintPath}${field.name}.%.`;
219
221
  if (locale && field.localized && adapter.payload.config.localization) {
220
- joins.push({
221
- condition: and(eq(arrayParentTable.id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
222
- table: adapter.tables[newTableName]
223
- });
222
+ const conditions = [
223
+ eq(arrayParentTable.id, adapter.tables[newTableName]._parentID)
224
+ ];
224
225
  if (locale !== 'all') {
225
- constraints.push({
226
- columnName: '_locale',
227
- table: adapter.tables[newTableName],
228
- value: locale
229
- });
226
+ conditions.push(eq(adapter.tables[newTableName]._locale, locale));
230
227
  }
228
+ addJoinTable({
229
+ condition: and(...conditions),
230
+ joins,
231
+ table: adapter.tables[newTableName]
232
+ });
231
233
  } else {
232
- joins.push({
234
+ addJoinTable({
233
235
  condition: eq(arrayParentTable.id, adapter.tables[newTableName]._parentID),
236
+ joins,
234
237
  table: adapter.tables[newTableName]
235
238
  });
236
239
  }
@@ -317,17 +320,16 @@ import { getTableAlias } from './getTableAlias.js';
317
320
  ...blockSelectFields
318
321
  };
319
322
  if (field.localized && adapter.payload.config.localization) {
323
+ const conditions = [
324
+ eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID)
325
+ ];
326
+ if (locale !== 'all') {
327
+ conditions.push(eq(adapter.tables[newTableName]._locale, locale));
328
+ }
320
329
  joins.push({
321
- condition: and(eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale)),
330
+ condition: and(...conditions),
322
331
  table: adapter.tables[newTableName]
323
332
  });
324
- if (locale) {
325
- constraints.push({
326
- columnName: '_locale',
327
- table: adapter.tables[newTableName],
328
- value: locale
329
- });
330
- }
331
333
  } else {
332
334
  joins.push({
333
335
  condition: eq((aliasTable || adapter.tables[tableName]).id, adapter.tables[newTableName]._parentID),
@@ -361,17 +363,17 @@ import { getTableAlias } from './getTableAlias.js';
361
363
  });
362
364
  // Join in the relationships table
363
365
  if (locale && field.localized && adapter.payload.config.localization) {
366
+ const conditions = [
367
+ eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),
368
+ like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)
369
+ ];
370
+ if (locale !== 'all') {
371
+ conditions.push(eq(aliasRelationshipTable.locale, locale));
372
+ }
364
373
  joins.push({
365
- condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
374
+ condition: and(...conditions),
366
375
  table: aliasRelationshipTable
367
376
  });
368
- if (locale !== 'all') {
369
- constraints.push({
370
- columnName: 'locale',
371
- table: aliasRelationshipTable,
372
- value: locale
373
- });
374
- }
375
377
  } else {
376
378
  // Join in the relationships table
377
379
  joins.push({
@@ -497,12 +499,20 @@ import { getTableAlias } from './getTableAlias.js';
497
499
  adapter,
498
500
  tableName: `${rootTableName}${adapter.localesSuffix}`
499
501
  });
500
- joins.push({
501
- condition: and(eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id), eq(aliasLocaleTable._locale, locale)),
502
- table: aliasLocaleTable
502
+ const condtions = [
503
+ eq(aliasLocaleTable._parentID, adapter.tables[rootTableName].id)
504
+ ];
505
+ if (locale !== 'all') {
506
+ condtions.push(eq(aliasLocaleTable._locale, locale));
507
+ }
508
+ const localesTable = adapter.tables[`${rootTableName}${adapter.localesSuffix}`];
509
+ addJoinTable({
510
+ condition: and(...condtions),
511
+ joins,
512
+ table: localesTable
503
513
  });
504
514
  joins.push({
505
- condition: eq(aliasLocaleTable[columnName], newAliasTable.id),
515
+ condition: eq(localesTable[columnName], newAliasTable.id),
506
516
  table: newAliasTable
507
517
  });
508
518
  } else {
@@ -534,25 +544,25 @@ import { getTableAlias } from './getTableAlias.js';
534
544
  }
535
545
  }
536
546
  if (fieldAffectsData(field)) {
547
+ let newTable = adapter.tables[newTableName];
537
548
  if (field.localized && adapter.payload.config.localization) {
538
549
  // If localized, we go to localized table and set aliasTable to undefined
539
550
  // so it is not picked up below to be used as targetTable
540
551
  const parentTable = aliasTable || adapter.tables[tableName];
541
552
  newTableName = `${tableName}${adapter.localesSuffix}`;
542
- joins.push({
543
- condition: eq(parentTable.id, adapter.tables[newTableName]._parentID),
544
- table: adapter.tables[newTableName]
545
- });
546
- aliasTable = undefined;
553
+ newTable = adapter.tables[newTableName];
554
+ let condition = eq(parentTable.id, newTable._parentID);
547
555
  if (locale !== 'all') {
548
- constraints.push({
549
- columnName: '_locale',
550
- table: adapter.tables[newTableName],
551
- value: locale
552
- });
556
+ condition = and(condition, eq(newTable._locale, locale));
553
557
  }
558
+ addJoinTable({
559
+ condition,
560
+ joins,
561
+ table: newTable
562
+ });
563
+ aliasTable = undefined;
554
564
  }
555
- const targetTable = aliasTable || adapter.tables[newTableName];
565
+ const targetTable = aliasTable || newTable;
556
566
  selectFields[`${newTableName}.${columnPrefix}${field.name}`] = targetTable[`${columnPrefix}${field.name}`];
557
567
  return {
558
568
  columnName: `${columnPrefix}${field.name}`,