@memberjunction/codegen-lib 5.4.1 → 5.6.0

package/dist/runCodeGen.js

@@ -3,6 +3,8 @@
  * Coordinates all aspects of code generation including database schema analysis,
  * metadata management, SQL generation, TypeScript entities, Angular components,
  * GraphQL resolvers, and more.
+ *
+ * Supports both SQL Server and PostgreSQL database platforms via the dbType configuration.
  */
 import { GraphQLServerGeneratorBase } from './Misc/graphql_server_codegen.js';
 import { SQLCodeGenBase } from './Database/sql_codegen.js';
@@ -10,7 +12,7 @@ import { EntitySubClassGeneratorBase } from './Misc/entity_subclasses_codegen.js
 import { UserCache, setupSQLServerClient } from '@memberjunction/sqlserver-dataprovider';
 import { MSSQLConnection, sqlConfig } from './Config/db-connection.js';
 import { ManageMetadataBase } from './Database/manage-metadata.js';
-import { outputDir, commands, mj_core_schema, configInfo, getSettingValue } from './Config/config.js';
+import { outputDir, commands, mj_core_schema, configInfo, getSettingValue, dbType } from './Config/config.js';
 import { logError, logStatus, logWarning, startSpinner, updateSpinner, succeedSpinner, failSpinner, warnSpinner } from './Misc/status_logging.js';
 import * as MJ from '@memberjunction/core';
 import { RunCommandsBase } from './Misc/runCommand.js';
@@ -18,119 +20,116 @@ import { DBSchemaGeneratorBase } from './Database/dbSchema.js';
 import { AngularClientGeneratorBase } from './Angular/angular-codegen.js';
 import { SQLServerProviderConfigData } from '@memberjunction/sqlserver-dataprovider';
 import { CreateNewUserBase } from './Misc/createNewUser.js';
-import { MJGlobal } from '@memberjunction/global';
+import { MJGlobal, UUIDsEqual } from '@memberjunction/global';
 import { ActionSubClassGeneratorBase } from './Misc/action_subclasses_codegen.js';
 import { SQLLogging } from './Misc/sql_logging.js';
+import { SQLServerCodeGenConnection } from './Database/providers/sqlserver/SQLServerCodeGenConnection.js';
+import { PostgreSQLCodeGenConnection } from './Database/providers/postgresql/PostgreSQLCodeGenConnection.js';
+import { PostgreSQLDataProvider, PostgreSQLProviderConfigData } from '@memberjunction/postgresql-dataprovider';
+import pg from 'pg';
 import { SystemIntegrityBase } from './Misc/system_integrity.js';
 import { ActionEngineBase } from '@memberjunction/actions-base';
 import { AIEngine } from '@memberjunction/aiengine';
+import { SetProvider, UserInfo } from '@memberjunction/core';
 // Import pre-built MJ class registrations manifest (covers all @memberjunction/* packages)
 import '@memberjunction/server-bootstrap-lite/mj-class-registrations';
 /** Extract core schema name from configuration */
 const { mjCoreSchema } = configInfo;
 /**
  * Main orchestrator class for the MemberJunction code generation process.
- *
- * This class coordinates a comprehensive code generation pipeline that transforms
- * database schemas into a complete, type-safe, full-stack application. The process includes:
- *
- * **Pipeline Steps:**
- * 1. **Database Setup** - Initialize connections and metadata
- * 2. **Metadata Management** - Analyze schema changes and update metadata
- * 3. **SQL Generation** - Create views, procedures, and indexes
- * 4. **TypeScript Entities** - Generate entity classes with validation
- * 5. **Angular Components** - Create forms and UI components
- * 6. **GraphQL Resolvers** - Generate API endpoints
- * 7. **Action Classes** - Create business logic containers
- * 8. **Documentation** - Generate schema JSON for AI/documentation
- * 9. **Post-processing** - Run commands and integrity checks
- *
- * **Customization:**
- * You can sub-class this class and override specific methods to customize
- * the code generation process for your specific needs.
- *
- * @example
- * ```typescript
- * const codeGen = new RunCodeGenBase();
- * await codeGen.Run(); // Full generation
- * await codeGen.Run(true); // Skip database operations
- * ```
  */
 export class RunCodeGenBase {
     /**
-     * Sets up the SQL Server data source and initializes the MemberJunction core metadata.
-     * This method establishes the database connection pool and configures the data provider
-     * that will be used throughout the code generation process.
-     *
-     * Override this method to customize the data source setup process for different
-     * database providers or connection configurations.
-     *
-     * @returns Promise resolving to the configured SQLServerDataProvider instance
-     * @throws Error if connection setup fails
+     * Sets up the data source based on the configured database type (SQL Server or PostgreSQL).
+     * Initializes the appropriate data provider, connection, and user cache.
      */
     async setupDataSource() {
-        /****************************************************************************************
-            // First, setup the data source and make sure the metadata and related stuff for MJCore is initialized
-            ****************************************************************************************/
         startSpinner('Initializing database connection...');
-        const pool = await MSSQLConnection(); // get the MSSQL connection pool
+        const platform = dbType();
+        if (platform === 'postgresql') {
+            return this.setupPostgreSQLDataSource();
+        }
+        return this.setupSQLServerDataSource();
+    }
+    /**
+     * Sets up SQL Server data source (original behavior).
+     */
+    async setupSQLServerDataSource() {
+        const pool = await MSSQLConnection();
         const config = new SQLServerProviderConfigData(pool, mj_core_schema());
-        const sqlServerProvider = await setupSQLServerClient(config);
-        // Get connection details from the sqlConfig
+        const provider = await setupSQLServerClient(config);
+        const conn = new SQLServerCodeGenConnection(pool);
         let connectionInfo = sqlConfig.server;
-        if (sqlConfig.port) {
-            connectionInfo += `:${sqlConfig.port}`;
-        }
-        if (sqlConfig.options?.instanceName) {
-            connectionInfo += `\\${sqlConfig.options.instanceName}`;
+        if (sqlConfig.port)
+            connectionInfo += ':' + sqlConfig.port;
+        if (sqlConfig.options?.instanceName)
+            connectionInfo += '\\' + sqlConfig.options.instanceName;
+        connectionInfo += '/' + sqlConfig.database;
+        await UserCache.Instance.Refresh(pool);
+        const userMatch = UserCache.Users.find((u) => u?.Type?.trim().toLowerCase() === 'owner');
+        const currentUser = userMatch ? userMatch : UserCache.Users[0];
+        succeedSpinner('SQL Server connection initialized: ' + connectionInfo);
+        return { provider, connection: conn, currentUser, connectionInfo };
+    }
+    /**
+     * Sets up PostgreSQL data source.
+     */
+    async setupPostgreSQLDataSource() {
+        const pgHost = process.env.PG_HOST ?? configInfo.dbHost;
+        const pgPort = parseInt(process.env.PG_PORT ?? String(configInfo.dbPort), 10) || 5432;
+        const pgDatabase = process.env.PG_DATABASE ?? configInfo.dbDatabase;
+        const pgUser = process.env.PG_USERNAME ?? configInfo.codeGenLogin;
+        const pgPassword = process.env.PG_PASSWORD ?? configInfo.codeGenPassword;
+        const coreSchema = mj_core_schema();
+        const pool = new pg.Pool({
+            host: pgHost,
+            port: pgPort,
+            database: pgDatabase,
+            user: pgUser,
+            password: pgPassword,
+            max: 20,
+        });
+        // Test connection
+        const client = await pool.connect();
+        client.release();
+        // Configure the PostgreSQL data provider
+        const pgConfig = new PostgreSQLProviderConfigData({ Host: pgHost, Port: pgPort, Database: pgDatabase, User: pgUser, Password: pgPassword }, coreSchema, 1 // checkRefreshIntervalSeconds: must be > 0 to trigger initial metadata load
+        );
+        const provider = new PostgreSQLDataProvider();
+        await provider.Config(pgConfig);
+        SetProvider(provider);
+        const conn = new PostgreSQLCodeGenConnection(pool);
+        // Load users (PostgreSQL version - query views directly)
+        const usersResult = await conn.query('SELECT * FROM "' + coreSchema + '"."vwUsers"');
+        const rolesResult = await conn.query('SELECT * FROM "' + coreSchema + '"."vwUserRoles"');
+        const userInfos = usersResult.recordset.map((user) => {
+            user.UserRoles = rolesResult.recordset.filter((role) => UUIDsEqual(role.UserID, user.ID));
+            return new UserInfo(provider, user);
+        });
+        const userMatch = userInfos.find((u) => u?.Type?.trim().toLowerCase() === 'owner');
+        const currentUser = userMatch ?? userInfos[0];
+        if (!currentUser) {
+            throw new Error('No users found in PostgreSQL. Ensure vwUsers has at least one user.');
         }
-        connectionInfo += `/${sqlConfig.database}`;
-        succeedSpinner(`Database connection initialized: ${connectionInfo}`);
-        return sqlServerProvider;
+        const connectionInfo = pgHost + ':' + pgPort + '/' + pgDatabase;
+        succeedSpinner('PostgreSQL connection initialized: ' + connectionInfo);
+        return { provider, connection: conn, currentUser, connectionInfo };
     }
     /**
      * Main entry point for the complete code generation process.
-     *
-     * Orchestrates the entire pipeline from database schema analysis to final code output.
-     * The process is highly configurable through the configuration file and can be
-     * partially skipped for faster iteration during development.
-     *
-     * **Process Flow:**
-     * 1. Initialize data sources and user context
-     * 2. Execute pre-generation commands and scripts
-     * 3. Manage metadata and schema changes
-     * 4. Generate SQL objects (views, procedures, indexes)
-     * 5. Generate TypeScript entity classes
-     * 6. Generate Angular UI components
-     * 7. Generate GraphQL API resolvers
-     * 8. Generate Action business logic classes
-     * 9. Create documentation JSON
-     * 10. Run integrity checks
-     * 11. Execute post-generation commands
-     *
-     * @param skipDatabaseGeneration If true, skips all database-related operations
-     *   (metadata management, SQL generation). Useful for faster UI-only regeneration.
-     * @throws Error if any critical step fails
-     * @returns Promise that resolves when generation is complete
      */
     async Run(skipDatabaseGeneration = false) {
         try {
             const startTime = new Date();
-            startSpinner(`Starting MemberJunction CodeGen @ ${startTime.toLocaleString()}`);
-            const provider = await this.setupDataSource();
-            updateSpinner('Loading user cache and metadata...');
-            const pool = await MSSQLConnection();
-            await UserCache.Instance.Refresh(pool);
-            const userMatch = UserCache.Users.find((u) => u?.Type?.trim().toLowerCase() === 'owner');
-            const currentUser = userMatch ? userMatch : UserCache.Users[0]; // if we don't find an Owner, use the first user in the cache
-            // get the entity metadata
+            const platform = dbType();
+            startSpinner('Starting MemberJunction CodeGen (' + platform + ') @ ' + startTime.toLocaleString());
+            const { provider, connection: conn, currentUser } = await this.setupDataSource();
             const md = new MJ.Metadata();
             if (md.Entities.length === 0) {
                 failSpinner('No entities found in metadata');
                 process.exit(1);
             }
-            succeedSpinner(`Loaded ${md.Entities.length} entities from metadata`);
-            // Initialize AIEngine for advanced generation features (needed for prompt metadata access)
+            succeedSpinner('Loaded ' + md.Entities.length + ' entities from metadata');
             if (configInfo.advancedGeneration?.enableAdvancedGeneration) {
                 startSpinner('Initializing AI Engine for advanced generation...');
                 await AIEngine.Instance.Config(false, currentUser);
@@ -138,14 +137,10 @@ export class RunCodeGenBase {
             }
             const runCommandsObject = MJGlobal.Instance.ClassFactory.CreateInstance(RunCommandsBase);
             const sqlCodeGenObject = MJGlobal.Instance.ClassFactory.CreateInstance(SQLCodeGenBase);
-            // check to see if the user wants to skip database generation via the config settings
             const skipDB = skipDatabaseGeneration || getSettingValue('skip_database_generation', false);
             if (!skipDB) {
                 startSpinner('Handling SQL Script Execution, Metadata Maintenance, and SQL Object Generation...');
-                SQLLogging.initSQLLogging(); // initialize the SQL Logging functionality
-                /****************************************************************************************
-                        // STEP 0 --- Precursor Step execute any commands specified in the config file
-                        ****************************************************************************************/
+                SQLLogging.initSQLLogging();
                 const beforeCommands = commands('BEFORE');
                 if (beforeCommands && beforeCommands.length > 0) {
                     updateSpinner('Executing BEFORE commands...');
@@ -153,15 +148,9 @@ export class RunCodeGenBase {
                     if (results.some((r) => !r.success))
                         logError('ERROR running one or more BEFORE commands');
                 }
-                /****************************************************************************************
-                        // STEP 0.1 --- Execute any before SQL Scripts specified in the config file
-                        ****************************************************************************************/
                 updateSpinner('Executing before-all SQL Scripts...');
-                if (!(await sqlCodeGenObject.runCustomSQLScripts(pool, 'before-all')))
+                if (!(await sqlCodeGenObject.runCustomSQLScripts(conn, 'before-all')))
                     logError('ERROR running before-all SQL Scripts');
-                /****************************************************************************************
-                        // STEP 0.2 --- Create a new user if there is newUserSetup info in the config file
-                        ****************************************************************************************/
                 const newUserSetup = configInfo.newUserSetup;
                 if (newUserSetup) {
                     updateSpinner('Setting up new user...');
@@ -177,33 +166,31 @@ export class RunCodeGenBase {
                         }
                     }
                 }
-                /****************************************************************************************
-                        // STEP 1 - Manage Metadata - including generating new metadata as required
-                        ****************************************************************************************/
                 const manageMD = MJGlobal.Instance.ClassFactory.CreateInstance(ManageMetadataBase);
                 updateSpinner('Managing Metadata...');
-                const metadataSuccess = await manageMD.manageMetadata(pool, currentUser);
+                const metadataSuccess = await manageMD.manageMetadata(conn, currentUser);
                 if (!metadataSuccess) {
                     failSpinner('ERROR managing metadata');
                 }
                 else {
-                    // now - we need to tell our metadata object to refresh itself
                     await provider.Refresh();
                     succeedSpinner('Metadata management completed');
                 }
-                /****************************************************************************************
-                        // STEP 2 - SQL Script Generation
-                        ****************************************************************************************/
                 const sqlOutputDir = outputDir('SQL', true);
                 if (sqlOutputDir) {
                     startSpinner('Managing SQL Scripts and Execution...');
-                    const sqlSuccess = await sqlCodeGenObject.manageSQLScriptsAndExecution(pool, md.Entities, sqlOutputDir, currentUser);
+                    const sqlSuccess = await sqlCodeGenObject.manageSQLScriptsAndExecution(conn, md.Entities, sqlOutputDir, currentUser);
                     if (!sqlSuccess) {
                         failSpinner('Error managing SQL scripts and execution');
                     }
                     else {
                         succeedSpinner('SQL scripts and execution completed');
                     }
+                    // Refresh metadata again after SQL scripts execution because the stale
+                    // entity relationship cleanup (step 3.5) runs inside manageSQLScriptsAndExecution,
+                    // AFTER the entity field sync. The first refresh (above) loaded metadata before
+                    // those DB changes, so the in-memory metadata still has stale relationships.
+                    await provider.Refresh();
                 }
                 else {
                     warnSpinner('SQL output directory NOT found in config file, skipping...');
@@ -211,26 +198,20 @@ export class RunCodeGenBase {
             }
             else {
                 warnSpinner('Skipping database generation (skip_database_generation = true)');
-                // we skipped the database generation but we need to load generated code for validators from the database to ensure that we have them
-                // ready for later use.
                 const manageMD = MJGlobal.Instance.ClassFactory.CreateInstance(ManageMetadataBase);
                 startSpinner('Checking/Loading AI Generated Code from Metadata...');
-                const metadataSuccess = await manageMD.loadGeneratedCode(pool, currentUser);
+                const metadataSuccess = await manageMD.loadGeneratedCode(conn, currentUser);
                 if (!metadataSuccess) {
                     failSpinner('ERROR checking/loading AI Generated Code from Metadata');
-                    return; // FATAL ERROR - we can't continue
+                    return;
                 }
                 else {
                     succeedSpinner('AI Generated Code loaded from Metadata');
                 }
             }
-            // Apply excludeSchemas filter to all entities before splitting into core/non-core
-            // This ensures TypeScript, Angular, and GraphQL generators respect schema exclusions
-            // (SQL generation already applies this filter internally in sql_codegen.ts)
             const apiEntities = md.Entities.filter((e) => e.IncludeInAPI);
             const excludedSchemaNames = configInfo.excludeSchemas.map(s => s.toLowerCase());
             const includedEntities = apiEntities.filter((e) => !excludedSchemaNames.includes(e.SchemaName.trim().toLowerCase()));
-            // Log excluded schemas if any entities were filtered out
             const excludedCount = apiEntities.length - includedEntities.length;
             if (excludedCount > 0) {
                 const excludedBySchema = apiEntities
@@ -241,24 +222,17 @@ export class RunCodeGenBase {
                     return acc;
                 }, {});
                 const schemaDetails = Object.entries(excludedBySchema)
-                    .map(([schema, count]) => `${schema}: ${count}`)
+                    .map(([schema, count]) => schema + ': ' + count)
                     .join(', ');
-                logStatus(`Excluded ${excludedCount} entities from code generation by schema: ${schemaDetails}`);
+                logStatus('Excluded ' + excludedCount + ' entities from code generation by schema: ' + schemaDetails);
             }
             const coreEntities = includedEntities.filter((e) => e.SchemaName.trim().toLowerCase() === mjCoreSchema.trim().toLowerCase());
             const nonCoreEntities = includedEntities.filter((e) => e.SchemaName.trim().toLowerCase() !== mjCoreSchema.trim().toLowerCase());
-            // Check if we're in verbose mode to determine spinner behavior
             const isVerbose = configInfo?.verboseOutput ?? false;
-            if (!isVerbose) {
-                // In non-verbose mode, start a single spinner for all TypeScript generation
+            if (!isVerbose)
                 startSpinner('Generating TypeScript code...');
-            }
-            /****************************************************************************************
-                  // STEP 3(a) - GraphQL Server Code Gen
-                  ****************************************************************************************/
             const graphQLCoreResolversOutputDir = outputDir('GraphQLCoreEntityResolvers', false);
             if (graphQLCoreResolversOutputDir) {
-                // generate the GraphQL server code
                 if (isVerbose)
                     startSpinner('Generating CORE Entity GraphQL Resolver Code...');
                 const graphQLGenerator = MJGlobal.Instance.ClassFactory.CreateInstance(GraphQLServerGeneratorBase);
@@ -266,13 +240,11 @@ export class RunCodeGenBase {
                     failSpinner('Error generating GraphQL server code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('CORE Entity GraphQL Resolver Code generated');
-                }
             }
             const graphqlOutputDir = outputDir('GraphQLServer', true);
             if (graphqlOutputDir) {
-                // generate the GraphQL server code
                 if (isVerbose)
                     startSpinner('Generating GraphQL Resolver Code...');
                 const graphQLGenerator = MJGlobal.Instance.ClassFactory.CreateInstance(GraphQLServerGeneratorBase);
@@ -281,56 +253,39 @@ export class RunCodeGenBase {
                     failSpinner('Error generating GraphQL Resolver code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('GraphQL Resolver Code generated');
-                }
             }
-            else if (isVerbose) {
+            else if (isVerbose)
                 warnSpinner('GraphQL server output directory NOT found in config file, skipping...');
-            }
-            /****************************************************************************************
-                  // STEP 4 - Core Entity Subclass Code Gen
-                  ****************************************************************************************/
             const coreEntitySubClassOutputDir = outputDir('CoreEntitySubClasses', false);
             if (coreEntitySubClassOutputDir && coreEntitySubClassOutputDir.length > 0) {
-                // generate the entity subclass code
                 if (isVerbose)
                     startSpinner('Generating CORE Entity Subclass Code...');
                 const entitySubClassGeneratorObject = MJGlobal.Instance.ClassFactory.CreateInstance(EntitySubClassGeneratorBase);
-                if (!await entitySubClassGeneratorObject.generateAllEntitySubClasses(pool, coreEntities, coreEntitySubClassOutputDir, skipDB)) {
+                if (!await entitySubClassGeneratorObject.generateAllEntitySubClasses(conn, coreEntities, coreEntitySubClassOutputDir, skipDB)) {
                     failSpinner('Error generating entity subclass code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('CORE Entity Subclass Code generated');
-                }
             }
-            /****************************************************************************************
-                  // STEP 4.1 - Entity Subclass Code Gen
-                  ****************************************************************************************/
             const entitySubClassOutputDir = outputDir('EntitySubClasses', true);
             if (entitySubClassOutputDir) {
-                // generate the entity subclass code
                 if (isVerbose)
                     startSpinner('Generating Entity Subclass Code...');
                 const entitySubClassGeneratorObject = MJGlobal.Instance.ClassFactory.CreateInstance(EntitySubClassGeneratorBase);
-                if (!await entitySubClassGeneratorObject.generateAllEntitySubClasses(pool, nonCoreEntities, entitySubClassOutputDir, skipDB)) {
+                if (!await entitySubClassGeneratorObject.generateAllEntitySubClasses(conn, nonCoreEntities, entitySubClassOutputDir, skipDB)) {
                     failSpinner('Error generating entity subclass code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('Entity Subclass Code generated');
-                }
             }
-            else if (isVerbose) {
+            else if (isVerbose)
                 warnSpinner('Entity subclass output directory NOT found in config file, skipping...');
-            }
-            /****************************************************************************************
-                  // STEP 5 - Angular Code Gen
-                  ****************************************************************************************/
             const angularCoreEntitiesOutputDir = outputDir('AngularCoreEntities', false);
             if (angularCoreEntitiesOutputDir) {
-                // generate the Angular client code
                 if (isVerbose)
                     startSpinner('Generating Angular CORE Entities Code...');
                 const angularGenerator = MJGlobal.Instance.ClassFactory.CreateInstance(AngularClientGeneratorBase);
@@ -338,13 +293,11 @@ export class RunCodeGenBase {
                     failSpinner('Error generating Angular CORE Entities code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('Angular CORE Entities Code generated');
-                }
             }
             const angularOutputDir = outputDir('Angular', false);
             if (angularOutputDir) {
-                // generate the Angular client code
                 if (isVerbose)
                     startSpinner('Generating Angular Code...');
                 const angularGenerator = MJGlobal.Instance.ClassFactory.CreateInstance(AngularClientGeneratorBase);
@@ -352,37 +305,26 @@ export class RunCodeGenBase {
                     failSpinner('Error generating Angular code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('Angular Code generated');
-                }
             }
-            else if (isVerbose) {
+            else if (isVerbose)
                 warnSpinner('Angular output directory NOT found in config file, skipping...');
-            }
-            /****************************************************************************************
-                  // STEP 6 - Database Schema Output in JSON - for documentation and can be used by AI/etc.
-                  ****************************************************************************************/
             const dbSchemaOutputDir = outputDir('DBSchemaJSON', false);
             if (dbSchemaOutputDir) {
-                // generate the GraphQL client code
                 if (isVerbose)
                     startSpinner('Generating Database Schema JSON Output...');
                 const schemaGeneratorObject = MJGlobal.Instance.ClassFactory.CreateInstance(DBSchemaGeneratorBase);
                 if (!schemaGeneratorObject.generateDBSchemaJSONOutput(md.Entities, dbSchemaOutputDir)) {
                     failSpinner('Error generating Database Schema JSON Output, non-fatal, continuing...');
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('Database Schema JSON Output generated');
-                }
             }
-            else if (isVerbose) {
+            else if (isVerbose)
                 warnSpinner('DB Schema output directory NOT found in config file, skipping...');
-            }
-            /****************************************************************************************
-                  // STEP 7 - Actions Code Gen
-                  ****************************************************************************************/
             const coreActionsOutputDir = outputDir('CoreActionSubclasses', false);
-            await ActionEngineBase.Instance.Config(false, currentUser); // this is inefficient as we have the server 
+            await ActionEngineBase.Instance.Config(false, currentUser);
             if (coreActionsOutputDir) {
                 if (isVerbose)
                     startSpinner('Generating CORE Actions Code...');
@@ -391,9 +333,8 @@ export class RunCodeGenBase {
                     failSpinner('Error generating CORE Actions code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('CORE Actions Code generated');
-                }
             }
             const actionsOutputDir = outputDir('ActionSubclasses', false);
             if (actionsOutputDir) {
@@ -404,80 +345,47 @@ export class RunCodeGenBase {
                     failSpinner('Error generating Actions code');
                     return;
                 }
-                else if (isVerbose) {
+                else if (isVerbose)
                     succeedSpinner('Actions Code generated');
-                }
             }
-            else if (isVerbose) {
+            else if (isVerbose)
                 warnSpinner('Actions output directory NOT found in config file, skipping...');
-            }
-            // WRAP UP SQL LOGGING HERE
-            SQLLogging.finishSQLLogging(); // finish up the SQL Logging
-            // Complete the TypeScript generation spinner in non-verbose mode
-            if (!isVerbose) {
+            SQLLogging.finishSQLLogging();
+            if (!isVerbose)
                 succeedSpinner('TypeScript code generation completed');
-            }
-            // now run integrity checks
             startSpinner('Running system integrity checks...');
-            await SystemIntegrityBase.RunIntegrityChecks(pool, true);
+            await SystemIntegrityBase.RunIntegrityChecks(conn, true);
             succeedSpinner('System integrity checks completed');
-            /****************************************************************************************
-            // STEP 8 --- Finalization Step - execute any AFTER commands specified in the config file
-            ****************************************************************************************/
             const afterCommands = commands('AFTER');
             if (afterCommands && afterCommands.length > 0) {
                 startSpinner('Executing AFTER commands...');
                 const results = await runCommandsObject.runCommands(afterCommands);
-                if (results.some((r) => !r.success)) {
+                if (results.some((r) => !r.success))
                     failSpinner('ERROR running one or more AFTER commands');
-                }
-                else {
+                else
                     succeedSpinner('AFTER commands completed');
-                }
             }
-            /****************************************************************************************
-            // STEP 9 --- Execute any AFTER SQL Scripts specified in the config file
-            ****************************************************************************************/
             if (!skipDB) {
                 startSpinner('Executing after-all SQL Scripts...');
-                if (!(await sqlCodeGenObject.runCustomSQLScripts(pool, 'after-all'))) {
+                if (!(await sqlCodeGenObject.runCustomSQLScripts(conn, 'after-all')))
                     failSpinner('ERROR running after-all SQL Scripts');
-                }
-                else {
+                else
                     succeedSpinner('After-all SQL Scripts completed');
-                }
             }
             const endTime = new Date();
             const totalSeconds = (endTime.getTime() - startTime.getTime()) / 1000;
-            succeedSpinner(`MJ CodeGen Complete! ${md.Entities.length} entities processed in ${totalSeconds}s @ ${endTime.toLocaleString()}`);
-            process.exit(0); // wrap it up, 0 means success
+            succeedSpinner('MJ CodeGen Complete! ' + md.Entities.length + ' entities processed in ' + totalSeconds + 's @ ' + endTime.toLocaleString());
+            process.exit(0);
         }
         catch (e) {
-            failSpinner(`CodeGen failed: ${e}`);
+            failSpinner('CodeGen failed: ' + e);
             logError(e);
-            process.exit(1); // error code
+            process.exit(1);
         }
     }
 }
 /**
  * Convenience function to run the MemberJunction code generation process.
- * Creates a new instance of RunCodeGenBase and executes the full generation pipeline.
- *
- * This is the recommended way to trigger code generation from external scripts
- * or applications.
- *
- * @param skipDatabaseGeneration Whether to skip database-related operations
- * @returns Promise that resolves when generation is complete
- * @throws Error if generation fails
- *
- * @example
- * ```typescript
- * // Full generation
- * await runMemberJunctionCodeGeneration();
- *
- * // Skip database operations for faster UI generation
- * await runMemberJunctionCodeGeneration(true);
- * ```
  */
 export async function runMemberJunctionCodeGeneration(skipDatabaseGeneration = false) {
     const runObject = MJGlobal.Instance.ClassFactory.CreateInstance(RunCodeGenBase);