@payloadcms/db-postgres 3.0.0-alpha.54 → 3.0.0-alpha.55
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/create.d.ts.map +1 -1
- package/dist/create.js +5 -2
- package/dist/create.js.map +1 -1
- package/dist/createGlobal.d.ts.map +1 -1
- package/dist/createGlobal.js +5 -2
- package/dist/createGlobal.js.map +1 -1
- package/dist/createGlobalVersion.d.ts.map +1 -1
- package/dist/createGlobalVersion.js +6 -3
- package/dist/createGlobalVersion.js.map +1 -1
- package/dist/createVersion.d.ts.map +1 -1
- package/dist/createVersion.js +12 -4
- package/dist/createVersion.js.map +1 -1
- package/dist/deleteMany.js +5 -2
- package/dist/deleteMany.js.map +1 -1
- package/dist/deleteOne.d.ts.map +1 -1
- package/dist/deleteOne.js +5 -2
- package/dist/deleteOne.js.map +1 -1
- package/dist/deleteVersions.d.ts.map +1 -1
- package/dist/deleteVersions.js +6 -2
- package/dist/deleteVersions.js.map +1 -1
- package/dist/find/traverseFields.d.ts.map +1 -1
- package/dist/find/traverseFields.js +24 -5
- package/dist/find/traverseFields.js.map +1 -1
- package/dist/find.d.ts.map +1 -1
- package/dist/find.js +9 -5
- package/dist/find.js.map +1 -1
- package/dist/findGlobal.d.ts.map +1 -1
- package/dist/findGlobal.js +5 -2
- package/dist/findGlobal.js.map +1 -1
- package/dist/findGlobalVersions.d.ts.map +1 -1
- package/dist/findGlobalVersions.js +6 -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 +8 -4
- package/dist/findOne.js.map +1 -1
- package/dist/findVersions.d.ts.map +1 -1
- package/dist/findVersions.js +6 -2
- package/dist/findVersions.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +27 -9
- package/dist/init.js.map +1 -1
- package/dist/migrate.js.map +1 -1
- package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
- package/dist/queries/getTableColumnFromPath.js +57 -13
- package/dist/queries/getTableColumnFromPath.js.map +1 -1
- package/dist/queryDrafts.d.ts.map +1 -1
- package/dist/queryDrafts.js +6 -2
- package/dist/queryDrafts.js.map +1 -1
- package/dist/schema/build.d.ts +2 -1
- package/dist/schema/build.d.ts.map +1 -1
- package/dist/schema/build.js +18 -8
- package/dist/schema/build.js.map +1 -1
- package/dist/schema/getTableName.d.ts +32 -0
- package/dist/schema/getTableName.d.ts.map +1 -0
- package/dist/schema/getTableName.js +31 -0
- package/dist/schema/getTableName.js.map +1 -0
- package/dist/schema/traverseFields.d.ts +2 -1
- package/dist/schema/traverseFields.d.ts.map +1 -1
- package/dist/schema/traverseFields.js +52 -15
- package/dist/schema/traverseFields.js.map +1 -1
- package/dist/types.d.ts +13 -0
- 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 +6 -3
- package/dist/update.js.map +1 -1
- package/dist/updateGlobal.d.ts.map +1 -1
- package/dist/updateGlobal.js +5 -2
- package/dist/updateGlobal.js.map +1 -1
- package/dist/updateGlobalVersion.d.ts.map +1 -1
- package/dist/updateGlobalVersion.js +6 -2
- package/dist/updateGlobalVersion.js.map +1 -1
- package/dist/updateVersion.d.ts.map +1 -1
- package/dist/updateVersion.js +6 -2
- package/dist/updateVersion.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +6 -1
package/dist/findVersions.js
CHANGED
@@ -1,10 +1,14 @@
|
|
1
1
|
import { buildVersionCollectionFields } from 'payload/versions';
|
2
|
-
import toSnakeCase from 'to-snake-case';
|
3
2
|
import { findMany } from './find/findMany.js';
|
3
|
+
import { getTableName } from './schema/getTableName.js';
|
4
4
|
export const findVersions = async function findVersions({ collection, limit, locale, page, pagination, req = {}, skip, sort: sortArg, where }) {
|
5
5
|
const collectionConfig = this.payload.collections[collection].config;
|
6
6
|
const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort;
|
7
|
-
const tableName =
|
7
|
+
const tableName = getTableName({
|
8
|
+
adapter: this,
|
9
|
+
config: collectionConfig,
|
10
|
+
versions: true
|
11
|
+
});
|
8
12
|
const fields = buildVersionCollectionFields(collectionConfig);
|
9
13
|
return findMany({
|
10
14
|
adapter: this,
|
package/dist/findVersions.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions } from 'payload/database'\nimport type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'\n\nimport { buildVersionCollectionFields } from 'payload/versions'\
|
1
|
+
{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { FindVersions } from 'payload/database'\nimport type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'\n\nimport { buildVersionCollectionFields } from 'payload/versions'\n\nimport type { PostgresAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\nimport { getTableName } from './schema/getTableName.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n this: PostgresAdapter,\n {\n collection,\n limit,\n locale,\n page,\n pagination,\n req = {} as PayloadRequest,\n skip,\n sort: sortArg,\n where,\n },\n) {\n const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n const sort = typeof sortArg === 'string' ? sortArg : collectionConfig.defaultSort\n\n const tableName = getTableName({\n adapter: this,\n config: collectionConfig,\n versions: true,\n })\n const fields = buildVersionCollectionFields(collectionConfig)\n\n return findMany({\n adapter: this,\n fields,\n limit,\n locale,\n page,\n pagination,\n req,\n skip,\n sort,\n tableName,\n where,\n })\n}\n"],"names":["buildVersionCollectionFields","findMany","getTableName","findVersions","collection","limit","locale","page","pagination","req","skip","sort","sortArg","where","collectionConfig","payload","collections","config","defaultSort","tableName","adapter","versions","fields"],"mappings":"AAGA,SAASA,4BAA4B,QAAQ,mBAAkB;AAI/D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,SAASC,YAAY,QAAQ,2BAA0B;AAEvD,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EACEC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACZ,WAAW,CAACa,MAAM;IAC/F,MAAMN,OAAO,OAAOC,YAAY,WAAWA,UAAUE,iBAAiBI,WAAW;IAEjF,MAAMC,YAAYjB,aAAa;QAC7BkB,SAAS,IAAI;QACbH,QAAQH;QACRO,UAAU;IACZ;IACA,MAAMC,SAAStB,6BAA6Bc;IAE5C,OAAOb,SAAS;QACdmB,SAAS,IAAI;QACbE;QACAjB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAQ;QACAN;IACF;AACF,EAAC"}
|
package/dist/index.d.ts
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import type { DatabaseAdapterObj } from 'payload/database';
|
2
|
-
export type { MigrateDownArgs, MigrateUpArgs } from './types.js';
|
3
2
|
import type { Args, PostgresAdapter } from './types.js';
|
3
|
+
export type { MigrateDownArgs, MigrateUpArgs } from './types.js';
|
4
4
|
export { sql } from 'drizzle-orm';
|
5
5
|
export declare function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>;
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAM1D,OAAO,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAiCvD,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEhE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAwE/E"}
|
package/dist/index.js
CHANGED
@@ -39,20 +39,24 @@ export function postgresAdapter(args) {
|
|
39
39
|
return createDatabaseAdapter({
|
40
40
|
name: 'postgres',
|
41
41
|
// Postgres-specific
|
42
|
+
blockTableNames: {},
|
42
43
|
drizzle: undefined,
|
43
44
|
enums: {},
|
44
45
|
fieldConstraints: {},
|
45
46
|
idType,
|
47
|
+
localesSuffix: args.localesSuffix || '_locales',
|
46
48
|
logger: args.logger,
|
47
49
|
pgSchema: undefined,
|
48
50
|
pool: undefined,
|
49
51
|
poolOptions: args.pool,
|
50
52
|
push: args.push,
|
51
53
|
relations: {},
|
54
|
+
relationshipsSuffix: args.relationshipsSuffix || '_rels',
|
52
55
|
schema: {},
|
53
56
|
schemaName: args.schemaName,
|
54
57
|
sessions: {},
|
55
58
|
tables: {},
|
59
|
+
versionsSuffix: args.versionsSuffix || '_v',
|
56
60
|
// DatabaseAdapter
|
57
61
|
beginTransaction,
|
58
62
|
commitTransaction,
|
package/dist/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport type { DatabaseAdapterObj } from 'payload/database'\
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport type { DatabaseAdapterObj } from 'payload/database'\n\nimport fs from 'fs'\nimport path from 'path'\nimport { createDatabaseAdapter } from 'payload/database'\n\nimport type { Args, PostgresAdapter } from './types.js'\n\nimport { connect } from './connect.js'\nimport { create } from './create.js'\nimport { createGlobal } from './createGlobal.js'\nimport { createGlobalVersion } from './createGlobalVersion.js'\nimport { createMigration } from './createMigration.js'\nimport { createVersion } from './createVersion.js'\nimport { deleteMany } from './deleteMany.js'\nimport { deleteOne } from './deleteOne.js'\nimport { deleteVersions } from './deleteVersions.js'\nimport { destroy } from './destroy.js'\nimport { find } from './find.js'\nimport { findGlobal } from './findGlobal.js'\nimport { findGlobalVersions } from './findGlobalVersions.js'\nimport { findOne } from './findOne.js'\nimport { findVersions } from './findVersions.js'\nimport { init } from './init.js'\nimport { migrate } from './migrate.js'\nimport { migrateDown } from './migrateDown.js'\nimport { migrateFresh } from './migrateFresh.js'\nimport { migrateRefresh } from './migrateRefresh.js'\nimport { migrateReset } from './migrateReset.js'\nimport { migrateStatus } from './migrateStatus.js'\nimport { queryDrafts } from './queryDrafts.js'\nimport { beginTransaction } from './transactions/beginTransaction.js'\nimport { commitTransaction } from './transactions/commitTransaction.js'\nimport { rollbackTransaction } from './transactions/rollbackTransaction.js'\nimport { updateOne } from './update.js'\nimport { updateGlobal } from './updateGlobal.js'\nimport { updateGlobalVersion } from './updateGlobalVersion.js'\nimport { updateVersion } from './updateVersion.js'\n\nexport type { MigrateDownArgs, MigrateUpArgs } from './types.js'\n\nexport { sql } from 'drizzle-orm'\n\nexport function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter> {\n function adapter({ payload }: { payload: Payload }) {\n const migrationDir = findMigrationDir(args.migrationDir)\n const idType = args.idType || 'serial'\n\n return createDatabaseAdapter<PostgresAdapter>({\n name: 'postgres',\n\n // Postgres-specific\n blockTableNames: {},\n drizzle: undefined,\n enums: {},\n fieldConstraints: {},\n idType,\n localesSuffix: args.localesSuffix || '_locales',\n logger: args.logger,\n pgSchema: undefined,\n pool: undefined,\n poolOptions: args.pool,\n push: args.push,\n relations: {},\n relationshipsSuffix: args.relationshipsSuffix || '_rels',\n schema: {},\n schemaName: args.schemaName,\n sessions: {},\n tables: {},\n versionsSuffix: args.versionsSuffix || '_v',\n\n // DatabaseAdapter\n beginTransaction,\n commitTransaction,\n connect,\n create,\n createGlobal,\n createGlobalVersion,\n createMigration,\n createVersion,\n /**\n * This represents how a default ID is treated in Payload as were a field type\n */\n defaultIDType: idType === 'serial' ? 'number' : 'text',\n deleteMany,\n deleteOne,\n deleteVersions,\n destroy,\n find,\n findGlobal,\n findGlobalVersions,\n findOne,\n findVersions,\n init,\n migrate,\n migrateDown,\n migrateFresh,\n migrateRefresh,\n migrateReset,\n migrateStatus,\n migrationDir,\n payload,\n queryDrafts,\n rollbackTransaction,\n updateGlobal,\n updateGlobalVersion,\n updateOne,\n updateVersion,\n })\n }\n\n return {\n defaultIDType: 'number',\n init: adapter,\n }\n}\n\n/**\n * Attempt to find migrations directory.\n *\n * Checks for the following directories in order:\n * - `migrationDir` argument from Payload config\n * - `src/migrations`\n * - `dist/migrations`\n * - `migrations`\n *\n * Defaults to `src/migrations`\n *\n * @param migrationDir\n * @returns\n */\nfunction findMigrationDir(migrationDir?: string): string {\n const cwd = process.cwd()\n const srcDir = path.resolve(cwd, 'src/migrations')\n const distDir = path.resolve(cwd, 'dist/migrations')\n const relativeMigrations = path.resolve(cwd, 'migrations')\n\n // Use arg if provided\n if (migrationDir) return migrationDir\n\n // Check other common locations\n if (fs.existsSync(srcDir)) {\n return srcDir\n }\n\n if (fs.existsSync(distDir)) {\n return distDir\n }\n\n if (fs.existsSync(relativeMigrations)) {\n return relativeMigrations\n }\n\n return srcDir\n}\n"],"names":["fs","path","createDatabaseAdapter","connect","create","createGlobal","createGlobalVersion","createMigration","createVersion","deleteMany","deleteOne","deleteVersions","destroy","find","findGlobal","findGlobalVersions","findOne","findVersions","init","migrate","migrateDown","migrateFresh","migrateRefresh","migrateReset","migrateStatus","queryDrafts","beginTransaction","commitTransaction","rollbackTransaction","updateOne","updateGlobal","updateGlobalVersion","updateVersion","sql","postgresAdapter","args","adapter","payload","migrationDir","findMigrationDir","idType","name","blockTableNames","drizzle","undefined","enums","fieldConstraints","localesSuffix","logger","pgSchema","pool","poolOptions","push","relations","relationshipsSuffix","schema","schemaName","sessions","tables","versionsSuffix","defaultIDType","cwd","process","srcDir","resolve","distDir","relativeMigrations","existsSync"],"mappings":"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"}
|
package/dist/init.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAW5C,eAAO,MAAM,IAAI,EAAE,
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAW5C,eAAO,MAAM,IAAI,EAAE,IA0FlB,CAAA"}
|
package/dist/init.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
/* eslint-disable no-param-reassign */ import { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core';
|
2
2
|
import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions';
|
3
|
-
import toSnakeCase from 'to-snake-case';
|
4
3
|
import { buildTable } from './schema/build.js';
|
4
|
+
import { getTableName } from './schema/getTableName.js';
|
5
5
|
export const init = function init() {
|
6
6
|
if (this.schemaName) {
|
7
7
|
this.pgSchema = pgSchema(this.schemaName);
|
@@ -14,7 +14,10 @@ export const init = function init() {
|
|
14
14
|
this.enums.enum__locales = pgEnum('_locales', this.payload.config.localization.locales.map(({ code })=>code));
|
15
15
|
}
|
16
16
|
this.payload.config.collections.forEach((collection)=>{
|
17
|
-
const tableName =
|
17
|
+
const tableName = getTableName({
|
18
|
+
adapter: this,
|
19
|
+
config: collection
|
20
|
+
});
|
18
21
|
buildTable({
|
19
22
|
adapter: this,
|
20
23
|
buildNumbers: true,
|
@@ -24,10 +27,15 @@ export const init = function init() {
|
|
24
27
|
disableUnique: false,
|
25
28
|
fields: collection.fields,
|
26
29
|
tableName,
|
27
|
-
timestamps: collection.timestamps
|
30
|
+
timestamps: collection.timestamps,
|
31
|
+
versions: false
|
28
32
|
});
|
29
33
|
if (collection.versions) {
|
30
|
-
const versionsTableName =
|
34
|
+
const versionsTableName = getTableName({
|
35
|
+
adapter: this,
|
36
|
+
config: collection,
|
37
|
+
versions: true
|
38
|
+
});
|
31
39
|
const versionFields = buildVersionCollectionFields(collection);
|
32
40
|
buildTable({
|
33
41
|
adapter: this,
|
@@ -38,12 +46,16 @@ export const init = function init() {
|
|
38
46
|
disableUnique: true,
|
39
47
|
fields: versionFields,
|
40
48
|
tableName: versionsTableName,
|
41
|
-
timestamps: true
|
49
|
+
timestamps: true,
|
50
|
+
versions: true
|
42
51
|
});
|
43
52
|
}
|
44
53
|
});
|
45
54
|
this.payload.config.globals.forEach((global)=>{
|
46
|
-
const tableName =
|
55
|
+
const tableName = getTableName({
|
56
|
+
adapter: this,
|
57
|
+
config: global
|
58
|
+
});
|
47
59
|
buildTable({
|
48
60
|
adapter: this,
|
49
61
|
buildNumbers: true,
|
@@ -53,10 +65,15 @@ export const init = function init() {
|
|
53
65
|
disableUnique: false,
|
54
66
|
fields: global.fields,
|
55
67
|
tableName,
|
56
|
-
timestamps: false
|
68
|
+
timestamps: false,
|
69
|
+
versions: false
|
57
70
|
});
|
58
71
|
if (global.versions) {
|
59
|
-
const versionsTableName =
|
72
|
+
const versionsTableName = getTableName({
|
73
|
+
adapter: this,
|
74
|
+
config: global,
|
75
|
+
versions: true
|
76
|
+
});
|
60
77
|
const versionFields = buildVersionGlobalFields(global);
|
61
78
|
buildTable({
|
62
79
|
adapter: this,
|
@@ -67,7 +84,8 @@ export const init = function init() {
|
|
67
84
|
disableUnique: true,
|
68
85
|
fields: versionFields,
|
69
86
|
tableName: versionsTableName,
|
70
|
-
timestamps: true
|
87
|
+
timestamps: true,
|
88
|
+
versions: true
|
71
89
|
});
|
72
90
|
}
|
73
91
|
});
|
package/dist/init.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../src/init.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { Init } from 'payload/database'\nimport type { SanitizedCollectionConfig } from 'payload/types'\n\nimport { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'\
|
1
|
+
{"version":3,"sources":["../src/init.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { Init } from 'payload/database'\nimport type { SanitizedCollectionConfig } from 'payload/types'\n\nimport { pgEnum, pgSchema, pgTable } from 'drizzle-orm/pg-core'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload/versions'\n\nimport type { PostgresAdapter } from './types.js'\n\nimport { buildTable } from './schema/build.js'\nimport { getTableName } from './schema/getTableName.js'\n\nexport const init: Init = function init(this: PostgresAdapter) {\n if (this.schemaName) {\n this.pgSchema = pgSchema(this.schemaName)\n } else {\n this.pgSchema = { table: pgTable }\n }\n\n if (this.payload.config.localization) {\n this.enums.enum__locales = pgEnum(\n '_locales',\n this.payload.config.localization.locales.map(({ code }) => code) as [string, ...string[]],\n )\n }\n\n this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n const tableName = getTableName({\n adapter: this,\n config: collection,\n })\n\n buildTable({\n adapter: this,\n buildNumbers: true,\n buildRelationships: true,\n buildTexts: true,\n disableNotNull: !!collection?.versions?.drafts,\n disableUnique: false,\n fields: collection.fields,\n tableName,\n timestamps: collection.timestamps,\n versions: false,\n })\n\n if (collection.versions) {\n const versionsTableName = getTableName({\n adapter: this,\n config: collection,\n versions: true,\n })\n const versionFields = buildVersionCollectionFields(collection)\n\n buildTable({\n adapter: this,\n buildNumbers: true,\n buildRelationships: true,\n buildTexts: true,\n disableNotNull: !!collection.versions?.drafts,\n disableUnique: true,\n fields: versionFields,\n tableName: versionsTableName,\n timestamps: true,\n versions: true,\n })\n }\n })\n\n this.payload.config.globals.forEach((global) => {\n const tableName = getTableName({ adapter: this, config: global })\n\n buildTable({\n adapter: this,\n buildNumbers: true,\n buildRelationships: true,\n buildTexts: true,\n disableNotNull: !!global?.versions?.drafts,\n disableUnique: false,\n fields: global.fields,\n tableName,\n timestamps: false,\n versions: false,\n })\n\n if (global.versions) {\n const versionsTableName = getTableName({ adapter: this, config: global, versions: true })\n const versionFields = buildVersionGlobalFields(global)\n\n buildTable({\n adapter: this,\n buildNumbers: true,\n buildRelationships: true,\n buildTexts: true,\n disableNotNull: !!global.versions?.drafts,\n disableUnique: true,\n fields: versionFields,\n tableName: versionsTableName,\n timestamps: true,\n versions: true,\n })\n }\n })\n}\n"],"names":["pgEnum","pgSchema","pgTable","buildVersionCollectionFields","buildVersionGlobalFields","buildTable","getTableName","init","schemaName","table","payload","config","localization","enums","enum__locales","locales","map","code","collections","forEach","collection","tableName","adapter","buildNumbers","buildRelationships","buildTexts","disableNotNull","versions","drafts","disableUnique","fields","timestamps","versionsTableName","versionFields","globals","global"],"mappings":"AAAA,oCAAoC,GAIpC,SAASA,MAAM,EAAEC,QAAQ,EAAEC,OAAO,QAAQ,sBAAqB;AAC/D,SAASC,4BAA4B,EAAEC,wBAAwB,QAAQ,mBAAkB;AAIzF,SAASC,UAAU,QAAQ,oBAAmB;AAC9C,SAASC,YAAY,QAAQ,2BAA0B;AAEvD,OAAO,MAAMC,OAAa,SAASA;IACjC,IAAI,IAAI,CAACC,UAAU,EAAE;QACnB,IAAI,CAACP,QAAQ,GAAGA,SAAS,IAAI,CAACO,UAAU;IAC1C,OAAO;QACL,IAAI,CAACP,QAAQ,GAAG;YAAEQ,OAAOP;QAAQ;IACnC;IAEA,IAAI,IAAI,CAACQ,OAAO,CAACC,MAAM,CAACC,YAAY,EAAE;QACpC,IAAI,CAACC,KAAK,CAACC,aAAa,GAAGd,OACzB,YACA,IAAI,CAACU,OAAO,CAACC,MAAM,CAACC,YAAY,CAACG,OAAO,CAACC,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA;IAE/D;IAEA,IAAI,CAACP,OAAO,CAACC,MAAM,CAACO,WAAW,CAACC,OAAO,CAAC,CAACC;QACvC,MAAMC,YAAYf,aAAa;YAC7BgB,SAAS,IAAI;YACbX,QAAQS;QACV;QAEAf,WAAW;YACTiB,SAAS,IAAI;YACbC,cAAc;YACdC,oBAAoB;YACpBC,YAAY;YACZC,gBAAgB,CAAC,CAACN,YAAYO,UAAUC;YACxCC,eAAe;YACfC,QAAQV,WAAWU,MAAM;YACzBT;YACAU,YAAYX,WAAWW,UAAU;YACjCJ,UAAU;QACZ;QAEA,IAAIP,WAAWO,QAAQ,EAAE;YACvB,MAAMK,oBAAoB1B,aAAa;gBACrCgB,SAAS,IAAI;gBACbX,QAAQS;gBACRO,UAAU;YACZ;YACA,MAAMM,gBAAgB9B,6BAA6BiB;YAEnDf,WAAW;gBACTiB,SAAS,IAAI;gBACbC,cAAc;gBACdC,oBAAoB;gBACpBC,YAAY;gBACZC,gBAAgB,CAAC,CAACN,WAAWO,QAAQ,EAAEC;gBACvCC,eAAe;gBACfC,QAAQG;gBACRZ,WAAWW;gBACXD,YAAY;gBACZJ,UAAU;YACZ;QACF;IACF;IAEA,IAAI,CAACjB,OAAO,CAACC,MAAM,CAACuB,OAAO,CAACf,OAAO,CAAC,CAACgB;QACnC,MAAMd,YAAYf,aAAa;YAAEgB,SAAS,IAAI;YAAEX,QAAQwB;QAAO;QAE/D9B,WAAW;YACTiB,SAAS,IAAI;YACbC,cAAc;YACdC,oBAAoB;YACpBC,YAAY;YACZC,gBAAgB,CAAC,CAACS,QAAQR,UAAUC;YACpCC,eAAe;YACfC,QAAQK,OAAOL,MAAM;YACrBT;YACAU,YAAY;YACZJ,UAAU;QACZ;QAEA,IAAIQ,OAAOR,QAAQ,EAAE;YACnB,MAAMK,oBAAoB1B,aAAa;gBAAEgB,SAAS,IAAI;gBAAEX,QAAQwB;gBAAQR,UAAU;YAAK;YACvF,MAAMM,gBAAgB7B,yBAAyB+B;YAE/C9B,WAAW;gBACTiB,SAAS,IAAI;gBACbC,cAAc;gBACdC,oBAAoB;gBACpBC,YAAY;gBACZC,gBAAgB,CAAC,CAACS,OAAOR,QAAQ,EAAEC;gBACnCC,eAAe;gBACfC,QAAQG;gBACRZ,WAAWW;gBACXD,YAAY;gBACZJ,UAAU;YACZ;QACF;IACF;AACF,EAAC"}
|
package/dist/migrate.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../src/migrate.ts"],"sourcesContent":["/* eslint-disable no-restricted-syntax, no-await-in-loop */\nimport type { Payload } from 'payload'\nimport type { Migration } from 'payload/database'\nimport type { PayloadRequest } from 'payload/types'\n\nimport { createRequire } from 'module'\nimport {\n commitTransaction,\n initTransaction,\n killTransaction,\n readMigrationFiles,\n} from 'payload/database'\nimport prompts from 'prompts'\n\nimport type { PostgresAdapter } from './types.js'\n\nimport { createMigrationTable } from './utilities/createMigrationTable.js'\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\nimport { parseError } from './utilities/parseError.js'\n\nconst require = createRequire(import.meta.url)\n\nexport async function migrate(this: PostgresAdapter): Promise<void> {\n const { payload } = this\n const migrationFiles = await readMigrationFiles({ payload })\n\n if (!migrationFiles.length) {\n payload.logger.info({ msg: 'No migrations to run.' })\n return\n }\n\n let latestBatch = 0\n let migrationsInDB = []\n\n const hasMigrationTable = await migrationTableExists(this.drizzle)\n\n if (hasMigrationTable) {\n ;({ docs: migrationsInDB } = await payload.find({\n collection: 'payload-migrations',\n limit: 0,\n sort: '-name',\n }))\n if (Number(migrationsInDB?.[0]?.batch) > 0) {\n latestBatch = Number(migrationsInDB[0]?.batch)\n }\n } else {\n await createMigrationTable(this)\n }\n\n if (migrationsInDB.find((m) => m.batch === -1)) {\n const { confirm: runMigrations } = await prompts(\n {\n name: 'confirm',\n type: 'confirm',\n initial: false,\n message:\n \"It looks like you've run Payload in dev mode, meaning you've dynamically pushed changes to your database.\\n\\n\" +\n \"If you'd like to run migrations, data loss will occur. Would you like to proceed?\",\n },\n {\n onCancel: () => {\n process.exit(0)\n },\n },\n )\n\n if (!runMigrations) {\n process.exit(0)\n }\n }\n\n const newBatch = latestBatch + 1\n\n // Execute 'up' function for each migration sequentially\n for (const migration of migrationFiles) {\n const alreadyRan = migrationsInDB.find((existing) => existing.name === migration.name)\n\n // If already ran, skip\n if (alreadyRan) {\n continue // eslint-disable-line no-continue\n }\n\n await runMigrationFile(payload, migration, newBatch)\n }\n}\n\nasync function runMigrationFile(payload: Payload, migration: Migration, batch: number) {\n const { generateDrizzleJson } = require('drizzle-kit/payload')\n\n const start = Date.now()\n const req = { payload } as PayloadRequest\n\n payload.logger.info({ msg: `Migrating: ${migration.name}` })\n\n const pgAdapter = payload.db
|
1
|
+
{"version":3,"sources":["../src/migrate.ts"],"sourcesContent":["/* eslint-disable no-restricted-syntax, no-await-in-loop */\nimport type { Payload } from 'payload'\nimport type { Migration } from 'payload/database'\nimport type { PayloadRequest } from 'payload/types'\n\nimport { createRequire } from 'module'\nimport {\n commitTransaction,\n initTransaction,\n killTransaction,\n readMigrationFiles,\n} from 'payload/database'\nimport prompts from 'prompts'\n\nimport type { PostgresAdapter } from './types.js'\n\nimport { createMigrationTable } from './utilities/createMigrationTable.js'\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\nimport { parseError } from './utilities/parseError.js'\n\nconst require = createRequire(import.meta.url)\n\nexport async function migrate(this: PostgresAdapter): Promise<void> {\n const { payload } = this\n const migrationFiles = await readMigrationFiles({ payload })\n\n if (!migrationFiles.length) {\n payload.logger.info({ msg: 'No migrations to run.' })\n return\n }\n\n let latestBatch = 0\n let migrationsInDB = []\n\n const hasMigrationTable = await migrationTableExists(this.drizzle)\n\n if (hasMigrationTable) {\n ;({ docs: migrationsInDB } = await payload.find({\n collection: 'payload-migrations',\n limit: 0,\n sort: '-name',\n }))\n if (Number(migrationsInDB?.[0]?.batch) > 0) {\n latestBatch = Number(migrationsInDB[0]?.batch)\n }\n } else {\n await createMigrationTable(this)\n }\n\n if (migrationsInDB.find((m) => m.batch === -1)) {\n const { confirm: runMigrations } = await prompts(\n {\n name: 'confirm',\n type: 'confirm',\n initial: false,\n message:\n \"It looks like you've run Payload in dev mode, meaning you've dynamically pushed changes to your database.\\n\\n\" +\n \"If you'd like to run migrations, data loss will occur. Would you like to proceed?\",\n },\n {\n onCancel: () => {\n process.exit(0)\n },\n },\n )\n\n if (!runMigrations) {\n process.exit(0)\n }\n }\n\n const newBatch = latestBatch + 1\n\n // Execute 'up' function for each migration sequentially\n for (const migration of migrationFiles) {\n const alreadyRan = migrationsInDB.find((existing) => existing.name === migration.name)\n\n // If already ran, skip\n if (alreadyRan) {\n continue // eslint-disable-line no-continue\n }\n\n await runMigrationFile(payload, migration, newBatch)\n }\n}\n\nasync function runMigrationFile(payload: Payload, migration: Migration, batch: number) {\n const { generateDrizzleJson } = require('drizzle-kit/payload')\n\n const start = Date.now()\n const req = { payload } as PayloadRequest\n\n payload.logger.info({ msg: `Migrating: ${migration.name}` })\n\n const pgAdapter = payload.db\n const drizzleJSON = generateDrizzleJson(pgAdapter.schema)\n\n try {\n await initTransaction(req)\n await migration.up({ payload, req })\n payload.logger.info({ msg: `Migrated: ${migration.name} (${Date.now() - start}ms)` })\n await payload.create({\n collection: 'payload-migrations',\n data: {\n name: migration.name,\n batch,\n schema: drizzleJSON,\n },\n req,\n })\n await commitTransaction(req)\n } catch (err: unknown) {\n await killTransaction(req)\n payload.logger.error({\n err,\n msg: parseError(err, `Error running migration ${migration.name}`),\n })\n }\n}\n"],"names":["createRequire","commitTransaction","initTransaction","killTransaction","readMigrationFiles","prompts","createMigrationTable","migrationTableExists","parseError","require","url","migrate","payload","migrationFiles","length","logger","info","msg","latestBatch","migrationsInDB","hasMigrationTable","drizzle","docs","find","collection","limit","sort","Number","batch","m","confirm","runMigrations","name","type","initial","message","onCancel","process","exit","newBatch","migration","alreadyRan","existing","runMigrationFile","generateDrizzleJson","start","Date","now","req","pgAdapter","db","drizzleJSON","schema","up","create","data","err","error"],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,eAAe,CAAA;AAUlG,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
1
|
+
{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,eAAe,CAAA;AAUlG,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI7E,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAC7C,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,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,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;CAC9C,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,CAAC,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACnD,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,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,EAAE,eAAe,CAAA;IACtB,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,2RAiBhC,IAAI,KAAG,WAgcT,CAAA"}
|
@@ -5,6 +5,7 @@ import { fieldAffectsData, tabHasName } from 'payload/types';
|
|
5
5
|
import { flattenTopLevelFields } from 'payload/utilities';
|
6
6
|
import toSnakeCase from 'to-snake-case';
|
7
7
|
import { v4 as uuid } from 'uuid';
|
8
|
+
import { getTableName } from '../schema/getTableName.js';
|
8
9
|
/**
|
9
10
|
* Transforms path to table and column name
|
10
11
|
* Adds tables to `join`
|
@@ -110,7 +111,13 @@ import { v4 as uuid } from 'uuid';
|
|
110
111
|
case 'group':
|
111
112
|
{
|
112
113
|
if (locale && field.localized && adapter.payload.config.localization) {
|
113
|
-
newTableName =
|
114
|
+
newTableName = getTableName({
|
115
|
+
adapter,
|
116
|
+
config: field,
|
117
|
+
locales: true,
|
118
|
+
parentTableName: tableName,
|
119
|
+
prefix: `${tableName}_`
|
120
|
+
});
|
114
121
|
joins[tableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
|
115
122
|
if (locale !== 'all') {
|
116
123
|
constraints.push({
|
@@ -141,7 +148,12 @@ import { v4 as uuid } from 'uuid';
|
|
141
148
|
}
|
142
149
|
case 'array':
|
143
150
|
{
|
144
|
-
newTableName =
|
151
|
+
newTableName = getTableName({
|
152
|
+
adapter,
|
153
|
+
config: field,
|
154
|
+
parentTableName: `${tableName}_${tableNameSuffix}`,
|
155
|
+
prefix: `${tableName}_${tableNameSuffix}`
|
156
|
+
});
|
145
157
|
constraintPath = `${constraintPath}${field.name}.%.`;
|
146
158
|
if (locale && field.localized && adapter.payload.config.localization) {
|
147
159
|
joins[newTableName] = and(eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID), eq(adapter.tables[newTableName]._locale, locale));
|
@@ -183,7 +195,12 @@ import { v4 as uuid } from 'uuid';
|
|
183
195
|
];
|
184
196
|
blockTypes.forEach((blockType)=>{
|
185
197
|
const block = field.blocks.find((block)=>block.slug === blockType);
|
186
|
-
newTableName =
|
198
|
+
newTableName = getTableName({
|
199
|
+
adapter,
|
200
|
+
config: block,
|
201
|
+
parentTableName: tableName,
|
202
|
+
prefix: `${tableName}_blocks_`
|
203
|
+
});
|
187
204
|
joins[newTableName] = eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID);
|
188
205
|
constraints.push({
|
189
206
|
columnName: '_path',
|
@@ -199,7 +216,12 @@ import { v4 as uuid } from 'uuid';
|
|
199
216
|
};
|
200
217
|
}
|
201
218
|
const hasBlockField = field.blocks.some((block)=>{
|
202
|
-
newTableName =
|
219
|
+
newTableName = getTableName({
|
220
|
+
adapter,
|
221
|
+
config: block,
|
222
|
+
parentTableName: tableName,
|
223
|
+
prefix: `${tableName}_blocks_`
|
224
|
+
});
|
203
225
|
constraintPath = `${constraintPath}${field.name}.%.`;
|
204
226
|
let result;
|
205
227
|
const blockConstraints = [];
|
@@ -262,21 +284,40 @@ import { v4 as uuid } from 'uuid';
|
|
262
284
|
case 'upload':
|
263
285
|
{
|
264
286
|
let relationshipFields;
|
265
|
-
const relationTableName = `${rootTableName}
|
287
|
+
const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`;
|
266
288
|
const newCollectionPath = pathSegments.slice(1).join('.');
|
267
289
|
const aliasRelationshipTableName = uuid();
|
268
290
|
const aliasRelationshipTable = alias(adapter.tables[relationTableName], aliasRelationshipTableName);
|
269
291
|
// Join in the relationships table
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
292
|
+
if (locale && field.localized && adapter.payload.config.localization) {
|
293
|
+
joinAliases.push({
|
294
|
+
condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), eq(aliasRelationshipTable.locale, locale), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
|
295
|
+
table: aliasRelationshipTable
|
296
|
+
});
|
297
|
+
if (locale !== 'all') {
|
298
|
+
constraints.push({
|
299
|
+
columnName: 'locale',
|
300
|
+
table: aliasRelationshipTable,
|
301
|
+
value: locale
|
302
|
+
});
|
303
|
+
}
|
304
|
+
} else {
|
305
|
+
// Join in the relationships table
|
306
|
+
joinAliases.push({
|
307
|
+
condition: and(eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent), like(aliasRelationshipTable.path, `${constraintPath}${field.name}`)),
|
308
|
+
table: aliasRelationshipTable
|
309
|
+
});
|
310
|
+
}
|
274
311
|
selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path;
|
275
312
|
let newAliasTable;
|
276
313
|
if (typeof field.relationTo === 'string') {
|
277
|
-
|
314
|
+
const relationshipConfig = adapter.payload.collections[field.relationTo].config;
|
315
|
+
newTableName = getTableName({
|
316
|
+
adapter,
|
317
|
+
config: relationshipConfig
|
318
|
+
});
|
278
319
|
// parent to relationship join table
|
279
|
-
relationshipFields =
|
320
|
+
relationshipFields = relationshipConfig.fields;
|
280
321
|
newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()));
|
281
322
|
joinAliases.push({
|
282
323
|
condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),
|
@@ -291,7 +332,10 @@ import { v4 as uuid } from 'uuid';
|
|
291
332
|
};
|
292
333
|
}
|
293
334
|
} else if (newCollectionPath === 'value') {
|
294
|
-
const tableColumnsNames = field.relationTo.map((relationTo)=>`"${aliasRelationshipTableName}"."${
|
335
|
+
const tableColumnsNames = field.relationTo.map((relationTo)=>`"${aliasRelationshipTableName}"."${getTableName({
|
336
|
+
adapter,
|
337
|
+
config: adapter.payload.collections[relationTo].config
|
338
|
+
})}_id"`);
|
295
339
|
return {
|
296
340
|
constraints,
|
297
341
|
field,
|
@@ -337,7 +381,7 @@ import { v4 as uuid } from 'uuid';
|
|
337
381
|
if (field.localized && adapter.payload.config.localization) {
|
338
382
|
// If localized, we go to localized table and set aliasTable to undefined
|
339
383
|
// so it is not picked up below to be used as targetTable
|
340
|
-
newTableName = `${tableName}
|
384
|
+
newTableName = `${tableName}${adapter.localesSuffix}`;
|
341
385
|
const parentTable = aliasTable || adapter.tables[tableName];
|
342
386
|
joins[newTableName] = eq(parentTable.id, adapter.tables[newTableName]._parentID);
|
343
387
|
aliasTable = undefined;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload/types'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { alias } from 'drizzle-orm/pg-core'\nimport { APIError } from 'payload/errors'\nimport { fieldAffectsData, tabHasName } from 'payload/types'\nimport { flattenTopLevelFields } from 'payload/utilities'\nimport toSnakeCase from 'to-snake-case'\nimport { v4 as uuid } from 'uuid'\n\nimport type { GenericColumn, GenericTable, PostgresAdapter } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.js'\n\ntype Constraint = {\n columnName: string\n table: GenericTable | PgTableWithColumns<any>\n value: unknown\n}\n\ntype TableColumn = {\n columnName?: string\n constraints: Constraint[]\n field: FieldAffectingData\n getNotNullColumnByValue?: (val: unknown) => string\n pathSegments?: string[]\n rawColumn?: SQL\n table: GenericTable | PgTableWithColumns<any>\n}\n\ntype Args = {\n adapter: PostgresAdapter\n aliasTable?: GenericTable | PgTableWithColumns<any>\n collectionPath: string\n columnPrefix?: string\n constraintPath?: string\n constraints?: Constraint[]\n fields: (Field | TabAsField)[]\n joinAliases: BuildQueryJoinAliases\n joins: BuildQueryJoins\n locale?: string\n pathSegments: string[]\n rootTableName?: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n /**\n * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n */\n tableNameSuffix?: string\n /**\n * The raw value of the query before sanitization\n */\n value: unknown\n}\n/**\n * Transforms path to table and column name\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix = '',\n constraintPath: incomingConstraintPath,\n constraints = [],\n fields,\n joinAliases,\n joins,\n locale: incomingLocale,\n pathSegments: incomingSegments,\n rootTableName: incomingRootTableName,\n selectFields,\n tableName,\n tableNameSuffix = '',\n value,\n}: Args): TableColumn => {\n const fieldPath = incomingSegments[0]\n let locale = incomingLocale\n const rootTableName = incomingRootTableName || tableName\n let constraintPath = incomingConstraintPath || ''\n\n const field = flattenTopLevelFields(fields as Field[]).find(\n (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n ) as Field | TabAsField\n let newTableName = tableName\n\n if (!field && fieldPath === 'id') {\n selectFields.id = adapter.tables[newTableName].id\n return {\n columnName: 'id',\n constraints,\n field: {\n name: 'id',\n type: adapter.idType === 'uuid' ? 'text' : 'number',\n } as NumberField | TextField,\n table: adapter.tables[newTableName],\n }\n }\n\n if (field) {\n const pathSegments = [...incomingSegments]\n\n // If next segment is a locale,\n // we need to take it out and use it as the locale from this point on\n if ('localized' in field && field.localized && adapter.payload.config.localization) {\n const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n (locale) => locale === pathSegments[1],\n )\n\n if (matchedLocale) {\n locale = matchedLocale\n pathSegments.splice(1, 1)\n }\n }\n\n switch (field.type) {\n case 'tabs': {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.tabs.map((tab) => ({\n ...tab,\n type: 'tab',\n })),\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n case 'tab': {\n if (tabHasName(field)) {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n\n case 'group': {\n if (locale && field.localized && adapter.payload.config.localization) {\n newTableName = `${tableName}_locales`\n\n joins[tableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n\n case 'array': {\n newTableName = `${tableName}_${tableNameSuffix}${toSnakeCase(field.name)}`\n constraintPath = `${constraintPath}${field.name}.%.`\n if (locale && field.localized && adapter.payload.config.localization) {\n joins[newTableName] = and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n )\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n }\n return getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n case 'blocks': {\n let blockTableColumn: TableColumn\n let newTableName: string\n\n // handle blockType queries\n if (pathSegments[1] === 'blockType') {\n // find the block config using the value\n const blockTypes = Array.isArray(value) ? value : [value]\n blockTypes.forEach((blockType) => {\n const block = field.blocks.find((block) => block.slug === blockType)\n newTableName = `${tableName}_blocks_${toSnakeCase(block.slug)}`\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n constraints.push({\n columnName: '_path',\n table: adapter.tables[newTableName],\n value: pathSegments[0],\n })\n })\n return {\n constraints,\n field,\n getNotNullColumnByValue: () => 'id',\n table: adapter.tables[tableName],\n }\n }\n\n const hasBlockField = field.blocks.some((block) => {\n newTableName = `${tableName}_blocks_${toSnakeCase(block.slug)}`\n constraintPath = `${constraintPath}${field.name}.%.`\n let result\n const blockConstraints = []\n const blockSelectFields = {}\n try {\n result = getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints: blockConstraints,\n fields: block.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields: blockSelectFields,\n tableName: newTableName,\n value,\n })\n } catch (error) {\n // this is fine, not every block will have the field\n }\n if (!result) {\n return\n }\n blockTableColumn = result\n constraints = constraints.concat(blockConstraints)\n selectFields = { ...selectFields, ...blockSelectFields }\n if (field.localized && adapter.payload.config.localization) {\n joins[newTableName] = and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n )\n if (locale) {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n }\n return true\n })\n if (hasBlockField) {\n return {\n columnName: blockTableColumn.columnName,\n constraints,\n field: blockTableColumn.field,\n pathSegments: pathSegments.slice(1),\n rawColumn: blockTableColumn.rawColumn,\n table: blockTableColumn.table,\n }\n }\n break\n }\n\n case 'relationship':\n case 'upload': {\n let relationshipFields\n const relationTableName = `${rootTableName}_rels`\n const newCollectionPath = pathSegments.slice(1).join('.')\n const aliasRelationshipTableName = uuid()\n const aliasRelationshipTable = alias(\n adapter.tables[relationTableName],\n aliasRelationshipTableName,\n )\n\n // Join in the relationships table\n joinAliases.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n\n selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n let newAliasTable\n\n if (typeof field.relationTo === 'string') {\n newTableName = `${toSnakeCase(field.relationTo)}`\n // parent to relationship join table\n relationshipFields = adapter.payload.collections[field.relationTo].config.fields\n\n newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()))\n\n joinAliases.push({\n condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n table: newAliasTable,\n })\n\n if (newCollectionPath === '' || newCollectionPath === 'id') {\n return {\n columnName: `${field.relationTo}ID`,\n constraints,\n field,\n table: aliasRelationshipTable,\n }\n }\n } else if (newCollectionPath === 'value') {\n const tableColumnsNames = field.relationTo.map(\n (relationTo) => `\"${aliasRelationshipTableName}\".\"${toSnakeCase(relationTo)}_id\"`,\n )\n return {\n constraints,\n field,\n rawColumn: sql.raw(`COALESCE(${tableColumnsNames.join(', ')})`),\n table: aliasRelationshipTable,\n }\n } else if (newCollectionPath === 'relationTo') {\n const relationTo = Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]\n\n return {\n constraints,\n field,\n getNotNullColumnByValue: (val) => {\n const matchedRelation = relationTo.find((relation) => relation === val)\n if (matchedRelation) return `${matchedRelation}ID`\n return undefined\n },\n table: aliasRelationshipTable,\n }\n } else {\n throw new APIError('Not supported')\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraints,\n fields: relationshipFields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName: newTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n default: {\n if (fieldAffectsData(field)) {\n if (field.localized && adapter.payload.config.localization) {\n // If localized, we go to localized table and set aliasTable to undefined\n // so it is not picked up below to be used as targetTable\n newTableName = `${tableName}_locales`\n\n const parentTable = aliasTable || adapter.tables[tableName]\n\n joins[newTableName] = eq(parentTable.id, adapter.tables[newTableName]._parentID)\n\n aliasTable = undefined\n\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n\n const targetTable = aliasTable || adapter.tables[newTableName]\n\n selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n targetTable[`${columnPrefix}${field.name}`]\n\n return {\n columnName: `${columnPrefix}${field.name}`,\n constraints,\n field,\n pathSegments,\n table: targetTable,\n }\n }\n }\n }\n }\n\n throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","alias","APIError","fieldAffectsData","tabHasName","flattenTopLevelFields","toSnakeCase","v4","uuid","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joinAliases","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","_parentID","push","_locale","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","relationshipFields","relationTableName","newCollectionPath","join","aliasRelationshipTableName","aliasRelationshipTable","condition","parent","path","newAliasTable","relationTo","collections","tableColumnsNames","raw","val","matchedRelation","relation","undefined","parentTable","targetTable"],"mappings":"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"}
|
1
|
+
{"version":3,"sources":["../../src/queries/getTableColumnFromPath.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, FieldAffectingData, NumberField, TabAsField, TextField } from 'payload/types'\n\nimport { and, eq, like, sql } from 'drizzle-orm'\nimport { alias } from 'drizzle-orm/pg-core'\nimport { APIError } from 'payload/errors'\nimport { fieldAffectsData, tabHasName } from 'payload/types'\nimport { flattenTopLevelFields } from 'payload/utilities'\nimport toSnakeCase from 'to-snake-case'\nimport { v4 as uuid } from 'uuid'\n\nimport type { GenericColumn, GenericTable, PostgresAdapter } from '../types.js'\nimport type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery.js'\n\nimport { getTableName } from '../schema/getTableName.js'\n\ntype Constraint = {\n columnName: string\n table: GenericTable | PgTableWithColumns<any>\n value: unknown\n}\n\ntype TableColumn = {\n columnName?: string\n constraints: Constraint[]\n field: FieldAffectingData\n getNotNullColumnByValue?: (val: unknown) => string\n pathSegments?: string[]\n rawColumn?: SQL\n table: GenericTable | PgTableWithColumns<any>\n}\n\ntype Args = {\n adapter: PostgresAdapter\n aliasTable?: GenericTable | PgTableWithColumns<any>\n collectionPath: string\n columnPrefix?: string\n constraintPath?: string\n constraints?: Constraint[]\n fields: (Field | TabAsField)[]\n joinAliases: BuildQueryJoinAliases\n joins: BuildQueryJoins\n locale?: string\n pathSegments: string[]\n rootTableName?: string\n selectFields: Record<string, GenericColumn>\n tableName: string\n /**\n * If creating a new table name for arrays and blocks, this suffix should be appended to the table name\n */\n tableNameSuffix?: string\n /**\n * The raw value of the query before sanitization\n */\n value: unknown\n}\n/**\n * Transforms path to table and column name\n * Adds tables to `join`\n * @returns TableColumn\n */\nexport const getTableColumnFromPath = ({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix = '',\n constraintPath: incomingConstraintPath,\n constraints = [],\n fields,\n joinAliases,\n joins,\n locale: incomingLocale,\n pathSegments: incomingSegments,\n rootTableName: incomingRootTableName,\n selectFields,\n tableName,\n tableNameSuffix = '',\n value,\n}: Args): TableColumn => {\n const fieldPath = incomingSegments[0]\n let locale = incomingLocale\n const rootTableName = incomingRootTableName || tableName\n let constraintPath = incomingConstraintPath || ''\n\n const field = flattenTopLevelFields(fields as Field[]).find(\n (fieldToFind) => fieldAffectsData(fieldToFind) && fieldToFind.name === fieldPath,\n ) as Field | TabAsField\n let newTableName = tableName\n\n if (!field && fieldPath === 'id') {\n selectFields.id = adapter.tables[newTableName].id\n return {\n columnName: 'id',\n constraints,\n field: {\n name: 'id',\n type: adapter.idType === 'uuid' ? 'text' : 'number',\n } as NumberField | TextField,\n table: adapter.tables[newTableName],\n }\n }\n\n if (field) {\n const pathSegments = [...incomingSegments]\n\n // If next segment is a locale,\n // we need to take it out and use it as the locale from this point on\n if ('localized' in field && field.localized && adapter.payload.config.localization) {\n const matchedLocale = adapter.payload.config.localization.localeCodes.find(\n (locale) => locale === pathSegments[1],\n )\n\n if (matchedLocale) {\n locale = matchedLocale\n pathSegments.splice(1, 1)\n }\n }\n\n switch (field.type) {\n case 'tabs': {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.tabs.map((tab) => ({\n ...tab,\n type: 'tab',\n })),\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n case 'tab': {\n if (tabHasName(field)) {\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix,\n constraintPath,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix,\n value,\n })\n }\n\n case 'group': {\n if (locale && field.localized && adapter.payload.config.localization) {\n newTableName = getTableName({\n adapter,\n config: field,\n locales: true,\n parentTableName: tableName,\n prefix: `${tableName}_`,\n })\n\n joins[tableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n return getTableColumnFromPath({\n adapter,\n aliasTable,\n collectionPath,\n columnPrefix: `${columnPrefix}${field.name}_`,\n constraintPath: `${constraintPath}${field.name}.`,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n tableNameSuffix: `${tableNameSuffix}${toSnakeCase(field.name)}_`,\n value,\n })\n }\n\n case 'array': {\n newTableName = getTableName({\n adapter,\n config: field,\n parentTableName: `${tableName}_${tableNameSuffix}`,\n prefix: `${tableName}_${tableNameSuffix}`,\n })\n constraintPath = `${constraintPath}${field.name}.%.`\n if (locale && field.localized && adapter.payload.config.localization) {\n joins[newTableName] = and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n )\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n }\n return getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints,\n fields: field.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n case 'blocks': {\n let blockTableColumn: TableColumn\n let newTableName: string\n\n // handle blockType queries\n if (pathSegments[1] === 'blockType') {\n // find the block config using the value\n const blockTypes = Array.isArray(value) ? value : [value]\n blockTypes.forEach((blockType) => {\n const block = field.blocks.find((block) => block.slug === blockType)\n newTableName = getTableName({\n adapter,\n config: block,\n parentTableName: tableName,\n prefix: `${tableName}_blocks_`,\n })\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n constraints.push({\n columnName: '_path',\n table: adapter.tables[newTableName],\n value: pathSegments[0],\n })\n })\n return {\n constraints,\n field,\n getNotNullColumnByValue: () => 'id',\n table: adapter.tables[tableName],\n }\n }\n\n const hasBlockField = field.blocks.some((block) => {\n newTableName = getTableName({\n adapter,\n config: block,\n parentTableName: tableName,\n prefix: `${tableName}_blocks_`,\n })\n constraintPath = `${constraintPath}${field.name}.%.`\n let result\n const blockConstraints = []\n const blockSelectFields = {}\n try {\n result = getTableColumnFromPath({\n adapter,\n collectionPath,\n constraintPath,\n constraints: blockConstraints,\n fields: block.fields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName,\n selectFields: blockSelectFields,\n tableName: newTableName,\n value,\n })\n } catch (error) {\n // this is fine, not every block will have the field\n }\n if (!result) {\n return\n }\n blockTableColumn = result\n constraints = constraints.concat(blockConstraints)\n selectFields = { ...selectFields, ...blockSelectFields }\n if (field.localized && adapter.payload.config.localization) {\n joins[newTableName] = and(\n eq(adapter.tables[tableName].id, adapter.tables[newTableName]._parentID),\n eq(adapter.tables[newTableName]._locale, locale),\n )\n if (locale) {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n } else {\n joins[newTableName] = eq(\n adapter.tables[tableName].id,\n adapter.tables[newTableName]._parentID,\n )\n }\n return true\n })\n if (hasBlockField) {\n return {\n columnName: blockTableColumn.columnName,\n constraints,\n field: blockTableColumn.field,\n pathSegments: pathSegments.slice(1),\n rawColumn: blockTableColumn.rawColumn,\n table: blockTableColumn.table,\n }\n }\n break\n }\n\n case 'relationship':\n case 'upload': {\n let relationshipFields\n const relationTableName = `${rootTableName}${adapter.relationshipsSuffix}`\n const newCollectionPath = pathSegments.slice(1).join('.')\n const aliasRelationshipTableName = uuid()\n const aliasRelationshipTable = alias(\n adapter.tables[relationTableName],\n aliasRelationshipTableName,\n )\n\n // Join in the relationships table\n if (locale && field.localized && adapter.payload.config.localization) {\n joinAliases.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n eq(aliasRelationshipTable.locale, locale),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n if (locale !== 'all') {\n constraints.push({\n columnName: 'locale',\n table: aliasRelationshipTable,\n value: locale,\n })\n }\n } else {\n // Join in the relationships table\n joinAliases.push({\n condition: and(\n eq((aliasTable || adapter.tables[rootTableName]).id, aliasRelationshipTable.parent),\n like(aliasRelationshipTable.path, `${constraintPath}${field.name}`),\n ),\n table: aliasRelationshipTable,\n })\n }\n\n selectFields[`${relationTableName}.path`] = aliasRelationshipTable.path\n\n let newAliasTable\n\n if (typeof field.relationTo === 'string') {\n const relationshipConfig = adapter.payload.collections[field.relationTo].config\n newTableName = getTableName({\n adapter,\n config: relationshipConfig,\n })\n // parent to relationship join table\n relationshipFields = relationshipConfig.fields\n\n newAliasTable = alias(adapter.tables[newTableName], toSnakeCase(uuid()))\n\n joinAliases.push({\n condition: eq(newAliasTable.id, aliasRelationshipTable[`${field.relationTo}ID`]),\n table: newAliasTable,\n })\n\n if (newCollectionPath === '' || newCollectionPath === 'id') {\n return {\n columnName: `${field.relationTo}ID`,\n constraints,\n field,\n table: aliasRelationshipTable,\n }\n }\n } else if (newCollectionPath === 'value') {\n const tableColumnsNames = field.relationTo.map(\n (relationTo) =>\n `\"${aliasRelationshipTableName}\".\"${getTableName({\n adapter,\n config: adapter.payload.collections[relationTo].config,\n })}_id\"`,\n )\n return {\n constraints,\n field,\n rawColumn: sql.raw(`COALESCE(${tableColumnsNames.join(', ')})`),\n table: aliasRelationshipTable,\n }\n } else if (newCollectionPath === 'relationTo') {\n const relationTo = Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]\n\n return {\n constraints,\n field,\n getNotNullColumnByValue: (val) => {\n const matchedRelation = relationTo.find((relation) => relation === val)\n if (matchedRelation) return `${matchedRelation}ID`\n return undefined\n },\n table: aliasRelationshipTable,\n }\n } else {\n throw new APIError('Not supported')\n }\n\n return getTableColumnFromPath({\n adapter,\n aliasTable: newAliasTable,\n collectionPath: newCollectionPath,\n constraints,\n fields: relationshipFields,\n joinAliases,\n joins,\n locale,\n pathSegments: pathSegments.slice(1),\n rootTableName: newTableName,\n selectFields,\n tableName: newTableName,\n value,\n })\n }\n\n default: {\n if (fieldAffectsData(field)) {\n if (field.localized && adapter.payload.config.localization) {\n // If localized, we go to localized table and set aliasTable to undefined\n // so it is not picked up below to be used as targetTable\n newTableName = `${tableName}${adapter.localesSuffix}`\n\n const parentTable = aliasTable || adapter.tables[tableName]\n\n joins[newTableName] = eq(parentTable.id, adapter.tables[newTableName]._parentID)\n\n aliasTable = undefined\n\n if (locale !== 'all') {\n constraints.push({\n columnName: '_locale',\n table: adapter.tables[newTableName],\n value: locale,\n })\n }\n }\n\n const targetTable = aliasTable || adapter.tables[newTableName]\n\n selectFields[`${newTableName}.${columnPrefix}${field.name}`] =\n targetTable[`${columnPrefix}${field.name}`]\n\n return {\n columnName: `${columnPrefix}${field.name}`,\n constraints,\n field,\n pathSegments,\n table: targetTable,\n }\n }\n }\n }\n }\n\n throw new APIError(`Cannot find field for path at ${fieldPath}`)\n}\n"],"names":["and","eq","like","sql","alias","APIError","fieldAffectsData","tabHasName","flattenTopLevelFields","toSnakeCase","v4","uuid","getTableName","getTableColumnFromPath","adapter","aliasTable","collectionPath","columnPrefix","constraintPath","incomingConstraintPath","constraints","fields","joinAliases","joins","locale","incomingLocale","pathSegments","incomingSegments","rootTableName","incomingRootTableName","selectFields","tableName","tableNameSuffix","value","fieldPath","field","find","fieldToFind","name","newTableName","id","tables","columnName","type","idType","table","localized","payload","config","localization","matchedLocale","localeCodes","splice","tabs","map","tab","slice","locales","parentTableName","prefix","_parentID","push","_locale","blockTableColumn","blockTypes","Array","isArray","forEach","blockType","block","blocks","slug","getNotNullColumnByValue","hasBlockField","some","result","blockConstraints","blockSelectFields","error","concat","rawColumn","relationshipFields","relationTableName","relationshipsSuffix","newCollectionPath","join","aliasRelationshipTableName","aliasRelationshipTable","condition","parent","path","newAliasTable","relationTo","relationshipConfig","collections","tableColumnsNames","raw","val","matchedRelation","relation","undefined","localesSuffix","parentTable","targetTable"],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"queryDrafts.d.ts","sourceRoot":"","sources":["../src/queryDrafts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,kBAAkB,CAAA;AAMnE,eAAO,MAAM,WAAW,EAAE,
|
1
|
+
{"version":3,"file":"queryDrafts.d.ts","sourceRoot":"","sources":["../src/queryDrafts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,kBAAkB,CAAA;AAMnE,eAAO,MAAM,WAAW,EAAE,WA+CzB,CAAA"}
|
package/dist/queryDrafts.js
CHANGED
@@ -1,10 +1,14 @@
|
|
1
1
|
import { combineQueries } from 'payload/database';
|
2
2
|
import { buildVersionCollectionFields } from 'payload/versions';
|
3
|
-
import toSnakeCase from 'to-snake-case';
|
4
3
|
import { findMany } from './find/findMany.js';
|
4
|
+
import { getTableName } from './schema/getTableName.js';
|
5
5
|
export const queryDrafts = async function queryDrafts({ collection, limit, locale, page = 1, pagination, req = {}, sort, where }) {
|
6
6
|
const collectionConfig = this.payload.collections[collection].config;
|
7
|
-
const tableName =
|
7
|
+
const tableName = getTableName({
|
8
|
+
adapter: this,
|
9
|
+
config: collectionConfig,
|
10
|
+
versions: true
|
11
|
+
});
|
8
12
|
const fields = buildVersionCollectionFields(collectionConfig);
|
9
13
|
const combinedWhere = combineQueries({
|
10
14
|
latest: {
|
package/dist/queryDrafts.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"sources":["../src/queryDrafts.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'\n\nimport { type QueryDrafts, combineQueries } from 'payload/database'\nimport { buildVersionCollectionFields } from 'payload/versions'\nimport
|
1
|
+
{"version":3,"sources":["../src/queryDrafts.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedCollectionConfig } from 'payload/types'\n\nimport { type QueryDrafts, combineQueries } from 'payload/database'\nimport { buildVersionCollectionFields } from 'payload/versions'\n\nimport { findMany } from './find/findMany.js'\nimport { getTableName } from './schema/getTableName.js'\n\nexport const queryDrafts: QueryDrafts = async function queryDrafts({\n collection,\n limit,\n locale,\n page = 1,\n pagination,\n req = {} as PayloadRequest,\n sort,\n where,\n}) {\n const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n const tableName = getTableName({\n adapter: this,\n config: collectionConfig,\n versions: true,\n })\n const fields = buildVersionCollectionFields(collectionConfig)\n\n const combinedWhere = combineQueries({ latest: { equals: true } }, where)\n\n const result = await findMany({\n adapter: this,\n fields,\n limit,\n locale,\n page,\n pagination,\n req,\n sort,\n tableName,\n where: combinedWhere,\n })\n\n return {\n ...result,\n docs: result.docs.map((doc) => {\n // eslint-disable-next-line no-param-reassign\n doc = {\n id: doc.parent,\n ...doc.version,\n createdAt: doc.createdAt,\n updatedAt: doc.updatedAt,\n }\n\n return doc\n }),\n }\n}\n"],"names":["combineQueries","buildVersionCollectionFields","findMany","getTableName","queryDrafts","collection","limit","locale","page","pagination","req","sort","where","collectionConfig","payload","collections","config","tableName","adapter","versions","fields","combinedWhere","latest","equals","result","docs","map","doc","id","parent","version","createdAt","updatedAt"],"mappings":"AAEA,SAA2BA,cAAc,QAAQ,mBAAkB;AACnE,SAASC,4BAA4B,QAAQ,mBAAkB;AAE/D,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,SAASC,YAAY,QAAQ,2BAA0B;AAEvD,OAAO,MAAMC,cAA2B,eAAeA,YAAY,EACjEC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,OAAO,CAAC,EACRC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,IAAI,EACJC,KAAK,EACN;IACC,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACV,WAAW,CAACW,MAAM;IAC/F,MAAMC,YAAYd,aAAa;QAC7Be,SAAS,IAAI;QACbF,QAAQH;QACRM,UAAU;IACZ;IACA,MAAMC,SAASnB,6BAA6BY;IAE5C,MAAMQ,gBAAgBrB,eAAe;QAAEsB,QAAQ;YAAEC,QAAQ;QAAK;IAAE,GAAGX;IAEnE,MAAMY,SAAS,MAAMtB,SAAS;QAC5BgB,SAAS,IAAI;QACbE;QACAd;QACAC;QACAC;QACAC;QACAC;QACAC;QACAM;QACAL,OAAOS;IACT;IAEA,OAAO;QACL,GAAGG,MAAM;QACTC,MAAMD,OAAOC,IAAI,CAACC,GAAG,CAAC,CAACC;YACrB,6CAA6C;YAC7CA,MAAM;gBACJC,IAAID,IAAIE,MAAM;gBACd,GAAGF,IAAIG,OAAO;gBACdC,WAAWJ,IAAII,SAAS;gBACxBC,WAAWL,IAAIK,SAAS;YAC1B;YAEA,OAAOL;QACT;IACF;AACF,EAAC"}
|