@pgpmjs/export 0.21.2 → 0.21.4

package/esm/export-graphql-meta.js

@@ -57,6 +57,15 @@ const buildDynamicFieldsFromGraphQL = async (client, tableConfig) => {
                 }
             }
         }
+        // Omit columns that are marked as columnDefaults — their DDL DEFAULT (e.g.
+        // current_database()) will supply the correct value at deploy time, so the
+        // exported INSERT must not hardcode an environment-specific literal.
+        if (tableConfig.columnDefaults) {
+            for (const colName of Object.keys(tableConfig.columnDefaults)) {
+                delete dynamicFields[colName];
+                enumFields.delete(colName);
+            }
+        }
         return { fields: dynamicFields, enumFields };
     }
     catch (err) {
@@ -139,6 +148,16 @@ export const exportGraphQLMeta = async ({ client, database_id }) => {
                 }
                 if (Object.keys(dynamicFields).length === 0)
                     return;
+                // Omit columnDefaults columns from row data so the Parser never sees them.
+                // configFields already excludes them (via buildDynamicFieldsFromGraphQL),
+                // so dynamicFields won't contain them either — but the pgRow data still does.
+                if (tableConfig.columnDefaults) {
+                    for (const colName of Object.keys(tableConfig.columnDefaults)) {
+                        for (const row of pgRows) {
+                            delete row[colName];
+                        }
+                    }
+                }
                 const parser = new Parser({
                     schema: tableConfig.schema,
                     table: tableConfig.table,

package/esm/export-meta.js

@@ -43,6 +43,14 @@ const buildDynamicFields = async (pool, tableConfig) => {
             }
         }
     }
+    // Omit columns that are marked as columnDefaults — their DDL DEFAULT (e.g.
+    // current_database()) will supply the correct value at deploy time, so the
+    // exported INSERT must not hardcode an environment-specific literal.
+    if (tableConfig.columnDefaults) {
+        for (const colName of Object.keys(tableConfig.columnDefaults)) {
+            delete dynamicFields[colName];
+        }
+    }
     return dynamicFields;
 };
 export const exportMeta = async ({ opts, dbname, database_id }) => {
@@ -104,6 +112,17 @@ export const exportMeta = async ({ opts, dbname, database_id }) => {
                         }
                     }
                 }
+                // Omit columnDefaults columns from row data so the Parser never sees them.
+                // The Parser's field config already excludes them (via buildDynamicFields),
+                // so they would be ignored anyway, but removing them from the data is cleaner.
+                const tblCfg = META_TABLE_CONFIG[key];
+                if (tblCfg?.columnDefaults) {
+                    for (const colName of Object.keys(tblCfg.columnDefaults)) {
+                        for (const row of result.rows) {
+                            delete row[colName];
+                        }
+                    }
+                }
                 const parsed = await parser.parse(result.rows);
                 if (parsed) {
                     sql[key] = parsed;

package/esm/export-utils.js

@@ -282,11 +282,17 @@ export const META_TABLE_CONFIG = {
             favicon: 'upload',
             apple_touch_icon: 'image',
             logo: 'image'
+        },
+        columnDefaults: {
+            dbname: 'current_database()'
         }
     },
     apis: {
         schema: 'services_public',
-        table: 'apis'
+        table: 'apis',
+        columnDefaults: {
+            dbname: 'current_database()'
+        }
     },
     apps: {
         schema: 'services_public',

package/export-graphql-meta.js

@@ -60,6 +60,15 @@ const buildDynamicFieldsFromGraphQL = async (client, tableConfig) => {
                 }
             }
         }
+        // Omit columns that are marked as columnDefaults — their DDL DEFAULT (e.g.
+        // current_database()) will supply the correct value at deploy time, so the
+        // exported INSERT must not hardcode an environment-specific literal.
+        if (tableConfig.columnDefaults) {
+            for (const colName of Object.keys(tableConfig.columnDefaults)) {
+                delete dynamicFields[colName];
+                enumFields.delete(colName);
+            }
+        }
         return { fields: dynamicFields, enumFields };
     }
     catch (err) {
@@ -142,6 +151,16 @@ const exportGraphQLMeta = async ({ client, database_id }) => {
                 }
                 if (Object.keys(dynamicFields).length === 0)
                     return;
+                // Omit columnDefaults columns from row data so the Parser never sees them.
+                // configFields already excludes them (via buildDynamicFieldsFromGraphQL),
+                // so dynamicFields won't contain them either — but the pgRow data still does.
+                if (tableConfig.columnDefaults) {
+                    for (const colName of Object.keys(tableConfig.columnDefaults)) {
+                        for (const row of pgRows) {
+                            delete row[colName];
+                        }
+                    }
+                }
                 const parser = new csv_to_pg_1.Parser({
                     schema: tableConfig.schema,
                     table: tableConfig.table,

package/export-meta.js

@@ -46,6 +46,14 @@ const buildDynamicFields = async (pool, tableConfig) => {
             }
         }
     }
+    // Omit columns that are marked as columnDefaults — their DDL DEFAULT (e.g.
+    // current_database()) will supply the correct value at deploy time, so the
+    // exported INSERT must not hardcode an environment-specific literal.
+    if (tableConfig.columnDefaults) {
+        for (const colName of Object.keys(tableConfig.columnDefaults)) {
+            delete dynamicFields[colName];
+        }
+    }
     return dynamicFields;
 };
 const exportMeta = async ({ opts, dbname, database_id }) => {
@@ -107,6 +115,17 @@ const exportMeta = async ({ opts, dbname, database_id }) => {
                         }
                     }
                 }
+                // Omit columnDefaults columns from row data so the Parser never sees them.
+                // The Parser's field config already excludes them (via buildDynamicFields),
+                // so they would be ignored anyway, but removing them from the data is cleaner.
+                const tblCfg = export_utils_1.META_TABLE_CONFIG[key];
+                if (tblCfg?.columnDefaults) {
+                    for (const colName of Object.keys(tblCfg.columnDefaults)) {
+                        for (const row of result.rows) {
+                            delete row[colName];
+                        }
+                    }
+                }
                 const parsed = await parser.parse(result.rows);
                 if (parsed) {
                     sql[key] = parsed;

package/export-utils.d.ts

@@ -37,6 +37,12 @@ export interface TableConfig {
     conflictDoNothing?: boolean;
     typeOverrides?: Record<string, FieldType>;
     gqlTypeName?: string;
+    /** Columns whose values are environment-specific and should be excluded from the
+     *  exported INSERT so that the column's DDL DEFAULT applies at deploy time.
+     *  Key = column name, Value = the SQL expression the column defaults to (for documentation).
+     *  E.g. { dbname: 'current_database()' } — the exporter omits `dbname` from the
+     *  INSERT, and `DEFAULT current_database()` in the table definition supplies it. */
+    columnDefaults?: Record<string, string>;
 }
 /**
  * Shared metadata table configuration.

package/export-utils.js

@@ -289,11 +289,17 @@ exports.META_TABLE_CONFIG = {
             favicon: 'upload',
             apple_touch_icon: 'image',
             logo: 'image'
+        },
+        columnDefaults: {
+            dbname: 'current_database()'
         }
     },
     apis: {
         schema: 'services_public',
-        table: 'apis'
+        table: 'apis',
+        columnDefaults: {
+            dbname: 'current_database()'
+        }
     },
     apps: {
         schema: 'services_public',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/export",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM export tools for SQL and GraphQL database migration extraction",
   "main": "index.js",
@@ -41,11 +41,11 @@
     "@pgsql/types": "^17.6.2",
     "@types/pg": "^8.20.0",
     "makage": "^0.3.0",
-    "pgsql-test": "^4.16.3"
+    "pgsql-test": "^4.16.4"
   },
   "dependencies": {
-    "@pgpmjs/core": "^6.23.0",
-    "@pgpmjs/migrate-client": "^0.15.4",
+    "@pgpmjs/core": "^6.24.0",
+    "@pgpmjs/migrate-client": "^0.15.5",
     "@pgpmjs/types": "^2.29.0",
     "csv-to-pg": "^3.18.0",
     "glob": "^13.0.6",
@@ -55,5 +55,5 @@
     "pg-cache": "^3.12.0",
     "pg-env": "^1.16.0"
   },
-  "gitHead": "30fdaaacfc61f86b3e466f0c4c3768550fd77a55"
+  "gitHead": "6d810d1b800a6e70ef25749415b69de17b066e50"
 }