@payloadcms/drizzle 3.5.1-canary.d9bd64a → 3.6.0

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

@@ -0,0 +1,149 @@
+export const traverseFields = ({ doc, fields, locale, path, rows })=>{
+    fields.forEach((field)=>{
+        switch(field.type){
+            case 'array':
+                {
+                    const rowData = doc?.[field.name];
+                    if (field.localized && typeof rowData === 'object' && rowData !== null) {
+                        Object.entries(rowData).forEach(([locale, localeRows])=>{
+                            if (Array.isArray(localeRows)) {
+                                localeRows.forEach((row, i)=>{
+                                    return traverseFields({
+                                        doc: row,
+                                        fields: field.flattenedFields,
+                                        locale,
+                                        path: `${path ? `${path}.` : ''}${field.name}.${i}`,
+                                        rows
+                                    });
+                                });
+                            }
+                        });
+                    }
+                    if (Array.isArray(rowData)) {
+                        rowData.forEach((row, i)=>{
+                            return traverseFields({
+                                doc: row,
+                                fields: field.flattenedFields,
+                                path: `${path ? `${path}.` : ''}${field.name}.${i}`,
+                                rows
+                            });
+                        });
+                    }
+                    break;
+                }
+            case 'blocks':
+                {
+                    const rowData = doc?.[field.name];
+                    if (field.localized && typeof rowData === 'object' && rowData !== null) {
+                        Object.entries(rowData).forEach(([locale, localeRows])=>{
+                            if (Array.isArray(localeRows)) {
+                                localeRows.forEach((row, i)=>{
+                                    const matchedBlock = field.blocks.find((block)=>block.slug === row.blockType);
+                                    if (matchedBlock) {
+                                        return traverseFields({
+                                            doc: row,
+                                            fields: matchedBlock.flattenedFields,
+                                            locale,
+                                            path: `${path ? `${path}.` : ''}${field.name}.${i}`,
+                                            rows
+                                        });
+                                    }
+                                });
+                            }
+                        });
+                    }
+                    if (Array.isArray(rowData)) {
+                        rowData.forEach((row, i)=>{
+                            const matchedBlock = field.blocks.find((block)=>block.slug === row.blockType);
+                            if (matchedBlock) {
+                                return traverseFields({
+                                    doc: row,
+                                    fields: matchedBlock.flattenedFields,
+                                    path: `${path ? `${path}.` : ''}${field.name}.${i}`,
+                                    rows
+                                });
+                            }
+                        });
+                    }
+                    break;
+                }
+            case 'group':
+            case 'tab':
+                {
+                    const newPath = `${path ? `${path}.` : ''}${field.name}`;
+                    const newDoc = doc?.[field.name];
+                    if (typeof newDoc === 'object' && newDoc !== null) {
+                        if (field.localized) {
+                            Object.entries(newDoc).forEach(([locale, localeDoc])=>{
+                                return traverseFields({
+                                    doc: localeDoc,
+                                    fields: field.flattenedFields,
+                                    locale,
+                                    path: newPath,
+                                    rows
+                                });
+                            });
+                        } else {
+                            return traverseFields({
+                                doc: newDoc,
+                                fields: field.flattenedFields,
+                                path: newPath,
+                                rows
+                            });
+                        }
+                    }
+                    break;
+                }
+            case 'relationship':
+            // falls through
+            case 'upload':
+                {
+                    if (typeof field.relationTo === 'string') {
+                        if (field.type === 'upload' || !field.hasMany) {
+                            const relationshipPath = `${path ? `${path}.` : ''}${field.name}`;
+                            if (field.localized) {
+                                const matchedRelationshipsWithLocales = rows.filter((row)=>row.path === relationshipPath);
+                                if (matchedRelationshipsWithLocales.length && !doc[field.name]) {
+                                    doc[field.name] = {};
+                                }
+                                const newDoc = doc[field.name];
+                                matchedRelationshipsWithLocales.forEach((localeRow)=>{
+                                    if (typeof localeRow.locale === 'string') {
+                                        const [, id] = Object.entries(localeRow).find(([key, val])=>val !== null && ![
+                                                'id',
+                                                'locale',
+                                                'order',
+                                                'parent_id',
+                                                'path'
+                                            ].includes(key));
+                                        newDoc[localeRow.locale] = id;
+                                    }
+                                });
+                            } else {
+                                const matchedRelationship = rows.find((row)=>{
+                                    const matchesPath = row.path === relationshipPath;
+                                    if (locale) {
+                                        return matchesPath && locale === row.locale;
+                                    }
+                                    return row.path === relationshipPath;
+                                });
+                                if (matchedRelationship) {
+                                    const [, id] = Object.entries(matchedRelationship).find(([key, val])=>val !== null && ![
+                                            'id',
+                                            'locale',
+                                            'order',
+                                            'parent_id',
+                                            'path'
+                                        ].includes(key));
+                                    doc[field.name] = id;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                }
+        }
+    });
+};
+
+//# sourceMappingURL=traverseFields.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/postgres/predefinedMigrations/v2-v3/fetchAndResave/traverseFields.ts"],"sourcesContent":["import type { FlattenedField } from 'payload'\n\ntype Args = {\n  doc: Record<string, unknown>\n  fields: FlattenedField[]\n  locale?: string\n  path: string\n  rows: Record<string, unknown>[]\n}\n\nexport const traverseFields = ({ doc, fields, locale, path, rows }: Args) => {\n  fields.forEach((field) => {\n    switch (field.type) {\n      case 'array': {\n        const rowData = doc?.[field.name]\n\n        if (field.localized && typeof rowData === 'object' && rowData !== null) {\n          Object.entries(rowData).forEach(([locale, localeRows]) => {\n            if (Array.isArray(localeRows)) {\n              localeRows.forEach((row, i) => {\n                return traverseFields({\n                  doc: row as Record<string, unknown>,\n                  fields: field.flattenedFields,\n                  locale,\n                  path: `${path ? `${path}.` : ''}${field.name}.${i}`,\n                  rows,\n                })\n              })\n            }\n          })\n        }\n\n        if (Array.isArray(rowData)) {\n          rowData.forEach((row, i) => {\n            return traverseFields({\n              doc: row as Record<string, unknown>,\n              fields: field.flattenedFields,\n              path: `${path ? `${path}.` : ''}${field.name}.${i}`,\n              rows,\n            })\n          })\n        }\n\n        break\n      }\n\n      case 'blocks': {\n        const rowData = doc?.[field.name]\n\n        if (field.localized && typeof rowData === 'object' && rowData !== null) {\n          Object.entries(rowData).forEach(([locale, localeRows]) => {\n            if (Array.isArray(localeRows)) {\n              localeRows.forEach((row, i) => {\n                const matchedBlock = field.blocks.find((block) => block.slug === row.blockType)\n\n                if (matchedBlock) {\n                  return traverseFields({\n                    doc: row as Record<string, unknown>,\n                    fields: matchedBlock.flattenedFields,\n                    locale,\n                    path: `${path ? `${path}.` : ''}${field.name}.${i}`,\n                    rows,\n                  })\n                }\n              })\n            }\n          })\n        }\n\n        if (Array.isArray(rowData)) {\n          rowData.forEach((row, i) => {\n            const matchedBlock = field.blocks.find((block) => block.slug === row.blockType)\n\n            if (matchedBlock) {\n              return traverseFields({\n                doc: row as Record<string, unknown>,\n                fields: matchedBlock.flattenedFields,\n                path: `${path ? `${path}.` : ''}${field.name}.${i}`,\n                rows,\n              })\n            }\n          })\n        }\n\n        break\n      }\n\n      case 'group':\n      case 'tab': {\n        const newPath = `${path ? `${path}.` : ''}${field.name}`\n        const newDoc = doc?.[field.name]\n\n        if (typeof newDoc === 'object' && newDoc !== null) {\n          if (field.localized) {\n            Object.entries(newDoc).forEach(([locale, localeDoc]) => {\n              return traverseFields({\n                doc: localeDoc,\n                fields: field.flattenedFields,\n                locale,\n                path: newPath,\n                rows,\n              })\n            })\n          } else {\n            return traverseFields({\n              doc: newDoc as Record<string, unknown>,\n              fields: field.flattenedFields,\n              path: newPath,\n              rows,\n            })\n          }\n        }\n\n        break\n      }\n\n      case 'relationship':\n      // falls through\n      case 'upload': {\n        if (typeof field.relationTo === 'string') {\n          if (field.type === 'upload' || !field.hasMany) {\n            const relationshipPath = `${path ? `${path}.` : ''}${field.name}`\n\n            if (field.localized) {\n              const matchedRelationshipsWithLocales = rows.filter(\n                (row) => row.path === relationshipPath,\n              )\n\n              if (matchedRelationshipsWithLocales.length && !doc[field.name]) {\n                doc[field.name] = {}\n              }\n\n              const newDoc = doc[field.name] as Record<string, unknown>\n\n              matchedRelationshipsWithLocales.forEach((localeRow) => {\n                if (typeof localeRow.locale === 'string') {\n                  const [, id] = Object.entries(localeRow).find(\n                    ([key, val]) =>\n                      val !== null && !['id', 'locale', 'order', 'parent_id', 'path'].includes(key),\n                  )\n\n                  newDoc[localeRow.locale] = id\n                }\n              })\n            } else {\n              const matchedRelationship = rows.find((row) => {\n                const matchesPath = row.path === relationshipPath\n\n                if (locale) {\n                  return matchesPath && locale === row.locale\n                }\n\n                return row.path === relationshipPath\n              })\n\n              if (matchedRelationship) {\n                const [, id] = Object.entries(matchedRelationship).find(\n                  ([key, val]) =>\n                    val !== null && !['id', 'locale', 'order', 'parent_id', 'path'].includes(key),\n                )\n\n                doc[field.name] = id\n              }\n            }\n          }\n        }\n        break\n      }\n    }\n  })\n}\n"],"names":["traverseFields","doc","fields","locale","path","rows","forEach","field","type","rowData","name","localized","Object","entries","localeRows","Array","isArray","row","i","flattenedFields","matchedBlock","blocks","find","block","slug","blockType","newPath","newDoc","localeDoc","relationTo","hasMany","relationshipPath","matchedRelationshipsWithLocales","filter","length","localeRow","id","key","val","includes","matchedRelationship","matchesPath"],"mappings":"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"}

package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.d.ts

@@ -0,0 +1,3 @@
+export type Groups = 'addColumn' | 'addConstraint' | 'dropColumn' | 'dropConstraint' | 'dropTable' | 'notNull';
+export declare const groupUpSQLStatements: (list: string[]) => Record<Groups, string[]>;
+//# sourceMappingURL=groupUpSQLStatements.d.ts.map

package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"groupUpSQLStatements.d.ts","sourceRoot":"","sources":["../../../../src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GACd,WAAW,GACX,eAAe,GACf,YAAY,GACZ,gBAAgB,GAChB,WAAW,GACX,SAAS,CAAA;AAgBb,eAAO,MAAM,oBAAoB,SAAU,MAAM,EAAE,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAmD5E,CAAA"}

package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.js

@@ -0,0 +1,56 @@
+/**
+ * Convert an "ADD COLUMN" statement to an "ALTER COLUMN" statement
+ * example: ALTER TABLE "pages_blocks_my_block" ADD COLUMN "person_id" integer NOT NULL;
+ * to: ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;
+ * @param sql
+ */ function convertAddColumnToAlterColumn(sql) {
+    // Regular expression to match the ADD COLUMN statement with its constraints
+    const regex = /ALTER TABLE ("[^"]+") ADD COLUMN ("[^"]+") [\w\s]+ NOT NULL;/;
+    // Replace the matched part with "ALTER COLUMN ... SET NOT NULL;"
+    return sql.replace(regex, 'ALTER TABLE $1 ALTER COLUMN $2 SET NOT NULL;');
+}
+export const groupUpSQLStatements = (list)=>{
+    const groups = {
+        addColumn: 'ADD COLUMN',
+        // example: ALTER TABLE "posts" ADD COLUMN "category_id" integer
+        addConstraint: 'ADD CONSTRAINT',
+        //example:
+        // DO $$ BEGIN
+        //  ALTER TABLE "pages_blocks_my_block" ADD CONSTRAINT "pages_blocks_my_block_person_id_users_id_fk" FOREIGN KEY ("person_id") REFERENCES "users"("id") ON DELETE cascade ON UPDATE no action;
+        // EXCEPTION
+        //  WHEN duplicate_object THEN null;
+        // END $$;
+        dropColumn: 'DROP COLUMN',
+        // example: ALTER TABLE "_posts_v_rels" DROP COLUMN IF EXISTS "posts_id";
+        dropConstraint: 'DROP CONSTRAINT',
+        // example: ALTER TABLE "_posts_v_rels" DROP CONSTRAINT "_posts_v_rels_posts_fk";
+        dropTable: 'DROP TABLE',
+        // example: DROP TABLE "pages_rels";
+        notNull: 'NOT NULL'
+    };
+    const result = Object.keys(groups).reduce((result, group)=>{
+        result[group] = [];
+        return result;
+    }, {});
+    for (const line of list){
+        Object.entries(groups).some(([key, value])=>{
+            if (line.endsWith('NOT NULL;')) {
+                // split up the ADD COLUMN and ALTER COLUMN NOT NULL statements
+                // example: ALTER TABLE "pages_blocks_my_block" ADD COLUMN "person_id" integer NOT NULL;
+                // becomes two separate statements:
+                //  1. ALTER TABLE "pages_blocks_my_block" ADD COLUMN "person_id" integer;
+                //  2.  ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;
+                result.addColumn.push(line.replace(' NOT NULL;', ';'));
+                result.notNull.push(convertAddColumnToAlterColumn(line));
+                return true;
+            }
+            if (line.includes(value)) {
+                result[key].push(line);
+                return true;
+            }
+        });
+    }
+    return result;
+};
+
+//# sourceMappingURL=groupUpSQLStatements.js.map

package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts"],"sourcesContent":["export type Groups =\n  | 'addColumn'\n  | 'addConstraint'\n  | 'dropColumn'\n  | 'dropConstraint'\n  | 'dropTable'\n  | 'notNull'\n\n/**\n * Convert an \"ADD COLUMN\" statement to an \"ALTER COLUMN\" statement\n * example: ALTER TABLE \"pages_blocks_my_block\" ADD COLUMN \"person_id\" integer NOT NULL;\n * to: ALTER TABLE \"pages_blocks_my_block\" ALTER COLUMN \"person_id\" SET NOT NULL;\n * @param sql\n */\nfunction convertAddColumnToAlterColumn(sql) {\n  // Regular expression to match the ADD COLUMN statement with its constraints\n  const regex = /ALTER TABLE (\"[^\"]+\") ADD COLUMN (\"[^\"]+\") [\\w\\s]+ NOT NULL;/\n\n  // Replace the matched part with \"ALTER COLUMN ... SET NOT NULL;\"\n  return sql.replace(regex, 'ALTER TABLE $1 ALTER COLUMN $2 SET NOT NULL;')\n}\n\nexport const groupUpSQLStatements = (list: string[]): Record<Groups, string[]> => {\n  const groups = {\n    addColumn: 'ADD COLUMN',\n    // example: ALTER TABLE \"posts\" ADD COLUMN \"category_id\" integer\n\n    addConstraint: 'ADD CONSTRAINT',\n    //example:\n    // DO $$ BEGIN\n    //  ALTER TABLE \"pages_blocks_my_block\" ADD CONSTRAINT \"pages_blocks_my_block_person_id_users_id_fk\" FOREIGN KEY (\"person_id\") REFERENCES \"users\"(\"id\") ON DELETE cascade ON UPDATE no action;\n    // EXCEPTION\n    //  WHEN duplicate_object THEN null;\n    // END $$;\n\n    dropColumn: 'DROP COLUMN',\n    // example: ALTER TABLE \"_posts_v_rels\" DROP COLUMN IF EXISTS \"posts_id\";\n\n    dropConstraint: 'DROP CONSTRAINT',\n    // example: ALTER TABLE \"_posts_v_rels\" DROP CONSTRAINT \"_posts_v_rels_posts_fk\";\n\n    dropTable: 'DROP TABLE',\n    // example: DROP TABLE \"pages_rels\";\n\n    notNull: 'NOT NULL',\n    // example: ALTER TABLE \"pages_blocks_my_block\" ALTER COLUMN \"person_id\" SET NOT NULL;\n  }\n\n  const result = Object.keys(groups).reduce((result, group: Groups) => {\n    result[group] = []\n    return result\n  }, {}) as Record<Groups, string[]>\n\n  for (const line of list) {\n    Object.entries(groups).some(([key, value]) => {\n      if (line.endsWith('NOT NULL;')) {\n        // split up the ADD COLUMN and ALTER COLUMN NOT NULL statements\n        // example: ALTER TABLE \"pages_blocks_my_block\" ADD COLUMN \"person_id\" integer NOT NULL;\n        // becomes two separate statements:\n        //  1. ALTER TABLE \"pages_blocks_my_block\" ADD COLUMN \"person_id\" integer;\n        //  2.  ALTER TABLE \"pages_blocks_my_block\" ALTER COLUMN \"person_id\" SET NOT NULL;\n        result.addColumn.push(line.replace(' NOT NULL;', ';'))\n        result.notNull.push(convertAddColumnToAlterColumn(line))\n        return true\n      }\n      if (line.includes(value)) {\n        result[key].push(line)\n        return true\n      }\n    })\n  }\n\n  return result\n}\n"],"names":["convertAddColumnToAlterColumn","sql","regex","replace","groupUpSQLStatements","list","groups","addColumn","addConstraint","dropColumn","dropConstraint","dropTable","notNull","result","Object","keys","reduce","group","line","entries","some","key","value","endsWith","push","includes"],"mappings":"AAQA;;;;;CAKC,GACD,SAASA,8BAA8BC,GAAG;IACxC,4EAA4E;IAC5E,MAAMC,QAAQ;IAEd,iEAAiE;IACjE,OAAOD,IAAIE,OAAO,CAACD,OAAO;AAC5B;AAEA,OAAO,MAAME,uBAAuB,CAACC;IACnC,MAAMC,SAAS;QACbC,WAAW;QACX,gEAAgE;QAEhEC,eAAe;QACf,UAAU;QACV,cAAc;QACd,8LAA8L;QAC9L,YAAY;QACZ,oCAAoC;QACpC,UAAU;QAEVC,YAAY;QACZ,yEAAyE;QAEzEC,gBAAgB;QAChB,iFAAiF;QAEjFC,WAAW;QACX,oCAAoC;QAEpCC,SAAS;IAEX;IAEA,MAAMC,SAASC,OAAOC,IAAI,CAACT,QAAQU,MAAM,CAAC,CAACH,QAAQI;QACjDJ,MAAM,CAACI,MAAM,GAAG,EAAE;QAClB,OAAOJ;IACT,GAAG,CAAC;IAEJ,KAAK,MAAMK,QAAQb,KAAM;QACvBS,OAAOK,OAAO,CAACb,QAAQc,IAAI,CAAC,CAAC,CAACC,KAAKC,MAAM;YACvC,IAAIJ,KAAKK,QAAQ,CAAC,cAAc;gBAC9B,+DAA+D;gBAC/D,wFAAwF;gBACxF,mCAAmC;gBACnC,0EAA0E;gBAC1E,kFAAkF;gBAClFV,OAAON,SAAS,CAACiB,IAAI,CAACN,KAAKf,OAAO,CAAC,cAAc;gBACjDU,OAAOD,OAAO,CAACY,IAAI,CAACxB,8BAA8BkB;gBAClD,OAAO;YACT;YACA,IAAIA,KAAKO,QAAQ,CAACH,QAAQ;gBACxBT,MAAM,CAACQ,IAAI,CAACG,IAAI,CAACN;gBACjB,OAAO;YACT;QACF;IACF;IAEA,OAAOL;AACT,EAAC"}

package/dist/postgres/predefinedMigrations/v2-v3/index.d.ts

@@ -0,0 +1,23 @@
+import type { Payload, PayloadRequest } from 'payload';
+type Args = {
+    debug?: boolean;
+    payload: Payload;
+    req?: Partial<PayloadRequest>;
+};
+/**
+ * Moves upload and relationship columns from the join table and into the tables while moving data
+ * This is done in the following order:
+ *    ADD COLUMNs
+ *    -- manipulate data to move relationships to new columns
+ *    ADD CONSTRAINTs
+ *    NOT NULLs
+ *    DROP TABLEs
+ *    DROP CONSTRAINTs
+ *    DROP COLUMNs
+ * @param debug
+ * @param payload
+ * @param req
+ */
+export declare const migratePostgresV2toV3: ({ debug, payload, req }: Args) => Promise<void>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/postgres/predefinedMigrations/v2-v3/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/postgres/predefinedMigrations/v2-v3/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAetD,KAAK,IAAI,GAAG;IACV,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC9B,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,4BAAmC,IAAI,kBAkPxE,CAAA"}

package/dist/postgres/predefinedMigrations/v2-v3/index.js

@@ -0,0 +1,212 @@
+import { sql } from 'drizzle-orm';
+import fs from 'fs';
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload';
+import toSnakeCase from 'to-snake-case';
+import { groupUpSQLStatements } from './groupUpSQLStatements.js';
+import { migrateRelationships } from './migrateRelationships.js';
+import { traverseFields } from './traverseFields.js';
+/**
+ * Moves upload and relationship columns from the join table and into the tables while moving data
+ * This is done in the following order:
+ *    ADD COLUMNs
+ *    -- manipulate data to move relationships to new columns
+ *    ADD CONSTRAINTs
+ *    NOT NULLs
+ *    DROP TABLEs
+ *    DROP CONSTRAINTs
+ *    DROP COLUMNs
+ * @param debug
+ * @param payload
+ * @param req
+ */ export const migratePostgresV2toV3 = async ({ debug, payload, req })=>{
+    const adapter = payload.db;
+    const db = adapter.sessions[await req.transactionID].db;
+    const dir = payload.db.migrationDir;
+    // get the drizzle migrateUpSQL from drizzle using the last schema
+    const { generateDrizzleJson, generateMigration, upSnapshot } = adapter.requireDrizzleKit();
+    const drizzleJsonAfter = generateDrizzleJson(adapter.schema);
+    // Get the previous migration snapshot
+    const previousSnapshot = fs.readdirSync(dir).filter((file)=>file.endsWith('.json') && !file.endsWith('relationships_v2_v3.json')).sort().reverse()?.[0];
+    if (!previousSnapshot) {
+        throw new Error(`No previous migration schema file found! A prior migration from v2 is required to migrate to v3.`);
+    }
+    let drizzleJsonBefore = JSON.parse(fs.readFileSync(`${dir}/${previousSnapshot}`, 'utf8'));
+    if (upSnapshot && drizzleJsonBefore.version < drizzleJsonAfter.version) {
+        drizzleJsonBefore = upSnapshot(drizzleJsonBefore);
+    }
+    const generatedSQL = await generateMigration(drizzleJsonBefore, drizzleJsonAfter);
+    if (!generatedSQL.length) {
+        payload.logger.info(`No schema changes needed.`);
+        process.exit(0);
+    }
+    const sqlUpStatements = groupUpSQLStatements(generatedSQL);
+    const addColumnsStatement = sqlUpStatements.addColumn.join('\n');
+    if (debug) {
+        payload.logger.info('CREATING NEW RELATIONSHIP COLUMNS');
+        payload.logger.info(addColumnsStatement);
+    }
+    await db.execute(sql.raw(addColumnsStatement));
+    for (const collection of payload.config.collections){
+        const tableName = adapter.tableNameMap.get(toSnakeCase(collection.slug));
+        const pathsToQuery = new Set();
+        traverseFields({
+            adapter,
+            collectionSlug: collection.slug,
+            columnPrefix: '',
+            db,
+            disableNotNull: false,
+            fields: collection.flattenedFields,
+            isVersions: false,
+            newTableName: tableName,
+            parentTableName: tableName,
+            path: '',
+            pathsToQuery,
+            payload,
+            rootTableName: tableName
+        });
+        await migrateRelationships({
+            adapter,
+            collectionSlug: collection.slug,
+            db,
+            debug,
+            fields: collection.flattenedFields,
+            isVersions: false,
+            pathsToQuery,
+            payload,
+            req,
+            tableName
+        });
+        if (collection.versions) {
+            const versionsTableName = adapter.tableNameMap.get(`_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`);
+            const versionFields = buildVersionCollectionFields(payload.config, collection, true);
+            const versionPathsToQuery = new Set();
+            traverseFields({
+                adapter,
+                collectionSlug: collection.slug,
+                columnPrefix: '',
+                db,
+                disableNotNull: true,
+                fields: versionFields,
+                isVersions: true,
+                newTableName: versionsTableName,
+                parentTableName: versionsTableName,
+                path: '',
+                pathsToQuery: versionPathsToQuery,
+                payload,
+                rootTableName: versionsTableName
+            });
+            await migrateRelationships({
+                adapter,
+                collectionSlug: collection.slug,
+                db,
+                debug,
+                fields: versionFields,
+                isVersions: true,
+                pathsToQuery: versionPathsToQuery,
+                payload,
+                req,
+                tableName: versionsTableName
+            });
+        }
+    }
+    for (const global of payload.config.globals){
+        const tableName = adapter.tableNameMap.get(toSnakeCase(global.slug));
+        const pathsToQuery = new Set();
+        traverseFields({
+            adapter,
+            columnPrefix: '',
+            db,
+            disableNotNull: false,
+            fields: global.flattenedFields,
+            globalSlug: global.slug,
+            isVersions: false,
+            newTableName: tableName,
+            parentTableName: tableName,
+            path: '',
+            pathsToQuery,
+            payload,
+            rootTableName: tableName
+        });
+        await migrateRelationships({
+            adapter,
+            db,
+            debug,
+            fields: global.flattenedFields,
+            globalSlug: global.slug,
+            isVersions: false,
+            pathsToQuery,
+            payload,
+            req,
+            tableName
+        });
+        if (global.versions) {
+            const versionsTableName = adapter.tableNameMap.get(`_${toSnakeCase(global.slug)}${adapter.versionsSuffix}`);
+            const versionFields = buildVersionGlobalFields(payload.config, global, true);
+            const versionPathsToQuery = new Set();
+            traverseFields({
+                adapter,
+                columnPrefix: '',
+                db,
+                disableNotNull: true,
+                fields: versionFields,
+                globalSlug: global.slug,
+                isVersions: true,
+                newTableName: versionsTableName,
+                parentTableName: versionsTableName,
+                path: '',
+                pathsToQuery: versionPathsToQuery,
+                payload,
+                rootTableName: versionsTableName
+            });
+            await migrateRelationships({
+                adapter,
+                db,
+                debug,
+                fields: versionFields,
+                globalSlug: global.slug,
+                isVersions: true,
+                pathsToQuery: versionPathsToQuery,
+                payload,
+                req,
+                tableName: versionsTableName
+            });
+        }
+    }
+    // ADD CONSTRAINT
+    const addConstraintsStatement = sqlUpStatements.addConstraint.join('\n');
+    if (debug) {
+        payload.logger.info('ADDING CONSTRAINTS');
+        payload.logger.info(addConstraintsStatement);
+    }
+    await db.execute(sql.raw(addConstraintsStatement));
+    // NOT NULL
+    const notNullStatements = sqlUpStatements.notNull.join('\n');
+    if (debug) {
+        payload.logger.info('NOT NULL CONSTRAINTS');
+        payload.logger.info(notNullStatements);
+    }
+    await db.execute(sql.raw(notNullStatements));
+    // DROP TABLE
+    const dropTablesStatement = sqlUpStatements.dropTable.join('\n');
+    if (debug) {
+        payload.logger.info('DROPPING TABLES');
+        payload.logger.info(dropTablesStatement);
+    }
+    await db.execute(sql.raw(dropTablesStatement));
+    // DROP CONSTRAINT
+    const dropConstraintsStatement = sqlUpStatements.dropConstraint.join('\n');
+    if (debug) {
+        payload.logger.info('DROPPING CONSTRAINTS');
+        payload.logger.info(dropConstraintsStatement);
+    }
+    await db.execute(sql.raw(dropConstraintsStatement));
+    // DROP COLUMN
+    const dropColumnsStatement = sqlUpStatements.dropColumn.join('\n');
+    if (debug) {
+        payload.logger.info('DROPPING COLUMNS');
+        payload.logger.info(dropColumnsStatement);
+    }
+    await db.execute(sql.raw(dropColumnsStatement));
+};
+
+//# sourceMappingURL=index.js.map

package/dist/postgres/predefinedMigrations/v2-v3/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/postgres/predefinedMigrations/v2-v3/index.ts"],"sourcesContent":["import type { DrizzleSnapshotJSON } from 'drizzle-kit/api'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport { sql } from 'drizzle-orm'\nimport fs from 'fs'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { TransactionPg } from '../../../types.js'\nimport type { BasePostgresAdapter } from '../../types.js'\nimport type { PathsToQuery } from './types.js'\n\nimport { groupUpSQLStatements } from './groupUpSQLStatements.js'\nimport { migrateRelationships } from './migrateRelationships.js'\nimport { traverseFields } from './traverseFields.js'\n\ntype Args = {\n  debug?: boolean\n  payload: Payload\n  req?: Partial<PayloadRequest>\n}\n\n/**\n * Moves upload and relationship columns from the join table and into the tables while moving data\n * This is done in the following order:\n *    ADD COLUMNs\n *    -- manipulate data to move relationships to new columns\n *    ADD CONSTRAINTs\n *    NOT NULLs\n *    DROP TABLEs\n *    DROP CONSTRAINTs\n *    DROP COLUMNs\n * @param debug\n * @param payload\n * @param req\n */\nexport const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {\n  const adapter = payload.db as unknown as BasePostgresAdapter\n  const db = adapter.sessions[await req.transactionID].db as TransactionPg\n  const dir = payload.db.migrationDir\n\n  // get the drizzle migrateUpSQL from drizzle using the last schema\n  const { generateDrizzleJson, generateMigration, upSnapshot } = adapter.requireDrizzleKit()\n  const drizzleJsonAfter = generateDrizzleJson(adapter.schema) as DrizzleSnapshotJSON\n\n  // Get the previous migration snapshot\n  const previousSnapshot = fs\n    .readdirSync(dir)\n    .filter((file) => file.endsWith('.json') && !file.endsWith('relationships_v2_v3.json'))\n    .sort()\n    .reverse()?.[0]\n\n  if (!previousSnapshot) {\n    throw new Error(\n      `No previous migration schema file found! A prior migration from v2 is required to migrate to v3.`,\n    )\n  }\n\n  let drizzleJsonBefore = JSON.parse(\n    fs.readFileSync(`${dir}/${previousSnapshot}`, 'utf8'),\n  ) as DrizzleSnapshotJSON\n\n  if (upSnapshot && drizzleJsonBefore.version < drizzleJsonAfter.version) {\n    drizzleJsonBefore = upSnapshot(drizzleJsonBefore)\n  }\n\n  const generatedSQL = await generateMigration(drizzleJsonBefore, drizzleJsonAfter)\n\n  if (!generatedSQL.length) {\n    payload.logger.info(`No schema changes needed.`)\n    process.exit(0)\n  }\n\n  const sqlUpStatements = groupUpSQLStatements(generatedSQL)\n\n  const addColumnsStatement = sqlUpStatements.addColumn.join('\\n')\n\n  if (debug) {\n    payload.logger.info('CREATING NEW RELATIONSHIP COLUMNS')\n    payload.logger.info(addColumnsStatement)\n  }\n\n  await db.execute(sql.raw(addColumnsStatement))\n\n  for (const collection of payload.config.collections) {\n    const tableName = adapter.tableNameMap.get(toSnakeCase(collection.slug))\n    const pathsToQuery: PathsToQuery = new Set()\n\n    traverseFields({\n      adapter,\n      collectionSlug: collection.slug,\n      columnPrefix: '',\n      db,\n      disableNotNull: false,\n      fields: collection.flattenedFields,\n      isVersions: false,\n      newTableName: tableName,\n      parentTableName: tableName,\n      path: '',\n      pathsToQuery,\n      payload,\n      rootTableName: tableName,\n    })\n\n    await migrateRelationships({\n      adapter,\n      collectionSlug: collection.slug,\n      db,\n      debug,\n      fields: collection.flattenedFields,\n      isVersions: false,\n      pathsToQuery,\n      payload,\n      req,\n      tableName,\n    })\n\n    if (collection.versions) {\n      const versionsTableName = adapter.tableNameMap.get(\n        `_${toSnakeCase(collection.slug)}${adapter.versionsSuffix}`,\n      )\n      const versionFields = buildVersionCollectionFields(payload.config, collection, true)\n      const versionPathsToQuery: PathsToQuery = new Set()\n\n      traverseFields({\n        adapter,\n        collectionSlug: collection.slug,\n        columnPrefix: '',\n        db,\n        disableNotNull: true,\n        fields: versionFields,\n        isVersions: true,\n        newTableName: versionsTableName,\n        parentTableName: versionsTableName,\n        path: '',\n        pathsToQuery: versionPathsToQuery,\n        payload,\n        rootTableName: versionsTableName,\n      })\n\n      await migrateRelationships({\n        adapter,\n        collectionSlug: collection.slug,\n        db,\n        debug,\n        fields: versionFields,\n        isVersions: true,\n        pathsToQuery: versionPathsToQuery,\n        payload,\n        req,\n        tableName: versionsTableName,\n      })\n    }\n  }\n\n  for (const global of payload.config.globals) {\n    const tableName = adapter.tableNameMap.get(toSnakeCase(global.slug))\n\n    const pathsToQuery: PathsToQuery = new Set()\n\n    traverseFields({\n      adapter,\n      columnPrefix: '',\n      db,\n      disableNotNull: false,\n      fields: global.flattenedFields,\n      globalSlug: global.slug,\n      isVersions: false,\n      newTableName: tableName,\n      parentTableName: tableName,\n      path: '',\n      pathsToQuery,\n      payload,\n      rootTableName: tableName,\n    })\n\n    await migrateRelationships({\n      adapter,\n      db,\n      debug,\n      fields: global.flattenedFields,\n      globalSlug: global.slug,\n      isVersions: false,\n      pathsToQuery,\n      payload,\n      req,\n      tableName,\n    })\n\n    if (global.versions) {\n      const versionsTableName = adapter.tableNameMap.get(\n        `_${toSnakeCase(global.slug)}${adapter.versionsSuffix}`,\n      )\n\n      const versionFields = buildVersionGlobalFields(payload.config, global, true)\n\n      const versionPathsToQuery: PathsToQuery = new Set()\n\n      traverseFields({\n        adapter,\n        columnPrefix: '',\n        db,\n        disableNotNull: true,\n        fields: versionFields,\n        globalSlug: global.slug,\n        isVersions: true,\n        newTableName: versionsTableName,\n        parentTableName: versionsTableName,\n        path: '',\n        pathsToQuery: versionPathsToQuery,\n        payload,\n        rootTableName: versionsTableName,\n      })\n\n      await migrateRelationships({\n        adapter,\n        db,\n        debug,\n        fields: versionFields,\n        globalSlug: global.slug,\n        isVersions: true,\n        pathsToQuery: versionPathsToQuery,\n        payload,\n        req,\n        tableName: versionsTableName,\n      })\n    }\n  }\n\n  // ADD CONSTRAINT\n  const addConstraintsStatement = sqlUpStatements.addConstraint.join('\\n')\n\n  if (debug) {\n    payload.logger.info('ADDING CONSTRAINTS')\n    payload.logger.info(addConstraintsStatement)\n  }\n\n  await db.execute(sql.raw(addConstraintsStatement))\n\n  // NOT NULL\n  const notNullStatements = sqlUpStatements.notNull.join('\\n')\n\n  if (debug) {\n    payload.logger.info('NOT NULL CONSTRAINTS')\n    payload.logger.info(notNullStatements)\n  }\n\n  await db.execute(sql.raw(notNullStatements))\n\n  // DROP TABLE\n  const dropTablesStatement = sqlUpStatements.dropTable.join('\\n')\n\n  if (debug) {\n    payload.logger.info('DROPPING TABLES')\n    payload.logger.info(dropTablesStatement)\n  }\n\n  await db.execute(sql.raw(dropTablesStatement))\n\n  // DROP CONSTRAINT\n  const dropConstraintsStatement = sqlUpStatements.dropConstraint.join('\\n')\n\n  if (debug) {\n    payload.logger.info('DROPPING CONSTRAINTS')\n    payload.logger.info(dropConstraintsStatement)\n  }\n\n  await db.execute(sql.raw(dropConstraintsStatement))\n\n  // DROP COLUMN\n  const dropColumnsStatement = sqlUpStatements.dropColumn.join('\\n')\n\n  if (debug) {\n    payload.logger.info('DROPPING COLUMNS')\n    payload.logger.info(dropColumnsStatement)\n  }\n\n  await db.execute(sql.raw(dropColumnsStatement))\n}\n"],"names":["sql","fs","buildVersionCollectionFields","buildVersionGlobalFields","toSnakeCase","groupUpSQLStatements","migrateRelationships","traverseFields","migratePostgresV2toV3","debug","payload","req","adapter","db","sessions","transactionID","dir","migrationDir","generateDrizzleJson","generateMigration","upSnapshot","requireDrizzleKit","drizzleJsonAfter","schema","previousSnapshot","readdirSync","filter","file","endsWith","sort","reverse","Error","drizzleJsonBefore","JSON","parse","readFileSync","version","generatedSQL","length","logger","info","process","exit","sqlUpStatements","addColumnsStatement","addColumn","join","execute","raw","collection","config","collections","tableName","tableNameMap","get","slug","pathsToQuery","Set","collectionSlug","columnPrefix","disableNotNull","fields","flattenedFields","isVersions","newTableName","parentTableName","path","rootTableName","versions","versionsTableName","versionsSuffix","versionFields","versionPathsToQuery","global","globals","globalSlug","addConstraintsStatement","addConstraint","notNullStatements","notNull","dropTablesStatement","dropTable","dropConstraintsStatement","dropConstraint","dropColumnsStatement","dropColumn"],"mappings":"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"}

package/dist/postgres/predefinedMigrations/v2-v3/migrateRelationships.d.ts

@@ -0,0 +1,20 @@
+import type { FlattenedField, Payload, PayloadRequest } from 'payload';
+import type { TransactionPg } from '../../../types.js';
+import type { BasePostgresAdapter } from '../../types.js';
+import type { PathsToQuery } from './types.js';
+type Args = {
+    adapter: BasePostgresAdapter;
+    collectionSlug?: string;
+    db: TransactionPg;
+    debug: boolean;
+    fields: FlattenedField[];
+    globalSlug?: string;
+    isVersions: boolean;
+    pathsToQuery: PathsToQuery;
+    payload: Payload;
+    req?: Partial<PayloadRequest>;
+    tableName: string;
+};
+export declare const migrateRelationships: ({ adapter, collectionSlug, db, debug, fields, globalSlug, isVersions, pathsToQuery, payload, req, tableName, }: Args) => Promise<void>;
+export {};
+//# sourceMappingURL=migrateRelationships.d.ts.map

package/dist/postgres/predefinedMigrations/v2-v3/migrateRelationships.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateRelationships.d.ts","sourceRoot":"","sources":["../../../../src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACzD,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,YAAY,CAAA;AAI5D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,EAAE,EAAE,aAAa,CAAA;IACjB,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,oBAAoB,mHAY9B,IAAI,kBAwEN,CAAA"}

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

@@ -0,0 +1,63 @@
+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/postgres/predefinedMigrations/v2-v3/migrateRelationships.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts"],"sourcesContent":["import type { FlattenedField, Payload, PayloadRequest } from 'payload'\n\nimport { sql } from 'drizzle-orm'\n\nimport type { TransactionPg } from '../../../types.js'\nimport type { BasePostgresAdapter } from '../../types.js'\nimport type { DocsToResave, PathsToQuery } from './types.js'\n\nimport { fetchAndResave } from './fetchAndResave/index.js'\n\ntype Args = {\n  adapter: BasePostgresAdapter\n  collectionSlug?: string\n  db: TransactionPg\n  debug: boolean\n  fields: FlattenedField[]\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) {\n    return\n  }\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) {\n      return\n    }\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]) {\n          docsToResave[parentID] = []\n        }\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":"AAEA,SAASA,GAAG,QAAQ,cAAa;AAMjC,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;QAC3B;IACF;IAEA,IAAIC,SAAS;IAEb,IAAIC;IAEJ,MAAMC,QAAQC,MAAMC,IAAI,CAACT,cAAcU,MAAM,CAAC,CAACC,WAAWC,MAAMC;QAC9D,OAAQF,aAAa,CAAC;CACzB,EAAER,YAAYV,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,YAAYV,QAAQqB,mBAAmB,CAAC;IACtG,EAAEP,MAAM,qCAAqC,EAAEF,SAAS,IAAI;EAC9D,CAAC;QAECC,mBAAmB,MAAMb,QAAQyB,OAAO,CAACC,OAAO,CAAC7B,IAAI8B,GAAG,CAAC,GAAGH,qBAAqB;QAEjF,IAAIX,iBAAiBS,IAAI,CAACC,MAAM,KAAK,GAAG;YACtC;QACF;QAEAX,UAAU;QAEV,MAAMM,YAAY,CAAC,cAAc,EAAER,YAAYV,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,GAAGT,WAAW;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,EAAE;oBAC3BF,YAAY,CAACE,SAAS,GAAG,EAAE;gBAC7B;gBACAF,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,YAAYV,QAAQqB,mBAAmB,CAAC,OAAO,EAAEP,OAAO;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,GAAGY,iBAAiB;AAC/C,EAAC"}