Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(oceanbase-oracle): persist dictionary-fallback view definitions

efeired16866f65b39
diff --git a/crates/dbx-sql/src/object_source_sql.rs b/crates/dbx-sql/src/object_source_sql.rs
index 2e0ca91fa8..ed3c856a88 100644
--- a/crates/dbx-sql/src/object_source_sql.rs
+++ b/crates/dbx-sql/src/object_source_sql.rs
@@ -163,7 +163,9 @@ pub fn build_executable_object_source_statements(input: EditableObjectSourceSqlI
)]);
}
- if is_oracle_like(input.database_type) && input.object_type == ObjectSourceKind::View {
+ if (is_oracle_like(input.database_type) || input.database_type == DatabaseType::OceanbaseOracle)
+ && input.object_type == ObjectSourceKind::View
+ {
return Ok(vec![executable_oracle_view_ddl(input.schema.as_deref(), &input.name, source)]);
}
@@ -567,14 +569,18 @@ fn leading_sql_statement_start(source: &str) -> usize {
fn executable_oracle_view_ddl(schema: Option<&str>, name: &str, source: &str) -> String {
let trimmed = source.trim();
- if Regex::new(r"(?i)^CREATE\s+OR\s+REPLACE\s+").unwrap().is_match(trimmed) || source_starts_with_alter(trimmed) {
+ let statement_start = leading_sql_statement_start(trimmed);
+ let executable = &trimmed[statement_start..];
+ if Regex::new(r"(?i)^CREATE\s+OR\s+REPLACE\s+").unwrap().is_match(executable)
+ || source_starts_with_alter(executable)
+ {
return ensure_semicolon(trimmed);
}
let create_view = Regex::new(r"(?i)^CREATE\s+((?:(?:NO)?FORCE\s+)?(?:(?:NON)?EDITIONABLE\s+)?VIEW\s+)").unwrap();
- if create_view.is_match(trimmed) {
- let replaced = create_view.replace(trimmed, "CREATE OR REPLACE $1");
- return ensure_semicolon(replaced.as_ref());
+ if create_view.is_match(executable) {
+ let replaced = create_view.replace(executable, "CREATE OR REPLACE $1");
+ return ensure_semicolon(&format!("{}{}", &trimmed[..statement_start], replaced));
}
format!("CREATE OR REPLACE VIEW {} AS\n{}", postgres_qualified_name(schema, name), ensure_semicolon(trimmed))
@@ -1668,6 +1674,56 @@ mod tests {
);
}
+ #[test]
+ fn oceanbase_oracle_view_source_builds_executable_replace_ddl() {
+ for (source, expected) in [
+ (
+ "SELECT 2 AS N FROM DUAL",
+ "CREATE OR REPLACE VIEW \"SYS\".\"DBX_VIEW_SAVE_PROBE\" AS\nSELECT 2 AS N FROM DUAL;",
+ ),
+ (
+ "CREATE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 3 AS N FROM DUAL",
+ "CREATE OR REPLACE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 3 AS N FROM DUAL;",
+ ),
+ ] {
+ let input = EditableObjectSourceSqlInput {
+ database_type: DatabaseType::OceanbaseOracle,
+ object_type: ObjectSourceKind::View,
+ schema: Some("SYS".to_string()),
+ name: "DBX_VIEW_SAVE_PROBE".to_string(),
+ source: source.to_string(),
+ };
+
+ assert_eq!(build_editable_object_source(input.clone()), expected);
+ assert_eq!(build_executable_object_source_sql(input).unwrap(), expected);
+ }
+ }
+
+ #[test]
+ fn oceanbase_oracle_view_full_ddl_keeps_leading_comments() {
+ for (source, expected) in [
+ (
+ "/* Keep this note */\nCREATE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 2 AS N FROM DUAL",
+ "/* Keep this note */\nCREATE OR REPLACE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 2 AS N FROM DUAL;",
+ ),
+ (
+ "-- Keep this note\nCREATE OR REPLACE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 3 AS N FROM DUAL",
+ "-- Keep this note\nCREATE OR REPLACE VIEW SYS.DBX_VIEW_SAVE_PROBE AS SELECT 3 AS N FROM DUAL;",
+ ),
+ ] {
+ let sql = build_executable_object_source_sql(EditableObjectSourceSqlInput {
+ database_type: DatabaseType::OceanbaseOracle,
+ object_type: ObjectSourceKind::View,
+ schema: Some("SYS".to_string()),
+ name: "DBX_VIEW_SAVE_PROBE".to_string(),
+ source: source.to_string(),
+ })
+ .unwrap();
+
+ assert_eq!(sql, expected);
+ }
+ }
+
#[test]
fn oracle_view_create_source_saves_as_create_or_replace_view() {
let sql = build_executable_object_source_sql(EditableObjectSourceSqlInput {