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
fix(oracle): repair oceanbase constraint preflight and readback
efeire166a0ba226db
diff --git a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.oracleConstraints.spec.ts b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.oracleConstraints.spec.tsindex 6ff931486a..56d59dc036 100644--- a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.oracleConstraints.spec.ts+++ b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.oracleConstraints.spec.ts@@ -207,8 +207,11 @@ function configureOracleIndexCatalog(}if (sql.includes("SYS_CONTEXT")) return { columns: [], rows: [["APP", "APP", "ORCL"]], affected_rows: 0, execution_time_ms: 1 } as never;if (sql.includes("SYS.ALL_OBJECTS")) return { columns: [], rows: [["APP", "CONTACTS", 77]], affected_rows: 0, execution_time_ms: 1 } as never;- if (sql.includes("SYS.ALL_TABLES")) return { columns: [], rows: [[null, "N"]], affected_rows: 0, execution_time_ms: 1 } as never;- if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return { columns: [], rows: [], affected_rows: 0, execution_time_ms: 1 } as never;+ if (sql.includes("SYS.ALL_TABLES")) return { columns: [], rows: [sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]], affected_rows: 0, execution_time_ms: 1 } as never;+ if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) {+ if (connection.db_type === "oceanbase-oracle") throw new Error("ORA-00942: SYS.ALL_EXTERNAL_TABLES does not exist");+ return { columns: [], rows: [], affected_rows: 0, execution_time_ms: 1 } as never;+ }if (sql.includes("SYS.ALL_TAB_COLS")) {const rows = sql.includes("USER_GENERATED")? [diff --git a/apps/desktop/src/lib/database/__tests__/oracleConstraints.spec.ts b/apps/desktop/src/lib/database/__tests__/oracleConstraints.spec.tsindex d8ad0630f9..772bc80e46 100644--- a/apps/desktop/src/lib/database/__tests__/oracleConstraints.spec.ts+++ b/apps/desktop/src/lib/database/__tests__/oracleConstraints.spec.ts@@ -1,6 +1,6 @@import { beforeEach, describe, expect, it, vi } from "vitest";import * as api from "@/lib/backend/api";-import { executeOracleConstraintPlan, oracleConstraintDefinitionFromInfo, OracleConstraintMetadataError, prepareOracleConstraintPlan } from "../oracleConstraints";+import { executeOracleConstraintPlan, oracleConstraintDefinitionFromInfo, OracleConstraintMetadataError, prepareOracleConstraintPlan, readOracleConstraintSnapshot, readOracleIndexSnapshot } from "../oracleConstraints";import type { ConstraintInfo } from "@/types/database";import type { OracleConstraintChange } from "@/lib/table/tableStructureEditorSql";@@ -89,7 +89,7 @@ beforeEach(() => {vi.mocked(api.executeQuery).mockImplementation(async (_connection, _database, sql) => {if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -111,6 +111,88 @@ beforeEach(() => {});describe("Oracle CHECK/UNIQUE constraint preflight", () => {+ describe.each([+ ["constraints", readOracleConstraintSnapshot],+ ["indexes", readOracleIndexSnapshot],+ ] as const)("OceanBase %s table safety", (_name, readSnapshot) => {+ function mockOceanbaseTable(rows: unknown[][] = [[null, "N", "NO"]]) {+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].includes("SYS.ALL_EXTERNAL_TABLES")) throw new Error("ORA-00942: SYS.ALL_EXTERNAL_TABLES does not exist");+ if (args[2].includes("SYS.ALL_TABLES")) return result(rows) as never;+ return execute(...args);+ });+ }++ it("reads an ordinary table without requiring Oracle's external-table view", async () => {+ mockOceanbaseTable();+ await expect(readSnapshot({ ...target, databaseType: "oceanbase-oracle" })).resolves.toMatchObject({ objectId: "77" });+ });++ it.each(+ [+ [[null, "N", "YES"]],+ [[null, "N", null]],+ [[null, "N", "UNKNOWN"]],+ [[null, "N"]],+ [],+ [+ [null, "N", "NO"],+ [null, "N", "NO"],+ ],+ ].map((rows) => ({ rows })),+ )("rejects external or incomplete table metadata: $rows", async ({ rows }) => {+ mockOceanbaseTable(rows);+ await expect(readSnapshot({ ...target, databaseType: "oceanbase-oracle" })).rejects.toMatchObject({ reason: "incomplete" });+ expect(api.buildTableStructureChangeSql).not.toHaveBeenCalled();+ expect(vi.mocked(api.executeQuery).mock.calls.some(([, , sql]) => /^(ALTER|CREATE|DROP)\b/.test(sql))).toBe(false);+ });++ it("propagates table dictionary errors before any DDL", async () => {+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].includes("SYS.ALL_TABLES")) throw new Error("dictionary unavailable");+ return execute(...args);+ });+ await expect(readSnapshot({ ...target, databaseType: "oceanbase-oracle" })).rejects.toThrow("dictionary unavailable");+ expect(api.buildTableStructureChangeSql).not.toHaveBeenCalled();+ });+ });++ it("retains Oracle's external-table guard", async () => {+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].includes("SYS.ALL_EXTERNAL_TABLES")) return result([["APP", "CONTACTS"]]) as never;+ return execute(...args);+ });+ await expect(prepareOracleConstraintPlan(target, { tableName: target.tableName, columns: [], indexes: [] }, makeChange())).rejects.toMatchObject({ reason: "incomplete" });+ expect(api.buildTableStructureChangeSql).not.toHaveBeenCalled();+ });++ it.each(["YES", null, "UNKNOWN"])("rechecks OceanBase external-table status %s before executing a prepared plan", async (external) => {+ let tableRows: unknown[][] = [[null, "N", "NO"]];+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].includes("SYS.ALL_TABLES")) return result(tableRows) as never;+ if (args[2].includes("SYS.ALL_EXTERNAL_TABLES")) throw new Error("ORA-00942");+ return execute(...args);+ });+ const plan = await prepareOracleConstraintPlan({ ...target, databaseType: "oceanbase-oracle" }, { tableName: target.tableName, columns: [], indexes: [] }, makeChange());+ tableRows = [[null, "N", external]];+ await expect(executeOracleConstraintPlan(plan, 30, () => true)).rejects.toMatchObject({ reason: "incomplete" });+ expect(vi.mocked(api.executeQuery).mock.calls.some(([, , sql]) => /^(ALTER|CREATE|DROP)\b/.test(sql))).toBe(false);+ });++ it("does not turn Oracle external-table dictionary errors into an empty result", async () => {+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].includes("SYS.ALL_EXTERNAL_TABLES")) throw new Error("dictionary unavailable");+ return execute(...args);+ });+ await expect(prepareOracleConstraintPlan(target, { tableName: target.tableName, columns: [], indexes: [] }, makeChange())).rejects.toThrow("dictionary unavailable");+ expect(api.buildTableStructureChangeSql).not.toHaveBeenCalled();+ });+it("checks duplicate composite keys including partial NULL keys and excludes all-NULL keys", async () => {const change = makeChange();const plan = await prepareOracleConstraintPlan(target, { tableName: target.tableName, columns: [], indexes: [] }, change);@@ -127,7 +209,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {vi.mocked(api.executeQuery).mockImplementation(async (_connection, _database, sql) => {if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -217,7 +299,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {}if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -335,7 +417,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {}if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS")) return result([["APP", "UQ_NEW", "APP", "CONTACTS", "NORMAL", "UNIQUE", "VALID", "NO", "VISIBLE", "N", "A", "ASC", null]]) as never;if (sql.includes("SYS.ALL_TAB_COLS"))@@ -398,7 +480,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {}if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", ddlStarted ? databaseName : "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", ddlStarted ? objectId : 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -428,7 +510,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {if (sql.startsWith("ALTER TABLE")) return { ...result([]), execution_error: true, error: { detail: "database rejected" } } as never;if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -510,7 +592,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {vi.mocked(api.executeQuery).mockImplementation(async (_connection, _database, sql) => {if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS")) return result([["APP", "OLD_INDEX", "APP", "CONTACTS", "NORMAL", "UNIQUE", "VALID", "NO", "VISIBLE", "N", "A", "ASC", null]]) as never;if (sql.includes("SYS.ALL_TAB_COLS"))@@ -576,7 +658,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {}if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return dropped@@ -643,7 +725,7 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {}if (sql.includes("SYS_CONTEXT")) return result([["APP", "APP", "ORCL"]]) as never;if (sql.includes("SYS.ALL_OBJECTS")) return result([["APP", "CONTACTS", 77]]) as never;- if (sql.includes("SYS.ALL_TABLES")) return result([[null, "N"]]) as never;+ if (sql.includes("SYS.ALL_TABLES")) return result([sql.includes(", EXTERNAL") ? [null, "N", "NO"] : [null, "N"]]) as never;if (sql.includes("SYS.ALL_EXTERNAL_TABLES")) return result([]) as never;if (sql.includes("SYS.ALL_IND_COLUMNS"))return result([@@ -701,4 +783,50 @@ describe("Oracle CHECK/UNIQUE constraint preflight", () => {expect(definition.definition.index.name).toBe("");}});++ it.each([+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: '("A" >= 1)', matches: true, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: '(("A" >= 1))', matches: true, edit: true },+ { databaseType: "oceanbase-oracle", expression: "\"A\" >= 1 AND 'x(y)' = 'x(y)'", readback: "((\"A\" >= 1 AND 'x(y)' = 'x(y)'))", matches: true, edit: false },+ { databaseType: "oceanbase-oracle", expression: '("A" > 1 OR "B" > 1) AND "B" < 10', readback: '"A" > 1 OR ("B" > 1 AND "B" < 10)', matches: false, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" > 1 OR "B" > 1', readback: '("A" > 1) OR ("B" > 1)', matches: false, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: '("A" >= 1', matches: false, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: ')"A" >= 1(', matches: false, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: "", matches: false, edit: false },+ { databaseType: "oceanbase-oracle", expression: '"A" >= 1', readback: "'unclosed", matches: false, edit: false },+ { databaseType: "oracle", expression: '"A" >= 1', readback: '("A" >= 1)', matches: false, edit: false },+ ] as const)("checks $databaseType CHECK readback $readback (edit=$edit)", async ({ databaseType, expression, readback, matches, edit }) => {+ const activeTarget = { ...target, databaseType };+ let stage = "before";+ const info = (definition: string): ConstraintInfo => ({+ name: "CK_POSITIVE",+ constraint_type: "CHECK",+ columns: [],+ definition,+ ref_columns: [],+ enabled: true,+ valid: true,+ deferrable: false,+ initially_deferred: false,+ oracle_metadata: { metadataComplete: true, owner: "APP", constraintType: "C", status: "ENABLED", validated: "VALIDATED", deferrable: "NOT DEFERRABLE", deferred: "IMMEDIATE", rely: null, indexOwner: null, indexName: null, indexSharing: null, index: null },+ });+ vi.mocked(api.listConstraints).mockImplementation(async () => (stage === "created" ? [info(readback)] : stage === "before" && edit ? [info('"A" >= 0')] : []));+ const add = 'ALTER TABLE "APP"."CONTACTS" ADD CONSTRAINT "CK_POSITIVE" CHECK ("A" >= 1);';+ vi.mocked(api.buildTableStructureChangeSql).mockResolvedValue({ statements: edit ? ['ALTER TABLE "APP"."CONTACTS" DROP CONSTRAINT "CK_POSITIVE";', add] : [add], warnings: [] } as never);+ const execute = vi.mocked(api.executeQuery).getMockImplementation()!;+ vi.mocked(api.executeQuery).mockImplementation(async (...args) => {+ if (args[2].startsWith("ALTER TABLE")) {+ stage = args[2].includes("DROP CONSTRAINT") ? "dropped" : "created";+ return result([]) as never;+ }+ return execute(...args);+ });+ const change: OracleConstraintChange = { original: edit ? oracleConstraintDefinitionFromInfo(info('"A" >= 0'), activeTarget) : null, target: { kind: "check", definition: { name: "CK_POSITIVE", expression, state } } };+ const plan = await prepareOracleConstraintPlan(activeTarget, { tableName: target.tableName, columns: [], indexes: [] }, change);+ const outcome = await executeOracleConstraintPlan(plan, 30, () => true);+ expect(outcome?.steps.every((step) => step.state === "committed")).toBe(true);+ if (matches) expect(outcome?.readbackError).toBeUndefined();+ else if (readback) expect(outcome?.readbackError).toBe("Constraint readback differs from the submitted definition.");+ else expect(outcome?.readbackError).toBeTruthy();+ });});diff --git a/apps/desktop/src/lib/database/oracleConstraints.ts b/apps/desktop/src/lib/database/oracleConstraints.tsindex 3b09cfe235..8de7aa7a83 100644--- a/apps/desktop/src/lib/database/oracleConstraints.ts+++ b/apps/desktop/src/lib/database/oracleConstraints.ts@@ -273,6 +273,7 @@ export async function readOracleIndexSnapshot(target: OracleConstraintTarget, stexport async function readOracleConstraintSnapshot(target: OracleConstraintTarget, change?: OracleConstraintChange, indexesOnly = false, stillCurrent: () => boolean = () => true, requestedIndexNames: string[] = []): Promise<OracleConstraintSnapshot> {if (!stillCurrent()) invalid("changed");target = { ...target };+ const oceanbase = target.databaseType === "oceanbase-oracle";if (change) change = JSON.parse(JSON.stringify(change)) as OracleConstraintChange;const baseColumnsSql = `SELECT COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE FROM SYS.ALL_TAB_COLS WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)} ORDER BY COLUMN_NAME`;const enhancedColumnsSql = `SELECT COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, DATA_SCALE, NULLABLE, CHAR_USED, CHAR_LENGTH, USER_GENERATED, HIDDEN_COLUMN FROM SYS.ALL_TAB_COLS WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)}`;@@ -299,8 +300,8 @@ export async function readOracleConstraintSnapshot(target: OracleConstraintTargeconst [identity, objects, tableShapes, externalTables, columns, infos, names, indexNames, indexDetails, indexUsage] = await Promise.all([query(target, "SELECT USER, SYS_CONTEXT('USERENV','CURRENT_SCHEMA'), SYS_CONTEXT('USERENV','DB_NAME') FROM DUAL", stillCurrent),query(target, `SELECT OWNER, OBJECT_NAME, OBJECT_ID FROM SYS.ALL_OBJECTS WHERE OWNER = ${literal(target.schema)} AND OBJECT_NAME = ${literal(target.tableName)} AND OBJECT_TYPE = 'TABLE'`, stillCurrent),- query(target, `SELECT IOT_TYPE, TEMPORARY FROM SYS.ALL_TABLES WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)}`, stillCurrent),- query(target, `SELECT OWNER, TABLE_NAME FROM SYS.ALL_EXTERNAL_TABLES WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)}`, stillCurrent),+ query(target, `SELECT IOT_TYPE, TEMPORARY${oceanbase ? ", EXTERNAL" : ""} FROM SYS.ALL_TABLES WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)}`, stillCurrent),+ oceanbase ? Promise.resolve([]) : query(target, `SELECT OWNER, TABLE_NAME FROM SYS.ALL_EXTERNAL_TABLES WHERE OWNER = ${literal(target.schema)} AND TABLE_NAME = ${literal(target.tableName)}`, stillCurrent),columnsQuery,indexesOnly ? Promise.resolve([]) : api.listConstraints(target.connectionId, target.database, target.schema, target.tableName, target.catalog),indexesOnly ? Promise.resolve([]) : query(target, `SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.ALL_CONSTRAINTS WHERE OWNER = ${literal(target.schema)}${inList("CONSTRAINT_NAME", wantedConstraintNames)} ORDER BY CONSTRAINT_NAME`, stillCurrent),@@ -315,7 +316,7 @@ export async function readOracleConstraintSnapshot(target: OracleConstraintTargeif (!stillCurrent()) invalid("changed");if (identity.length !== 1 || identity[0]?.length !== 3 || identity[0].some((value) => typeof value !== "string" || !value)) invalid();if (objects.length !== 1 || objects[0]?.length !== 3 || objects[0][0] !== target.schema || objects[0][1] !== target.tableName || !/^[1-9]\d*$/.test(String(objects[0][2]))) invalid();- if (tableShapes.length !== 1 || tableShapes[0]?.length !== 2 || (tableShapes[0][0] !== null && tableShapes[0][0] !== "") || tableShapes[0][1] !== "N") invalid();+ if (tableShapes.length !== 1 || tableShapes[0]?.length !== (oceanbase ? 3 : 2) || (tableShapes[0][0] !== null && tableShapes[0][0] !== "") || tableShapes[0][1] !== "N" || (oceanbase && tableShapes[0][2] !== "NO")) invalid();if (externalTables.length !== 0) invalid();if (typeof objects[0][2] === "number" && !Number.isSafeInteger(objects[0][2])) invalid();const numeric = (value: unknown): string | null => {@@ -602,9 +603,38 @@ async function prepareUniqueTargetIndex(snapshot: OracleConstraintSnapshot, targreturn next;}+function oceanbaseCheckTokens(expression: string): string[] {+ let tokens = expressionTokens(expression);+ let depth = 0;+ for (const token of tokens) {+ if (token === "(") depth++;+ if (token === ")" && --depth < 0) return [];+ }+ if (depth !== 0) return [];+ // OceanBase wraps CHECK dictionary expressions; preserve all internal grouping.+ while (tokens[0] === "(" && tokens[tokens.length - 1] === ")") {+ depth = 0;+ const end = tokens.findIndex((token) => {+ if (token === "(") depth++;+ if (token === ")") depth--;+ return depth === 0;+ });+ if (end !== tokens.length - 1) break;+ tokens = tokens.slice(1, -1);+ }+ return tokens;+}+function readbackMatches(target: OracleConstraintTarget, actual: OracleConstraintDefinition | undefined, expected: OracleConstraintDefinition): boolean {if (!actual || actual.kind !== expected.kind || actual.definition.name !== expected.definition.name || sortedJson(actual.definition.state) !== sortedJson(expected.definition.state)) return false;- if (expected.kind === "check" && actual.kind === "check") return sortedJson(expressionTokens(actual.definition.expression)) === sortedJson(expressionTokens(expected.definition.expression));+ if (expected.kind === "check" && actual.kind === "check") {+ if (target.databaseType === "oceanbase-oracle") {+ const actualTokens = oceanbaseCheckTokens(actual.definition.expression);+ const expectedTokens = oceanbaseCheckTokens(expected.definition.expression);+ return actualTokens.length > 0 && expectedTokens.length > 0 && sortedJson(actualTokens) === sortedJson(expectedTokens);+ }+ return sortedJson(expressionTokens(actual.definition.expression)) === sortedJson(expressionTokens(expected.definition.expression));+ }if (expected.kind !== "unique" || actual.kind !== "unique") return false;if (sortedJson(actual.definition.columns) !== sortedJson(expected.definition.columns)) return false;const index = actual.definition.index;diff --git a/crates/dbx-sql-schema/src/table_structure_sql/oracle_constraints.rs b/crates/dbx-sql-schema/src/table_structure_sql/oracle_constraints.rsindex 9493d50e93..4a048a7afd 100644--- a/crates/dbx-sql-schema/src/table_structure_sql/oracle_constraints.rs+++ b/crates/dbx-sql-schema/src/table_structure_sql/oracle_constraints.rs@@ -473,7 +473,12 @@ fn add_unique(let kind = if unique.state.deferrable || !unique.state.validated { "INDEX" } else { "UNIQUE INDEX" };format!(" USING INDEX (CREATE {kind} {index_ref} ON {table} ({columns}))")};- let (before_index, after_index) = constraint_state_parts(&unique.state, database_type);+ // OceanBase UNIQUE only supports the default state already enforced by validate_unique.+ let (before_index, after_index) = if database_type == DatabaseType::OceanbaseOracle {+ (String::new(), String::new())+ } else {+ constraint_state_parts(&unique.state, database_type)+ };Some(format!("ALTER TABLE {table} ADD CONSTRAINT {} UNIQUE ({columns}){before_index}{using_index}{after_index};",quote_ident(dialect, &unique.name),diff --git a/crates/dbx-sql-schema/tests/oracle_constraint_editor.rs b/crates/dbx-sql-schema/tests/oracle_constraint_editor.rsindex 31445112b0..0fa98081ea 100644--- a/crates/dbx-sql-schema/tests/oracle_constraint_editor.rs+++ b/crates/dbx-sql-schema/tests/oracle_constraint_editor.rs@@ -1,6 +1,7 @@+use dbx_sql_schema::models::connection::DatabaseType;use dbx_sql_schema::table_structure_sql::{- build_table_structure_change_sql, build_table_structure_change_sql_with_context, StarRocksAlterOptions,- TableStructureSqlOptions,+ build_table_structure_change_sql, build_table_structure_change_sql_with_context, OracleConstraintDefinition,+ StarRocksAlterOptions, TableStructureSqlOptions,};use serde_json::{json, Value};@@ -66,6 +67,62 @@ fn unique_state_options() -> TableStructureSqlOptions {})).unwrap()}+#[test]+fn oceanbase_unique_add_and_rebuild_use_the_verified_default_state() {+ for rebuild in [false, true] {+ let mut options = unique_state_options();+ options.database_type = Some(DatabaseType::OceanbaseOracle);+ let change = &mut options.oracle_constraint_changes.as_mut().unwrap()[0];+ change.index_policy = "none".into();+ if let Some(OracleConstraintDefinition::Unique(original)) = change.original.as_mut() {+ original.index.secondary = None;+ }+ let Some(OracleConstraintDefinition::Unique(target)) = change.target.as_mut() else { panic!() };+ target.state.enabled = true;+ target.index.secondary = None;+ if rebuild {+ target.columns.push("EMAIL".into());+ target.index.columns = target.columns.clone();+ target.index.directions.push("ASC".into());+ target.index.key_is_expression.push(false);+ } else {+ target.index.name.clear();+ target.index.metadata_complete = false;+ change.original = None;+ }+ let result = build_table_structure_change_sql(options.clone());+ assert!(result.warnings.is_empty(), "{:?}", result.warnings);+ let columns = if rebuild { "\"ID\", \"EMAIL\"" } else { "\"ID\"" };+ assert_eq!(+ result.statements.last().unwrap(),+ &format!("ALTER TABLE \"APP\".\"CONTACTS\" ADD CONSTRAINT \"UQ_CONTACTS\" UNIQUE ({columns});")+ );+ assert_eq!(result.statements.len(), if rebuild { 2 } else { 1 });++ let Some(OracleConstraintDefinition::Unique(target)) =+ options.oracle_constraint_changes.as_mut().unwrap()[0].target.as_mut()+ else {+ panic!()+ };+ target.state.validated = false;+ let rejected = build_table_structure_change_sql(options);+ assert!(rejected.statements.is_empty());+ assert!(!rejected.warnings.is_empty());+ }+}++#[test]+fn oracle_unique_add_retains_explicit_state_clauses() {+ let mut options = unique_state_options();+ let change = &mut options.oracle_constraint_changes.as_mut().unwrap()[0];+ change.original = None;+ let Some(OracleConstraintDefinition::Unique(target)) = change.target.as_mut() else { panic!() };+ target.state.enabled = true;+ let result = build_table_structure_change_sql(options);+ assert!(result.warnings.is_empty(), "{:?}", result.warnings);+ assert!(result.statements[0].ends_with("USING INDEX \"APP\".\"UQ_CONTACTS\" ENABLE VALIDATE;"));+}+#[test]fn starrocks_alter_rejects_oracle_only_changes_before_generating_ddl() {for (field, value) in [