25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(oceanbase-oracle): allow adding primary keys to keyless tables
efeire2532e0ff59d2
diff --git a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.tsindex 64e69966ca..2160de68ad 100644--- a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts+++ b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts@@ -520,8 +520,8 @@ describe("TableStructureEditor primary key editing", () => {);});- it("enables a primary key on an existing keyless Oracle column and makes it not null", async () => {- const root = await mountEditor("oracle");+ it.each(["oracle", "oceanbase-oracle"] as const)("enables a primary key on an existing keyless %s column and makes it not null", async (databaseType) => {+ const root = await mountEditor(databaseType);const primaryKey = columnCheckbox(root, "structureEditor.primaryKey");const nullable = columnCheckbox(root, "structureEditor.nullable");@@ -542,8 +542,8 @@ describe("TableStructureEditor primary key editing", () => {);});- it("keeps all primary-key checkboxes enabled while composing a new Oracle key", async () => {- const root = await mountEditor("oracle");+ it.each(["oracle", "oceanbase-oracle"] as const)("keeps all primary-key checkboxes enabled while composing a new %s key", async (databaseType) => {+ const root = await mountEditor(databaseType);buttonWithText(root, "structureEditor.addColumn").click();await nextTick();@@ -570,8 +570,8 @@ describe("TableStructureEditor primary key editing", () => {);});- it("keeps an existing Oracle primary key and all replacement choices disabled", async () => {- const root = await mountEditor("oracle", true);+ it.each(["oracle", "oceanbase-oracle"] as const)("keeps an existing %s primary key and all replacement choices disabled", async (databaseType) => {+ const root = await mountEditor(databaseType, true);buttonWithText(root, "structureEditor.addColumn").click();await nextTick();@@ -579,8 +579,8 @@ describe("TableStructureEditor primary key editing", () => {expect(columnCheckbox(root, "structureEditor.primaryKey", 1).disabled).toBe(true);});- it.each(["oceanbase-oracle", "iris"] as const)("keeps primary-key creation disabled for existing %s tables", async (databaseType) => {- const root = await mountEditor(databaseType);+ it("keeps primary-key creation disabled for existing iris tables", async () => {+ const root = await mountEditor("iris");expect(columnCheckbox(root, "structureEditor.primaryKey").disabled).toBe(true);});diff --git a/apps/desktop/src/lib/__tests__/table/tableStructureCapabilities.spec.ts b/apps/desktop/src/lib/__tests__/table/tableStructureCapabilities.spec.tsindex dabb769f61..65d711dc74 100644--- a/apps/desktop/src/lib/__tests__/table/tableStructureCapabilities.spec.ts+++ b/apps/desktop/src/lib/__tests__/table/tableStructureCapabilities.spec.ts@@ -106,7 +106,12 @@ describe("tableStructureCapabilities", () => {addPrimaryKey: true,alterPrimaryKey: true,});- for (const databaseType of ["oceanbase-oracle", "iris"] as const) {+ expect(getTableStructureCapabilities("oceanbase-oracle", "oceanbase-oracle")).toMatchObject({+ addPrimaryKey: true,+ alterPrimaryKey: false,+ foreignKey: false,+ });+ for (const databaseType of ["yashandb", "xugu", "iris"] as const) {expect(getTableStructureCapabilities(databaseType, databaseType)).toMatchObject({addPrimaryKey: false,alterPrimaryKey: false,diff --git a/apps/desktop/src/lib/table/tableStructureCapabilities.ts b/apps/desktop/src/lib/table/tableStructureCapabilities.tsindex 46c4d02184..f52f1bfb5a 100644--- a/apps/desktop/src/lib/table/tableStructureCapabilities.ts+++ b/apps/desktop/src/lib/table/tableStructureCapabilities.ts@@ -213,6 +213,11 @@ const oracleCapabilities = capabilities({addPrimaryKey: true,});+const oceanbaseOracleCapabilities = capabilities({+ ...oracleCompatibleCapabilities,+ addPrimaryKey: true,+});+// Dameng (DM8): ALTER TABLE ... DROP PRIMARY KEY / ADD PRIMARY KEY is official DDL.// Keep separate from Oracle-compatible engines so UI cannot enable PK edits without verified DDL.const damengCapabilities = capabilities({@@ -368,7 +373,7 @@ const capabilityByType: Partial<Record<DatabaseType, TableStructureCapabilities>sqlserver: sqlserverCapabilities,oracle: oracleCapabilities,dameng: damengCapabilities,- "oceanbase-oracle": oracleCompatibleCapabilities,+ "oceanbase-oracle": oceanbaseOracleCapabilities,iris: irisCapabilities,yashandb: oracleCompatibleCapabilities,xugu: oracleCompatibleCapabilities,diff --git a/crates/dbx-sql-schema/src/table_structure_sql/dialect.rs b/crates/dbx-sql-schema/src/table_structure_sql/dialect.rsindex a7f22f2081..a7150a8a1b 100644--- a/crates/dbx-sql-schema/src/table_structure_sql/dialect.rs+++ b/crates/dbx-sql-schema/src/table_structure_sql/dialect.rs@@ -342,6 +342,7 @@ pub(super) fn capabilities_for(drop_index: true,rebuild_index: true,index_type: true,+ add_primary_key: matches!(database_type, Some(DatabaseType::OceanbaseOracle)),..base}}diff --git a/crates/dbx-sql-schema/src/table_structure_sql/tests.rs b/crates/dbx-sql-schema/src/table_structure_sql/tests.rsindex 72f32ec36d..2854865c48 100644--- a/crates/dbx-sql-schema/src/table_structure_sql/tests.rs+++ b/crates/dbx-sql-schema/src/table_structure_sql/tests.rs@@ -5021,98 +5021,104 @@ fn dameng_blocks_dropping_former_primary_key_column() {#[test]fn oracle_sets_not_null_before_adding_primary_key() {- let mut id = existing_pk_column("id", "NUMBER", false, true);- id.original.as_mut().unwrap().is_nullable = true;+ for database_type in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle] {+ let mut id = existing_pk_column("id", "NUMBER", false, true);+ id.original.as_mut().unwrap().is_nullable = true;- let result =- build_table_structure_change_sql(structure_change_options(DatabaseType::Oracle, Some("HR"), "users", vec![id]));+ let result =+ build_table_structure_change_sql(structure_change_options(database_type, Some("HR"), "users", vec![id]));- assert_eq!(result.warnings, Vec::<String>::new());- assert_eq!(- result.statements,- vec![- "ALTER TABLE \"HR\".\"users\" MODIFY (\"id\" NUMBER NOT NULL);",- "ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"id\");",- ]- );+ assert_eq!(result.warnings, Vec::<String>::new());+ assert_eq!(+ result.statements,+ vec![+ "ALTER TABLE \"HR\".\"users\" MODIFY (\"id\" NUMBER NOT NULL);",+ "ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"id\");",+ ]+ );+ }}#[test]fn oracle_adds_composite_primary_key_in_draft_order() {- let mut tenant_id = existing_pk_column("tenant_id", "NUMBER", false, true);- tenant_id.id = "tenant_id".to_string();- let mut code = existing_pk_column("code", "VARCHAR2(50)", false, true);- code.id = "code".to_string();+ for database_type in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle] {+ let mut tenant_id = existing_pk_column("tenant_id", "NUMBER", false, true);+ tenant_id.id = "tenant_id".to_string();+ let mut code = existing_pk_column("code", "VARCHAR2(50)", false, true);+ code.id = "code".to_string();- let result = build_table_structure_change_sql(structure_change_options(- DatabaseType::Oracle,- Some("HR"),- "users",- vec![code, tenant_id],- ));+ let result = build_table_structure_change_sql(structure_change_options(+ database_type,+ Some("HR"),+ "users",+ vec![code, tenant_id],+ ));- assert_eq!(result.warnings, Vec::<String>::new());- assert_eq!(result.statements, vec!["ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"code\", \"tenant_id\");"]);+ assert_eq!(result.warnings, Vec::<String>::new());+ assert_eq!(result.statements, vec!["ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"code\", \"tenant_id\");"]);+ }}#[test]fn oracle_adds_new_primary_key_column_before_adding_constraint() {- let mut code = column("code");- code.data_type = "VARCHAR2(50)".to_string();- code.is_nullable = false;- code.is_primary_key = true;+ for database_type in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle] {+ let mut code = column("code");+ code.data_type = "VARCHAR2(50)".to_string();+ code.is_nullable = false;+ code.is_primary_key = true;- let result = build_table_structure_change_sql(structure_change_options(- DatabaseType::Oracle,- Some("HR"),- "users",- vec![code],- ));+ let result =+ build_table_structure_change_sql(structure_change_options(database_type, Some("HR"), "users", vec![code]));- assert_eq!(result.warnings, Vec::<String>::new());- assert_eq!(- result.statements,- vec![- "ALTER TABLE \"HR\".\"users\" ADD (\"code\" VARCHAR2(50));",- "ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"code\");",- ]- );+ assert_eq!(result.warnings, Vec::<String>::new());+ assert_eq!(+ result.statements,+ vec![+ "ALTER TABLE \"HR\".\"users\" ADD (\"code\" VARCHAR2(50));",+ "ALTER TABLE \"HR\".\"users\" ADD PRIMARY KEY (\"code\");",+ ]+ );+ }}#[test]fn oracle_rejects_existing_primary_key_changes_without_partial_sql() {- let uncheck =- vec![existing_pk_column("id", "NUMBER", true, false), existing_pk_column("name", "VARCHAR2(50)", false, false)];- let replacement = vec![- existing_pk_column("id", "NUMBER", true, false),- existing_pk_column("code", "VARCHAR2(50)", false, true),- existing_pk_column("name", "VARCHAR2(50)", false, false),- ];- let second_key = vec![- existing_pk_column("id", "NUMBER", true, true),- existing_pk_column("code", "VARCHAR2(50)", false, true),- existing_pk_column("name", "VARCHAR2(50)", false, false),- ];+ for database_type in [DatabaseType::Oracle, DatabaseType::OceanbaseOracle] {+ let uncheck = vec![+ existing_pk_column("id", "NUMBER", true, false),+ existing_pk_column("name", "VARCHAR2(50)", false, false),+ ];+ let replacement = vec![+ existing_pk_column("id", "NUMBER", true, false),+ existing_pk_column("code", "VARCHAR2(50)", false, true),+ existing_pk_column("name", "VARCHAR2(50)", false, false),+ ];+ let second_key = vec![+ existing_pk_column("id", "NUMBER", true, true),+ existing_pk_column("code", "VARCHAR2(50)", false, true),+ existing_pk_column("name", "VARCHAR2(50)", false, false),+ ];- for (case, columns) in [("uncheck", uncheck), ("replacement", replacement), ("second key", second_key)] {- let mut options = structure_change_options(DatabaseType::Oracle, Some("HR"), "users", columns);- options.indexes = vec![index("idx_users_name", &["name"])];+ for (case, columns) in [("uncheck", uncheck), ("replacement", replacement), ("second key", second_key)] {+ let mut options = structure_change_options(database_type, Some("HR"), "users", columns);+ options.indexes = vec![index("idx_users_name", &["name"])];- let result = build_table_structure_change_sql(options);+ let result = build_table_structure_change_sql(options);- assert!(result.statements.is_empty(), "{case} must not emit partial SQL: {:?}", result.statements);- assert_eq!(result.warnings.len(), 1, "unexpected {case} warnings: {:?}", result.warnings);- assert!(- result.warnings[0].contains("Changing primary keys"),- "unexpected {case} warning: {:?}",- result.warnings- );+ assert!(result.statements.is_empty(), "{case} must not emit partial SQL: {:?}", result.statements);+ assert_eq!(result.warnings.len(), 1, "unexpected {case} warnings: {:?}", result.warnings);+ assert!(+ result.warnings[0].contains("Changing primary keys"),+ "unexpected {case} warning: {:?}",+ result.warnings+ );+ }}}#[test]fn oracle_compatible_engines_do_not_inherit_oracle_primary_key_add() {- for database_type in [DatabaseType::OceanbaseOracle, DatabaseType::Iris] {+ for database_type in [DatabaseType::Yashandb, DatabaseType::Xugu, DatabaseType::Iris] {let columns = vec![existing_pk_column("id", "NUMBER", false, true),existing_pk_column("name", "VARCHAR2(50)", false, false),