@payloadcms/drizzle 3.38.0-internal.6b8eed8 → 3.38.0-internal.78d3ba4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/postgres/predefinedMigrations/v2-v3/migrateRelationships.js +2 -2
- package/dist/postgres/predefinedMigrations/v2-v3/migrateRelationships.js.map +1 -1
- package/package.json +3 -3
- package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.spec.js +0 -2537
- package/dist/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.spec.js.map +0 -1
|
@@ -16,7 +16,7 @@ export const migrateRelationships = async ({ adapter, collectionSlug, db, debug,
|
|
|
16
16
|
const paginationStatement = `SELECT DISTINCT parent_id FROM "${schemaName}"."${tableName}${adapter.relationshipsSuffix}" WHERE
|
|
17
17
|
${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};
|
|
18
18
|
`;
|
|
19
|
-
paginationResult = await
|
|
19
|
+
paginationResult = await db.execute(sql.raw(`${paginationStatement}`));
|
|
20
20
|
if (paginationResult.rows.length === 0) {
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
@@ -28,7 +28,7 @@ export const migrateRelationships = async ({ adapter, collectionSlug, db, debug,
|
|
|
28
28
|
payload.logger.info('FINDING ROWS TO MIGRATE');
|
|
29
29
|
payload.logger.info(statement);
|
|
30
30
|
}
|
|
31
|
-
const result = await
|
|
31
|
+
const result = await db.execute(sql.raw(`${statement}`));
|
|
32
32
|
const docsToResave = {};
|
|
33
33
|
result.rows.forEach((row)=>{
|
|
34
34
|
const parentID = row.parent_id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts"],"sourcesContent":["import type { PgSchema } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, Payload, PayloadRequest } from 'payload'\n\nimport { sql } from 'drizzle-orm'\n\nimport type { BasePostgresAdapter, PostgresDB } 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: PostgresDB\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 schemaName = (adapter.pgSchema as PgSchema).schemaName ?? 'public'\n\n const where = Array.from(pathsToQuery).reduce((statement, path, i) => {\n return (statement += `\n\"${schemaName}\".\"${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 \"${schemaName}\".\"${tableName}${adapter.relationshipsSuffix}\" WHERE\n ${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};\n `\n\n paginationResult = await
|
|
1
|
+
{"version":3,"sources":["../../../../src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts"],"sourcesContent":["import type { PgSchema } from 'drizzle-orm/pg-core'\nimport type { FlattenedField, Payload, PayloadRequest } from 'payload'\n\nimport { sql } from 'drizzle-orm'\n\nimport type { BasePostgresAdapter, PostgresDB } 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: PostgresDB\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 schemaName = (adapter.pgSchema as PgSchema).schemaName ?? 'public'\n\n const where = Array.from(pathsToQuery).reduce((statement, path, i) => {\n return (statement += `\n\"${schemaName}\".\"${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 \"${schemaName}\".\"${tableName}${adapter.relationshipsSuffix}\" WHERE\n ${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};\n `\n\n paginationResult = await db.execute(sql.raw(`${paginationStatement}`))\n\n if (paginationResult.rows.length === 0) {\n return\n }\n\n offset += 1\n\n const statement = `SELECT * FROM \"${schemaName}\".\"${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 db.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,\n tableName,\n })\n }\n\n const deleteStatement = `DELETE FROM \"${schemaName}\".\"${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","schemaName","pgSchema","where","Array","from","reduce","statement","path","i","relationshipsSuffix","rows","length","paginationStatement","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;QAC3B;IACF;IAEA,IAAIC,SAAS;IAEb,IAAIC;IAEJ,MAAMC,aAAa,AAACd,QAAQe,QAAQ,CAAcD,UAAU,IAAI;IAEhE,MAAME,QAAQC,MAAMC,IAAI,CAACX,cAAcY,MAAM,CAAC,CAACC,WAAWC,MAAMC;QAC9D,OAAQF,aAAa,CAAC;CACzB,EAAEN,WAAW,GAAG,EAAEJ,YAAYV,QAAQuB,mBAAmB,CAAC,eAAe,EAAEF,KAAK,CAAC,EAAEd,aAAaI,IAAI,KAAKW,IAAI,IAAI,QAAQ,GAAG;AAC7H,CAAC;IACC,GAAG;IAEH,MAAO,OAAOT,qBAAqB,eAAeA,iBAAiBW,IAAI,CAACC,MAAM,GAAG,EAAG;QAClF,MAAMC,sBAAsB,CAAC,gCAAgC,EAAEZ,WAAW,GAAG,EAAEJ,YAAYV,QAAQuB,mBAAmB,CAAC;IACvH,EAAEP,MAAM,qCAAqC,EAAEJ,SAAS,IAAI;EAC9D,CAAC;QAECC,mBAAmB,MAAMX,GAAGyB,OAAO,CAAC9B,IAAI+B,GAAG,CAAC,GAAGF,qBAAqB;QAEpE,IAAIb,iBAAiBW,IAAI,CAACC,MAAM,KAAK,GAAG;YACtC;QACF;QAEAb,UAAU;QAEV,MAAMQ,YAAY,CAAC,eAAe,EAAEN,WAAW,GAAG,EAAEJ,YAAYV,QAAQuB,mBAAmB,CAAC;KAC3F,EAAEP,MAAM,oBAAoB,EAAEH,iBAAiBW,IAAI,CAACK,GAAG,CAAC,CAACC,MAAQ,CAAC,CAAC,EAAEA,IAAIC,SAAS,CAAC,CAAC,CAAC,EAAEC,IAAI,CAAC,MAAM;AACvG,CAAC;QACG,IAAI7B,OAAO;YACTK,QAAQyB,MAAM,CAACC,IAAI,CAAC;YACpB1B,QAAQyB,MAAM,CAACC,IAAI,CAACd;QACtB;QAEA,MAAMe,SAAS,MAAMjC,GAAGyB,OAAO,CAAC9B,IAAI+B,GAAG,CAAC,GAAGR,WAAW;QAEtD,MAAMgB,eAA6B,CAAC;QAEpCD,OAAOX,IAAI,CAACa,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,MAAMhC,eAAe;YACnBE;YACAC;YACAC;YACAC;YACAiC;YACAhC;YACAC;YACAC;YACAE;YACAC;YACAC;QACF;IACF;IAEA,MAAM8B,kBAAkB,CAAC,aAAa,EAAE1B,WAAW,GAAG,EAAEJ,YAAYV,QAAQuB,mBAAmB,CAAC,QAAQ,EAAEP,OAAO;IACjH,IAAIb,OAAO;QACTK,QAAQyB,MAAM,CAACC,IAAI,CAAC;QACpB1B,QAAQyB,MAAM,CAACC,IAAI,CAACM;IACtB;IACA,MAAMtC,GAAGyB,OAAO,CAAC9B,IAAI+B,GAAG,CAAC,GAAGY,iBAAiB;AAC/C,EAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/drizzle",
|
|
3
|
-
"version": "3.38.0-internal.
|
|
3
|
+
"version": "3.38.0-internal.78d3ba4",
|
|
4
4
|
"description": "A library of shared functions used by different payload database adapters",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
6
|
"repository": {
|
|
@@ -53,10 +53,10 @@
|
|
|
53
53
|
"@types/pg": "8.10.2",
|
|
54
54
|
"@types/to-snake-case": "1.0.0",
|
|
55
55
|
"@payloadcms/eslint-config": "3.28.0",
|
|
56
|
-
"payload": "3.38.0-internal.
|
|
56
|
+
"payload": "3.38.0-internal.78d3ba4"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"payload": "3.38.0-internal.
|
|
59
|
+
"payload": "3.38.0-internal.78d3ba4"
|
|
60
60
|
},
|
|
61
61
|
"scripts": {
|
|
62
62
|
"build": "pnpm build:swc && pnpm build:types",
|