fix(codegen): preserve db.pgpm when merging CLI args with file config

fix(graphile-settings): resolve function/table resource name collisions

- Add functionResourceName override to InflektPlugin to restore schema
  prefixes for functions while keeping clean names for tables
- Filter ConflictDetectorPlugin by configured pgServices.schemas to
  prevent false-positive warnings from unrelated schemas
- Deep-merge db config in codegen CLI to preserve file config db fields
- Use filterDefined in buildDbConfig to strip undefined values

Author: pyramation

graphile/graphile-settings/src/plugins/conflict-detector.ts

@@ -29,6 +29,16 @@ export const ConflictDetectorPlugin: GraphileConfig.Plugin = {
         // Track codecs by their GraphQL name to detect conflicts
         const codecsByName = new Map<string, CodecInfo[]>();
 
+        // Get configured schemas from pgServices to only check relevant codecs
+        const configuredSchemas = new Set<string>();
+        const pgServices = (build as any).resolvedPreset?.pgServices ?? [];
+
+        for (const service of pgServices) {
+          for (const schema of service.schemas ?? ['public']) {
+            configuredSchemas.add(schema);
+          }
+        }
+
         // Iterate through all codecs to find tables
         for (const codec of Object.values(build.input.pgRegistry.pgCodecs)) {
           // Skip non-table codecs (those without attributes or anonymous ones)
@@ -41,6 +51,11 @@ export const ConflictDetectorPlugin: GraphileConfig.Plugin = {
           const schemaName = pgExtensions?.schemaName || 'unknown';
           const tableName = codec.name;
 
+          // Skip codecs from schemas not in the configured list
+          if (configuredSchemas.size > 0 && !configuredSchemas.has(schemaName)) {
+            continue;
+          }
+
           // Get the GraphQL name that would be generated
           const graphqlName = build.inflection.tableType(codec);
 

graphile/graphile-settings/src/plugins/custom-inflector.ts

@@ -129,6 +129,39 @@ export const InflektPlugin: GraphileConfig.Plugin = {
         return '';
       },
 
+      /**
+       * Restore PostGraphile's default schema prefix logic for functions.
+       *
+       * Our _schemaPrefix override returns '' for all schemas to give clean
+       * table names. However, this strips prefixes from functions too, causing
+       * resource naming collisions when a function and table share the same
+       * base name across schemas (e.g., actions_public.table_grant() collides
+       * with metaschema_public.table_grant table).
+       *
+       * Fix: bypass our _schemaPrefix override for functions and use
+       * PostGraphile's default prefix logic instead.
+       */
+      functionResourceName(_previous, options: any, details: any) {
+        const { serviceName, pgProc } = details;
+        const { tags } = pgProc.getTagsAndDescription();
+
+        if (typeof tags.name === 'string') {
+          return tags.name;
+        }
+
+        const pgNamespace = pgProc.getNamespace();
+
+        if (!pgNamespace) {
+          return pgProc.proname;
+        }
+
+        const pgService = (options.pgServices ?? []).find((db: any) => db.name === serviceName);
+        const primarySchema = pgService?.schemas?.[0] ?? 'public';
+        const databasePrefix = serviceName === 'main' ? '' : `${serviceName}_`;
+        const schemaPrefix = pgNamespace.nspname === primarySchema ? '' : `${pgNamespace.nspname}_`;
+        return `${databasePrefix}${schemaPrefix}${pgProc.proname}`;
+      },
+
       /**
        * Keep `id` columns as `id` instead of renaming to `rowId`.
        *

graphql/codegen/src/cli/index.ts

@@ -114,10 +114,11 @@ export const commands = async (
       let hasError = false;
       for (const name of names) {
         console.log(`\n[${name}]`);
-        const result = await generate({
-          ...targets[name],
-          ...cliOptions,
-        } as GraphQLSDKConfigTarget);
+        const targetConfig = { ...targets[name], ...cliOptions } as GraphQLSDKConfigTarget;
+        if (targets[name].db && targetConfig.db) {
+          targetConfig.db = { ...targets[name].db, ...targetConfig.db };
+        }
+        const result = await generate(targetConfig);
         printResult(result);
         if (!result.success) hasError = true;
       }

graphql/codegen/src/cli/shared.ts

@@ -202,7 +202,10 @@ export function buildDbConfig(
 ): Record<string, unknown> {
   const { schemas, apiNames, ...rest } = options;
   if (schemas || apiNames) {
-    return { ...rest, db: { schemas, apiNames } };
+    return {
+      ...rest,
+      db: filterDefined({ schemas, apiNames } as Record<string, unknown>),
+    };
   }
   return rest;
 }
@@ -259,5 +262,9 @@ export function buildGenerateOptions(
   const camelized = camelizeArgv(answers);
   const normalized = normalizeCodegenListOptions(camelized);
   const withDb = buildDbConfig(normalized);
-  return { ...fileConfig, ...withDb } as GraphQLSDKConfigTarget;
+  const merged = { ...fileConfig, ...withDb } as GraphQLSDKConfigTarget;
+  if (fileConfig.db && merged.db) {
+    merged.db = { ...fileConfig.db, ...merged.db };
+  }
+  return merged;
 }