@nine-lab/nine-connector 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nine-lab/nine-connector",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "NineQuery AI Connector for Database",
   "main": "src/index.js",
   "type": "module",
@@ -22,6 +22,7 @@
     "express": "^4.22.1",
     "mariadb": "^3.5.2",
     "mysql2": "^3.9.7",
+    "oracledb": "^6.10.0",
     "pg": "^8.11.5"
   },
   "publishConfig": {

package/src/ai/AIProcessor.js

@@ -24,6 +24,7 @@ export class AIProcessor {
 
     async filterTables(question, schemaSummary) {
         if (!this.#chains['table-filter']) throw new Error("table-filter 체인 미등록");
+
         return await this.#chains['table-filter'].invoke({
             question,
             schema_summary: JSON.stringify(schemaSummary, null, 2)

package/src/ai/AIService.js

@@ -13,14 +13,19 @@ export class AIService {
 
         // 2) AI: 필요한 테이블 필터링
         // AI 결과가 문자열일 경우를 대비해 파싱 로직이 AIProcessor에 없다면 여기서 보완 가능
-        const { tables } = await this.ai.filterTables(question, schemaSummary);
+        //const { selected_tables } = await this.ai.filterTables(question, schemaSummary);
+        const { selected_tables } = await this.ai.filterTables(question, schemaSummary);
 
-        if (!tables || tables.length === 0) {
+        console.log(selected_tables);
+
+        if (!selected_tables || selected_tables.length === 0) {
             throw new Error("질문과 관련된 테이블을 찾을 수 없습니다.");
         }
 
+        console.log(schemaSummary);
+
         // 3) 상세 스키마 필터링 및 SQL 생성
-        const detailedSchema = schemaSummary.filter(t => tables.includes(t.tableName));
+        const detailedSchema = schemaSummary.filter(t => selected_tables.includes(t.tableName));
         const { sql, explanation } = await this.ai.generateSql(
             question,
             detailedSchema,

package/src/core/init.js

@@ -18,7 +18,7 @@ async function createEnvFile(rl) {
         { key: 'SERVER_PORT', label: '1. 커넥터 서버 포트', default: '3000' },
         { key: 'GEMINI_API_KEY', label: '2. Gemini API Key', default: '' },
         { key: 'GEMINI_MODEL', label: '3. 사용할 모델', default: 'gemini-2.5-flash' },
-        { key: 'DB_TYPE', label: '4. DB 종류 (mysql, pg, mariadb)', default: 'mysql' },
+        { key: 'DB_TYPE', label: '4. DB 종류 (mysql, mariadb, postgres, oracle)', default: 'mysql' },
         { key: 'DB_HOST', label: '5. DB 호스트', default: '127.0.0.1' },
         { key: 'DB_PORT', label: '6. DB 포트', default: '3306' },
         { key: 'DB_USER', label: '7. DB 사용자 계정', default: 'root' },

package/src/database/core/DatabaseManager.js

@@ -16,13 +16,14 @@ class DatabaseManager {
     /**
      * DatabaseFactory의 init() 역할을 수행합니다.
      */
+    // DatabaseManager.js 내부
     async connect() {
         try {
-            // Pool 생성은 전적으로 PoolManager에게 맡깁니다.
-            this.pool = PoolManager.createPool(this.config);
+            // 이제 createPool이 async이므로 await를 붙입니다.
+            this.pool = await PoolManager.createPool(this.config);
 
-            // 단순 연결 확인 쿼리
-            await this.query('SELECT 1');
+            // 연결 확인
+            await this.query(this.dialect.testQuery || 'SELECT 1');
             console.log(`[${this.type}] Database connection successful.`);
         } catch (error) {
             console.error(`[${this.type}] Connection failed:`, error.message);
@@ -39,6 +40,7 @@ class DatabaseManager {
 
         const result = await this.pool.query(sql, params);
 
+        /**
         if (this.type === 'postgres') {
             return result.rows;
         } else {
@@ -47,7 +49,20 @@ class DatabaseManager {
             return (Array.isArray(result) && Array.isArray(result[0]))
                 ? result[0]
                 : result;
+        } */
+        if (this.type === 'postgres' || this.type === 'postgresql') {
+            return result.rows;
+        }
+
+        // MariaDB/MySQL 대응:
+        // DDL(INSERT/UPDATE) 결과와 DQL(SELECT) 결과를 구분해야 함
+        if (Array.isArray(result)) {
+            // mysql2 대응: rows가 0번에 담겨오는 경우
+            if (Array.isArray(result[0])) return result[0];
+            return result;
         }
+
+        return result;
     }
 
     /**
@@ -63,18 +78,18 @@ class DatabaseManager {
     async getTableSchema() {
         const rows = await this.query(this.dialect.schemaQuery);
 
-        return rows.reduce((acc, row) => {
+        // 1. 우선 객체 형태로 그룹화 (중복 방지 및 효율적 정리를 위해)
+        const grouped = rows.reduce((acc, row) => {
             const { table_name, table_comment, column_name, data_type } = row;
 
-            // 테이블이 처음 등장하면 초기화
             if (!acc[table_name]) {
                 acc[table_name] = {
-                    description: table_comment || "", // 테이블 설명 추가
+                    tableName: table_name, // 배열로 변환 시 식별을 위해 추가
+                    description: table_comment || "",
                     columns: []
                 };
             }
 
-            // 컬럼 정보 push
             acc[table_name].columns.push({
                 column: column_name,
                 type: data_type
@@ -82,6 +97,9 @@ class DatabaseManager {
 
             return acc;
         }, {});
+
+        // 2. 최종적으로 객체의 값들만 뽑아서 배열로 변환
+        return Object.values(grouped);
     }
 }
 

package/src/database/core/Dialects.js

@@ -1,6 +1,7 @@
 const Dialects = {
     // MySQL 추가 (MariaDB와 동일)
     mysql: {
+        testQuery: 'SELECT 1',
         schemaQuery: `
             SELECT
                 c.TABLE_NAME as table_name,
@@ -15,6 +16,7 @@ const Dialects = {
             ORDER BY c.TABLE_NAME, c.ORDINAL_POSITION`
     },
     mariadb: {
+        testQuery: 'SELECT 1',
         schemaQuery: `
             SELECT
                 c.TABLE_NAME as table_name,
@@ -29,19 +31,24 @@ const Dialects = {
             ORDER BY c.TABLE_NAME, c.ORDINAL_POSITION`
     },
     postgres: {
+        testQuery: 'SELECT 1',
         schemaQuery: `
             SELECT
                 t.table_name,
-                obj_description(pgc.oid, 'pg_class') AS table_comment,
+                (SELECT obj_description(pgc.oid, 'pg_class')
+                 FROM pg_class pgc
+                 WHERE pgc.relname = t.table_name
+                   AND pgc.relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = t.table_schema)
+                ) AS table_comment,
                 c.column_name,
                 c.data_type
             FROM information_schema.tables t
-                     JOIN information_schema.columns c ON t.table_name = c.table_name
-                     JOIN pg_class pgc ON t.table_name = pgc.relname
-            WHERE t.table_schema = 'public'
+                     JOIN information_schema.columns c ON t.table_name = c.table_name AND t.table_schema = c.table_schema
+            WHERE t.table_schema = CURRENT_SCHEMA() -- 현재 스키마 자동 대응
             ORDER BY t.table_name, c.ordinal_position`
     },
     oracle: {
+        testQuery: 'SELECT 1 FROM DUAL',
         schemaQuery: `
             SELECT 
                 t.TABLE_NAME as table_name, 

package/src/database/core/PoolManager.js

@@ -1,5 +1,6 @@
 import * as mariadb from 'mariadb';
 import pg from 'pg';
+//import oracledb from 'oracledb';
 
 class PoolManager {
     /**
@@ -15,11 +16,49 @@ class PoolManager {
             case 'postgres':
             case 'postgresql':
                 return this.#createPostgresPool(config);
+            case 'oracle':
+                return this.#createOraclePool(config); // 추가
             default:
                 throw new Error(`[PoolManager] Unsupported DB_TYPE: ${type}`);
         }
     }
 
+    static async #createOraclePool(config) {
+        try {
+            const { default: oracledb } = await import('oracledb');
+
+            oracledb.outFormat = oracledb.OUT_FORMAT_OBJECT;
+            oracledb.autoCommit = true;
+
+            const pool = await oracledb.createPool({
+                user: config.user,
+                password: config.password,
+                connectString: `${config.host}:${config.port}/${config.database}`,
+                poolMax: 10,
+                poolMin: 2,
+                poolIncrement: 1
+            });
+
+            // 다른 DB들과 사용법을 맞추기 위해 래핑(Wrapping)
+            return {
+                query: async (sql, params = []) => {
+                    let conn;
+                    try {
+                        conn = await pool.getConnection();
+                        const result = await conn.execute(sql, params);
+                        return result.rows; // 객체 배열 반환
+                    } finally {
+                        if (conn) await conn.close();
+                    }
+                },
+                close: () => pool.close()
+            };
+        } catch (err) {
+            console.error("Oracle Pool 생성 실패:", err.message);
+            throw err;
+        }
+    }
+
     static #createMariaDBPool(config) {
         return mariadb.createPool({
             host: config.host,

package/src/index.js

@@ -69,6 +69,9 @@ async function bootstrap() {
 
     // [API] 자연어 질의 엔드포인트
     app.post('/api/ask', async (req, res) => {
+
+
+
         const { question } = req.body;
         if (!question) return res.status(400).json({ success: false, error: "질문을 입력해주세요." });