@pgpmjs/core 4.7.2 → 4.8.0

package/esm/export/export-migrations.js

@@ -92,7 +92,7 @@ const installMissingModules = async (moduleDir, missingModules) => {
     await moduleProject.installModules(...missingNames);
     console.log('Modules installed successfully.');
 };
-const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir }) => {
+const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir, skipSchemaRenaming = false }) => {
     outdir = outdir + '/';
     // Use serviceOutdir for service module, defaulting to outdir if not provided
     const svcOutdir = (serviceOutdir || outdir.slice(0, -1)) + '/';
@@ -111,11 +111,20 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         return;
     }
     const name = extensionName || db.rows[0].name;
+    // When skipSchemaRenaming is true, pass empty schemas array to avoid renaming
+    // This is useful for self-referential introspection where you want to apply
+    // policies to real infrastructure schemas (metaschema_public, services_public, etc.)
+    const schemasForReplacement = skipSchemaRenaming
+        ? []
+        : schemas.rows.filter((schema) => schema_names.includes(schema.schema_name));
     const { replace, replacer } = makeReplacer({
-        schemas: schemas.rows.filter((schema) => schema_names.includes(schema.schema_name)),
+        schemas: schemasForReplacement,
         name
     });
-    const results = await pgPool.query(`select * from db_migrate.sql_actions order by id`);
+    // Filter sql_actions by database_id to avoid cross-database pollution
+    // Previously this query had no WHERE clause, which could export actions
+    // from unrelated databases in a persistent database environment
+    const results = await pgPool.query(`select * from db_migrate.sql_actions where database_id = $1 order by id`, [databaseId]);
     const opts = {
         name,
         replacer,
@@ -171,8 +180,12 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         if (svcMissingResult.shouldInstall) {
             await installMissingModules(svcModuleDir, svcMissingResult.missingModules);
         }
+        // Use same skipSchemaRenaming logic for meta replacer
+        const metaSchemasForReplacement = skipSchemaRenaming
+            ? []
+            : schemas.rows.filter((schema) => schema_names.includes(schema.schema_name));
         const metaReplacer = makeReplacer({
-            schemas: schemas.rows.filter((schema) => schema_names.includes(schema.schema_name)),
+            schemas: metaSchemasForReplacement,
             name: metaExtensionName
         });
         const metaPackage = [
@@ -219,7 +232,7 @@ SET session_replication_role TO DEFAULT;
     }
     pgPool.end();
 };
-export const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir }) => {
+export const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir, skipSchemaRenaming }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -238,7 +251,8 @@ export const exportMigrations = async ({ project, options, dbInfo, author, outdi
             prompter,
             repoName,
             username,
-            serviceOutdir
+            serviceOutdir,
+            skipSchemaRenaming
         });
     }
 };

package/esm/modules/modules.js

@@ -8,8 +8,8 @@ import { errors } from '@pgpmjs/types';
 export const PGPM_MODULE_MAP = {
     'pgpm-base32': '@pgpm/base32',
     'pgpm-database-jobs': '@pgpm/database-jobs',
-    'db-meta-modules': '@pgpm/db-meta-modules',
-    'db-meta-schema': '@pgpm/db-meta-schema',
+    'metaschema-modules': '@pgpm/metaschema-modules',
+    'metaschema-schema': '@pgpm/metaschema-schema',
     'pgpm-inflection': '@pgpm/inflection',
     'pgpm-jwt-claims': '@pgpm/jwt-claims',
     'pgpm-stamps': '@pgpm/stamps',

package/export/export-migrations.d.ts

@@ -29,6 +29,12 @@ interface ExportOptions {
     username?: string;
     /** Output directory for service/meta module. Defaults to outdir if not provided. */
     serviceOutdir?: string;
+    /**
+     * Skip schema name replacement for infrastructure schemas.
+     * When true, schema names like metaschema_public, services_public will not be renamed.
+     * Useful for self-referential introspection where you want to apply policies to real schemas.
+     */
+    skipSchemaRenaming?: boolean;
 }
-export declare const exportMigrations: ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir }: ExportOptions) => Promise<void>;
+export declare const exportMigrations: ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir, skipSchemaRenaming }: ExportOptions) => Promise<void>;
 export {};

package/export/export-migrations.js

@@ -98,7 +98,7 @@ const installMissingModules = async (moduleDir, missingModules) => {
     await moduleProject.installModules(...missingNames);
     console.log('Modules installed successfully.');
 };
-const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir }) => {
+const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir, skipSchemaRenaming = false }) => {
     outdir = outdir + '/';
     // Use serviceOutdir for service module, defaulting to outdir if not provided
     const svcOutdir = (serviceOutdir || outdir.slice(0, -1)) + '/';
@@ -117,11 +117,20 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         return;
     }
     const name = extensionName || db.rows[0].name;
+    // When skipSchemaRenaming is true, pass empty schemas array to avoid renaming
+    // This is useful for self-referential introspection where you want to apply
+    // policies to real infrastructure schemas (metaschema_public, services_public, etc.)
+    const schemasForReplacement = skipSchemaRenaming
+        ? []
+        : schemas.rows.filter((schema) => schema_names.includes(schema.schema_name));
     const { replace, replacer } = makeReplacer({
-        schemas: schemas.rows.filter((schema) => schema_names.includes(schema.schema_name)),
+        schemas: schemasForReplacement,
         name
     });
-    const results = await pgPool.query(`select * from db_migrate.sql_actions order by id`);
+    // Filter sql_actions by database_id to avoid cross-database pollution
+    // Previously this query had no WHERE clause, which could export actions
+    // from unrelated databases in a persistent database environment
+    const results = await pgPool.query(`select * from db_migrate.sql_actions where database_id = $1 order by id`, [databaseId]);
     const opts = {
         name,
         replacer,
@@ -177,8 +186,12 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         if (svcMissingResult.shouldInstall) {
             await installMissingModules(svcModuleDir, svcMissingResult.missingModules);
         }
+        // Use same skipSchemaRenaming logic for meta replacer
+        const metaSchemasForReplacement = skipSchemaRenaming
+            ? []
+            : schemas.rows.filter((schema) => schema_names.includes(schema.schema_name));
         const metaReplacer = makeReplacer({
-            schemas: schemas.rows.filter((schema) => schema_names.includes(schema.schema_name)),
+            schemas: metaSchemasForReplacement,
             name: metaExtensionName
         });
         const metaPackage = [
@@ -225,7 +238,7 @@ SET session_replication_role TO DEFAULT;
     }
     pgPool.end();
 };
-const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir }) => {
+const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username, serviceOutdir, skipSchemaRenaming }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -244,7 +257,8 @@ const exportMigrations = async ({ project, options, dbInfo, author, outdir, sche
             prompter,
             repoName,
             username,
-            serviceOutdir
+            serviceOutdir,
+            skipSchemaRenaming
         });
     }
 };

package/modules/modules.js

@@ -11,8 +11,8 @@ const types_1 = require("@pgpmjs/types");
 exports.PGPM_MODULE_MAP = {
     'pgpm-base32': '@pgpm/base32',
     'pgpm-database-jobs': '@pgpm/database-jobs',
-    'db-meta-modules': '@pgpm/db-meta-modules',
-    'db-meta-schema': '@pgpm/db-meta-schema',
+    'metaschema-modules': '@pgpm/metaschema-modules',
+    'metaschema-schema': '@pgpm/metaschema-schema',
     'pgpm-inflection': '@pgpm/inflection',
     'pgpm-jwt-claims': '@pgpm/jwt-claims',
     'pgpm-stamps': '@pgpm/stamps',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "4.7.2",
+  "version": "4.8.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -64,5 +64,5 @@
     "pgsql-parser": "^17.9.9",
     "yanse": "^0.1.11"
   },
-  "gitHead": "5eca40587d2b8e2362a2308bc3fa8c1eecf131da"
+  "gitHead": "97528ad4eb2f60c16785ffb84af7b61c52cb5ad8"
 }