@payloadcms/db-postgres 3.0.0-canary.6041f49 → 3.0.0-canary.690108d

package/dist/predefinedMigrations/v2-v3/migrateRelationships.js

@@ -0,0 +1,57 @@
+import { sql } from 'drizzle-orm';
+import { fetchAndResave } from './fetchAndResave/index.js';
+export const migrateRelationships = async ({ adapter, collectionSlug, db, debug, fields, globalSlug, isVersions, pathsToQuery, payload, req, tableName })=>{
+    if (pathsToQuery.size === 0) return;
+    let offset = 0;
+    let paginationResult;
+    const where = Array.from(pathsToQuery).reduce((statement, path, i)=>{
+        return statement += `
+"${tableName}${adapter.relationshipsSuffix}"."path" LIKE '${path}'${pathsToQuery.size !== i + 1 ? ' OR' : ''}
+`;
+    }, '');
+    while(typeof paginationResult === 'undefined' || paginationResult.rows.length > 0){
+        const paginationStatement = `SELECT DISTINCT parent_id FROM ${tableName}${adapter.relationshipsSuffix} WHERE
+    ${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};
+  `;
+        paginationResult = await adapter.drizzle.execute(sql.raw(`${paginationStatement}`));
+        if (paginationResult.rows.length === 0) return;
+        offset += 1;
+        const statement = `SELECT * FROM ${tableName}${adapter.relationshipsSuffix} WHERE
+    (${where}) AND parent_id IN (${paginationResult.rows.map((row)=>row.parent_id).join(', ')});
+`;
+        if (debug) {
+            payload.logger.info('FINDING ROWS TO MIGRATE');
+            payload.logger.info(statement);
+        }
+        const result = await adapter.drizzle.execute(sql.raw(`${statement}`));
+        const docsToResave = {};
+        result.rows.forEach((row)=>{
+            const parentID = row.parent_id;
+            if (typeof parentID === 'string' || typeof parentID === 'number') {
+                if (!docsToResave[parentID]) docsToResave[parentID] = [];
+                docsToResave[parentID].push(row);
+            }
+        });
+        await fetchAndResave({
+            adapter,
+            collectionSlug,
+            db,
+            debug,
+            docsToResave,
+            fields,
+            globalSlug,
+            isVersions,
+            payload,
+            req: req,
+            tableName
+        });
+    }
+    const deleteStatement = `DELETE FROM ${tableName}${adapter.relationshipsSuffix} WHERE ${where}`;
+    if (debug) {
+        payload.logger.info('DELETING ROWS');
+        payload.logger.info(deleteStatement);
+    }
+    await db.execute(sql.raw(`${deleteStatement}`));
+};
+
+//# sourceMappingURL=migrateRelationships.js.map

package/dist/predefinedMigrations/v2-v3/migrateRelationships.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/predefinedMigrations/v2-v3/migrateRelationships.ts"],"sourcesContent":["import type { TransactionPg } from '@payloadcms/drizzle/types'\nimport type { Field, Payload, PayloadRequest } from 'payload'\n\nimport { sql } from 'drizzle-orm'\n\nimport type { PostgresAdapter } from '../../types.js'\nimport type { DocsToResave, PathsToQuery } from './types.js'\n\nimport { fetchAndResave } from './fetchAndResave/index.js'\n\ntype Args = {\n  adapter: PostgresAdapter\n  collectionSlug?: string\n  db: TransactionPg\n  debug: boolean\n  fields: Field[]\n  globalSlug?: string\n  isVersions: boolean\n  pathsToQuery: PathsToQuery\n  payload: Payload\n  req?: Partial<PayloadRequest>\n  tableName: string\n}\n\nexport const migrateRelationships = async ({\n  adapter,\n  collectionSlug,\n  db,\n  debug,\n  fields,\n  globalSlug,\n  isVersions,\n  pathsToQuery,\n  payload,\n  req,\n  tableName,\n}: Args) => {\n  if (pathsToQuery.size === 0) return\n\n  let offset = 0\n\n  let paginationResult\n\n  const where = Array.from(pathsToQuery).reduce((statement, path, i) => {\n    return (statement += `\n\"${tableName}${adapter.relationshipsSuffix}\".\"path\" LIKE '${path}'${pathsToQuery.size !== i + 1 ? ' OR' : ''}\n`)\n  }, '')\n\n  while (typeof paginationResult === 'undefined' || paginationResult.rows.length > 0) {\n    const paginationStatement = `SELECT DISTINCT parent_id FROM ${tableName}${adapter.relationshipsSuffix} WHERE\n    ${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};\n  `\n\n    paginationResult = await adapter.drizzle.execute(sql.raw(`${paginationStatement}`))\n\n    if (paginationResult.rows.length === 0) return\n\n    offset += 1\n\n    const statement = `SELECT * FROM ${tableName}${adapter.relationshipsSuffix} WHERE\n    (${where}) AND parent_id IN (${paginationResult.rows.map((row) => row.parent_id).join(', ')});\n`\n    if (debug) {\n      payload.logger.info('FINDING ROWS TO MIGRATE')\n      payload.logger.info(statement)\n    }\n\n    const result = await adapter.drizzle.execute(sql.raw(`${statement}`))\n\n    const docsToResave: DocsToResave = {}\n\n    result.rows.forEach((row) => {\n      const parentID = row.parent_id\n\n      if (typeof parentID === 'string' || typeof parentID === 'number') {\n        if (!docsToResave[parentID]) docsToResave[parentID] = []\n        docsToResave[parentID].push(row)\n      }\n    })\n\n    await fetchAndResave({\n      adapter,\n      collectionSlug,\n      db,\n      debug,\n      docsToResave,\n      fields,\n      globalSlug,\n      isVersions,\n      payload,\n      req: req as unknown as PayloadRequest,\n      tableName,\n    })\n  }\n\n  const deleteStatement = `DELETE FROM ${tableName}${adapter.relationshipsSuffix} WHERE ${where}`\n  if (debug) {\n    payload.logger.info('DELETING ROWS')\n    payload.logger.info(deleteStatement)\n  }\n  await db.execute(sql.raw(`${deleteStatement}`))\n}\n"],"names":["sql","fetchAndResave","migrateRelationships","adapter","collectionSlug","db","debug","fields","globalSlug","isVersions","pathsToQuery","payload","req","tableName","size","offset","paginationResult","where","Array","from","reduce","statement","path","i","relationshipsSuffix","rows","length","paginationStatement","drizzle","execute","raw","map","row","parent_id","join","logger","info","result","docsToResave","forEach","parentID","push","deleteStatement"],"mappings":"AAGA,SAASA,GAAG,QAAQ,cAAa;AAKjC,SAASC,cAAc,QAAQ,4BAA2B;AAgB1D,OAAO,MAAMC,uBAAuB,OAAO,EACzCC,OAAO,EACPC,cAAc,EACdC,EAAE,EACFC,KAAK,EACLC,MAAM,EACNC,UAAU,EACVC,UAAU,EACVC,YAAY,EACZC,OAAO,EACPC,GAAG,EACHC,SAAS,EACJ;IACL,IAAIH,aAAaI,IAAI,KAAK,GAAG;IAE7B,IAAIC,SAAS;IAEb,IAAIC;IAEJ,MAAMC,QAAQC,MAAMC,IAAI,CAACT,cAAcU,MAAM,CAAC,CAACC,WAAWC,MAAMC;QAC9D,OAAQF,aAAa,CAAC;CACzB,EAAER,UAAU,EAAEV,QAAQqB,mBAAmB,CAAC,eAAe,EAAEF,KAAK,CAAC,EAAEZ,aAAaI,IAAI,KAAKS,IAAI,IAAI,QAAQ,GAAG;AAC7G,CAAC;IACC,GAAG;IAEH,MAAO,OAAOP,qBAAqB,eAAeA,iBAAiBS,IAAI,CAACC,MAAM,GAAG,EAAG;QAClF,MAAMC,sBAAsB,CAAC,+BAA+B,EAAEd,UAAU,EAAEV,QAAQqB,mBAAmB,CAAC;IACtG,EAAEP,MAAM,qCAAqC,EAAEF,SAAS,IAAI;EAC9D,CAAC;QAECC,mBAAmB,MAAMb,QAAQyB,OAAO,CAACC,OAAO,CAAC7B,IAAI8B,GAAG,CAAC,CAAC,EAAEH,oBAAoB,CAAC;QAEjF,IAAIX,iBAAiBS,IAAI,CAACC,MAAM,KAAK,GAAG;QAExCX,UAAU;QAEV,MAAMM,YAAY,CAAC,cAAc,EAAER,UAAU,EAAEV,QAAQqB,mBAAmB,CAAC;KAC1E,EAAEP,MAAM,oBAAoB,EAAED,iBAAiBS,IAAI,CAACM,GAAG,CAAC,CAACC,MAAQA,IAAIC,SAAS,EAAEC,IAAI,CAAC,MAAM;AAChG,CAAC;QACG,IAAI5B,OAAO;YACTK,QAAQwB,MAAM,CAACC,IAAI,CAAC;YACpBzB,QAAQwB,MAAM,CAACC,IAAI,CAACf;QACtB;QAEA,MAAMgB,SAAS,MAAMlC,QAAQyB,OAAO,CAACC,OAAO,CAAC7B,IAAI8B,GAAG,CAAC,CAAC,EAAET,UAAU,CAAC;QAEnE,MAAMiB,eAA6B,CAAC;QAEpCD,OAAOZ,IAAI,CAACc,OAAO,CAAC,CAACP;YACnB,MAAMQ,WAAWR,IAAIC,SAAS;YAE9B,IAAI,OAAOO,aAAa,YAAY,OAAOA,aAAa,UAAU;gBAChE,IAAI,CAACF,YAAY,CAACE,SAAS,EAAEF,YAAY,CAACE,SAAS,GAAG,EAAE;gBACxDF,YAAY,CAACE,SAAS,CAACC,IAAI,CAACT;YAC9B;QACF;QAEA,MAAM/B,eAAe;YACnBE;YACAC;YACAC;YACAC;YACAgC;YACA/B;YACAC;YACAC;YACAE;YACAC,KAAKA;YACLC;QACF;IACF;IAEA,MAAM6B,kBAAkB,CAAC,YAAY,EAAE7B,UAAU,EAAEV,QAAQqB,mBAAmB,CAAC,OAAO,EAAEP,MAAM,CAAC;IAC/F,IAAIX,OAAO;QACTK,QAAQwB,MAAM,CAACC,IAAI,CAAC;QACpBzB,QAAQwB,MAAM,CAACC,IAAI,CAACM;IACtB;IACA,MAAMrC,GAAGwB,OAAO,CAAC7B,IAAI8B,GAAG,CAAC,CAAC,EAAEY,gBAAgB,CAAC;AAC/C,EAAC"}

package/dist/predefinedMigrations/v2-v3/traverseFields.d.ts

@@ -0,0 +1,23 @@
+import type { TransactionPg } from '@payloadcms/drizzle/types';
+import type { Field, Payload } from 'payload';
+import type { PostgresAdapter } from '../../types.js';
+import type { PathsToQuery } from './types.js';
+type Args = {
+    adapter: PostgresAdapter;
+    collectionSlug?: string;
+    columnPrefix: string;
+    db: TransactionPg;
+    disableNotNull: boolean;
+    fields: Field[];
+    globalSlug?: string;
+    isVersions: boolean;
+    newTableName: string;
+    parentTableName: string;
+    path: string;
+    pathsToQuery: PathsToQuery;
+    payload: Payload;
+    rootTableName: string;
+};
+export declare const traverseFields: (args: Args) => void;
+export {};
+//# sourceMappingURL=traverseFields.d.ts.map

package/dist/predefinedMigrations/v2-v3/traverseFields.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../../src/predefinedMigrations/v2-v3/traverseFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAK7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,EAAE,EAAE,aAAa,CAAA;IACjB,cAAc,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,IAAI,SA0FxC,CAAA"}

package/dist/predefinedMigrations/v2-v3/traverseFields.js

@@ -0,0 +1,85 @@
+import { tabHasName } from 'payload/shared';
+import toSnakeCase from 'to-snake-case';
+export const traverseFields = (args)=>{
+    args.fields.forEach((field)=>{
+        switch(field.type){
+            case 'group':
+                {
+                    let newTableName = `${args.newTableName}_${toSnakeCase(field.name)}`;
+                    if (field.localized && args.payload.config.localization) {
+                        newTableName += args.adapter.localesSuffix;
+                    }
+                    return traverseFields({
+                        ...args,
+                        columnPrefix: `${args.columnPrefix}${toSnakeCase(field.name)}_`,
+                        fields: field.fields,
+                        newTableName,
+                        path: `${args.path ? `${args.path}.` : ''}${field.name}`
+                    });
+                }
+            case 'row':
+            case 'collapsible':
+                {
+                    return traverseFields({
+                        ...args,
+                        fields: field.fields
+                    });
+                }
+            case 'array':
+                {
+                    const newTableName = args.adapter.tableNameMap.get(`${args.newTableName}_${toSnakeCase(field.name)}`);
+                    return traverseFields({
+                        ...args,
+                        columnPrefix: '',
+                        fields: field.fields,
+                        newTableName,
+                        parentTableName: newTableName,
+                        path: `${args.path ? `${args.path}.` : ''}${field.name}.%`
+                    });
+                }
+            case 'blocks':
+                {
+                    return field.blocks.forEach((block)=>{
+                        const newTableName = args.adapter.tableNameMap.get(`${args.rootTableName}_blocks_${toSnakeCase(block.slug)}`);
+                        traverseFields({
+                            ...args,
+                            columnPrefix: '',
+                            fields: block.fields,
+                            newTableName,
+                            parentTableName: newTableName,
+                            path: `${args.path ? `${args.path}.` : ''}${field.name}.%`
+                        });
+                    });
+                }
+            case 'tabs':
+                {
+                    return field.tabs.forEach((tab)=>{
+                        if (tabHasName(tab)) {
+                            args.columnPrefix = `${args.columnPrefix}_${toSnakeCase(tab.name)}_`;
+                            args.path = `${args.path ? `${args.path}.` : ''}${tab.name}`;
+                            args.newTableName = `${args.newTableName}_${toSnakeCase(tab.name)}`;
+                            if (tab.localized && args.payload.config.localization) {
+                                args.newTableName += args.adapter.localesSuffix;
+                            }
+                        }
+                        traverseFields({
+                            ...args,
+                            fields: tab.fields
+                        });
+                    });
+                }
+            case 'relationship':
+            case 'upload':
+                {
+                    if (typeof field.relationTo === 'string') {
+                        if (field.type === 'upload' || !field.hasMany) {
+                            args.pathsToQuery.add(`${args.path ? `${args.path}.` : ''}${field.name}`);
+                        }
+                    }
+                    return null;
+                }
+        }
+    });
+};
+
+//# sourceMappingURL=traverseFields.js.map

package/dist/predefinedMigrations/v2-v3/traverseFields.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/predefinedMigrations/v2-v3/traverseFields.ts"],"sourcesContent":["import type { TransactionPg } from '@payloadcms/drizzle/types'\nimport type { Field, Payload } from 'payload'\n\nimport { tabHasName } from 'payload/shared'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { PostgresAdapter } from '../../types.js'\nimport type { PathsToQuery } from './types.js'\n\ntype Args = {\n  adapter: PostgresAdapter\n  collectionSlug?: string\n  columnPrefix: string\n  db: TransactionPg\n  disableNotNull: boolean\n  fields: Field[]\n  globalSlug?: string\n  isVersions: boolean\n  newTableName: string\n  parentTableName: string\n  path: string\n  pathsToQuery: PathsToQuery\n  payload: Payload\n  rootTableName: string\n}\n\nexport const traverseFields = (args: Args) => {\n  args.fields.forEach((field) => {\n    switch (field.type) {\n      case 'group': {\n        let newTableName = `${args.newTableName}_${toSnakeCase(field.name)}`\n\n        if (field.localized && args.payload.config.localization) {\n          newTableName += args.adapter.localesSuffix\n        }\n\n        return traverseFields({\n          ...args,\n          columnPrefix: `${args.columnPrefix}${toSnakeCase(field.name)}_`,\n          fields: field.fields,\n          newTableName,\n          path: `${args.path ? `${args.path}.` : ''}${field.name}`,\n        })\n      }\n\n      case 'row':\n      case 'collapsible': {\n        return traverseFields({\n          ...args,\n          fields: field.fields,\n        })\n      }\n\n      case 'array': {\n        const newTableName = args.adapter.tableNameMap.get(\n          `${args.newTableName}_${toSnakeCase(field.name)}`,\n        )\n\n        return traverseFields({\n          ...args,\n          columnPrefix: '',\n          fields: field.fields,\n          newTableName,\n          parentTableName: newTableName,\n          path: `${args.path ? `${args.path}.` : ''}${field.name}.%`,\n        })\n      }\n\n      case 'blocks': {\n        return field.blocks.forEach((block) => {\n          const newTableName = args.adapter.tableNameMap.get(\n            `${args.rootTableName}_blocks_${toSnakeCase(block.slug)}`,\n          )\n\n          traverseFields({\n            ...args,\n            columnPrefix: '',\n            fields: block.fields,\n            newTableName,\n            parentTableName: newTableName,\n            path: `${args.path ? `${args.path}.` : ''}${field.name}.%`,\n          })\n        })\n      }\n\n      case 'tabs': {\n        return field.tabs.forEach((tab) => {\n          if (tabHasName(tab)) {\n            args.columnPrefix = `${args.columnPrefix}_${toSnakeCase(tab.name)}_`\n            args.path = `${args.path ? `${args.path}.` : ''}${tab.name}`\n            args.newTableName = `${args.newTableName}_${toSnakeCase(tab.name)}`\n\n            if (tab.localized && args.payload.config.localization) {\n              args.newTableName += args.adapter.localesSuffix\n            }\n          }\n\n          traverseFields({\n            ...args,\n            fields: tab.fields,\n          })\n        })\n      }\n\n      case 'relationship':\n      case 'upload': {\n        if (typeof field.relationTo === 'string') {\n          if (field.type === 'upload' || !field.hasMany) {\n            args.pathsToQuery.add(`${args.path ? `${args.path}.` : ''}${field.name}`)\n          }\n        }\n\n        return null\n      }\n    }\n  })\n}\n"],"names":["tabHasName","toSnakeCase","traverseFields","args","fields","forEach","field","type","newTableName","name","localized","payload","config","localization","adapter","localesSuffix","columnPrefix","path","tableNameMap","get","parentTableName","blocks","block","rootTableName","slug","tabs","tab","relationTo","hasMany","pathsToQuery","add"],"mappings":"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"}

package/dist/predefinedMigrations/v2-v3/types.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Set of all paths which should be moved
+ * This will be built up into one WHERE query
+ */
+export type PathsToQuery = Set<string>;
+export type DocsToResave = {
+    [id: number | string]: Record<string, unknown>[];
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/predefinedMigrations/v2-v3/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/predefinedMigrations/v2-v3/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;AAEtC,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;CACjD,CAAA"}

package/dist/predefinedMigrations/v2-v3/types.js

@@ -0,0 +1,6 @@
+/**
+ * Set of all paths which should be moved
+ * This will be built up into one WHERE query
+ */ export { };
+
+//# sourceMappingURL=types.js.map

package/dist/predefinedMigrations/v2-v3/types.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/predefinedMigrations/v2-v3/types.ts"],"sourcesContent":["/**\n * Set of all paths which should be moved\n * This will be built up into one WHERE query\n */\nexport type PathsToQuery = Set<string>\n\nexport type DocsToResave = {\n  [id: number | string]: Record<string, unknown>[]\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD,WAEC"}

package/dist/types.d.ts

@@ -1,99 +1,64 @@
-import type { ColumnBaseConfig, ColumnDataType, DrizzleConfig, ExtractTablesWithRelations, Relation, Relations } from 'drizzle-orm';
-import type { NodePgDatabase, NodePgQueryResultHKT } from 'drizzle-orm/node-postgres';
-import type { PgColumn, PgEnum, PgSchema, PgTableWithColumns, PgTransaction } from 'drizzle-orm/pg-core';
-import type { PgTableFn } from 'drizzle-orm/pg-core/table';
-import type { Payload } from 'payload';
-import type { BaseDatabaseAdapter } from 'payload/database';
-import type { PayloadRequestWithData } from 'payload/types';
+import type { BasePostgresAdapter, GenericEnum, MigrateDownArgs, MigrateUpArgs, PostgresDB } from '@payloadcms/drizzle/postgres';
+import type { DrizzleAdapter } from '@payloadcms/drizzle/types';
+import type { DrizzleConfig } from 'drizzle-orm';
+import type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-core';
 import type { Pool, PoolConfig } from 'pg';
-export type DrizzleDB = NodePgDatabase<Record<string, unknown>>;
 export type Args = {
     idType?: 'serial' | 'uuid';
     localesSuffix?: string;
     logger?: DrizzleConfig['logger'];
     migrationDir?: string;
     pool: PoolConfig;
+    prodMigrations?: {
+        down: (args: MigrateDownArgs) => Promise<void>;
+        name: string;
+        up: (args: MigrateUpArgs) => Promise<void>;
+    }[];
     push?: boolean;
     relationshipsSuffix?: string;
-    schemaName?: string;
-    versionsSuffix?: string;
-};
-export type GenericColumn = PgColumn<ColumnBaseConfig<ColumnDataType, string>, Record<string, unknown>>;
-export type GenericColumns = {
-    [x: string]: GenericColumn;
-};
-export type GenericTable = PgTableWithColumns<{
-    columns: GenericColumns;
-    dialect: string;
-    name: string;
-    schema: undefined;
-}>;
-export type GenericEnum = PgEnum<[string, ...string[]]>;
-export type GenericRelation = Relations<string, Record<string, Relation<string>>>;
-export type DrizzleTransaction = PgTransaction<NodePgQueryResultHKT, Record<string, unknown>, ExtractTablesWithRelations<Record<string, unknown>>>;
-export type PostgresAdapter = BaseDatabaseAdapter & {
-    drizzle: DrizzleDB;
-    enums: Record<string, GenericEnum>;
     /**
-     * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name
-     * Used for returning properly formed errors from unique fields
+     * The schema name to use for the database
+     * @experimental This only works when there are not other tables or enums of the same name in the database under a different schema. Awaiting fix from Drizzle.
      */
-    fieldConstraints: Record<string, Record<string, string>>;
-    idType: Args['idType'];
-    localesSuffix?: string;
-    logger: DrizzleConfig['logger'];
-    pgSchema?: {
-        table: PgTableFn;
-    } | PgSchema;
-    pool: Pool;
-    poolOptions: Args['pool'];
-    push: boolean;
-    relations: Record<string, GenericRelation>;
-    relationshipsSuffix?: string;
-    schema: Record<string, GenericEnum | GenericRelation | GenericTable>;
-    schemaName?: Args['schemaName'];
-    sessions: {
-        [id: string]: {
-            db: DrizzleTransaction;
-            reject: () => Promise<void>;
-            resolve: () => Promise<void>;
-        };
-    };
-    tableNameMap: Map<string, string>;
-    tables: Record<string, GenericTable | PgTableWithColumns<any>>;
+    schemaName?: string;
+    transactionOptions?: PgTransactionConfig | false;
     versionsSuffix?: string;
 };
-export type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar';
-export type PostgresAdapterResult = (args: {
-    payload: Payload;
-}) => PostgresAdapter;
-export type MigrateUpArgs = {
-    payload: Payload;
-    req?: Partial<PayloadRequestWithData>;
-};
-export type MigrateDownArgs = {
-    payload: Payload;
-    req?: Partial<PayloadRequestWithData>;
-};
+export type PostgresAdapter = {
+    pool: Pool;
+    poolOptions: PoolConfig;
+} & BasePostgresAdapter;
 declare module 'payload' {
-    interface DatabaseAdapter extends Omit<Args, 'migrationDir' | 'pool'>, BaseDatabaseAdapter {
-        drizzle: DrizzleDB;
+    interface DatabaseAdapter extends Omit<Args, 'idType' | 'logger' | 'migrationDir' | 'pool'>, DrizzleAdapter {
+        beginTransaction: (options?: PgTransactionConfig) => Promise<null | number | string>;
+        drizzle: PostgresDB;
         enums: Record<string, GenericEnum>;
+        /**
+         * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name
+         * Used for returning properly formed errors from unique fields
+         */
         fieldConstraints: Record<string, Record<string, string>>;
-        localeSuffix?: string;
+        idType: Args['idType'];
+        initializing: Promise<void>;
+        localesSuffix?: string;
+        logger: DrizzleConfig['logger'];
+        pgSchema?: {
+            table: PgTableFn;
+        } | PgSchema;
         pool: Pool;
+        poolOptions: Args['pool'];
+        prodMigrations?: {
+            down: (args: MigrateDownArgs) => Promise<void>;
+            name: string;
+            up: (args: MigrateUpArgs) => Promise<void>;
+        }[];
         push: boolean;
-        relations: Record<string, GenericRelation>;
+        rejectInitializing: () => void;
         relationshipsSuffix?: string;
-        schema: Record<string, GenericEnum | GenericRelation | GenericTable>;
-        sessions: {
-            [id: string]: {
-                db: DrizzleTransaction;
-                reject: () => Promise<void>;
-                resolve: () => Promise<void>;
-            };
-        };
-        tables: Record<string, GenericTable>;
+        resolveInitializing: () => void;
+        schema: Record<string, unknown>;
+        schemaName?: Args['schemaName'];
+        tableNameMap: Map<string, string>;
         versionsSuffix?: string;
     }
 }

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  ColumnBaseConfig,\n  ColumnDataType,\n  DrizzleConfig,\n  ExtractTablesWithRelations,\n  Relation,\n  Relations,\n} from 'drizzle-orm'\nimport type { NodePgDatabase, NodePgQueryResultHKT } from 'drizzle-orm/node-postgres'\nimport type {\n  PgColumn,\n  PgEnum,\n  PgSchema,\n  PgTableWithColumns,\n  PgTransaction,\n} from 'drizzle-orm/pg-core'\nimport type { PgTableFn } from 'drizzle-orm/pg-core/table'\nimport type { Payload } from 'payload'\nimport type { BaseDatabaseAdapter } from 'payload/database'\nimport type { PayloadRequestWithData } from 'payload/types'\nimport type { Pool, PoolConfig } from 'pg'\n\nexport type DrizzleDB = NodePgDatabase<Record<string, unknown>>\n\nexport type Args = {\n  idType?: 'serial' | 'uuid'\n  localesSuffix?: string\n  logger?: DrizzleConfig['logger']\n  migrationDir?: string\n  pool: PoolConfig\n  push?: boolean\n  relationshipsSuffix?: string\n  schemaName?: string\n  versionsSuffix?: string\n}\n\nexport type GenericColumn = PgColumn<\n  ColumnBaseConfig<ColumnDataType, string>,\n  Record<string, unknown>\n>\n\nexport type GenericColumns = {\n  [x: string]: GenericColumn\n}\n\nexport type GenericTable = PgTableWithColumns<{\n  columns: GenericColumns\n  dialect: string\n  name: string\n  schema: undefined\n}>\n\nexport type GenericEnum = PgEnum<[string, ...string[]]>\n\nexport type GenericRelation = Relations<string, Record<string, Relation<string>>>\n\nexport type DrizzleTransaction = PgTransaction<\n  NodePgQueryResultHKT,\n  Record<string, unknown>,\n  ExtractTablesWithRelations<Record<string, unknown>>\n>\n\nexport type PostgresAdapter = BaseDatabaseAdapter & {\n  drizzle: DrizzleDB\n  enums: Record<string, GenericEnum>\n  /**\n   * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n   * Used for returning properly formed errors from unique fields\n   */\n  fieldConstraints: Record<string, Record<string, string>>\n  idType: Args['idType']\n  localesSuffix?: string\n  logger: DrizzleConfig['logger']\n  pgSchema?: { table: PgTableFn } | PgSchema\n  pool: Pool\n  poolOptions: Args['pool']\n  push: boolean\n  relations: Record<string, GenericRelation>\n  relationshipsSuffix?: string\n  schema: Record<string, GenericEnum | GenericRelation | GenericTable>\n  schemaName?: Args['schemaName']\n  sessions: {\n    [id: string]: {\n      db: DrizzleTransaction\n      reject: () => Promise<void>\n      resolve: () => Promise<void>\n    }\n  }\n  tableNameMap: Map<string, string>\n  tables: Record<string, GenericTable | PgTableWithColumns<any>>\n  versionsSuffix?: string\n}\n\nexport type IDType = 'integer' | 'numeric' | 'uuid' | 'varchar'\n\nexport type PostgresAdapterResult = (args: { payload: Payload }) => PostgresAdapter\n\nexport type MigrateUpArgs = { payload: Payload; req?: Partial<PayloadRequestWithData> }\nexport type MigrateDownArgs = { payload: Payload; req?: Partial<PayloadRequestWithData> }\n\ndeclare module 'payload' {\n  export interface DatabaseAdapter\n    extends Omit<Args, 'migrationDir' | 'pool'>,\n      BaseDatabaseAdapter {\n    drizzle: DrizzleDB\n    enums: Record<string, GenericEnum>\n    fieldConstraints: Record<string, Record<string, string>>\n    localeSuffix?: string\n    pool: Pool\n    push: boolean\n    relations: Record<string, GenericRelation>\n    relationshipsSuffix?: string\n    schema: Record<string, GenericEnum | GenericRelation | GenericTable>\n    sessions: {\n      [id: string]: {\n        db: DrizzleTransaction\n        reject: () => Promise<void>\n        resolve: () => Promise<void>\n      }\n    }\n    tables: Record<string, GenericTable>\n    versionsSuffix?: string\n  }\n}\n"],"names":[],"rangeMappings":"","mappings":"AAkGA,WAAyF"}
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  BasePostgresAdapter,\n  GenericEnum,\n  MigrateDownArgs,\n  MigrateUpArgs,\n  PostgresDB,\n} from '@payloadcms/drizzle/postgres'\nimport type { DrizzleAdapter } from '@payloadcms/drizzle/types'\nimport type { DrizzleConfig } from 'drizzle-orm'\nimport type { PgSchema, PgTableFn, PgTransactionConfig } from 'drizzle-orm/pg-core'\nimport type { Pool, PoolConfig } from 'pg'\n\nexport type Args = {\n  idType?: 'serial' | 'uuid'\n  localesSuffix?: string\n  logger?: DrizzleConfig['logger']\n  migrationDir?: string\n  pool: PoolConfig\n  prodMigrations?: {\n    down: (args: MigrateDownArgs) => Promise<void>\n    name: string\n    up: (args: MigrateUpArgs) => Promise<void>\n  }[]\n  push?: boolean\n  relationshipsSuffix?: string\n  /**\n   * The schema name to use for the database\n   * @experimental This only works when there are not other tables or enums of the same name in the database under a different schema. Awaiting fix from Drizzle.\n   */\n  schemaName?: string\n  transactionOptions?: PgTransactionConfig | false\n  versionsSuffix?: string\n}\n\nexport type PostgresAdapter = {\n  pool: Pool\n  poolOptions: PoolConfig\n} & BasePostgresAdapter\n\ndeclare module 'payload' {\n  export interface DatabaseAdapter\n    extends Omit<Args, 'idType' | 'logger' | 'migrationDir' | 'pool'>,\n      DrizzleAdapter {\n    beginTransaction: (options?: PgTransactionConfig) => Promise<null | number | string>\n    drizzle: PostgresDB\n    enums: Record<string, GenericEnum>\n    /**\n     * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n     * Used for returning properly formed errors from unique fields\n     */\n    fieldConstraints: Record<string, Record<string, string>>\n    idType: Args['idType']\n    initializing: Promise<void>\n    localesSuffix?: string\n    logger: DrizzleConfig['logger']\n    pgSchema?: { table: PgTableFn } | PgSchema\n    pool: Pool\n    poolOptions: Args['pool']\n    prodMigrations?: {\n      down: (args: MigrateDownArgs) => Promise<void>\n      name: string\n      up: (args: MigrateUpArgs) => Promise<void>\n    }[]\n    push: boolean\n    rejectInitializing: () => void\n    relationshipsSuffix?: string\n    resolveInitializing: () => void\n    schema: Record<string, unknown>\n    schemaName?: Args['schemaName']\n    tableNameMap: Map<string, string>\n    versionsSuffix?: string\n  }\n}\n"],"names":[],"mappings":"AAkCA,WAGuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-canary.6041f49",
+  "version": "3.0.0-canary.690108d",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -14,13 +14,18 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./types": {
       "import": "./dist/types.js",
-      "require": "./dist/types.js",
-      "types": "./dist/types.d.ts"
+      "types": "./dist/types.d.ts",
+      "default": "./dist/types.js"
+    },
+    "./migration-utils": {
+      "import": "./dist/exports/migration-utils.js",
+      "types": "./dist/exports/migration-utils.d.ts",
+      "default": "./dist/exports/migration-utils.js"
     }
   },
   "main": "./dist/index.js",
@@ -30,28 +35,32 @@
     "mock.js"
   ],
   "dependencies": {
-    "@libsql/client": "^0.5.2",
     "console-table-printer": "2.11.2",
-    "drizzle-kit": "0.20.14-1f2c838",
-    "drizzle-orm": "0.29.4",
+    "drizzle-kit": "0.23.2-df9e596",
+    "drizzle-orm": "0.32.1",
     "pg": "8.11.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
-    "uuid": "9.0.0"
+    "uuid": "10.0.0",
+    "@payloadcms/drizzle": "3.0.0-canary.690108d"
   },
   "devDependencies": {
+    "@hyrious/esbuild-plugin-commonjs": "^0.2.4",
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
-    "@payloadcms/eslint-config": "1.1.1",
-    "payload": "3.0.0-canary.6041f49"
+    "esbuild": "0.23.0",
+    "payload": "3.0.0-canary.690108d",
+    "@payloadcms/eslint-config": "3.0.0-beta.59"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.6041f49"
+    "payload": "3.0.0-canary.690108d"
   },
   "scripts": {
-    "build": "pnpm build:swc && pnpm build:types",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc",
+    "build": "rimraf .dist && rimraf tsconfig.tsbuildinfo  && pnpm build:types && pnpm build:swc && pnpm build:esbuild && pnpm renamePredefinedMigrations",
+    "build:esbuild": "echo skipping esbuild",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}"
+    "clean": "rimraf {dist,*.tsbuildinfo}",
+    "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"
   }
 }

package/dist/count.d.ts

@@ -1,3 +0,0 @@
-import type { Count } from 'payload/database';
-export declare const count: Count;
-//# sourceMappingURL=count.d.ts.map

package/dist/count.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../src/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAY7C,eAAO,MAAM,KAAK,EAAE,KAiDnB,CAAA"}

package/dist/count.js

@@ -1,50 +0,0 @@
-import { sql } from 'drizzle-orm';
-import toSnakeCase from 'to-snake-case';
-import { chainMethods } from './find/chainMethods.js';
-import buildQuery from './queries/buildQuery.js';
-export const count = async function count({ collection, locale, req, where: whereArg }) {
-    const collectionConfig = this.payload.collections[collection].config;
-    const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug));
-    const db = this.sessions[req.transactionID]?.db || this.drizzle;
-    const table = this.tables[tableName];
-    const { joinAliases, joins, where } = await buildQuery({
-        adapter: this,
-        fields: collectionConfig.fields,
-        locale,
-        tableName,
-        where: whereArg
-    });
-    const selectCountMethods = [];
-    joinAliases.forEach(({ condition, table })=>{
-        selectCountMethods.push({
-            args: [
-                table,
-                condition
-            ],
-            method: 'leftJoin'
-        });
-    });
-    Object.entries(joins).forEach(([joinTable, condition])=>{
-        if (joinTable) {
-            selectCountMethods.push({
-                args: [
-                    this.tables[joinTable],
-                    condition
-                ],
-                method: 'leftJoin'
-            });
-        }
-    });
-    const countResult = await chainMethods({
-        methods: selectCountMethods,
-        query: db.select({
-            count: sql`count
-            (DISTINCT ${this.tables[tableName].id})`
-        }).from(table).where(where)
-    });
-    return {
-        totalDocs: Number(countResult[0].count)
-    };
-};
-
-//# sourceMappingURL=count.js.map

package/dist/count.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/count.ts"],"sourcesContent":["import type { Count } from 'payload/database'\nimport type { SanitizedCollectionConfig } from 'payload/types'\n\nimport { sql } from 'drizzle-orm'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { ChainedMethods } from './find/chainMethods.js'\nimport type { PostgresAdapter } from './types.js'\n\nimport { chainMethods } from './find/chainMethods.js'\nimport buildQuery from './queries/buildQuery.js'\n\nexport const count: Count = async function count(\n  this: PostgresAdapter,\n  { collection, locale, req, where: whereArg },\n) {\n  const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))\n\n  const db = this.sessions[req.transactionID]?.db || this.drizzle\n  const table = this.tables[tableName]\n\n  const { joinAliases, joins, where } = await buildQuery({\n    adapter: this,\n    fields: collectionConfig.fields,\n    locale,\n    tableName,\n    where: whereArg,\n  })\n\n  const selectCountMethods: ChainedMethods = []\n\n  joinAliases.forEach(({ condition, table }) => {\n    selectCountMethods.push({\n      args: [table, condition],\n      method: 'leftJoin',\n    })\n  })\n\n  Object.entries(joins).forEach(([joinTable, condition]) => {\n    if (joinTable) {\n      selectCountMethods.push({\n        args: [this.tables[joinTable], condition],\n        method: 'leftJoin',\n      })\n    }\n  })\n\n  const countResult = await chainMethods({\n    methods: selectCountMethods,\n    query: db\n      .select({\n        count: sql<number>`count\n            (DISTINCT ${this.tables[tableName].id})`,\n      })\n      .from(table)\n      .where(where),\n  })\n\n  return { totalDocs: Number(countResult[0].count) }\n}\n"],"names":["sql","toSnakeCase","chainMethods","buildQuery","count","collection","locale","req","where","whereArg","collectionConfig","payload","collections","config","tableName","tableNameMap","get","slug","db","sessions","transactionID","drizzle","table","tables","joinAliases","joins","adapter","fields","selectCountMethods","forEach","condition","push","args","method","Object","entries","joinTable","countResult","methods","query","select","id","from","totalDocs","Number"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,GAAG,QAAQ,cAAa;AACjC,OAAOC,iBAAiB,gBAAe;AAKvC,SAASC,YAAY,QAAQ,yBAAwB;AACrD,OAAOC,gBAAgB,0BAAyB;AAEhD,OAAO,MAAMC,QAAe,eAAeA,MAEzC,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,OAAOC,QAAQ,EAAE;IAE5C,MAAMC,mBAA8C,IAAI,CAACC,OAAO,CAACC,WAAW,CAACP,WAAW,CAACQ,MAAM;IAE/F,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACf,YAAYS,iBAAiBO,IAAI;IAEzE,MAAMC,KAAK,IAAI,CAACC,QAAQ,CAACZ,IAAIa,aAAa,CAAC,EAAEF,MAAM,IAAI,CAACG,OAAO;IAC/D,MAAMC,QAAQ,IAAI,CAACC,MAAM,CAACT,UAAU;IAEpC,MAAM,EAAEU,WAAW,EAAEC,KAAK,EAAEjB,KAAK,EAAE,GAAG,MAAML,WAAW;QACrDuB,SAAS,IAAI;QACbC,QAAQjB,iBAAiBiB,MAAM;QAC/BrB;QACAQ;QACAN,OAAOC;IACT;IAEA,MAAMmB,qBAAqC,EAAE;IAE7CJ,YAAYK,OAAO,CAAC,CAAC,EAAEC,SAAS,EAAER,KAAK,EAAE;QACvCM,mBAAmBG,IAAI,CAAC;YACtBC,MAAM;gBAACV;gBAAOQ;aAAU;YACxBG,QAAQ;QACV;IACF;IAEAC,OAAOC,OAAO,CAACV,OAAOI,OAAO,CAAC,CAAC,CAACO,WAAWN,UAAU;QACnD,IAAIM,WAAW;YACbR,mBAAmBG,IAAI,CAAC;gBACtBC,MAAM;oBAAC,IAAI,CAACT,MAAM,CAACa,UAAU;oBAAEN;iBAAU;gBACzCG,QAAQ;YACV;QACF;IACF;IAEA,MAAMI,cAAc,MAAMnC,aAAa;QACrCoC,SAASV;QACTW,OAAOrB,GACJsB,MAAM,CAAC;YACNpC,OAAOJ,GAAW,CAAC;sBACL,EAAE,IAAI,CAACuB,MAAM,CAACT,UAAU,CAAC2B,EAAE,CAAC,CAAC,CAAC;QAC9C,GACCC,IAAI,CAACpB,OACLd,KAAK,CAACA;IACX;IAEA,OAAO;QAAEmC,WAAWC,OAAOP,WAAW,CAAC,EAAE,CAACjC,KAAK;IAAE;AACnD,EAAC"}

package/dist/create.d.ts

@@ -1,3 +0,0 @@
-import type { Create } from 'payload/database';
-export declare const create: Create;
-//# sourceMappingURL=create.d.ts.map

package/dist/create.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAQ9C,eAAO,MAAM,MAAM,EAAE,MAoBpB,CAAA"}

package/dist/create.js

@@ -1,19 +0,0 @@
-import toSnakeCase from 'to-snake-case';
-import { upsertRow } from './upsertRow/index.js';
-export const create = async function create({ collection: collectionSlug, data, req }) {
-    const db = this.sessions[req.transactionID]?.db || this.drizzle;
-    const collection = this.payload.collections[collectionSlug].config;
-    const tableName = this.tableNameMap.get(toSnakeCase(collection.slug));
-    const result = await upsertRow({
-        adapter: this,
-        data,
-        db,
-        fields: collection.fields,
-        operation: 'create',
-        req,
-        tableName
-    });
-    return result;
-};
-
-//# sourceMappingURL=create.js.map

package/dist/create.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/create.ts"],"sourcesContent":["import type { Create } from 'payload/database'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { PostgresAdapter } from './types.js'\n\nimport { upsertRow } from './upsertRow/index.js'\n\nexport const create: Create = async function create(\n  this: PostgresAdapter,\n  { collection: collectionSlug, data, req },\n) {\n  const db = this.sessions[req.transactionID]?.db || this.drizzle\n  const collection = this.payload.collections[collectionSlug].config\n\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n\n  const result = await upsertRow({\n    adapter: this,\n    data,\n    db,\n    fields: collection.fields,\n    operation: 'create',\n    req,\n    tableName,\n  })\n\n  return result\n}\n"],"names":["toSnakeCase","upsertRow","create","collection","collectionSlug","data","req","db","sessions","transactionID","drizzle","payload","collections","config","tableName","tableNameMap","get","slug","result","adapter","fields","operation"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,SAAS,QAAQ,uBAAsB;AAEhD,OAAO,MAAMC,SAAiB,eAAeA,OAE3C,EAAEC,YAAYC,cAAc,EAAEC,IAAI,EAAEC,GAAG,EAAE;IAEzC,MAAMC,KAAK,IAAI,CAACC,QAAQ,CAACF,IAAIG,aAAa,CAAC,EAAEF,MAAM,IAAI,CAACG,OAAO;IAC/D,MAAMP,aAAa,IAAI,CAACQ,OAAO,CAACC,WAAW,CAACR,eAAe,CAACS,MAAM;IAElE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAChB,YAAYG,WAAWc,IAAI;IAEnE,MAAMC,SAAS,MAAMjB,UAAU;QAC7BkB,SAAS,IAAI;QACbd;QACAE;QACAa,QAAQjB,WAAWiB,MAAM;QACzBC,WAAW;QACXf;QACAQ;IACF;IAEA,OAAOI;AACT,EAAC"}

package/dist/createGlobal.d.ts

@@ -1,5 +0,0 @@
-import type { CreateGlobalArgs } from 'payload/database';
-import type { TypeWithID } from 'payload/types';
-import type { PostgresAdapter } from './types.js';
-export declare function createGlobal<T extends TypeWithID>(this: PostgresAdapter, { slug, data, req }: CreateGlobalArgs): Promise<T>;
-//# sourceMappingURL=createGlobal.d.ts.map

package/dist/createGlobal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createGlobal.d.ts","sourceRoot":"","sources":["../src/createGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,KAAK,EAA0B,UAAU,EAAE,MAAM,eAAe,CAAA;AAIvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIjD,wBAAsB,YAAY,CAAC,CAAC,SAAS,UAAU,EACrD,IAAI,EAAE,eAAe,EACrB,EAAE,IAAI,EAAE,IAAI,EAAE,GAAkC,EAAE,EAAE,gBAAgB,GACnE,OAAO,CAAC,CAAC,CAAC,CAiBZ"}

package/dist/createGlobal.js

@@ -1,19 +0,0 @@
-import toSnakeCase from 'to-snake-case';
-import { upsertRow } from './upsertRow/index.js';
-export async function createGlobal({ slug, data, req = {} }) {
-    const db = this.sessions[req.transactionID]?.db || this.drizzle;
-    const globalConfig = this.payload.globals.config.find((config)=>config.slug === slug);
-    const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug));
-    const result = await upsertRow({
-        adapter: this,
-        data,
-        db,
-        fields: globalConfig.fields,
-        operation: 'create',
-        req,
-        tableName
-    });
-    return result;
-}
-
-//# sourceMappingURL=createGlobal.js.map