From df4d5904408e7e17bab63a7e523199266f16bc1a Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Tue, 9 Jun 2026 13:20:29 +0800
Subject: [PATCH] fix(navicat): improve NCX connection type detection with
 numeric codes and port fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add Navicat numeric ConnType codes (1-9) to typeMap for correct DB type mapping
- Add port-based inference fallback (6379→Redis, 27017→MongoDB, etc.)
- Expand typeMap with ClickHouse, Snowflake, KingbaseES, GaussDB, OceanBase
- Skip unrecognized connections instead of silently falling back to MySQL
---
 apps/desktop/src/lib/navicatImport.ts | 44 +++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/lib/navicatImport.ts b/apps/desktop/src/lib/navicatImport.ts
index a090109040..399732f973 100644
--- a/apps/desktop/src/lib/navicatImport.ts
+++ b/apps/desktop/src/lib/navicatImport.ts
@@ -9,6 +9,7 @@ type ParsedNode = {
 };
 
 const typeMap: Record<string, { dbType: DatabaseType; profile: string; label: string; port: number; user: string }> = {
+  // String type identifiers (from Navicat ConnType / DatabaseType attributes)
   mysql: { dbType: "mysql", profile: "mysql", label: "MySQL", port: 3306, user: "root" },
   mariadb: { dbType: "mysql", profile: "mariadb", label: "MariaDB", port: 3306, user: "root" },
   postgresql: { dbType: "postgres", profile: "postgres", label: "PostgreSQL", port: 5432, user: "postgres" },
@@ -22,6 +23,21 @@ const typeMap: Record<string, { dbType: DatabaseType; profile: string; label: st
   mongo: { dbType: "mongodb", profile: "mongodb", label: "MongoDB", port: 27017, user: "" },
   dameng: { dbType: "dameng", profile: "dm", label: "DM (Dameng)", port: 5236, user: "SYSDBA" },
   dm: { dbType: "dameng", profile: "dm", label: "DM (Dameng)", port: 5236, user: "SYSDBA" },
+  clickhouse: { dbType: "clickhouse", profile: "clickhouse", label: "ClickHouse", port: 8123, user: "default" },
+  snowflake: { dbType: "snowflake", profile: "snowflake", label: "Snowflake", port: 443, user: "" },
+  kingbase: { dbType: "kingbase", profile: "kingbase", label: "KingbaseES", port: 54321, user: "SYSTEM" },
+  kingbasees: { dbType: "kingbase", profile: "kingbase", label: "KingbaseES", port: 54321, user: "SYSTEM" },
+  gaussdb: { dbType: "gaussdb", profile: "gaussdb", label: "GaussDB", port: 8000, user: "root" },
+  oceanbase: { dbType: "oceanbase-oracle", profile: "oceanbase", label: "OceanBase", port: 2881, user: "root" },
+  // Numeric type codes (Navicat uses numeric ConnType for some exports)
+  "1": { dbType: "mysql", profile: "mysql", label: "MySQL", port: 3306, user: "root" },
+  "2": { dbType: "postgres", profile: "postgres", label: "PostgreSQL", port: 5432, user: "postgres" },
+  "3": { dbType: "sqlite", profile: "sqlite", label: "SQLite", port: 0, user: "" },
+  "4": { dbType: "oracle", profile: "oracle", label: "Oracle", port: 1521, user: "system" },
+  "5": { dbType: "mysql", profile: "mariadb", label: "MariaDB", port: 3306, user: "root" },
+  "7": { dbType: "sqlserver", profile: "sqlserver", label: "SQL Server", port: 1433, user: "sa" },
+  "8": { dbType: "mongodb", profile: "mongodb", label: "MongoDB", port: 27017, user: "" },
+  "9": { dbType: "redis", profile: "redis", label: "Redis", port: 6379, user: "" },
 };
 
 const unsupportedTypes = new Set(["http", "https", "ftp", "sftp", "ssh"]);
@@ -72,13 +88,22 @@ async function decryptNavicatPassword(value: string) {
   }
 }
 
-function inferProfile(rawType: string, tag: string) {
+function inferProfile(rawType: string, tag: string, port?: number) {
   const key = normalizeKey(rawType || tag);
   for (const [needle, profile] of Object.entries(typeMap)) {
     if (key.includes(needle)) return profile;
   }
   if (unsupportedTypes.has(key)) return null;
-  return typeMap.mysql;
+  // Port-based fallback for common default ports
+  if (port) {
+    if (port === 6379) return typeMap.redis;
+    if (port === 27017) return typeMap.mongodb;
+    if (port === 5432) return typeMap.postgresql;
+    if (port === 3306) return typeMap.mysql;
+    if (port === 1433) return typeMap.sqlserver;
+    if (port === 1521) return typeMap.oracle;
+  }
+  return null;
 }
 
 function readNode(element: Element): ParsedNode {
@@ -121,8 +146,16 @@ function isConnectionCandidate(node: ParsedNode) {
 
 async function parseConnection(node: ParsedNode): Promise<ConnectionConfig | null> {
   const rawType = getAny(node.values, ["type", "connType", "connectionType", "databaseType", "driver", "dbType"]);
-  const profile = inferProfile(rawType, node.tag);
-  if (!profile) return null;
+  const portValue = Number(getAny(node.values, ["port", "serverPort"]));
+  const port = Number.isFinite(portValue) && portValue > 0 ? portValue : undefined;
+  const profile = inferProfile(rawType, node.tag, port);
+  if (!profile) {
+    const name = getAny(node.values, ["name", "connectionName", "connName", "caption", "title"]) || "(unnamed)";
+    console.warn(
+      `[Navicat Import] 跳过无法识别类型的连接: "${name}" (type="${rawType}", tag="${node.tag}", port=${port ?? "N/A"})`,
+    );
+    return null;
+  }
 
   const name =
     getAny(node.values, ["name", "connectionName", "connName", "caption", "title"]) ||
@@ -132,7 +165,6 @@ async function parseConnection(node: ParsedNode): Promise<ConnectionConfig | nul
     getAny(node.values, ["host", "server", "hostname", "serverHost", "address"]) ||
     getAny(node.values, ["databaseFile", "filename", "path", "databasePath"]) ||
     (profile.dbType === "sqlite" ? "" : "127.0.0.1");
-  const portValue = Number(getAny(node.values, ["port", "serverPort"]));
   const database = getAny(node.values, ["database", "databaseName", "initialDatabase", "serviceName", "sid", "schema"]);
   const oracleConnectionType =
     profile.dbType === "oracle" && getAny(node.values, ["sid"])
@@ -150,7 +182,7 @@ async function parseConnection(node: ParsedNode): Promise<ConnectionConfig | nul
     driver_label: profile.label,
     url_params: "",
     host,
-    port: Number.isFinite(portValue) && portValue > 0 ? portValue : profile.port,
+    port: port || profile.port,
     username,
     password,
     database: database || undefined,