feat:修复高斯数据库链接报错问题

Author: jaguarliuu

CLAUDE.md

@@ -26,14 +26,15 @@ def build_conn_str(self, host: str, port: int, database: str,
                      username: str, password: str) -> str:
         """构建达梦数据库连接字符串
 
-        达梦连接格式：dm+dmPython://username:password@host:port/?schema=SCHEMANAME
+        dmPython 不支持 SQLAlchemy 方言，改用 Oracle 兼容模式
+        达梦数据库在协议层面兼容 Oracle，可以使用 oracledb 驱动
         """
         encoded_username = quote_plus(username)
         encoded_password = quote_plus(password)
 
-        # 达梦数据库连接字符串
-        # 注意：达梦的连接方式类似 Oracle
-        return f"dm+dmPython://{encoded_username}:{encoded_password}@{host}:{port}/"
+        # 使用 Oracle 驱动连接达梦数据库（达梦兼容 Oracle 协议）
+        # 格式：oracle+oracledb://user:pass@host:port/?service_name=SYSDBA
+        return f"oracle+oracledb://{encoded_username}:{encoded_password}@{host}:{port}/?service_name=SYSDBA"
 
     def get_table_names(self, inspector: reflection.Inspector) -> list[str]:
         """获取指定 schema 下的所有表名"""

database_schema/inspectors/dm.py

@@ -4,6 +4,12 @@
 from .base import BaseInspector
 from urllib.parse import quote_plus
 
+# 导入 GaussDB 自定义方言以注册到 SQLAlchemy
+try:
+    from utils.gaussdb_dialect import GaussDBDialect
+except ImportError:
+    pass  # 如果导入失败,使用标准 PostgreSQL 方言
+
 class GaussDBInspector(BaseInspector):
     """华为高斯数据库(GaussDB) 元数据获取实现
 
@@ -16,26 +22,25 @@ class GaussDBInspector(BaseInspector):
 
     def __init__(self, host: str, port: int, database: str,
                 username: str, password: str, schema_name: str = None, **kwargs):
-        super().__init__(host, port, database, username, password)
+        super().__init__(host, port, database, username, password, schema_name)
         self.schema_name = schema_name or "public"
 
     def build_conn_str(self, host: str, port: int, database: str,
                      username: str, password: str) -> str:
         """构建高斯数据库连接字符串
 
         关键参数说明：
-        - sslmode=disable: 禁用 SSL（如果服务器支持可改为 prefer）
-        - gssencmode=disable: 禁用 GSS 加密，避免 SASL 认证问题
+        - sslmode=disable: 禁用 SSL
+        - 保留 SCRAM-SHA-256 等认证方式的支持
         """
         encoded_password = quote_plus(password)
         encoded_username = quote_plus(username)
 
-        # 构建基础连接字符串
-        base_uri = f"postgresql+psycopg2://{encoded_username}:{encoded_password}@{host}:{port}/{database}"
+        # 构建基础连接字符串,使用自定义的 gaussdb 方言
+        base_uri = f"gaussdb+psycopg://{encoded_username}:{encoded_password}@{host}:{port}/{database}"
 
-        # 添加关键连接参数以解决 SASL 认证问题
-        # gssencmode=disable 是关键，用于禁用 GSSAPI/SASL 认证
-        conn_params = "?sslmode=disable&gssencmode=disable"
+        # 只禁用 SSL，保留 SCRAM-SHA-256 认证支持
+        conn_params = "?sslmode=disable"
 
         return base_uri + conn_params
 
@@ -49,41 +54,40 @@ def get_table_comment(self, inspector: reflection.Inspector,
 
         GaussDB 使用与 PostgreSQL 相同的系统目录结构
         """
-        sql = """
-            SELECT obj_description(c.oid, 'pg_class')
-            FROM pg_catalog.pg_class c
-            LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-            WHERE n.nspname = :schema AND c.relname = :table
-        """
-        result = self.conn.execute(
-            text(sql),
-            {"schema": self.schema_name, "table": table_name}
-        ).scalar()
-        return result or ""
+        with self.engine.connect() as conn:
+            sql = text("""
+                SELECT obj_description(c.oid, 'pg_class')
+                FROM pg_catalog.pg_class c
+                LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+                WHERE n.nspname = :schema AND c.relname = :table
+            """)
+            result = conn.execute(sql, {
+                "schema": self.schema_name,
+                "table": table_name
+            }).scalar()
+            return result or ""
 
     def get_column_comment(self, inspector: reflection.Inspector,
                          table_name: str, column_name: str) -> str:
         """获取列注释"""
-        sql = """
-            SELECT pg_catalog.col_description(c.oid, a.attnum)
-            FROM pg_catalog.pg_class c
-            JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-            JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
-            WHERE n.nspname = :schema
-            AND c.relname = :table
-            AND a.attname = :column
-            AND a.attnum > 0
-            AND NOT a.attisdropped
-        """
-        result = self.conn.execute(
-            text(sql),
-            {
+        with self.engine.connect() as conn:
+            sql = text("""
+                SELECT pg_catalog.col_description(c.oid, a.attnum)
+                FROM pg_catalog.pg_class c
+                JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+                JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
+                WHERE n.nspname = :schema
+                AND c.relname = :table
+                AND a.attname = :column
+                AND a.attnum > 0
+                AND NOT a.attisdropped
+            """)
+            result = conn.execute(sql, {
                 "schema": self.schema_name,
                 "table": table_name,
                 "column": column_name
-            }
-        ).scalar()
-        return result or ""
+            }).scalar()
+            return result or ""
 
     def normalize_type(self, raw_type: str) -> str:
         """标准化字段类型

database_schema/inspectors/gaussdb.py

@@ -1,4 +1,4 @@
-version: 1.0.1
+version: 1.0.3
 type: plugin
 author: jaguarliuu
 name: rookie_text2data

manifest.yaml

@@ -5,9 +5,10 @@ sqlalchemy>=2.0.0
 # 数据库驱动
 pyodbc>=4.0.39       # SQL Server新驱动
 pymysql>=1.1.1       # MySQL驱动
-psycopg2-binary>=2.9.10  # PostgreSQL驱动 (也用于GaussDB)
-oracledb>=2.0.0      # Oracle驱动 (推荐使用 python-oracledb，替代 cx_Oracle)
-dmPython>=2.3.0      # 达梦数据库驱动
+psycopg2-binary>=2.9.10  # PostgreSQL驱动 (也用于GaussDB，2.9+ 支持 SCRAM-SHA-256)
+psycopg[binary]>=3.2.0  # 为 GaussDB 使用 psycopg3 驱动
+oracledb>=2.0.0      # Oracle驱动 (也用于达梦数据库，达梦兼容 Oracle 协议)
+# dmPython>=2.3.0    # 达梦原生驱动（不支持 SQLAlchemy，已改用 oracledb）
 
 # 安全相关
 cryptography>=41.0.0,<43.0.0  # 使用范围版本以提高平台兼容性