diff --git a/apps/desktop/public/icons/database/iris.png b/apps/desktop/public/icons/database/iris.png new file mode 100644 index 0000000000..e4be5d9a80 Binary files /dev/null and b/apps/desktop/public/icons/database/iris.png differ diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue index 3ecb36f1ab..19f687c8c0 100644 --- a/apps/desktop/src/components/connection/ConnectionDialog.vue +++ b/apps/desktop/src/components/connection/ConnectionDialog.vue @@ -257,6 +257,7 @@ const driverProfiles: Record< sundb: { type: "sundb", port: 22000, user: "root", label: "SunDB", icon: "sundb" }, jdbc: { type: "jdbc", port: 0, user: "", label: "JDBC", icon: "jdbc" }, tdengine: { type: "tdengine", port: 6041, user: "root", label: "TDengine", icon: "tdengine" }, + iris: { type: "iris", port: 1972, user: "_SYSTEM", label: "IRIS", icon: "iris" }, custom_mysql: { type: "mysql", port: 3306, @@ -492,6 +493,7 @@ const iconTypeMap: Record = { hive: "hive", db2: "db2", informix: "informix", + iris: "iris", neo4j: "neo4j", cassandra: "cassandra", bigquery: "bigquery", @@ -552,6 +554,7 @@ const dbOptions = [ { value: "bigquery", label: "BigQuery" }, { value: "kylin", label: "Kylin" }, { value: "sundb", label: "SunDB" }, + { value: "iris", label: "IRIS" }, { value: "jdbc", label: "JDBC" }, { value: "custom_mysql", label: "Custom (MySQL)" }, { value: "custom_postgres", label: "Custom (PostgreSQL)" }, diff --git a/apps/desktop/src/components/icons/DatabaseIcon.vue b/apps/desktop/src/components/icons/DatabaseIcon.vue index 906a6c141d..c1892dd5d9 100644 --- a/apps/desktop/src/components/icons/DatabaseIcon.vue +++ b/apps/desktop/src/components/icons/DatabaseIcon.vue @@ -62,6 +62,7 @@ const assetIcons: Record = { tdsql: "tdsql.webp", polardb: "polardb.webp", greatsql: "greatsql.webp", + iris: "iris.png", }; const letterIcons: Record = {}; diff --git a/apps/desktop/src/lib/connectionPresentation.ts b/apps/desktop/src/lib/connectionPresentation.ts index d08f4e040e..733d470a9b 100644 --- a/apps/desktop/src/lib/connectionPresentation.ts +++ b/apps/desktop/src/lib/connectionPresentation.ts @@ -73,6 +73,9 @@ export function connectionUrlPlaceholder(dbType: DatabaseType): string { case "bigquery": return "bigquery://https://www.googleapis.com/bigquery/v2:443/project-id"; + case "iris": + return "iris://user:password@host:port/namespace"; + case "jdbc": return "jdbc:mysql://host:3306/database"; diff --git a/apps/desktop/src/lib/connectionUrl.ts b/apps/desktop/src/lib/connectionUrl.ts index 8cc6bbbfe8..2ad2e44e7c 100644 --- a/apps/desktop/src/lib/connectionUrl.ts +++ b/apps/desktop/src/lib/connectionUrl.ts @@ -45,6 +45,7 @@ const SCHEME_PROFILES: Record = { opengauss: { type: "gaussdb", profile: "opengauss", label: "openGauss", defaultPort: 5432 }, tdengine: { type: "tdengine", profile: "tdengine", label: "TDengine", defaultPort: 6041 }, "taos-ws": { type: "tdengine", profile: "tdengine", label: "TDengine", defaultPort: 6041 }, + iris: { type: "iris", profile: "iris", label: "IRIS", defaultPort: 1972 }, }; const HTTP_SELECTED_PROFILES: Record = { diff --git a/apps/desktop/src/lib/databaseCapabilitySets.ts b/apps/desktop/src/lib/databaseCapabilitySets.ts index 45c5b25699..e34488a651 100644 --- a/apps/desktop/src/lib/databaseCapabilitySets.ts +++ b/apps/desktop/src/lib/databaseCapabilitySets.ts @@ -25,6 +25,7 @@ export const SCHEMA_AWARE_TYPES = new Set([ "trino", "db2", "tdengine", + "iris", "duckdb", ]); @@ -56,6 +57,7 @@ export const DIAGRAM_SUPPORTED_TYPES = new Set([ "access", "h2", "db2", + "iris", ]); export const DATABASE_SEARCH_SUPPORTED_TYPES = new Set([ @@ -96,6 +98,7 @@ export const DATABASE_SEARCH_SUPPORTED_TYPES = new Set([ "kylin", "sundb", "tdengine", + "iris", ]); export const TABLE_IMPORT_SUPPORTED_TYPES = new Set([ @@ -140,6 +143,7 @@ export const TABLE_STRUCTURE_SUPPORTED_TYPES = new Set([ "oceanbase-oracle", "h2", "sundb", + "iris", ]); export const CREATE_DATABASE_SUPPORTED_TYPES = new Set([ @@ -202,6 +206,7 @@ export const TREE_SCHEMA_TYPES = new Set([ "trino", "h2", "tdengine", + "iris", "duckdb", ]); @@ -238,6 +243,7 @@ export const AGENT_DRIVER_TYPES = new Set([ "sundb", "gaussdb", "tdengine", + "iris", ]); export const TRANSFER_SQL_TYPES = new Set([ diff --git a/apps/desktop/src/lib/tableStructureCapabilities.ts b/apps/desktop/src/lib/tableStructureCapabilities.ts index 648c2b0c7a..7c904aa48f 100644 --- a/apps/desktop/src/lib/tableStructureCapabilities.ts +++ b/apps/desktop/src/lib/tableStructureCapabilities.ts @@ -220,6 +220,7 @@ const capabilityByType: Partial oracle: oracleCapabilities, dameng: oracleCapabilities, "oceanbase-oracle": oracleCapabilities, + iris: oracleCapabilities, h2: h2Capabilities, clickhouse: clickhouseCapabilities, }; diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts index ec3b005a2a..111bd49256 100644 --- a/apps/desktop/src/types/database.ts +++ b/apps/desktop/src/types/database.ts @@ -41,6 +41,7 @@ export type DatabaseType = | "kylin" | "sundb" | "tdengine" + | "iris" | "jdbc"; export interface SqlSnippet { diff --git a/crates/dbx-core/src/connection.rs b/crates/dbx-core/src/connection.rs index 0e30008e30..e7eb39ed03 100644 --- a/crates/dbx-core/src/connection.rs +++ b/crates/dbx-core/src/connection.rs @@ -297,6 +297,7 @@ impl AppState { | DatabaseType::Kylin | DatabaseType::Sundb | DatabaseType::Tdengine + | DatabaseType::Iris | DatabaseType::Access => { let connect_params = agent_connect_params(&db_config, &host, port, db_config.effective_database().unwrap_or("")); diff --git a/crates/dbx-core/src/data_grid_sql.rs b/crates/dbx-core/src/data_grid_sql.rs index d16b01d9ba..dd22fd68ef 100644 --- a/crates/dbx-core/src/data_grid_sql.rs +++ b/crates/dbx-core/src/data_grid_sql.rs @@ -1216,6 +1216,7 @@ fn uses_keyless_row_predicate(database_type: Option) -> bool { | DatabaseType::Bigquery | DatabaseType::Sundb | DatabaseType::Hive + | DatabaseType::Iris ) ) } diff --git a/crates/dbx-core/src/database_capabilities.rs b/crates/dbx-core/src/database_capabilities.rs index 60a992df59..e4b3185f7c 100644 --- a/crates/dbx-core/src/database_capabilities.rs +++ b/crates/dbx-core/src/database_capabilities.rs @@ -33,6 +33,7 @@ pub fn agent_key(db_type: &DatabaseType, driver_profile: Option<&str>) -> Option DatabaseType::Sundb => Some("sundb"), DatabaseType::MongoDb => Some("mongodb"), DatabaseType::Tdengine => Some("tdengine"), + DatabaseType::Iris => Some("iris"), DatabaseType::Access => Some("access"), _ => None, } @@ -56,6 +57,7 @@ pub fn is_single_connection_pool(db_type: &DatabaseType) -> bool { | DatabaseType::Goldendb | DatabaseType::Yashandb | DatabaseType::Firebird + | DatabaseType::Iris | DatabaseType::OceanbaseOracle | DatabaseType::Access | DatabaseType::Jdbc diff --git a/crates/dbx-core/src/models/connection.rs b/crates/dbx-core/src/models/connection.rs index e5ccea3adb..bdfd26a79b 100644 --- a/crates/dbx-core/src/models/connection.rs +++ b/crates/dbx-core/src/models/connection.rs @@ -190,6 +190,8 @@ pub enum DatabaseType { Kylin, Sundb, Tdengine, + #[serde(rename = "iris")] + Iris, Jdbc, } @@ -374,6 +376,7 @@ impl ConnectionConfig { DatabaseType::Kylin => format!("kylin://{host}:{port}{db_part}"), DatabaseType::Sundb => format!("sundb://{host}:{port}{db_part}"), DatabaseType::Tdengine => format!("tdengine://{host}:{port}{db_part}"), + DatabaseType::Iris => format!("iris://{host}:{port}{db_part}"), DatabaseType::Jdbc => "jdbc:".to_string(), } } @@ -533,6 +536,9 @@ impl ConnectionConfig { DatabaseType::Tdengine => { format!("tdengine://{}:{}@{host}:{port}{db_part}", username, password) } + DatabaseType::Iris => { + format!("iris://{}:{}@{host}:{port}{db_part}", username, password) + } DatabaseType::Jdbc => { self.connection_string.as_deref().filter(|value| !value.is_empty()).unwrap_or("jdbc:").to_string() } diff --git a/crates/dbx-core/src/sql_dialect.rs b/crates/dbx-core/src/sql_dialect.rs index a0098b75ed..6c9165bf98 100644 --- a/crates/dbx-core/src/sql_dialect.rs +++ b/crates/dbx-core/src/sql_dialect.rs @@ -351,6 +351,7 @@ pub fn is_schema_aware(database_type: DatabaseType) -> bool { | DatabaseType::Db2 | DatabaseType::Tdengine | DatabaseType::DuckDb + | DatabaseType::Iris ) } diff --git a/crates/dbx-core/src/table_structure_sql.rs b/crates/dbx-core/src/table_structure_sql.rs index ff36792472..66b02783cf 100644 --- a/crates/dbx-core/src/table_structure_sql.rs +++ b/crates/dbx-core/src/table_structure_sql.rs @@ -278,7 +278,7 @@ fn capabilities_for(database_type: Option) -> TableStructureCapabi index_comment: true, ..base }, - Some(DatabaseType::Oracle | DatabaseType::Dameng | DatabaseType::OceanbaseOracle) => { + Some(DatabaseType::Oracle | DatabaseType::Dameng | DatabaseType::OceanbaseOracle | DatabaseType::Iris) => { TableStructureCapabilities { dialect: StructureDialect::Oracle, add_column: true,