@payloadcms/drizzle 3.0.0-canary.2c2c95f → 3.0.0-canary.483db21

package/dist/utilities/pushDevSchema.js

@@ -5,9 +5,11 @@ import prompts from 'prompts';
  * @param {DrizzleAdapter} adapter - The PostgresAdapter instance connected to the database.
  * @returns {Promise<void>} - A promise that resolves once the schema push is complete.
  */ export const pushDevSchema = async (adapter)=>{
-    const { pushSchema } = adapter.requireDrizzleKit(adapter);
+    const { pushSchema } = adapter.requireDrizzleKit();
     // This will prompt if clarifications are needed for Drizzle to push new schema
-    const { apply, hasDataLoss, warnings } = await pushSchema(adapter.schema, adapter.drizzle);
+    const { apply, hasDataLoss, warnings } = await pushSchema(adapter.schema, adapter.drizzle, adapter.schemaName ? [
+        adapter.schemaName
+    ] : undefined);
     if (warnings.length) {
         let message = `Warnings detected during schema push: \n\n${warnings.join('\n')}\n\n`;
         if (hasDataLoss) {

package/dist/utilities/pushDevSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/pushDevSchema.ts"],"sourcesContent":["import prompts from 'prompts'\n\nimport type { DrizzleAdapter } from '../types.js'\n\n/**\n * Pushes the development schema to the database using Drizzle.\n *\n * @param {DrizzleAdapter} adapter - The PostgresAdapter instance connected to the database.\n * @returns {Promise<void>} - A promise that resolves once the schema push is complete.\n */\nexport const pushDevSchema = async (adapter: DrizzleAdapter) => {\n  const { pushSchema } = adapter.requireDrizzleKit(adapter)\n\n  // This will prompt if clarifications are needed for Drizzle to push new schema\n  const { apply, hasDataLoss, warnings } = await pushSchema(adapter.schema, adapter.drizzle)\n\n  if (warnings.length) {\n    let message = `Warnings detected during schema push: \\n\\n${warnings.join('\\n')}\\n\\n`\n\n    if (hasDataLoss) {\n      message += `DATA LOSS WARNING: Possible data loss detected if schema is pushed.\\n\\n`\n    }\n\n    message += `Accept warnings and push schema to database?`\n\n    const { confirm: acceptWarnings } = await prompts(\n      {\n        name: 'confirm',\n        type: 'confirm',\n        initial: false,\n        message,\n      },\n      {\n        onCancel: () => {\n          process.exit(0)\n        },\n      },\n    )\n\n    // Exit if user does not accept warnings.\n    // Q: Is this the right type of exit for this interaction?\n    if (!acceptWarnings) {\n      process.exit(0)\n    }\n  }\n\n  await apply()\n  const migrationsTable = adapter.schemaName\n    ? `\"${adapter.schemaName}\".\"payload_migrations\"`\n    : '\"payload_migrations\"'\n\n  const result = await adapter.execute({\n    drizzle: adapter.drizzle,\n    raw: `SELECT * FROM ${migrationsTable} WHERE batch = '-1'`,\n  })\n\n  const devPush = result.rows\n\n  if (!devPush.length) {\n    await adapter.execute({\n      drizzle: adapter.drizzle,\n      raw: `INSERT INTO ${migrationsTable} (name, batch) VALUES ('dev', '-1')`,\n    })\n  } else {\n    await adapter.execute({\n      drizzle: adapter.drizzle,\n      raw: `UPDATE ${migrationsTable} SET updated_at = CURRENT_TIMESTAMP WHERE batch = '-1'`,\n    })\n  }\n}\n"],"names":["prompts","pushDevSchema","adapter","pushSchema","requireDrizzleKit","apply","hasDataLoss","warnings","schema","drizzle","length","message","join","confirm","acceptWarnings","name","type","initial","onCancel","process","exit","migrationsTable","schemaName","result","execute","raw","devPush","rows"],"mappings":"AAAA,OAAOA,aAAa,UAAS;AAI7B;;;;;CAKC,GACD,OAAO,MAAMC,gBAAgB,OAAOC;IAClC,MAAM,EAAEC,UAAU,EAAE,GAAGD,QAAQE,iBAAiB,CAACF;IAEjD,+EAA+E;IAC/E,MAAM,EAAEG,KAAK,EAAEC,WAAW,EAAEC,QAAQ,EAAE,GAAG,MAAMJ,WAAWD,QAAQM,MAAM,EAAEN,QAAQO,OAAO;IAEzF,IAAIF,SAASG,MAAM,EAAE;QACnB,IAAIC,UAAU,CAAC,0CAA0C,EAAEJ,SAASK,IAAI,CAAC,MAAM,IAAI,CAAC;QAEpF,IAAIN,aAAa;YACfK,WAAW,CAAC,uEAAuE,CAAC;QACtF;QAEAA,WAAW,CAAC,4CAA4C,CAAC;QAEzD,MAAM,EAAEE,SAASC,cAAc,EAAE,GAAG,MAAMd,QACxC;YACEe,MAAM;YACNC,MAAM;YACNC,SAAS;YACTN;QACF,GACA;YACEO,UAAU;gBACRC,QAAQC,IAAI,CAAC;YACf;QACF;QAGF,yCAAyC;QACzC,0DAA0D;QAC1D,IAAI,CAACN,gBAAgB;YACnBK,QAAQC,IAAI,CAAC;QACf;IACF;IAEA,MAAMf;IACN,MAAMgB,kBAAkBnB,QAAQoB,UAAU,GACtC,CAAC,CAAC,EAAEpB,QAAQoB,UAAU,CAAC,sBAAsB,CAAC,GAC9C;IAEJ,MAAMC,SAAS,MAAMrB,QAAQsB,OAAO,CAAC;QACnCf,SAASP,QAAQO,OAAO;QACxBgB,KAAK,CAAC,cAAc,EAAEJ,gBAAgB,mBAAmB,CAAC;IAC5D;IAEA,MAAMK,UAAUH,OAAOI,IAAI;IAE3B,IAAI,CAACD,QAAQhB,MAAM,EAAE;QACnB,MAAMR,QAAQsB,OAAO,CAAC;YACpBf,SAASP,QAAQO,OAAO;YACxBgB,KAAK,CAAC,YAAY,EAAEJ,gBAAgB,mCAAmC,CAAC;QAC1E;IACF,OAAO;QACL,MAAMnB,QAAQsB,OAAO,CAAC;YACpBf,SAASP,QAAQO,OAAO;YACxBgB,KAAK,CAAC,OAAO,EAAEJ,gBAAgB,sDAAsD,CAAC;QACxF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/pushDevSchema.ts"],"sourcesContent":["import prompts from 'prompts'\n\nimport type { DrizzleAdapter } from '../types.js'\n\n/**\n * Pushes the development schema to the database using Drizzle.\n *\n * @param {DrizzleAdapter} adapter - The PostgresAdapter instance connected to the database.\n * @returns {Promise<void>} - A promise that resolves once the schema push is complete.\n */\nexport const pushDevSchema = async (adapter: DrizzleAdapter) => {\n  const { pushSchema } = adapter.requireDrizzleKit()\n\n  // This will prompt if clarifications are needed for Drizzle to push new schema\n  const { apply, hasDataLoss, warnings } = await pushSchema(\n    adapter.schema,\n    adapter.drizzle,\n    adapter.schemaName ? [adapter.schemaName] : undefined,\n  )\n\n  if (warnings.length) {\n    let message = `Warnings detected during schema push: \\n\\n${warnings.join('\\n')}\\n\\n`\n\n    if (hasDataLoss) {\n      message += `DATA LOSS WARNING: Possible data loss detected if schema is pushed.\\n\\n`\n    }\n\n    message += `Accept warnings and push schema to database?`\n\n    const { confirm: acceptWarnings } = await prompts(\n      {\n        name: 'confirm',\n        type: 'confirm',\n        initial: false,\n        message,\n      },\n      {\n        onCancel: () => {\n          process.exit(0)\n        },\n      },\n    )\n\n    // Exit if user does not accept warnings.\n    // Q: Is this the right type of exit for this interaction?\n    if (!acceptWarnings) {\n      process.exit(0)\n    }\n  }\n\n  await apply()\n  const migrationsTable = adapter.schemaName\n    ? `\"${adapter.schemaName}\".\"payload_migrations\"`\n    : '\"payload_migrations\"'\n\n  const result = await adapter.execute({\n    drizzle: adapter.drizzle,\n    raw: `SELECT * FROM ${migrationsTable} WHERE batch = '-1'`,\n  })\n\n  const devPush = result.rows\n\n  if (!devPush.length) {\n    await adapter.execute({\n      drizzle: adapter.drizzle,\n      raw: `INSERT INTO ${migrationsTable} (name, batch) VALUES ('dev', '-1')`,\n    })\n  } else {\n    await adapter.execute({\n      drizzle: adapter.drizzle,\n      raw: `UPDATE ${migrationsTable} SET updated_at = CURRENT_TIMESTAMP WHERE batch = '-1'`,\n    })\n  }\n}\n"],"names":["prompts","pushDevSchema","adapter","pushSchema","requireDrizzleKit","apply","hasDataLoss","warnings","schema","drizzle","schemaName","undefined","length","message","join","confirm","acceptWarnings","name","type","initial","onCancel","process","exit","migrationsTable","result","execute","raw","devPush","rows"],"mappings":"AAAA,OAAOA,aAAa,UAAS;AAI7B;;;;;CAKC,GACD,OAAO,MAAMC,gBAAgB,OAAOC;IAClC,MAAM,EAAEC,UAAU,EAAE,GAAGD,QAAQE,iBAAiB;IAEhD,+EAA+E;IAC/E,MAAM,EAAEC,KAAK,EAAEC,WAAW,EAAEC,QAAQ,EAAE,GAAG,MAAMJ,WAC7CD,QAAQM,MAAM,EACdN,QAAQO,OAAO,EACfP,QAAQQ,UAAU,GAAG;QAACR,QAAQQ,UAAU;KAAC,GAAGC;IAG9C,IAAIJ,SAASK,MAAM,EAAE;QACnB,IAAIC,UAAU,CAAC,0CAA0C,EAAEN,SAASO,IAAI,CAAC,MAAM,IAAI,CAAC;QAEpF,IAAIR,aAAa;YACfO,WAAW,CAAC,uEAAuE,CAAC;QACtF;QAEAA,WAAW,CAAC,4CAA4C,CAAC;QAEzD,MAAM,EAAEE,SAASC,cAAc,EAAE,GAAG,MAAMhB,QACxC;YACEiB,MAAM;YACNC,MAAM;YACNC,SAAS;YACTN;QACF,GACA;YACEO,UAAU;gBACRC,QAAQC,IAAI,CAAC;YACf;QACF;QAGF,yCAAyC;QACzC,0DAA0D;QAC1D,IAAI,CAACN,gBAAgB;YACnBK,QAAQC,IAAI,CAAC;QACf;IACF;IAEA,MAAMjB;IACN,MAAMkB,kBAAkBrB,QAAQQ,UAAU,GACtC,CAAC,CAAC,EAAER,QAAQQ,UAAU,CAAC,sBAAsB,CAAC,GAC9C;IAEJ,MAAMc,SAAS,MAAMtB,QAAQuB,OAAO,CAAC;QACnChB,SAASP,QAAQO,OAAO;QACxBiB,KAAK,CAAC,cAAc,EAAEH,gBAAgB,mBAAmB,CAAC;IAC5D;IAEA,MAAMI,UAAUH,OAAOI,IAAI;IAE3B,IAAI,CAACD,QAAQf,MAAM,EAAE;QACnB,MAAMV,QAAQuB,OAAO,CAAC;YACpBhB,SAASP,QAAQO,OAAO;YACxBiB,KAAK,CAAC,YAAY,EAAEH,gBAAgB,mCAAmC,CAAC;QAC1E;IACF,OAAO;QACL,MAAMrB,QAAQuB,OAAO,CAAC;YACpBhB,SAASP,QAAQO,OAAO;YACxBiB,KAAK,CAAC,OAAO,EAAEH,gBAAgB,sDAAsD,CAAC;QACxF;IACF;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-canary.2c2c95f",
+  "version": "3.0.0-canary.483db21",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -29,7 +29,7 @@
   ],
   "dependencies": {
     "console-table-printer": "2.11.2",
-    "drizzle-orm": "0.31.2",
+    "drizzle-orm": "0.32.1",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"
@@ -39,10 +39,10 @@
     "@types/pg": "8.10.2",
     "@types/to-snake-case": "1.0.0",
     "@payloadcms/eslint-config": "3.0.0-beta.59",
-    "payload": "3.0.0-beta.63"
+    "payload": "3.0.0-canary.483db21"
   },
   "peerDependencies": {
-    "payload": "3.0.0-beta.63"
+    "payload": "3.0.0-canary.483db21"
   },
   "scripts": {
     "build": "pnpm build:swc && pnpm build:types",