@payloadcms/drizzle 3.0.0-beta.112 → 3.0.0-beta.114
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/createGlobalVersion.d.ts +1 -1
- package/dist/createGlobalVersion.d.ts.map +1 -1
- package/dist/createGlobalVersion.js +3 -1
- package/dist/createGlobalVersion.js.map +1 -1
- package/dist/createVersion.d.ts +1 -1
- package/dist/createVersion.d.ts.map +1 -1
- package/dist/createVersion.js +3 -4
- package/dist/createVersion.js.map +1 -1
- package/dist/exports/postgres.d.ts +1 -0
- package/dist/exports/postgres.d.ts.map +1 -1
- package/dist/exports/postgres.js +1 -0
- package/dist/exports/postgres.js.map +1 -1
- package/dist/find/traverseFields.d.ts.map +1 -1
- package/dist/find/traverseFields.js +16 -10
- package/dist/find/traverseFields.js.map +1 -1
- package/dist/migrateReset.js +1 -1
- package/dist/migrateReset.js.map +1 -1
- package/dist/postgres/createDatabase.d.ts +14 -0
- package/dist/postgres/createDatabase.d.ts.map +1 -0
- package/dist/postgres/createDatabase.js +76 -0
- package/dist/postgres/createDatabase.js.map +1 -0
- package/dist/postgres/schema/build.d.ts +3 -1
- package/dist/postgres/schema/build.d.ts.map +1 -1
- package/dist/postgres/schema/build.js +25 -3
- package/dist/postgres/schema/build.js.map +1 -1
- package/dist/postgres/schema/traverseFields.d.ts +3 -1
- package/dist/postgres/schema/traverseFields.d.ts.map +1 -1
- package/dist/postgres/schema/traverseFields.js +24 -7
- package/dist/postgres/schema/traverseFields.js.map +1 -1
- package/dist/postgres/types.d.ts +14 -1
- package/dist/postgres/types.d.ts.map +1 -1
- package/dist/postgres/types.js.map +1 -1
- package/dist/queries/sanitizeQueryValue.d.ts.map +1 -1
- package/dist/queries/sanitizeQueryValue.js +4 -2
- package/dist/queries/sanitizeQueryValue.js.map +1 -1
- package/dist/queryDrafts.d.ts.map +1 -1
- package/dist/queryDrafts.js +1 -3
- package/dist/queryDrafts.js.map +1 -1
- package/dist/transform/read/traverseFields.js +2 -2
- package/dist/transform/read/traverseFields.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { CreateGlobalVersionArgs, TypeWithID, TypeWithVersion } from 'payload';
|
|
2
2
|
import type { DrizzleAdapter } from './types.js';
|
|
3
|
-
export declare function createGlobalVersion<T extends TypeWithID>(this: DrizzleAdapter, { autosave, globalSlug, publishedLocale, req, snapshot, versionData, }: CreateGlobalVersionArgs): Promise<TypeWithVersion<T>>;
|
|
3
|
+
export declare function createGlobalVersion<T extends TypeWithID>(this: DrizzleAdapter, { autosave, createdAt, globalSlug, publishedLocale, req, snapshot, updatedAt, versionData, }: CreateGlobalVersionArgs): Promise<TypeWithVersion<T>>;
|
|
4
4
|
//# sourceMappingURL=createGlobalVersion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAkB,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAMnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,UAAU,EAC5D,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,UAAU,EACV,eAAe,EACf,GAA0B,EAC1B,QAAQ,EACR,WAAW,GACZ,EAAE,uBAAuB,+
|
|
1
|
+
{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAkB,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAMnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,UAAU,EAC5D,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,SAAS,EACT,UAAU,EACV,eAAe,EACf,GAA0B,EAC1B,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,uBAAuB,+BAsC3B"}
|
|
@@ -2,7 +2,7 @@ import { sql } from 'drizzle-orm';
|
|
|
2
2
|
import { buildVersionGlobalFields } from 'payload';
|
|
3
3
|
import toSnakeCase from 'to-snake-case';
|
|
4
4
|
import { upsertRow } from './upsertRow/index.js';
|
|
5
|
-
export async function createGlobalVersion({ autosave, globalSlug, publishedLocale, req = {}, snapshot, versionData }) {
|
|
5
|
+
export async function createGlobalVersion({ autosave, createdAt, globalSlug, publishedLocale, req = {}, snapshot, updatedAt, versionData }) {
|
|
6
6
|
const db = this.sessions[await req?.transactionID]?.db || this.drizzle;
|
|
7
7
|
const global = this.payload.globals.config.find(({ slug })=>slug === globalSlug);
|
|
8
8
|
const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`);
|
|
@@ -10,9 +10,11 @@ export async function createGlobalVersion({ autosave, globalSlug, publishedLocal
|
|
|
10
10
|
adapter: this,
|
|
11
11
|
data: {
|
|
12
12
|
autosave,
|
|
13
|
+
createdAt,
|
|
13
14
|
latest: true,
|
|
14
15
|
publishedLocale,
|
|
15
16
|
snapshot,
|
|
17
|
+
updatedAt,
|
|
16
18
|
version: versionData
|
|
17
19
|
},
|
|
18
20
|
db,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import type { CreateGlobalVersionArgs, PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\n\nexport async function createGlobalVersion<T extends TypeWithID>(\n this: DrizzleAdapter,\n {\n autosave,\n globalSlug,\n publishedLocale,\n req = {} as PayloadRequest,\n snapshot,\n versionData,\n }: CreateGlobalVersionArgs,\n) {\n const db = this.sessions[await req?.transactionID]?.db || this.drizzle\n const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`)\n\n const result = await upsertRow<TypeWithVersion<T>>({\n adapter: this,\n data: {\n autosave,\n latest: true,\n publishedLocale,\n snapshot,\n version: versionData,\n },\n db,\n fields: buildVersionGlobalFields(this.payload.config, global),\n operation: 'create',\n req,\n tableName,\n })\n\n const table = this.tables[tableName]\n if (global.versions.drafts) {\n await this.execute({\n db,\n sql: sql`\n UPDATE ${table}\n SET latest = false\n WHERE ${table.id} != ${result.id};\n `,\n })\n }\n\n return result\n}\n"],"names":["sql","buildVersionGlobalFields","toSnakeCase","upsertRow","createGlobalVersion","autosave","globalSlug","publishedLocale","req","snapshot","versionData","db","sessions","transactionID","drizzle","global","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","result","adapter","data","latest","version","fields","operation","table","tables","versions","drafts","execute","id"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAEhD,OAAO,eAAeC,oBAEpB,EACEC,QAAQ,EACRC,UAAU,EACVC,eAAe,EACfC,MAAM,CAAC,CAAmB,EAC1BC,QAAQ,EACRC,WAAW,EACa;IAE1B,MAAMC,KAAK,IAAI,CAACC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import type { CreateGlobalVersionArgs, PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\n\nexport async function createGlobalVersion<T extends TypeWithID>(\n this: DrizzleAdapter,\n {\n autosave,\n createdAt,\n globalSlug,\n publishedLocale,\n req = {} as PayloadRequest,\n snapshot,\n updatedAt,\n versionData,\n }: CreateGlobalVersionArgs,\n) {\n const db = this.sessions[await req?.transactionID]?.db || this.drizzle\n const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`)\n\n const result = await upsertRow<TypeWithVersion<T>>({\n adapter: this,\n data: {\n autosave,\n createdAt,\n latest: true,\n publishedLocale,\n snapshot,\n updatedAt,\n version: versionData,\n },\n db,\n fields: buildVersionGlobalFields(this.payload.config, global),\n operation: 'create',\n req,\n tableName,\n })\n\n const table = this.tables[tableName]\n if (global.versions.drafts) {\n await this.execute({\n db,\n sql: sql`\n UPDATE ${table}\n SET latest = false\n WHERE ${table.id} != ${result.id};\n `,\n })\n }\n\n return result\n}\n"],"names":["sql","buildVersionGlobalFields","toSnakeCase","upsertRow","createGlobalVersion","autosave","createdAt","globalSlug","publishedLocale","req","snapshot","updatedAt","versionData","db","sessions","transactionID","drizzle","global","payload","globals","config","find","slug","tableName","tableNameMap","get","versionsSuffix","result","adapter","data","latest","version","fields","operation","table","tables","versions","drafts","execute","id"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,wBAAwB,QAAQ,UAAS;AAClD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAEhD,OAAO,eAAeC,oBAEpB,EACEC,QAAQ,EACRC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,MAAM,CAAC,CAAmB,EAC1BC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACa;IAE1B,MAAMC,KAAK,IAAI,CAACC,QAAQ,CAAC,MAAML,KAAKM,cAAc,EAAEF,MAAM,IAAI,CAACG,OAAO;IACtE,MAAMC,SAAS,IAAI,CAACC,OAAO,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASf;IAEvE,MAAMgB,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEvB,YAAYe,OAAOK,IAAI,EAAE,EAAE,IAAI,CAACI,cAAc,CAAC,CAAC;IAE5F,MAAMC,SAAS,MAAMxB,UAA8B;QACjDyB,SAAS,IAAI;QACbC,MAAM;YACJxB;YACAC;YACAwB,QAAQ;YACRtB;YACAE;YACAC;YACAoB,SAASnB;QACX;QACAC;QACAmB,QAAQ/B,yBAAyB,IAAI,CAACiB,OAAO,CAACE,MAAM,EAAEH;QACtDgB,WAAW;QACXxB;QACAc;IACF;IAEA,MAAMW,QAAQ,IAAI,CAACC,MAAM,CAACZ,UAAU;IACpC,IAAIN,OAAOmB,QAAQ,CAACC,MAAM,EAAE;QAC1B,MAAM,IAAI,CAACC,OAAO,CAAC;YACjBzB;YACAb,KAAKA,GAAG,CAAC;iBACE,EAAEkC,MAAM;;gBAET,EAAEA,MAAMK,EAAE,CAAC,IAAI,EAAEZ,OAAOY,EAAE,CAAC;QACnC,CAAC;QACL;IACF;IAEA,OAAOZ;AACT"}
|
package/dist/createVersion.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { CreateVersionArgs, TypeWithID, TypeWithVersion } from 'payload';
|
|
2
2
|
import type { DrizzleAdapter } from './types.js';
|
|
3
|
-
export declare function createVersion<T extends TypeWithID>(this: DrizzleAdapter, { autosave, collectionSlug, parent, publishedLocale, req, snapshot, versionData, }: CreateVersionArgs<T>): Promise<TypeWithVersion<T>>;
|
|
3
|
+
export declare function createVersion<T extends TypeWithID>(this: DrizzleAdapter, { autosave, collectionSlug, createdAt, parent, publishedLocale, req, snapshot, updatedAt, versionData, }: CreateVersionArgs<T>): Promise<TypeWithVersion<T>>;
|
|
4
4
|
//# sourceMappingURL=createVersion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAkB,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,aAAa,CAAC,CAAC,SAAS,UAAU,EACtD,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,cAAc,EACd,MAAM,EACN,eAAe,EACf,GAA0B,EAC1B,QAAQ,EACR,WAAW,GACZ,EAAE,iBAAiB,CAAC,CAAC,CAAC,+
|
|
1
|
+
{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAkB,UAAU,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,aAAa,CAAC,CAAC,SAAS,UAAU,EACtD,IAAI,EAAE,cAAc,EACpB,EACE,QAAQ,EACR,cAAc,EACd,SAAS,EACT,MAAM,EACN,eAAe,EACf,GAA0B,EAC1B,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE,iBAAiB,CAAC,CAAC,CAAC,+BAiDxB"}
|
package/dist/createVersion.js
CHANGED
|
@@ -2,7 +2,7 @@ import { sql } from 'drizzle-orm';
|
|
|
2
2
|
import { buildVersionCollectionFields } from 'payload';
|
|
3
3
|
import toSnakeCase from 'to-snake-case';
|
|
4
4
|
import { upsertRow } from './upsertRow/index.js';
|
|
5
|
-
export async function createVersion({ autosave, collectionSlug, parent, publishedLocale, req = {}, snapshot, versionData }) {
|
|
5
|
+
export async function createVersion({ autosave, collectionSlug, createdAt, parent, publishedLocale, req = {}, snapshot, updatedAt, versionData }) {
|
|
6
6
|
const db = this.sessions[await req?.transactionID]?.db || this.drizzle;
|
|
7
7
|
const collection = this.payload.collections[collectionSlug].config;
|
|
8
8
|
const defaultTableName = toSnakeCase(collection.slug);
|
|
@@ -15,15 +15,14 @@ export async function createVersion({ autosave, collectionSlug, parent, publishe
|
|
|
15
15
|
}
|
|
16
16
|
const data = {
|
|
17
17
|
autosave,
|
|
18
|
+
createdAt,
|
|
18
19
|
latest: true,
|
|
19
20
|
parent,
|
|
20
21
|
publishedLocale,
|
|
21
22
|
snapshot,
|
|
23
|
+
updatedAt,
|
|
22
24
|
version
|
|
23
25
|
};
|
|
24
|
-
if ('createdAt' in version) {
|
|
25
|
-
data.createdAt = version.createdAt;
|
|
26
|
-
}
|
|
27
26
|
const result = await upsertRow({
|
|
28
27
|
adapter: this,
|
|
29
28
|
data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import type { CreateVersionArgs, PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\n\nexport async function createVersion<T extends TypeWithID>(\n this: DrizzleAdapter,\n {\n autosave,\n collectionSlug,\n parent,\n publishedLocale,\n req = {} as PayloadRequest,\n snapshot,\n versionData,\n }: CreateVersionArgs<T>,\n) {\n const db = this.sessions[await req?.transactionID]?.db || this.drizzle\n const collection = this.payload.collections[collectionSlug].config\n const defaultTableName = toSnakeCase(collection.slug)\n\n const tableName = this.tableNameMap.get(`_${defaultTableName}${this.versionsSuffix}`)\n\n const version = { ...versionData }\n if (version.id) {\n delete version.id\n }\n\n const data: Record<string, unknown> = {\n autosave,\n latest: true,\n parent,\n publishedLocale,\n snapshot,\n
|
|
1
|
+
{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import type { CreateVersionArgs, PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport { buildVersionCollectionFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\n\nexport async function createVersion<T extends TypeWithID>(\n this: DrizzleAdapter,\n {\n autosave,\n collectionSlug,\n createdAt,\n parent,\n publishedLocale,\n req = {} as PayloadRequest,\n snapshot,\n updatedAt,\n versionData,\n }: CreateVersionArgs<T>,\n) {\n const db = this.sessions[await req?.transactionID]?.db || this.drizzle\n const collection = this.payload.collections[collectionSlug].config\n const defaultTableName = toSnakeCase(collection.slug)\n\n const tableName = this.tableNameMap.get(`_${defaultTableName}${this.versionsSuffix}`)\n\n const version = { ...versionData }\n if (version.id) {\n delete version.id\n }\n\n const data: Record<string, unknown> = {\n autosave,\n createdAt,\n latest: true,\n parent,\n publishedLocale,\n snapshot,\n updatedAt,\n version,\n }\n\n const result = await upsertRow<TypeWithVersion<T>>({\n adapter: this,\n data,\n db,\n fields: buildVersionCollectionFields(this.payload.config, collection),\n operation: 'create',\n req,\n tableName,\n })\n\n const table = this.tables[tableName]\n\n if (collection.versions.drafts) {\n await this.execute({\n db,\n sql: sql`\n UPDATE ${table}\n SET latest = false\n WHERE ${table.id} != ${result.id}\n AND ${table.parent} = ${parent}\n `,\n })\n }\n\n return result\n}\n"],"names":["sql","buildVersionCollectionFields","toSnakeCase","upsertRow","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","snapshot","updatedAt","versionData","db","sessions","transactionID","drizzle","collection","payload","collections","config","defaultTableName","slug","tableName","tableNameMap","get","versionsSuffix","version","id","data","latest","result","adapter","fields","operation","table","tables","versions","drafts","execute"],"mappings":"AAEA,SAASA,GAAG,QAAQ,cAAa;AACjC,SAASC,4BAA4B,QAAQ,UAAS;AACtD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAEhD,OAAO,eAAeC,cAEpB,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,MAAM,CAAC,CAAmB,EAC1BC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACU;IAEvB,MAAMC,KAAK,IAAI,CAACC,QAAQ,CAAC,MAAML,KAAKM,cAAc,EAAEF,MAAM,IAAI,CAACG,OAAO;IACtE,MAAMC,aAAa,IAAI,CAACC,OAAO,CAACC,WAAW,CAACd,eAAe,CAACe,MAAM;IAClE,MAAMC,mBAAmBpB,YAAYgB,WAAWK,IAAI;IAEpD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,EAAEJ,iBAAiB,EAAE,IAAI,CAACK,cAAc,CAAC,CAAC;IAEpF,MAAMC,UAAU;QAAE,GAAGf,WAAW;IAAC;IACjC,IAAIe,QAAQC,EAAE,EAAE;QACd,OAAOD,QAAQC,EAAE;IACnB;IAEA,MAAMC,OAAgC;QACpCzB;QACAE;QACAwB,QAAQ;QACRvB;QACAC;QACAE;QACAC;QACAgB;IACF;IAEA,MAAMI,SAAS,MAAM7B,UAA8B;QACjD8B,SAAS,IAAI;QACbH;QACAhB;QACAoB,QAAQjC,6BAA6B,IAAI,CAACkB,OAAO,CAACE,MAAM,EAAEH;QAC1DiB,WAAW;QACXzB;QACAc;IACF;IAEA,MAAMY,QAAQ,IAAI,CAACC,MAAM,CAACb,UAAU;IAEpC,IAAIN,WAAWoB,QAAQ,CAACC,MAAM,EAAE;QAC9B,MAAM,IAAI,CAACC,OAAO,CAAC;YACjB1B;YACAd,KAAKA,GAAG,CAAC;eACA,EAAEoC,MAAM;;cAET,EAAEA,MAAMP,EAAE,CAAC,IAAI,EAAEG,OAAOH,EAAE,CAAC;cAC3B,EAAEO,MAAM5B,MAAM,CAAC,GAAG,EAAEA,OAAO;MACnC,CAAC;QACH;IACF;IAEA,OAAOwB;AACT"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { countDistinct } from '../postgres/countDistinct.js';
|
|
2
|
+
export { createDatabase } from '../postgres/createDatabase.js';
|
|
2
3
|
export { convertPathToJSONTraversal } from '../postgres/createJSONQuery/convertPathToJSONTraversal.js';
|
|
3
4
|
export { createJSONQuery } from '../postgres/createJSONQuery/index.js';
|
|
4
5
|
export { createMigration } from '../postgres/createMigration.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/exports/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,2DAA2D,CAAA;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,cAAc,sBAAsB,CAAA"}
|
|
1
|
+
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/exports/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,2DAA2D,CAAA;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACpE,cAAc,sBAAsB,CAAA"}
|
package/dist/exports/postgres.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { countDistinct } from '../postgres/countDistinct.js';
|
|
2
|
+
export { createDatabase } from '../postgres/createDatabase.js';
|
|
2
3
|
export { convertPathToJSONTraversal } from '../postgres/createJSONQuery/convertPathToJSONTraversal.js';
|
|
3
4
|
export { createJSONQuery } from '../postgres/createJSONQuery/index.js';
|
|
4
5
|
export { createMigration } from '../postgres/createMigration.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/exports/postgres.ts"],"sourcesContent":["export { countDistinct } from '../postgres/countDistinct.js'\nexport { convertPathToJSONTraversal } from '../postgres/createJSONQuery/convertPathToJSONTraversal.js'\nexport { createJSONQuery } from '../postgres/createJSONQuery/index.js'\nexport { createMigration } from '../postgres/createMigration.js'\nexport { defaultDrizzleSnapshot } from '../postgres/defaultSnapshot.js'\nexport { deleteWhere } from '../postgres/deleteWhere.js'\nexport { dropDatabase } from '../postgres/dropDatabase.js'\nexport { execute } from '../postgres/execute.js'\nexport { getMigrationTemplate } from '../postgres/getMigrationTemplate.js'\nexport { init } from '../postgres/init.js'\nexport { insert } from '../postgres/insert.js'\nexport { requireDrizzleKit } from '../postgres/requireDrizzleKit.js'\nexport * from '../postgres/types.js'\n"],"names":["countDistinct","convertPathToJSONTraversal","createJSONQuery","createMigration","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","getMigrationTemplate","init","insert","requireDrizzleKit"],"mappings":"AAAA,SAASA,aAAa,QAAQ,+BAA8B;AAC5D,SAASC,0BAA0B,QAAQ,4DAA2D;AACtG,SAASC,eAAe,QAAQ,uCAAsC;AACtE,SAASC,eAAe,QAAQ,iCAAgC;AAChE,SAASC,sBAAsB,QAAQ,iCAAgC;AACvE,SAASC,WAAW,QAAQ,6BAA4B;AACxD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,OAAO,QAAQ,yBAAwB;AAChD,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,IAAI,QAAQ,sBAAqB;AAC1C,SAASC,MAAM,QAAQ,wBAAuB;AAC9C,SAASC,iBAAiB,QAAQ,mCAAkC;AACpE,cAAc,uBAAsB"}
|
|
1
|
+
{"version":3,"sources":["../../src/exports/postgres.ts"],"sourcesContent":["export { countDistinct } from '../postgres/countDistinct.js'\nexport { createDatabase } from '../postgres/createDatabase.js'\nexport { convertPathToJSONTraversal } from '../postgres/createJSONQuery/convertPathToJSONTraversal.js'\nexport { createJSONQuery } from '../postgres/createJSONQuery/index.js'\nexport { createMigration } from '../postgres/createMigration.js'\nexport { defaultDrizzleSnapshot } from '../postgres/defaultSnapshot.js'\nexport { deleteWhere } from '../postgres/deleteWhere.js'\nexport { dropDatabase } from '../postgres/dropDatabase.js'\nexport { execute } from '../postgres/execute.js'\nexport { getMigrationTemplate } from '../postgres/getMigrationTemplate.js'\nexport { init } from '../postgres/init.js'\nexport { insert } from '../postgres/insert.js'\nexport { requireDrizzleKit } from '../postgres/requireDrizzleKit.js'\nexport * from '../postgres/types.js'\n"],"names":["countDistinct","createDatabase","convertPathToJSONTraversal","createJSONQuery","createMigration","defaultDrizzleSnapshot","deleteWhere","dropDatabase","execute","getMigrationTemplate","init","insert","requireDrizzleKit"],"mappings":"AAAA,SAASA,aAAa,QAAQ,+BAA8B;AAC5D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,0BAA0B,QAAQ,4DAA2D;AACtG,SAASC,eAAe,QAAQ,uCAAsC;AACtE,SAASC,eAAe,QAAQ,iCAAgC;AAChE,SAASC,sBAAsB,QAAQ,iCAAgC;AACvE,SAASC,WAAW,QAAQ,6BAA4B;AACxD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,OAAO,QAAQ,yBAAwB;AAChD,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,IAAI,QAAQ,sBAAqB;AAC1C,SAASC,MAAM,QAAQ,wBAAuB;AAC9C,SAASC,iBAAiB,QAAQ,mCAAkC;AACpE,cAAc,uBAAsB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAkB,cAAc,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAKpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,qJAcxB,iBAAiB,4BA8UnB,CAAA"}
|
|
@@ -179,14 +179,17 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
|
|
|
179
179
|
}
|
|
180
180
|
const fields = adapter.payload.collections[field.collection].config.fields;
|
|
181
181
|
const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
|
|
182
|
-
|
|
183
|
-
if (
|
|
182
|
+
let joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''}`;
|
|
183
|
+
if (field.hasMany) {
|
|
184
184
|
const db = adapter.drizzle;
|
|
185
|
+
if (field.localized) {
|
|
186
|
+
joinTableName = adapter.tableNameMap.get(toSnakeCase(field.collection));
|
|
187
|
+
}
|
|
185
188
|
const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`;
|
|
186
189
|
const joins = [
|
|
187
190
|
{
|
|
188
191
|
type: 'innerJoin',
|
|
189
|
-
condition: and(eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id), eq(sql.raw(`"${joinTable}"."${topLevelTableName}_id"`), adapter.tables[currentTableName].id)),
|
|
192
|
+
condition: and(eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id), eq(sql.raw(`"${joinTable}"."${topLevelTableName}_id"`), adapter.tables[currentTableName].id), eq(adapter.tables[joinTable].path, field.on)),
|
|
190
193
|
table: adapter.tables[joinTable]
|
|
191
194
|
}
|
|
192
195
|
];
|
|
@@ -212,24 +215,27 @@ export const traverseFields = ({ _locales, adapter, currentArgs, currentTableNam
|
|
|
212
215
|
const subQuery = chainMethods({
|
|
213
216
|
methods: chainedMethods,
|
|
214
217
|
query: db.select({
|
|
215
|
-
id: adapter.tables[joinTableName].id
|
|
216
|
-
|
|
218
|
+
id: adapter.tables[joinTableName].id,
|
|
219
|
+
...field.localized && {
|
|
220
|
+
locale: adapter.tables[joinTable].locale
|
|
221
|
+
}
|
|
222
|
+
}).from(adapter.tables[joinTableName]).where(subQueryWhere).orderBy(orderBy.order(orderBy.column)).limit(limit)
|
|
217
223
|
});
|
|
218
224
|
const columnName = `${path.replaceAll('.', '_')}${field.name}`;
|
|
219
|
-
const
|
|
225
|
+
const jsonObjectSelect = field.localized ? sql.raw(`'_parentID', "id", '_locale', "locale"`) : sql.raw(`'id', "id"`);
|
|
220
226
|
if (adapter.name === 'sqlite') {
|
|
221
|
-
extras[columnName] = sql`
|
|
227
|
+
currentArgs.extras[columnName] = sql`
|
|
222
228
|
COALESCE((
|
|
223
|
-
SELECT json_group_array(
|
|
229
|
+
SELECT json_group_array(json_object(${jsonObjectSelect}))
|
|
224
230
|
FROM (
|
|
225
231
|
${subQuery}
|
|
226
232
|
) AS ${sql.raw(`${columnName}_sub`)}
|
|
227
233
|
), '[]')
|
|
228
234
|
`.as(columnName);
|
|
229
235
|
} else {
|
|
230
|
-
extras[columnName] = sql`
|
|
236
|
+
currentArgs.extras[columnName] = sql`
|
|
231
237
|
COALESCE((
|
|
232
|
-
SELECT json_agg(
|
|
238
|
+
SELECT json_agg(json_build_object(${jsonObjectSelect}))
|
|
233
239
|
FROM (
|
|
234
240
|
${subQuery}
|
|
235
241
|
) AS ${sql.raw(`${columnName}_sub`)}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, type DBQueryConfig, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n _locales: Result\n adapter: DrizzleAdapter\n currentArgs: Result\n currentTableName: string\n depth?: number\n fields: Field[]\n joinQuery: JoinQuery\n joins?: BuildQueryJoinAliases\n locale?: string\n path: string\n tablePath: string\n topLevelArgs: Record<string, unknown>\n topLevelTableName: string\n}\n\nexport const traverseFields = ({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields,\n joinQuery = {},\n joins,\n locale,\n path,\n tablePath,\n topLevelArgs,\n topLevelTableName,\n}: TraverseFieldArgs) => {\n fields.forEach((field) => {\n if (fieldIsVirtual(field)) {\n return\n }\n\n // handle simple relationship\n if (\n depth > 0 &&\n (field.type === 'upload' || field.type === 'relationship') &&\n !field.hasMany &&\n typeof field.relationTo === 'string'\n ) {\n if (field.localized) {\n _locales.with[`${path}${field.name}`] = true\n } else {\n currentArgs.with[`${path}${field.name}`] = true\n }\n }\n\n if (field.type === 'collapsible' || field.type === 'row') {\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: field.fields,\n joinQuery,\n joins,\n path,\n tablePath,\n topLevelArgs,\n topLevelTableName,\n })\n\n return\n }\n\n if (field.type === 'tabs') {\n field.tabs.forEach((tab) => {\n const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: tab.fields,\n joinQuery,\n joins,\n path: tabPath,\n tablePath: tabTablePath,\n topLevelArgs,\n topLevelTableName,\n })\n })\n\n return\n }\n\n if (fieldAffectsData(field)) {\n switch (field.type) {\n case 'array': {\n const withArray: Result = {\n columns: {\n _parentID: false,\n },\n orderBy: ({ _order }, { asc }) => [asc(_order)],\n with: {},\n }\n\n const arrayTableName = adapter.tableNameMap.get(\n `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n )\n\n const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n if (adapter.tables[arrayTableNameWithLocales]) {\n withArray.with._locales = {\n columns: {\n id: false,\n _parentID: false,\n },\n with: {},\n }\n }\n currentArgs.with[`${path}${field.name}`] = withArray\n\n traverseFields({\n _locales: withArray.with._locales,\n adapter,\n currentArgs: withArray,\n currentTableName: arrayTableName,\n depth,\n fields: field.fields,\n joinQuery,\n path: '',\n tablePath: '',\n topLevelArgs,\n topLevelTableName,\n })\n\n break\n }\n\n case 'select': {\n if (field.hasMany) {\n const withSelect: Result = {\n columns: {\n id: false,\n order: false,\n parent: false,\n },\n orderBy: ({ order }, { asc }) => [asc(order)],\n }\n\n currentArgs.with[`${path}${field.name}`] = withSelect\n }\n\n break\n }\n\n case 'blocks':\n field.blocks.forEach((block) => {\n const blockKey = `_blocks_${block.slug}`\n\n if (!topLevelArgs[blockKey]) {\n const withBlock: Result = {\n columns: {\n _parentID: false,\n },\n orderBy: ({ _order }, { asc }) => [asc(_order)],\n with: {},\n }\n\n const tableName = adapter.tableNameMap.get(\n `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n )\n\n if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n withBlock.with._locales = {\n with: {},\n }\n }\n topLevelArgs.with[blockKey] = withBlock\n\n traverseFields({\n _locales: withBlock.with._locales,\n adapter,\n currentArgs: withBlock,\n currentTableName: tableName,\n depth,\n fields: block.fields,\n joinQuery,\n path: '',\n tablePath: '',\n topLevelArgs,\n topLevelTableName,\n })\n }\n })\n\n break\n\n case 'group': {\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: field.fields,\n joinQuery,\n joins,\n path: `${path}${field.name}_`,\n tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n topLevelArgs,\n topLevelTableName,\n })\n\n break\n }\n\n case 'join': {\n // when `joinsQuery` is false, do not join\n if (joinQuery === false) {\n break\n }\n const {\n limit: limitArg = 10,\n sort,\n where,\n } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n let limit = limitArg\n if (limit !== 0) {\n // get an additional document and slice it later to determine if there is a next page\n limit += 1\n }\n\n const fields = adapter.payload.collections[field.collection].config.fields\n const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n const joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${\n field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''\n }`\n\n if (!adapter.tables[joinTableName][field.on]) {\n const db = adapter.drizzle as LibSQLDatabase\n const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`\n\n const joins: BuildQueryJoinAliases = [\n {\n type: 'innerJoin',\n condition: and(\n eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id),\n eq(\n sql.raw(`\"${joinTable}\".\"${topLevelTableName}_id\"`),\n adapter.tables[currentTableName].id,\n ),\n ),\n table: adapter.tables[joinTable],\n },\n ]\n\n const { orderBy, where: subQueryWhere } = buildQuery({\n adapter,\n fields,\n joins,\n locale,\n sort,\n tableName: joinCollectionTableName,\n where: {},\n })\n\n const chainedMethods: ChainedMethods = []\n\n joins.forEach(({ type, condition, table }) => {\n chainedMethods.push({\n args: [table, condition],\n method: type ?? 'leftJoin',\n })\n })\n\n const subQuery = chainMethods({\n methods: chainedMethods,\n query: db\n .select({\n id: adapter.tables[joinTableName].id,\n })\n .from(adapter.tables[joinTableName])\n .where(subQueryWhere)\n .orderBy(orderBy.order(orderBy.column))\n .limit(11),\n })\n\n const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n const extras = field.localized ? _locales.extras : currentArgs.extras\n\n if (adapter.name === 'sqlite') {\n extras[columnName] = sql`\n COALESCE((\n SELECT json_group_array(\"id\")\n FROM (\n ${subQuery}\n ) AS ${sql.raw(`${columnName}_sub`)}\n ), '[]')\n `.as(columnName)\n } else {\n extras[columnName] = sql`\n COALESCE((\n SELECT json_agg(\"id\")\n FROM (\n ${subQuery}\n ) AS ${sql.raw(`${columnName}_sub`)}\n ), '[]'::json)\n `.as(columnName)\n }\n\n break\n }\n\n const selectFields = {}\n\n const withJoin: DBQueryConfig<'many', true, any, any> = {\n columns: selectFields,\n }\n if (limit) {\n withJoin.limit = limit\n }\n\n if (field.localized) {\n withJoin.columns._locale = true\n withJoin.columns._parentID = true\n } else {\n withJoin.columns.id = true\n withJoin.columns.parent = true\n }\n const { orderBy, where: joinWhere } = buildQuery({\n adapter,\n fields,\n joins,\n locale,\n sort,\n tableName: joinTableName,\n where,\n })\n if (joinWhere) {\n withJoin.where = () => joinWhere\n }\n withJoin.orderBy = orderBy.order(orderBy.column)\n currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin\n break\n }\n\n default: {\n break\n }\n }\n }\n })\n\n return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","joinTableName","localization","on","db","drizzle","joinTable","relationshipsSuffix","condition","raw","table","subQueryWhere","chainedMethods","push","args","method","subQuery","methods","query","select","from","column","columnName","extras","as","selectFields","withJoin","_locale","joinWhere"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/find/traverseFields.ts"],"sourcesContent":["import type { DBQueryConfig } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { Field, JoinQuery } from 'payload'\n\nimport { and, eq, sql } from 'drizzle-orm'\nimport { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { BuildQueryJoinAliases, ChainedMethods, DrizzleAdapter } from '../types.js'\nimport type { Result } from './buildFindManyArgs.js'\n\nimport buildQuery from '../queries/buildQuery.js'\nimport { chainMethods } from './chainMethods.js'\n\ntype TraverseFieldArgs = {\n _locales: Result\n adapter: DrizzleAdapter\n currentArgs: Result\n currentTableName: string\n depth?: number\n fields: Field[]\n joinQuery: JoinQuery\n joins?: BuildQueryJoinAliases\n locale?: string\n path: string\n tablePath: string\n topLevelArgs: Record<string, unknown>\n topLevelTableName: string\n}\n\nexport const traverseFields = ({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields,\n joinQuery = {},\n joins,\n locale,\n path,\n tablePath,\n topLevelArgs,\n topLevelTableName,\n}: TraverseFieldArgs) => {\n fields.forEach((field) => {\n if (fieldIsVirtual(field)) {\n return\n }\n\n // handle simple relationship\n if (\n depth > 0 &&\n (field.type === 'upload' || field.type === 'relationship') &&\n !field.hasMany &&\n typeof field.relationTo === 'string'\n ) {\n if (field.localized) {\n _locales.with[`${path}${field.name}`] = true\n } else {\n currentArgs.with[`${path}${field.name}`] = true\n }\n }\n\n if (field.type === 'collapsible' || field.type === 'row') {\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: field.fields,\n joinQuery,\n joins,\n path,\n tablePath,\n topLevelArgs,\n topLevelTableName,\n })\n\n return\n }\n\n if (field.type === 'tabs') {\n field.tabs.forEach((tab) => {\n const tabPath = tabHasName(tab) ? `${path}${tab.name}_` : path\n const tabTablePath = tabHasName(tab) ? `${tablePath}${toSnakeCase(tab.name)}_` : tablePath\n\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: tab.fields,\n joinQuery,\n joins,\n path: tabPath,\n tablePath: tabTablePath,\n topLevelArgs,\n topLevelTableName,\n })\n })\n\n return\n }\n\n if (fieldAffectsData(field)) {\n switch (field.type) {\n case 'array': {\n const withArray: Result = {\n columns: {\n _parentID: false,\n },\n orderBy: ({ _order }, { asc }) => [asc(_order)],\n with: {},\n }\n\n const arrayTableName = adapter.tableNameMap.get(\n `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,\n )\n\n const arrayTableNameWithLocales = `${arrayTableName}${adapter.localesSuffix}`\n\n if (adapter.tables[arrayTableNameWithLocales]) {\n withArray.with._locales = {\n columns: {\n id: false,\n _parentID: false,\n },\n with: {},\n }\n }\n currentArgs.with[`${path}${field.name}`] = withArray\n\n traverseFields({\n _locales: withArray.with._locales,\n adapter,\n currentArgs: withArray,\n currentTableName: arrayTableName,\n depth,\n fields: field.fields,\n joinQuery,\n path: '',\n tablePath: '',\n topLevelArgs,\n topLevelTableName,\n })\n\n break\n }\n\n case 'select': {\n if (field.hasMany) {\n const withSelect: Result = {\n columns: {\n id: false,\n order: false,\n parent: false,\n },\n orderBy: ({ order }, { asc }) => [asc(order)],\n }\n\n currentArgs.with[`${path}${field.name}`] = withSelect\n }\n\n break\n }\n\n case 'blocks':\n field.blocks.forEach((block) => {\n const blockKey = `_blocks_${block.slug}`\n\n if (!topLevelArgs[blockKey]) {\n const withBlock: Result = {\n columns: {\n _parentID: false,\n },\n orderBy: ({ _order }, { asc }) => [asc(_order)],\n with: {},\n }\n\n const tableName = adapter.tableNameMap.get(\n `${topLevelTableName}_blocks_${toSnakeCase(block.slug)}`,\n )\n\n if (adapter.tables[`${tableName}${adapter.localesSuffix}`]) {\n withBlock.with._locales = {\n with: {},\n }\n }\n topLevelArgs.with[blockKey] = withBlock\n\n traverseFields({\n _locales: withBlock.with._locales,\n adapter,\n currentArgs: withBlock,\n currentTableName: tableName,\n depth,\n fields: block.fields,\n joinQuery,\n path: '',\n tablePath: '',\n topLevelArgs,\n topLevelTableName,\n })\n }\n })\n\n break\n\n case 'group': {\n traverseFields({\n _locales,\n adapter,\n currentArgs,\n currentTableName,\n depth,\n fields: field.fields,\n joinQuery,\n joins,\n path: `${path}${field.name}_`,\n tablePath: `${tablePath}${toSnakeCase(field.name)}_`,\n topLevelArgs,\n topLevelTableName,\n })\n\n break\n }\n\n case 'join': {\n // when `joinsQuery` is false, do not join\n if (joinQuery === false) {\n break\n }\n const {\n limit: limitArg = 10,\n sort,\n where,\n } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}\n let limit = limitArg\n if (limit !== 0) {\n // get an additional document and slice it later to determine if there is a next page\n limit += 1\n }\n\n const fields = adapter.payload.collections[field.collection].config.fields\n const joinCollectionTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n let joinTableName = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${\n field.localized && adapter.payload.config.localization ? adapter.localesSuffix : ''\n }`\n\n if (field.hasMany) {\n const db = adapter.drizzle as LibSQLDatabase\n if (field.localized) {\n joinTableName = adapter.tableNameMap.get(toSnakeCase(field.collection))\n }\n const joinTable = `${joinTableName}${adapter.relationshipsSuffix}`\n\n const joins: BuildQueryJoinAliases = [\n {\n type: 'innerJoin',\n condition: and(\n eq(adapter.tables[joinTable].parent, adapter.tables[joinTableName].id),\n eq(\n sql.raw(`\"${joinTable}\".\"${topLevelTableName}_id\"`),\n adapter.tables[currentTableName].id,\n ),\n eq(adapter.tables[joinTable].path, field.on),\n ),\n table: adapter.tables[joinTable],\n },\n ]\n\n const { orderBy, where: subQueryWhere } = buildQuery({\n adapter,\n fields,\n joins,\n locale,\n sort,\n tableName: joinCollectionTableName,\n where: {},\n })\n\n const chainedMethods: ChainedMethods = []\n\n joins.forEach(({ type, condition, table }) => {\n chainedMethods.push({\n args: [table, condition],\n method: type ?? 'leftJoin',\n })\n })\n\n const subQuery = chainMethods({\n methods: chainedMethods,\n query: db\n .select({\n id: adapter.tables[joinTableName].id,\n ...(field.localized && {\n locale: adapter.tables[joinTable].locale,\n }),\n })\n .from(adapter.tables[joinTableName])\n .where(subQueryWhere)\n .orderBy(orderBy.order(orderBy.column))\n .limit(limit),\n })\n\n const columnName = `${path.replaceAll('.', '_')}${field.name}`\n\n const jsonObjectSelect = field.localized\n ? sql.raw(`'_parentID', \"id\", '_locale', \"locale\"`)\n : sql.raw(`'id', \"id\"`)\n\n if (adapter.name === 'sqlite') {\n currentArgs.extras[columnName] = sql`\n COALESCE((\n SELECT json_group_array(json_object(${jsonObjectSelect}))\n FROM (\n ${subQuery}\n ) AS ${sql.raw(`${columnName}_sub`)}\n ), '[]')\n `.as(columnName)\n } else {\n currentArgs.extras[columnName] = sql`\n COALESCE((\n SELECT json_agg(json_build_object(${jsonObjectSelect}))\n FROM (\n ${subQuery}\n ) AS ${sql.raw(`${columnName}_sub`)}\n ), '[]'::json)\n `.as(columnName)\n }\n\n break\n }\n\n const selectFields = {}\n\n const withJoin: DBQueryConfig<'many', true, any, any> = {\n columns: selectFields,\n }\n if (limit) {\n withJoin.limit = limit\n }\n\n if (field.localized) {\n withJoin.columns._locale = true\n withJoin.columns._parentID = true\n } else {\n withJoin.columns.id = true\n withJoin.columns.parent = true\n }\n const { orderBy, where: joinWhere } = buildQuery({\n adapter,\n fields,\n joins,\n locale,\n sort,\n tableName: joinTableName,\n where,\n })\n if (joinWhere) {\n withJoin.where = () => joinWhere\n }\n withJoin.orderBy = orderBy.order(orderBy.column)\n currentArgs.with[`${path.replaceAll('.', '_')}${field.name}`] = withJoin\n break\n }\n\n default: {\n break\n }\n }\n }\n })\n\n return topLevelArgs\n}\n"],"names":["and","eq","sql","fieldAffectsData","fieldIsVirtual","tabHasName","toSnakeCase","buildQuery","chainMethods","traverseFields","_locales","adapter","currentArgs","currentTableName","depth","fields","joinQuery","joins","locale","path","tablePath","topLevelArgs","topLevelTableName","forEach","field","type","hasMany","relationTo","localized","with","name","tabs","tab","tabPath","tabTablePath","withArray","columns","_parentID","orderBy","_order","asc","arrayTableName","tableNameMap","get","arrayTableNameWithLocales","localesSuffix","tables","id","withSelect","order","parent","blocks","block","blockKey","slug","withBlock","tableName","limit","limitArg","sort","where","replaceAll","payload","collections","collection","config","joinCollectionTableName","joinTableName","localization","db","drizzle","joinTable","relationshipsSuffix","condition","raw","on","table","subQueryWhere","chainedMethods","push","args","method","subQuery","methods","query","select","from","column","columnName","jsonObjectSelect","extras","as","selectFields","withJoin","_locale","joinWhere"],"mappings":"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"}
|
package/dist/migrateReset.js
CHANGED
package/dist/migrateReset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/migrateReset.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport {\n commitTransaction,\n getMigrations,\n initTransaction,\n killTransaction,\n readMigrationFiles,\n} from 'payload'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\n\n/**\n * Run all migrate down functions\n */\nexport async function migrateReset(this: DrizzleAdapter): Promise<void> {\n const { payload } = this\n const migrationFiles = await readMigrationFiles({ payload })\n\n const { existingMigrations } = await getMigrations({ payload })\n\n if (!existingMigrations?.length) {\n payload.logger.info({ msg: 'No migrations to reset.' })\n return\n }\n\n const req = { payload } as PayloadRequest\n\n // Rollback all migrations in order\n for (const migration of existingMigrations) {\n const migrationFile = migrationFiles.find((m) => m.name === migration.name)\n try {\n if (!migrationFile) {\n throw new Error(`Migration ${migration.name} not found locally.`)\n }\n\n const start = Date.now()\n payload.logger.info({ msg: `Migrating down: ${migrationFile.name}` })\n await initTransaction(req)\n await migrationFile.down({ payload, req })\n payload.logger.info({\n msg: `Migrated down: ${migrationFile.name} (${Date.now() - start}ms)`,\n })\n\n const tableExists = await migrationTableExists(this)\n if (tableExists) {\n await payload.delete({\n id: migration.id,\n collection: 'payload-migrations',\n req,\n })\n }\n\n await commitTransaction(req)\n } catch (err: unknown) {\n let msg = `Error running migration ${migrationFile.name}.`\n\n if (err instanceof Error) {\n msg += ` ${err.message}`\n }\n\n await killTransaction(req)\n payload.logger.error({\n err,\n msg,\n })\n process.exit(1)\n }\n }\n\n // Delete dev migration\n\n const tableExists = await migrationTableExists(this)\n if (tableExists) {\n try {\n await payload.delete({\n collection: 'payload-migrations',\n where: {\n batch: {\n equals: -1,\n },\n },\n })\n } catch (err: unknown) {\n payload.logger.error({
|
|
1
|
+
{"version":3,"sources":["../src/migrateReset.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport {\n commitTransaction,\n getMigrations,\n initTransaction,\n killTransaction,\n readMigrationFiles,\n} from 'payload'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\n\n/**\n * Run all migrate down functions\n */\nexport async function migrateReset(this: DrizzleAdapter): Promise<void> {\n const { payload } = this\n const migrationFiles = await readMigrationFiles({ payload })\n\n const { existingMigrations } = await getMigrations({ payload })\n\n if (!existingMigrations?.length) {\n payload.logger.info({ msg: 'No migrations to reset.' })\n return\n }\n\n const req = { payload } as PayloadRequest\n\n // Rollback all migrations in order\n for (const migration of existingMigrations) {\n const migrationFile = migrationFiles.find((m) => m.name === migration.name)\n try {\n if (!migrationFile) {\n throw new Error(`Migration ${migration.name} not found locally.`)\n }\n\n const start = Date.now()\n payload.logger.info({ msg: `Migrating down: ${migrationFile.name}` })\n await initTransaction(req)\n await migrationFile.down({ payload, req })\n payload.logger.info({\n msg: `Migrated down: ${migrationFile.name} (${Date.now() - start}ms)`,\n })\n\n const tableExists = await migrationTableExists(this)\n if (tableExists) {\n await payload.delete({\n id: migration.id,\n collection: 'payload-migrations',\n req,\n })\n }\n\n await commitTransaction(req)\n } catch (err: unknown) {\n let msg = `Error running migration ${migrationFile.name}.`\n\n if (err instanceof Error) {\n msg += ` ${err.message}`\n }\n\n await killTransaction(req)\n payload.logger.error({\n err,\n msg,\n })\n process.exit(1)\n }\n }\n\n // Delete dev migration\n\n const tableExists = await migrationTableExists(this)\n if (tableExists) {\n try {\n await payload.delete({\n collection: 'payload-migrations',\n where: {\n batch: {\n equals: -1,\n },\n },\n })\n } catch (err: unknown) {\n payload.logger.error({ err, msg: 'Error deleting dev migration' })\n }\n }\n}\n"],"names":["commitTransaction","getMigrations","initTransaction","killTransaction","readMigrationFiles","migrationTableExists","migrateReset","payload","migrationFiles","existingMigrations","length","logger","info","msg","req","migration","migrationFile","find","m","name","Error","start","Date","now","down","tableExists","delete","id","collection","err","message","error","process","exit","where","batch","equals"],"mappings":"AAEA,SACEA,iBAAiB,EACjBC,aAAa,EACbC,eAAe,EACfC,eAAe,EACfC,kBAAkB,QACb,UAAS;AAIhB,SAASC,oBAAoB,QAAQ,sCAAqC;AAE1E;;CAEC,GACD,OAAO,eAAeC;IACpB,MAAM,EAAEC,OAAO,EAAE,GAAG,IAAI;IACxB,MAAMC,iBAAiB,MAAMJ,mBAAmB;QAAEG;IAAQ;IAE1D,MAAM,EAAEE,kBAAkB,EAAE,GAAG,MAAMR,cAAc;QAAEM;IAAQ;IAE7D,IAAI,CAACE,oBAAoBC,QAAQ;QAC/BH,QAAQI,MAAM,CAACC,IAAI,CAAC;YAAEC,KAAK;QAA0B;QACrD;IACF;IAEA,MAAMC,MAAM;QAAEP;IAAQ;IAEtB,mCAAmC;IACnC,KAAK,MAAMQ,aAAaN,mBAAoB;QAC1C,MAAMO,gBAAgBR,eAAeS,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ,UAAUI,IAAI;QAC1E,IAAI;YACF,IAAI,CAACH,eAAe;gBAClB,MAAM,IAAII,MAAM,CAAC,UAAU,EAAEL,UAAUI,IAAI,CAAC,mBAAmB,CAAC;YAClE;YAEA,MAAME,QAAQC,KAAKC,GAAG;YACtBhB,QAAQI,MAAM,CAACC,IAAI,CAAC;gBAAEC,KAAK,CAAC,gBAAgB,EAAEG,cAAcG,IAAI,CAAC,CAAC;YAAC;YACnE,MAAMjB,gBAAgBY;YACtB,MAAME,cAAcQ,IAAI,CAAC;gBAAEjB;gBAASO;YAAI;YACxCP,QAAQI,MAAM,CAACC,IAAI,CAAC;gBAClBC,KAAK,CAAC,gBAAgB,EAAEG,cAAcG,IAAI,CAAC,EAAE,EAAEG,KAAKC,GAAG,KAAKF,MAAM,GAAG,CAAC;YACxE;YAEA,MAAMI,cAAc,MAAMpB,qBAAqB,IAAI;YACnD,IAAIoB,aAAa;gBACf,MAAMlB,QAAQmB,MAAM,CAAC;oBACnBC,IAAIZ,UAAUY,EAAE;oBAChBC,YAAY;oBACZd;gBACF;YACF;YAEA,MAAMd,kBAAkBc;QAC1B,EAAE,OAAOe,KAAc;YACrB,IAAIhB,MAAM,CAAC,wBAAwB,EAAEG,cAAcG,IAAI,CAAC,CAAC,CAAC;YAE1D,IAAIU,eAAeT,OAAO;gBACxBP,OAAO,CAAC,CAAC,EAAEgB,IAAIC,OAAO,CAAC,CAAC;YAC1B;YAEA,MAAM3B,gBAAgBW;YACtBP,QAAQI,MAAM,CAACoB,KAAK,CAAC;gBACnBF;gBACAhB;YACF;YACAmB,QAAQC,IAAI,CAAC;QACf;IACF;IAEA,uBAAuB;IAEvB,MAAMR,cAAc,MAAMpB,qBAAqB,IAAI;IACnD,IAAIoB,aAAa;QACf,IAAI;YACF,MAAMlB,QAAQmB,MAAM,CAAC;gBACnBE,YAAY;gBACZM,OAAO;oBACLC,OAAO;wBACLC,QAAQ,CAAC;oBACX;gBACF;YACF;QACF,EAAE,OAAOP,KAAc;YACrBtB,QAAQI,MAAM,CAACoB,KAAK,CAAC;gBAAEF;gBAAKhB,KAAK;YAA+B;QAClE;IACF;AACF"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { BasePostgresAdapter } from './types.js';
|
|
2
|
+
type Args = {
|
|
3
|
+
/**
|
|
4
|
+
* Name of a database, defaults to the current one
|
|
5
|
+
*/
|
|
6
|
+
name?: string;
|
|
7
|
+
/**
|
|
8
|
+
* Schema to create in addition to 'public'. Defaults to adapter.schemaName if exists.
|
|
9
|
+
*/
|
|
10
|
+
schemaName?: string;
|
|
11
|
+
};
|
|
12
|
+
export declare const createDatabase: (this: BasePostgresAdapter, args?: Args) => Promise<boolean>;
|
|
13
|
+
export {};
|
|
14
|
+
//# sourceMappingURL=createDatabase.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createDatabase.d.ts","sourceRoot":"","sources":["../../src/postgres/createDatabase.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAgBrD,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AACD,eAAO,MAAM,cAAc,SAAyB,mBAAmB,SAAQ,IAAI,qBAiFlF,CAAA"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
const setConnectionStringDatabase = ({ connectionString, database })=>{
|
|
2
|
+
const connectionURL = new URL(connectionString);
|
|
3
|
+
const newConnectionURL = new URL(connectionURL);
|
|
4
|
+
newConnectionURL.pathname = `/${database}`;
|
|
5
|
+
return newConnectionURL.toString();
|
|
6
|
+
};
|
|
7
|
+
export const createDatabase = async function(args = {}) {
|
|
8
|
+
// DATABASE_URL - default Vercel env
|
|
9
|
+
const connectionString = this.poolOptions?.connectionString ?? process.env.DATABASE_URL;
|
|
10
|
+
let managementClientConfig = {};
|
|
11
|
+
let dbName = args.name;
|
|
12
|
+
const schemaName = this.schemaName || 'public';
|
|
13
|
+
if (connectionString) {
|
|
14
|
+
if (!dbName) {
|
|
15
|
+
dbName = new URL(connectionString).pathname.slice(1);
|
|
16
|
+
}
|
|
17
|
+
managementClientConfig.connectionString = setConnectionStringDatabase({
|
|
18
|
+
connectionString,
|
|
19
|
+
database: 'postgres'
|
|
20
|
+
});
|
|
21
|
+
} else {
|
|
22
|
+
if (!dbName) {
|
|
23
|
+
dbName = this.poolOptions.database;
|
|
24
|
+
}
|
|
25
|
+
managementClientConfig = {
|
|
26
|
+
...this.poolOptions,
|
|
27
|
+
database: 'postgres'
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
// import pg only when createDatabase is used
|
|
31
|
+
const pg = await import('pg');
|
|
32
|
+
const managementClient = new pg.Client(managementClientConfig);
|
|
33
|
+
try {
|
|
34
|
+
await managementClient.connect();
|
|
35
|
+
await managementClient.query(`CREATE DATABASE ${dbName}`);
|
|
36
|
+
this.payload.logger.info(`Created database "${dbName}"`);
|
|
37
|
+
if (schemaName !== 'public') {
|
|
38
|
+
let createdDatabaseConfig = {};
|
|
39
|
+
if (connectionString) {
|
|
40
|
+
createdDatabaseConfig.connectionString = setConnectionStringDatabase({
|
|
41
|
+
connectionString,
|
|
42
|
+
database: dbName
|
|
43
|
+
});
|
|
44
|
+
} else {
|
|
45
|
+
createdDatabaseConfig = {
|
|
46
|
+
...this.poolOptions,
|
|
47
|
+
database: dbName
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
const createdDatabaseClient = new pg.Client(createdDatabaseConfig);
|
|
51
|
+
try {
|
|
52
|
+
await createdDatabaseClient.connect();
|
|
53
|
+
await createdDatabaseClient.query(`CREATE SCHEMA ${schemaName}`);
|
|
54
|
+
this.payload.logger.info(`Created schema "${dbName}.${schemaName}"`);
|
|
55
|
+
} catch (err) {
|
|
56
|
+
this.payload.logger.error({
|
|
57
|
+
err,
|
|
58
|
+
msg: `Error: failed to create schema "${dbName}.${schemaName}". Details: ${err.message}`
|
|
59
|
+
});
|
|
60
|
+
} finally{
|
|
61
|
+
await createdDatabaseClient.end();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return true;
|
|
65
|
+
} catch (err) {
|
|
66
|
+
this.payload.logger.error({
|
|
67
|
+
err,
|
|
68
|
+
msg: `Error: failed to create database ${dbName}. Details: ${err.message}`
|
|
69
|
+
});
|
|
70
|
+
return false;
|
|
71
|
+
} finally{
|
|
72
|
+
await managementClient.end();
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
//# sourceMappingURL=createDatabase.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/postgres/createDatabase.ts"],"sourcesContent":["import type { ClientConfig } from 'pg'\n\nimport type { BasePostgresAdapter } from './types.js'\n\nconst setConnectionStringDatabase = ({\n connectionString,\n database,\n}: {\n connectionString: string\n database: string\n}): string => {\n const connectionURL = new URL(connectionString)\n const newConnectionURL = new URL(connectionURL)\n newConnectionURL.pathname = `/${database}`\n\n return newConnectionURL.toString()\n}\n\ntype 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 to adapter.schemaName if exists.\n */\n schemaName?: string\n}\nexport const createDatabase = async function (this: BasePostgresAdapter, args: Args = {}) {\n // DATABASE_URL - default Vercel env\n const connectionString = this.poolOptions?.connectionString ?? process.env.DATABASE_URL\n let managementClientConfig: ClientConfig = {}\n let dbName = args.name\n const schemaName = this.schemaName || 'public'\n\n if (connectionString) {\n if (!dbName) {\n dbName = new URL(connectionString).pathname.slice(1)\n }\n\n managementClientConfig.connectionString = setConnectionStringDatabase({\n connectionString,\n database: 'postgres',\n })\n } else {\n if (!dbName) {\n dbName = this.poolOptions.database\n }\n\n managementClientConfig = {\n ...this.poolOptions,\n database: 'postgres',\n }\n }\n\n // import pg only when createDatabase is used\n const pg = await import('pg')\n\n const managementClient = new pg.Client(managementClientConfig)\n\n try {\n await managementClient.connect()\n await managementClient.query(`CREATE DATABASE ${dbName}`)\n\n this.payload.logger.info(`Created database \"${dbName}\"`)\n\n if (schemaName !== 'public') {\n let createdDatabaseConfig: ClientConfig = {}\n\n if (connectionString) {\n createdDatabaseConfig.connectionString = setConnectionStringDatabase({\n connectionString,\n database: dbName,\n })\n } else {\n createdDatabaseConfig = {\n ...this.poolOptions,\n database: dbName,\n }\n }\n\n const createdDatabaseClient = new pg.Client(createdDatabaseConfig)\n\n try {\n await createdDatabaseClient.connect()\n\n await createdDatabaseClient.query(`CREATE SCHEMA ${schemaName}`)\n this.payload.logger.info(`Created schema \"${dbName}.${schemaName}\"`)\n } catch (err) {\n this.payload.logger.error({\n err,\n msg: `Error: failed to create schema \"${dbName}.${schemaName}\". Details: ${err.message}`,\n })\n } finally {\n await createdDatabaseClient.end()\n }\n }\n\n return true\n } catch (err) {\n this.payload.logger.error({\n err,\n msg: `Error: failed to create database ${dbName}. Details: ${err.message}`,\n })\n\n return false\n } finally {\n await managementClient.end()\n }\n}\n"],"names":["setConnectionStringDatabase","connectionString","database","connectionURL","URL","newConnectionURL","pathname","toString","createDatabase","args","poolOptions","process","env","DATABASE_URL","managementClientConfig","dbName","name","schemaName","slice","pg","managementClient","Client","connect","query","payload","logger","info","createdDatabaseConfig","createdDatabaseClient","err","error","msg","message","end"],"mappings":"AAIA,MAAMA,8BAA8B,CAAC,EACnCC,gBAAgB,EAChBC,QAAQ,EAIT;IACC,MAAMC,gBAAgB,IAAIC,IAAIH;IAC9B,MAAMI,mBAAmB,IAAID,IAAID;IACjCE,iBAAiBC,QAAQ,GAAG,CAAC,CAAC,EAAEJ,SAAS,CAAC;IAE1C,OAAOG,iBAAiBE,QAAQ;AAClC;AAYA,OAAO,MAAMC,iBAAiB,eAA2CC,OAAa,CAAC,CAAC;IACtF,oCAAoC;IACpC,MAAMR,mBAAmB,IAAI,CAACS,WAAW,EAAET,oBAAoBU,QAAQC,GAAG,CAACC,YAAY;IACvF,IAAIC,yBAAuC,CAAC;IAC5C,IAAIC,SAASN,KAAKO,IAAI;IACtB,MAAMC,aAAa,IAAI,CAACA,UAAU,IAAI;IAEtC,IAAIhB,kBAAkB;QACpB,IAAI,CAACc,QAAQ;YACXA,SAAS,IAAIX,IAAIH,kBAAkBK,QAAQ,CAACY,KAAK,CAAC;QACpD;QAEAJ,uBAAuBb,gBAAgB,GAAGD,4BAA4B;YACpEC;YACAC,UAAU;QACZ;IACF,OAAO;QACL,IAAI,CAACa,QAAQ;YACXA,SAAS,IAAI,CAACL,WAAW,CAACR,QAAQ;QACpC;QAEAY,yBAAyB;YACvB,GAAG,IAAI,CAACJ,WAAW;YACnBR,UAAU;QACZ;IACF;IAEA,6CAA6C;IAC7C,MAAMiB,KAAK,MAAM,MAAM,CAAC;IAExB,MAAMC,mBAAmB,IAAID,GAAGE,MAAM,CAACP;IAEvC,IAAI;QACF,MAAMM,iBAAiBE,OAAO;QAC9B,MAAMF,iBAAiBG,KAAK,CAAC,CAAC,gBAAgB,EAAER,OAAO,CAAC;QAExD,IAAI,CAACS,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,kBAAkB,EAAEX,OAAO,CAAC,CAAC;QAEvD,IAAIE,eAAe,UAAU;YAC3B,IAAIU,wBAAsC,CAAC;YAE3C,IAAI1B,kBAAkB;gBACpB0B,sBAAsB1B,gBAAgB,GAAGD,4BAA4B;oBACnEC;oBACAC,UAAUa;gBACZ;YACF,OAAO;gBACLY,wBAAwB;oBACtB,GAAG,IAAI,CAACjB,WAAW;oBACnBR,UAAUa;gBACZ;YACF;YAEA,MAAMa,wBAAwB,IAAIT,GAAGE,MAAM,CAACM;YAE5C,IAAI;gBACF,MAAMC,sBAAsBN,OAAO;gBAEnC,MAAMM,sBAAsBL,KAAK,CAAC,CAAC,cAAc,EAAEN,WAAW,CAAC;gBAC/D,IAAI,CAACO,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,gBAAgB,EAAEX,OAAO,CAAC,EAAEE,WAAW,CAAC,CAAC;YACrE,EAAE,OAAOY,KAAK;gBACZ,IAAI,CAACL,OAAO,CAACC,MAAM,CAACK,KAAK,CAAC;oBACxBD;oBACAE,KAAK,CAAC,gCAAgC,EAAEhB,OAAO,CAAC,EAAEE,WAAW,YAAY,EAAEY,IAAIG,OAAO,CAAC,CAAC;gBAC1F;YACF,SAAU;gBACR,MAAMJ,sBAAsBK,GAAG;YACjC;QACF;QAEA,OAAO;IACT,EAAE,OAAOJ,KAAK;QACZ,IAAI,CAACL,OAAO,CAACC,MAAM,CAACK,KAAK,CAAC;YACxBD;YACAE,KAAK,CAAC,iCAAiC,EAAEhB,OAAO,WAAW,EAAEc,IAAIG,OAAO,CAAC,CAAC;QAC5E;QAEA,OAAO;IACT,SAAU;QACR,MAAMZ,iBAAiBa,GAAG;IAC5B;AACF,EAAC"}
|
|
@@ -12,6 +12,7 @@ type Args = {
|
|
|
12
12
|
buildNumbers?: boolean;
|
|
13
13
|
buildRelationships?: boolean;
|
|
14
14
|
disableNotNull: boolean;
|
|
15
|
+
disableRelsTableUnique?: boolean;
|
|
15
16
|
disableUnique: boolean;
|
|
16
17
|
fields: Field[];
|
|
17
18
|
joins?: SanitizedJoins;
|
|
@@ -19,6 +20,7 @@ type Args = {
|
|
|
19
20
|
rootRelationsToBuild?: RelationMap;
|
|
20
21
|
rootTableIDColType?: string;
|
|
21
22
|
rootTableName?: string;
|
|
23
|
+
rootUniqueRelationships?: Set<string>;
|
|
22
24
|
tableName: string;
|
|
23
25
|
timestamps?: boolean;
|
|
24
26
|
versions: boolean;
|
|
@@ -36,6 +38,6 @@ type Result = {
|
|
|
36
38
|
hasManyTextField: 'index' | boolean;
|
|
37
39
|
relationsToBuild: RelationMap;
|
|
38
40
|
};
|
|
39
|
-
export declare const buildTable: ({ adapter, baseColumns, baseExtraConfig, disableNotNull, disableUnique, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, tableName, timestamps, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
|
|
41
|
+
export declare const buildTable: ({ adapter, baseColumns, baseExtraConfig, disableNotNull, disableRelsTableUnique, disableUnique, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
|
|
40
42
|
export {};
|
|
41
43
|
//# sourceMappingURL=build.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAEhB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAepD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAInB,WAAW,EACZ,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAEhB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAepD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAInB,WAAW,EACZ,MAAM,aAAa,CAAA;AAQpB,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC7C;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,cAAc,CAAA;IACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC/B,oBAAoB,CAAC,EAAE,WAAW,CAAA;IAClC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAA;CACtC,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,2BAA2B,EAAE,OAAO,CAAA;IACpC,yBAAyB,EAAE,OAAO,CAAA;IAClC,6BAA6B,EAAE,OAAO,CAAA;IACtC,kBAAkB,EAAE,OAAO,GAAG,OAAO,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAA;IACnC,gBAAgB,EAAE,WAAW,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,UAAU,+SAkBpB,IAAI,KAAG,MAyaT,CAAA"}
|
|
@@ -2,10 +2,11 @@ import { relations } from 'drizzle-orm';
|
|
|
2
2
|
import { foreignKey, index, integer, numeric, serial, timestamp, unique, varchar } from 'drizzle-orm/pg-core';
|
|
3
3
|
import toSnakeCase from 'to-snake-case';
|
|
4
4
|
import { createTableName } from '../../createTableName.js';
|
|
5
|
+
import { createIndex } from './createIndex.js';
|
|
5
6
|
import { parentIDColumnMap } from './parentIDColumnMap.js';
|
|
6
7
|
import { setColumnID } from './setColumnID.js';
|
|
7
8
|
import { traverseFields } from './traverseFields.js';
|
|
8
|
-
export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, disableNotNull, disableUnique = false, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, tableName, timestamps, versions, withinLocalizedArrayOrBlock })=>{
|
|
9
|
+
export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, disableNotNull, disableRelsTableUnique = false, disableUnique = false, fields, joins, rootRelationships, rootRelationsToBuild, rootTableIDColType, rootTableName: incomingRootTableName, rootUniqueRelationships, tableName, timestamps, versions, withinLocalizedArrayOrBlock })=>{
|
|
9
10
|
const isRoot = !incomingRootTableName;
|
|
10
11
|
const rootTableName = incomingRootTableName || tableName;
|
|
11
12
|
const columns = baseColumns;
|
|
@@ -17,6 +18,8 @@ export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, di
|
|
|
17
18
|
let numbersTable;
|
|
18
19
|
// Relationships to the base collection
|
|
19
20
|
const relationships = rootRelationships || new Set();
|
|
21
|
+
// Unique relationships to the base collection
|
|
22
|
+
const uniqueRelationships = rootUniqueRelationships || new Set();
|
|
20
23
|
let relationshipsTable;
|
|
21
24
|
// Drizzle relations
|
|
22
25
|
const relationsToBuild = new Map();
|
|
@@ -29,6 +32,7 @@ export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, di
|
|
|
29
32
|
adapter,
|
|
30
33
|
columns,
|
|
31
34
|
disableNotNull,
|
|
35
|
+
disableRelsTableUnique,
|
|
32
36
|
disableUnique,
|
|
33
37
|
fields,
|
|
34
38
|
indexes,
|
|
@@ -42,6 +46,7 @@ export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, di
|
|
|
42
46
|
rootRelationsToBuild: rootRelationsToBuild || relationsToBuild,
|
|
43
47
|
rootTableIDColType: rootTableIDColType || idColType,
|
|
44
48
|
rootTableName,
|
|
49
|
+
uniqueRelationships,
|
|
45
50
|
versions,
|
|
46
51
|
withinLocalizedArrayOrBlock
|
|
47
52
|
});
|
|
@@ -256,16 +261,33 @@ export const buildTable = ({ adapter, baseColumns = {}, baseExtraConfig = {}, di
|
|
|
256
261
|
if (relatedCollectionCustomIDType === 'text') {
|
|
257
262
|
colType = 'varchar';
|
|
258
263
|
}
|
|
259
|
-
|
|
264
|
+
const colName = `${relationTo}ID`;
|
|
265
|
+
relationshipColumns[colName] = parentIDColumnMap[colType](`${formattedRelationTo}_id`);
|
|
260
266
|
relationExtraConfig[`${relationTo}IdFk`] = (cols)=>foreignKey({
|
|
261
267
|
name: `${relationshipsTableName}_${toSnakeCase(relationTo)}_fk`,
|
|
262
268
|
columns: [
|
|
263
|
-
cols[
|
|
269
|
+
cols[colName]
|
|
264
270
|
],
|
|
265
271
|
foreignColumns: [
|
|
266
272
|
adapter.tables[formattedRelationTo].id
|
|
267
273
|
]
|
|
268
274
|
}).onDelete('cascade');
|
|
275
|
+
const indexName = [
|
|
276
|
+
colName
|
|
277
|
+
];
|
|
278
|
+
const unique = !disableUnique && uniqueRelationships.has(relationTo);
|
|
279
|
+
if (unique) {
|
|
280
|
+
indexName.push('path');
|
|
281
|
+
}
|
|
282
|
+
if (hasLocalizedRelationshipField) {
|
|
283
|
+
indexName.push('locale');
|
|
284
|
+
}
|
|
285
|
+
relationExtraConfig[`${relationTo}IdIdx`] = createIndex({
|
|
286
|
+
name: indexName,
|
|
287
|
+
columnName: `${formattedRelationTo}_id`,
|
|
288
|
+
tableName: relationshipsTableName,
|
|
289
|
+
unique
|
|
290
|
+
});
|
|
269
291
|
});
|
|
270
292
|
relationshipsTable = adapter.pgSchema.table(relationshipsTableName, relationshipColumns, (cols)=>{
|
|
271
293
|
const result = Object.entries(relationExtraConfig).reduce((config, [key, func])=>{
|