From 816b0a0996ea7f81cd23e4fd264531c1be8a59c9 Mon Sep 17 00:00:00 2001 From: Muhamad Syahrul Mubarok <36539528+muhamadsyahrulmubarok@users.noreply.github.com> Date: Wed, 30 Sep 2026 20:55:29 +0700 Subject: [PATCH] fix(desktop): show CREATE OR REPLACE for view structure DDL --- .../src/components/layout/ContentArea.vue | 1 + .../structure/TableStructureEditor.vue | 16 ++++- .../TableStructureEditor.ddlTab.spec.ts | 13 ++++ crates/dbx-sql-core/src/object_source_sql.rs | 69 +++++++++++++++++-- 4 files changed, 93 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index 46b6e0362b..9fdd7ab3d0 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -3086,6 +3086,7 @@ defineExpose({ :catalog="activeTab.catalog" :schema="activeTab.schema" :table-name="activeTab.structureTableName || ''" + :table-type="activeTab.structureTableType" :initial-tab="activeTab.structureInitialTab" :initial-tab-request-id="activeTab.structureInitialTabRequestId" :initial-target="activeTab.structureInitialTarget" diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue index 05027a47db..075d8dea9c 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.vue +++ b/apps/desktop/src/components/structure/TableStructureEditor.vue @@ -190,6 +190,8 @@ const props = defineProps<{ catalog?: string; schema?: string; tableName: string; + /** `view` loads `CREATE OR REPLACE VIEW` instead of table DDL. */ + tableType?: "table" | "view"; initialTab?: TableInfoTab; initialTabRequestId?: number; initialTarget?: TableStructureEditorTarget; @@ -431,13 +433,23 @@ function applyDdlGenerationPreferences(sql: string, dialect: SqlFormatDialect): return formatGeneratedDdlIdentifierQuotes(unqualified, dialect, false, { preserveCaseSensitiveIdentifiers: tableStoresCaseSensitiveIdentifiers.value }); } -function ddlRequest() { +type StructureDdlRequest = { + connectionId: string; + database: string; + schema: string; + tableName: string; + catalog?: string; + objectType?: "VIEW"; +}; + +function ddlRequest(): StructureDdlRequest { return { connectionId: props.connectionId, database: props.database, schema: metadataSchema.value, tableName: props.tableName, catalog: props.catalog, + objectType: props.tableType === "view" ? "VIEW" : undefined, }; } @@ -2533,7 +2545,7 @@ async function fetchTableCommentValue(connectionId: string, database: string, sc } } -function loadCachedTableComment(request: ReturnType, force = false): Promise<{ value: string | undefined; cacheStatus: "memory" | "disk" | "remote" }> { +function loadCachedTableComment(request: StructureDdlRequest, force = false): Promise<{ value: string | undefined; cacheStatus: "memory" | "disk" | "remote" }> { return loadObjectMetadataFacet(request, "comment", () => fetchTableCommentValue(request.connectionId, request.database, request.schema, request.tableName, request.catalog), { force }); } diff --git a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.ddlTab.spec.ts b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.ddlTab.spec.ts index 5494eaa230..92a93d24fc 100644 --- a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.ddlTab.spec.ts +++ b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.ddlTab.spec.ts @@ -417,6 +417,19 @@ afterEach(() => { }); describe("TableStructureEditor DDL tab", () => { + it("loads CREATE OR REPLACE VIEW ddl when editing a view", async () => { + const viewDdl = "CREATE OR REPLACE VIEW `active_users` AS\nSELECT id FROM users;"; + mocks.loadObjectDdl.mockResolvedValue({ ddl: viewDdl, cacheStatus: "remote" }); + + const root = await mountStructureEditor({ database: "app", schema: "app", tableName: "active_users", tableType: "view" }); + await clickTab(root, "ddl"); + await vi.waitFor(() => expect(ddlEditorText(root)).toContain("CREATE OR REPLACE VIEW"), { timeout: 3000 }); + + expect(ddlEditorText(root)).toContain("`active_users`"); + expect(ddlEditorText(root)).not.toContain("CREATE TABLE"); + expect(mocks.loadObjectDdl).toHaveBeenCalledWith(expect.objectContaining({ tableName: "active_users", objectType: "VIEW" }), expect.anything()); + }); + it("keeps the DDL rendered when the tab is left and revisited", async () => { // Regression for #7818/#7778: the second visit re-mounts the pane one tick // after the tab activates, and nothing re-fetches (the DDL is already diff --git a/crates/dbx-sql-core/src/object_source_sql.rs b/crates/dbx-sql-core/src/object_source_sql.rs index bba3dd75a3..dd663bc826 100644 --- a/crates/dbx-sql-core/src/object_source_sql.rs +++ b/crates/dbx-sql-core/src/object_source_sql.rs @@ -232,6 +232,9 @@ pub fn build_editable_object_source(input: EditableObjectSourceSqlInput) -> Stri pub fn build_view_ddl_sql(input: BuildViewDdlInput) -> String { let source = input.source.trim(); + if input.database_type.is_some_and(is_mysql_like) { + return display_mysql_view_ddl(source, "e_mysql_identifier(&input.name)); + } let terminated_source = if matches!( input.database_type, Some(DatabaseType::Oracle | DatabaseType::OceanbaseOracle | DatabaseType::Dameng) @@ -604,6 +607,34 @@ fn executable_oracle_routine_ddl(source: &str) -> String { ensure_semicolon(trimmed) } +/// View DDL shown in Edit Structure. MySQL returns `CREATE VIEW`, which the +/// structure editor used to present like a table script. Rewrite that to +/// `CREATE OR REPLACE VIEW` and keep the view name unqualified. +fn display_mysql_view_ddl(source: &str, view_name: &str) -> String { + let trimmed = source.trim(); + if let Some(statement) = rewrite_mysql_view_statement(trimmed) { + return statement; + } + if Regex::new(r"(?i)^(?:CREATE|ALTER)\s+").unwrap().is_match(trimmed) { + return ensure_semicolon(trimmed); + } + format!("CREATE OR REPLACE VIEW {view_name} AS\n{}", ensure_semicolon(trimmed)) +} + +fn rewrite_mysql_view_statement(source: &str) -> Option { + let start = leading_sql_statement_start(source); + let executable = source[start..].trim_end(); + let create_view = Regex::new( + r"(?is)^(?:CREATE|ALTER)\s+(?:OR\s+REPLACE\s+)?(?P(?:ALGORITHM\s*=\s*(?:UNDEFINED|MERGE|TEMPTABLE)\s+)?(?:DEFINER\s*=\s*(?:(?:`(?:``|[^`])+`|'(?:''|[^'])+'|[^\s]+)\s*@\s*(?:`(?:``|[^`])+`|'(?:''|[^'])+'|[^\s]+)|CURRENT_USER(?:\(\))?)\s+)?(?:SQL\s+SECURITY\s+(?:DEFINER|INVOKER)\s+)?)VIEW\s+(?:(?:`(?:``|[^`])+`|[A-Za-z0-9_$]+)\s*\.\s*)?(?P.*)$", + ) + .unwrap(); + let captures = create_view.captures(executable)?; + let options = captures.name("options").map(|value| value.as_str()).unwrap_or(""); + let rest = captures.name("rest")?.as_str(); + let statement = format!("CREATE OR REPLACE {options}VIEW {rest}"); + Some(ensure_semicolon(&format!("{}{}", &source[..start], statement.trim_start()))) +} + fn executable_mysql_view_ddl(source: &str) -> String { let trimmed = source.trim(); let statement_start = leading_sql_statement_start(trimmed); @@ -1905,20 +1936,50 @@ mod tests { identifier_quote: None, }); - assert_eq!(sql, "CREATE ALGORITHM=UNDEFINED VIEW `active_users` AS SELECT `id` FROM `users`;"); + assert_eq!(sql, "CREATE OR REPLACE ALGORITHM=UNDEFINED VIEW `active_users` AS SELECT `id` FROM `users`;"); } #[test] - fn view_ddl_uses_create_view_for_non_postgres_like_databases() { + fn mysql_view_ddl_uses_create_or_replace_without_database_name() { let sql = build_view_ddl_sql(BuildViewDdlInput { database_type: Some(DatabaseType::Mysql), - schema: Some("reporting".to_string()), + schema: Some("app".to_string()), name: "active_users".to_string(), source: "SELECT id FROM users".to_string(), identifier_quote: None, }); - assert_eq!(sql, "CREATE VIEW `reporting`.`active_users` AS\nSELECT id FROM users;"); + assert_eq!(sql, "CREATE OR REPLACE VIEW `active_users` AS\nSELECT id FROM users;"); + } + + #[test] + fn mysql_show_create_view_drops_database_qualifier() { + let sql = build_view_ddl_sql(BuildViewDdlInput { + database_type: Some(DatabaseType::Mysql), + schema: Some("app".to_string()), + name: "active_users".to_string(), + source: "CREATE ALGORITHM=UNDEFINED DEFINER=`hr`@`%` SQL SECURITY DEFINER VIEW `app`.`active_users` AS select `id` from `users`" + .to_string(), + identifier_quote: None, + }); + + assert_eq!( + sql, + "CREATE OR REPLACE ALGORITHM=UNDEFINED DEFINER=`hr`@`%` SQL SECURITY DEFINER VIEW `active_users` AS select `id` from `users`;" + ); + } + + #[test] + fn view_ddl_uses_create_view_for_non_postgres_like_databases() { + let sql = build_view_ddl_sql(BuildViewDdlInput { + database_type: Some(DatabaseType::Sqlite), + schema: Some("main".to_string()), + name: "active_users".to_string(), + source: "SELECT id FROM users".to_string(), + identifier_quote: None, + }); + + assert_eq!(sql, "CREATE VIEW \"main\".\"active_users\" AS\nSELECT id FROM users;"); } #[test]