增加 ObjectQL 类的 close 方法，允许在测试中直接传递 app 实例以便于资源管理和连接关闭

Author: hotlong

packages/foundation/core/src/app.ts

@@ -197,6 +197,15 @@ export class ObjectQL implements IObjectQL {
         return objects;
     }
 
+    async close() {
+        for (const [name, driver] of Object.entries(this.datasources)) {
+            if (driver.disconnect) {
+                console.log(`Closing driver '${name}'...`);
+                await driver.disconnect();
+            }
+        }
+    }
+
     async init() {
         // 0. Init Plugins (This allows plugins to register custom loaders)
         for (const plugin of this.pluginsList) {

packages/foundation/types/src/app.ts

@@ -10,6 +10,7 @@ export interface IObjectQL {
     getConfigs(): Record<string, ObjectConfig>;
     datasource(name: string): Driver;
     init(): Promise<void>;
+    close?(): Promise<void>;
     removePackage(name: string): void;
     metadata: MetadataRegistry; 
 

packages/tools/cli/__tests__/commands.test.ts

@@ -162,10 +162,15 @@ describe('CLI Commands', () => {
 
         beforeEach(async () => {
             // Create a test SQLite database with sample schema
+            const dbPath = path.join(testDir, `test_${Date.now()}.db`);
             const driver = new SqlDriver({
                 client: 'sqlite3',
-                connection: { filename: path.join(testDir, 'test.db') },
-                useNullAsDefault: true
+                connection: { filename: dbPath },
+                useNullAsDefault: true,
+                pool: { 
+                    min: 1, 
+                    max: 1 // Single connection for test
+                }
             });
 
             app = new ObjectQL({
@@ -195,42 +200,21 @@ describe('CLI Commands', () => {
             });
 
             await app.init();
-
-            // Create a config file for the sync command to use
-            configPath = path.join(testDir, 'objectql.config.js');
-            const configContent = `
-                const { ObjectQL } = require('@objectql/core');
-                const { SqlDriver } = require('@objectql/driver-sql');
-                
-                const driver = new SqlDriver({
-                    client: 'sqlite3',
-                    connection: { filename: '${path.join(testDir, 'test.db').replace(/\\/g, '\\\\')}' },
-                    useNullAsDefault: true
-                });
-
-                const app = new ObjectQL({
-                    datasources: { default: driver }
-                });
-
-                module.exports = { default: app };
-            `;
-            fs.writeFileSync(configPath, configContent, 'utf-8');
         });
 
         afterEach(async () => {
-            if (app && app.datasources && app.datasources.default) {
-                const driver = app.datasources.default as any;
-                if (driver.disconnect) {
-                    await driver.disconnect();
-                }
+            try {
+                if (app) await app.close();
+            } catch (e) {
+                // Ignore if already closed
             }
         });
 
         it('should introspect database and generate .object.yml files', async () => {
             const outputDir = path.join(testDir, 'objects');
 
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir
             });
 
@@ -269,7 +253,7 @@ describe('CLI Commands', () => {
             const outputDir = path.join(testDir, 'objects_selective');
 
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir,
                 tables: ['users']
             });
@@ -284,7 +268,7 @@ describe('CLI Commands', () => {
 
             // First sync
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir
             });
 
@@ -295,7 +279,7 @@ describe('CLI Commands', () => {
 
             // Second sync without force - should skip
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir
             });
 
@@ -308,7 +292,7 @@ describe('CLI Commands', () => {
 
             // First sync
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir
             });
 
@@ -318,7 +302,7 @@ describe('CLI Commands', () => {
 
             // Second sync with force - should overwrite
             await syncDatabase({
-                config: configPath,
+                app: app,
                 output: outputDir,
                 force: true
             });

packages/tools/cli/src/commands/sync.ts

@@ -9,6 +9,7 @@ interface SyncOptions {
     output?: string;
     tables?: string[];
     force?: boolean;
+    app?: any; // Allow passing app instance directly for testing
 }
 
 /**
@@ -20,10 +21,15 @@ export async function syncDatabase(options: SyncOptions) {
 
     console.log(chalk.blue('🔄 Syncing database schema to ObjectQL...'));
     console.log(chalk.gray(`Output directory: ${outputDir}\n`));
+    
+    let app: any = options.app;
+    const shouldClose = !options.app; // Only close if we loaded it ourselves
 
     try {
-        // Load ObjectQL instance from config
-        const app = await loadObjectQLInstance(options.config);
+        // Load ObjectQL instance from config if not provided
+        if (!app) {
+            app = await loadObjectQLInstance(options.config);
+        }
 
         // Check if driver supports introspection
         const driver = app.datasources?.default;
@@ -109,6 +115,16 @@ export async function syncDatabase(options: SyncOptions) {
             console.error(chalk.gray(error.stack));
         }
         throw error;
+    } finally {
+        // Ensure connection is closed if we opened it
+        if (shouldClose) {
+            if (app && app.close) {
+                 await app.close();
+            } else if (app && app.datasources && app.datasources.default && (app.datasources.default as any).disconnect) {
+                 // Fallback for older versions if close isn't available
+                 await (app.datasources.default as any).disconnect();
+            }
+        }
     }
 }
 
@@ -287,6 +303,15 @@ async function loadObjectQLInstance(configPath?: string): Promise<any> {
     }
 
     const configModule = require(configFile);
+    
+    // Clear cache to support multiple runs in same process (e.g. tests)
+    try {
+        const resolvedPath = require.resolve(configFile);
+        delete require.cache[resolvedPath];
+    } catch (e) {
+        // Ignore resolution errors
+    }
+
     // Support multiple export patterns: default, app, objectql, or db (in order of precedence)
     const app = configModule.default || configModule.app || configModule.objectql || configModule.db;