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(data-grid): optional database/schema prefix in copied INSERT SQL
二丫讲梵3dea25eaa747
diff --git a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue b/apps/desktop/src/components/grid/DataGridExtractorDialog.vueindex 6186eab31b..207d78cb50 100644--- a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue+++ b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue@@ -209,6 +209,9 @@ function save() {<label v-if="draftExtractor === 'sql-inserts'" class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.excludePrimaryKeysFromInsert" @change="updateSql('excludePrimaryKeysFromInsert', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorExcludePrimaryKeys") }}</label>+ <label v-if="draftExtractor === 'sql-inserts'" class="flex items-center gap-2 text-sm"+ ><input type="checkbox" :checked="draftOptions.sql.includeDatabaseName" @change="updateSql('includeDatabaseName', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorIncludeDatabaseName") }}</label+ ><div v-if="draftExtractor === 'sql-inserts'" class="space-y-1.5"><Label>{{ t("grid.copyExtractorInsertMode") }}</Label><Select :model-value="draftOptions.sql.insertMode" @update:model-value="updateSql('insertMode', $event as DataGridExtractorOptions['sql']['insertMode'])">diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex bdab88b1e6..29362a0fc1 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -1754,6 +1754,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "Hesablanan sütunları ötür",copyExtractorSkipGenerated: "Avtomatik yaradılan sütunları ötür",copyExtractorExcludePrimaryKeys: "Əsas açarları istisna et",+ copyExtractorIncludeDatabaseName: "Verilənlər bazasının adını daxil et",copyExtractorInsertMode: "INSERT əmrləri",copyExtractorInsertMerged: "Sətirləri birləşdir",copyExtractorInsertRowByRow: "Hər sətir üçün bir əmr",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex ce899ab698..243ea5a731 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -1903,6 +1903,7 @@ export default {copyExtractorSkipComputed: "Skip computed columns",copyExtractorSkipGenerated: "Skip generated columns",copyExtractorExcludePrimaryKeys: "Exclude primary keys",+ copyExtractorIncludeDatabaseName: "Include database name",copyExtractorInsertMode: "INSERT statements",copyExtractorInsertMerged: "Merge rows",copyExtractorInsertRowByRow: "One statement per row",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 3bee2fd85b..140d828d05 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -2348,6 +2348,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "Saltar columnas calculadas",copyExtractorSkipGenerated: "Saltar columnas generadas",copyExtractorExcludePrimaryKeys: "Excluir claves primarias",+ copyExtractorIncludeDatabaseName: "Incluir el nombre de la base de datos",copyExtractorInsertMode: "Modo de sentencia INSERT",copyExtractorInsertMerged: "Combinar varias filas",copyExtractorInsertRowByRow: "Una sentencia por fila",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex 86968d3e23..a8eaa8020f 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -2346,6 +2346,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "Salta colonne calcolate",copyExtractorSkipGenerated: "Salta colonne generate",copyExtractorExcludePrimaryKeys: "Escludi chiavi primarie",+ copyExtractorIncludeDatabaseName: "Includi il nome del database",copyExtractorInsertMode: "Modalità istruzione INSERT",copyExtractorInsertMerged: "Unisci più righe",copyExtractorInsertRowByRow: "Una istruzione per riga",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 2f33d0a22c..9b17995b5e 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -2368,6 +2368,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "計算列をスキップ",copyExtractorSkipGenerated: "生成列をスキップ",copyExtractorExcludePrimaryKeys: "主キーを除外",+ copyExtractorIncludeDatabaseName: "データベース名を含める",copyExtractorInsertMode: "INSERT文モード",copyExtractorInsertMerged: "複数行をマージ",copyExtractorInsertRowByRow: "1行ごとに1文",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 82cbae7e30..a8aa9243bc 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -1773,6 +1773,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "계산된 컬럼 건너뛰기",copyExtractorSkipGenerated: "생성된 컬럼 건너뛰기",copyExtractorExcludePrimaryKeys: "기본 키 제외",+ copyExtractorIncludeDatabaseName: "데이터베이스 이름 포함",copyExtractorInsertMode: "INSERT 구문",copyExtractorInsertMerged: "행 병합",copyExtractorInsertRowByRow: "행별 한 구문",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 5e19a56945..e3cea923d1 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -2348,6 +2348,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "Pular colunas computadas",copyExtractorSkipGenerated: "Pular colunas geradas",copyExtractorExcludePrimaryKeys: "Excluir chaves primárias",+ copyExtractorIncludeDatabaseName: "Incluir nome do banco de dados",copyExtractorInsertMode: "Modo de instrução INSERT",copyExtractorInsertMerged: "Mesclar várias linhas",copyExtractorInsertRowByRow: "Uma instrução por linha",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 0a8c9e6fff..dd1ff908e1 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -1755,6 +1755,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "Hesaplanan sütunları atla",copyExtractorSkipGenerated: "Üretilen sütunları atla",copyExtractorExcludePrimaryKeys: "Birincil anahtarları hariç tut",+ copyExtractorIncludeDatabaseName: "Veritabanı adını dahil et",copyExtractorInsertMode: "INSERT ifadeleri",copyExtractorInsertMerged: "Satırları birleştir",copyExtractorInsertRowByRow: "Her satır için bir ifade",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex de7ca4088e..eff280e438 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -1817,6 +1817,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "跳过计算列",copyExtractorSkipGenerated: "跳过生成列",copyExtractorExcludePrimaryKeys: "排除主键",+ copyExtractorIncludeDatabaseName: "包含数据库名称",copyExtractorInsertMode: "INSERT 语句模式",copyExtractorInsertMerged: "合并多行",copyExtractorInsertRowByRow: "每行一条语句",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 58ded5af6e..be6321755d 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -2354,6 +2354,7 @@ export default withEnglishFallback({copyExtractorSkipComputed: "跳過計算列",copyExtractorSkipGenerated: "跳過生成列",copyExtractorExcludePrimaryKeys: "排除主鍵",+ copyExtractorIncludeDatabaseName: "包含資料庫名稱",copyExtractorInsertMode: "INSERT 語句模式",copyExtractorInsertMerged: "合併多行",copyExtractorInsertRowByRow: "每行一條語句",diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.tsindex a64bc1c451..9cfe33cf8d 100644--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts@@ -3,6 +3,13 @@ import { describe, expect, it } from "vitest";import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, normalizeDataGridCopyPreference, normalizeDataGridExtractorOptions, resolveDataGridCopyPreference, validateDataGridExtractorOptions } from "@/lib/dataGrid/dataGridCopyExtractor";describe("data-grid extractor options", () => {+ it("keeps database qualification for legacy options and persists explicit opt-out", () => {+ expect(normalizeDataGridExtractorOptions({ sql: {} }).sql.includeDatabaseName).toBe(true);+ const configured = normalizeDataGridExtractorOptions({ sql: { includeDatabaseName: false } });+ expect(normalizeDataGridExtractorOptions(JSON.parse(JSON.stringify(configured))).sql.includeDatabaseName).toBe(false);+ expect(normalizeDataGridExtractorOptions({ sql: { includeDatabaseName: "false" } }).sql.includeDatabaseName).toBe(true);+ });+it("defaults DSV NULL output to an empty spreadsheet field", () => {expect(DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.dsv.nullText).toBe("");expect(normalizeDataGridExtractorOptions({}).dsv.nullText).toBe("");diff --git a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.tsindex f976c48e61..828ab6d92e 100644--- a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts@@ -88,6 +88,7 @@ export interface DataGridExtractorOptions {skipGeneratedColumns: boolean;insertMode: DataGridCopyInsertMode;excludePrimaryKeysFromInsert: boolean;+ includeDatabaseName: boolean;};json: {pretty: boolean;@@ -148,6 +149,7 @@ export const DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS: DataGridExtractorOptions = {skipGeneratedColumns: true,insertMode: "merged",excludePrimaryKeysFromInsert: false,+ includeDatabaseName: true,},json: { pretty: true, camelCaseFieldNames: false },};@@ -178,6 +180,7 @@ export function normalizeDataGridExtractorOptions(value: unknown): DataGridExtraskipGeneratedColumns: sql.skipGeneratedColumns !== false,insertMode: sql.insertMode === "row-by-row" ? "row-by-row" : "merged",excludePrimaryKeysFromInsert: sql.excludePrimaryKeysFromInsert === true,+ includeDatabaseName: sql.includeDatabaseName !== false,},json: {pretty: json.pretty !== false,diff --git a/apps/desktop/src/lib/dataGrid/dataGridSql.ts b/apps/desktop/src/lib/dataGrid/dataGridSql.tsindex a433025929..ff590487a6 100644--- a/apps/desktop/src/lib/dataGrid/dataGridSql.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridSql.ts@@ -56,6 +56,7 @@ export interface DataGridCopyInsertStatementOptions {rows: GridCellValue[][];excludePrimaryKeys?: boolean;includeComputedColumns?: boolean;+ includeDatabaseName?: boolean;insertMode?: DataGridCopyInsertMode;}diff --git a/crates/dbx-core/tests/live_postgres_tsvector.rs b/crates/dbx-core/tests/live_postgres_tsvector.rsindex 52cf046522..8ab317d6f8 100644--- a/crates/dbx-core/tests/live_postgres_tsvector.rs+++ b/crates/dbx-core/tests/live_postgres_tsvector.rs@@ -78,6 +78,7 @@ async fn postgres_tsvector_generated_columns_are_readable_and_omitted_from_inserrows: result.rows.clone(),exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,}).expect("copy insert");diff --git a/crates/dbx-sql/src/data_grid_extractors/contract.rs b/crates/dbx-sql/src/data_grid_extractors/contract.rsindex c784a5f9a4..7963f12c75 100644--- a/crates/dbx-sql/src/data_grid_extractors/contract.rs+++ b/crates/dbx-sql/src/data_grid_extractors/contract.rs@@ -94,6 +94,7 @@ pub struct DataGridSqlExtractorOptions {pub skip_generated_columns: bool,pub insert_mode: DataGridCopyInsertMode,pub exclude_primary_keys_from_insert: bool,+ pub include_database_name: bool,}impl Default for DataGridSqlExtractorOptions {@@ -103,6 +104,7 @@ impl Default for DataGridSqlExtractorOptions {skip_generated_columns: DEFAULT_SQL_SKIP_GENERATED_COLUMNS,insert_mode: DataGridCopyInsertMode::Merged,exclude_primary_keys_from_insert: false,+ include_database_name: true,}}}diff --git a/crates/dbx-sql/src/data_grid_extractors/sql.rs b/crates/dbx-sql/src/data_grid_extractors/sql.rsindex b0674a7dc0..f792f85fa7 100644--- a/crates/dbx-sql/src/data_grid_extractors/sql.rs+++ b/crates/dbx-sql/src/data_grid_extractors/sql.rs@@ -72,6 +72,7 @@ pub(super) fn write_sql_inserts(rows: data.rows,exclude_primary_keys: context.request.options.sql.exclude_primary_keys_from_insert,include_computed_columns: !context.request.options.sql.skip_computed_columns,+ include_database_name: context.request.options.sql.include_database_name,insert_mode: context.request.options.sql.insert_mode,}).ok_or_else(|| {diff --git a/crates/dbx-sql/src/data_grid_extractors/tests.rs b/crates/dbx-sql/src/data_grid_extractors/tests.rsindex 5fb660066c..f35a9237ac 100644--- a/crates/dbx-sql/src/data_grid_extractors/tests.rs+++ b/crates/dbx-sql/src/data_grid_extractors/tests.rs@@ -42,10 +42,133 @@ fn partially_deserialized_options_use_the_canonical_defaults() {assert!(!options.sql.skip_generated_columns);assert_eq!(options.sql.insert_mode, crate::data_grid_sql::DataGridCopyInsertMode::Merged);assert!(!options.sql.exclude_primary_keys_from_insert);+ assert!(options.sql.include_database_name);assert!(options.json.pretty);assert!(!options.json.camel_case_field_names);}+#[test]+fn insert_database_name_option_handles_engine_namespaces() {+ use crate::data_grid_sql::DataGridCopyInsertMode;+ use crate::sql_dialect::uses_single_row_insert_statements;++ for (database_type, catalog, schema, qualified, unqualified) in [+ (DatabaseType::Mysql, None, "a`b", "`a``b`.`users`", "`users`"),+ (DatabaseType::Goldendb, None, "app", "`app`.`users`", "`users`"),+ (DatabaseType::Doris, Some("internal"), "app", "`app`.`users`", "`users`"),+ (DatabaseType::StarRocks, None, "app", "`app`.`users`", "`users`"),+ (DatabaseType::Sqlite, None, "main", "\"main\".\"users\"", "\"users\""),+ (DatabaseType::Sqlite, None, "attached", "\"attached\".\"users\"", "\"users\""),+ (DatabaseType::DuckDb, None, "main", "\"main\".\"users\"", "\"users\""),+ (DatabaseType::Oracle, None, "APP", "\"APP\".\"users\"", "\"users\""),+ (DatabaseType::Dameng, None, "APP", "\"APP\".\"users\"", "\"users\""),+ (DatabaseType::Kingbase, None, "audit", "\"audit\".\"users\"", "\"users\""),+ (DatabaseType::Gaussdb, None, "audit", "\"audit\".\"users\"", "\"users\""),+ (DatabaseType::OpenGauss, None, "audit", "\"audit\".\"users\"", "\"users\""),+ (DatabaseType::Db2, None, "APP", "\"APP\".\"users\"", "\"users\""),+ (DatabaseType::StarRocks, Some("iceberg"), "app", "`iceberg`.`app`.`users`", "`users`"),+ (DatabaseType::Postgres, None, "audit", "\"audit\".\"users\"", "\"users\""),+ (DatabaseType::SqlServer, Some("app"), "audit", "[app].[audit].[users]", "[users]"),+ (DatabaseType::Doris, Some("iceberg"), "app", "`iceberg`.`app`.`users`", "`users`"),+ ] {+ for include_database_name in [true, false] {+ for insert_mode in [DataGridCopyInsertMode::Merged, DataGridCopyInsertMode::RowByRow] {+ let mut request = request(DataGridExtractorId::SqlInserts);+ request.database_type = Some(database_type);+ request.table_meta = Some(DataGridTableMeta {+ catalog: catalog.map(str::to_owned),+ database: Some("app".to_owned()),+ schema: Some(schema.to_owned()),+ table_name: "users".to_owned(),+ primary_keys: vec![],+ columns: None,+ });+ request.options.sql.include_database_name = include_database_name;+ request.options.sql.insert_mode = insert_mode;+ // Exercise the same camelCase contract sent by the frontend.+ let request = serde_json::from_value(serde_json::to_value(request).unwrap()).unwrap();+ let result = extract_data_grid_selection(request).unwrap();+ let table = if include_database_name { qualified } else { unqualified };+ let statements: Vec<_> = result.text.split(";\n").collect();+ let expected_statement_count = if insert_mode == DataGridCopyInsertMode::RowByRow+ || uses_single_row_insert_statements(database_type)+ {+ 2+ } else {+ 1+ };+ assert_eq!(statements.len(), expected_statement_count);+ for statement in statements {+ assert!(statement.starts_with(&format!("INSERT INTO {table} (")), "{statement}");+ }+ }+ }+ }+}++#[test]+fn insert_database_name_option_uses_database_when_schema_is_absent() {+ use crate::data_grid_sql::DataGridCopyInsertMode;++ for database_type in [DatabaseType::Mysql, DatabaseType::Goldendb, DatabaseType::Doris, DatabaseType::StarRocks] {+ for (database, schema, qualified) in [+ (Some("a`b"), None, "`a``b`.`users`"),+ (Some("app"), Some(""), "`app`.`users`"),+ (Some("app"), Some(" "), "`app`.`users`"),+ (Some("app"), Some("other"), "`other`.`users`"),+ (None, Some("other"), "`other`.`users`"),+ (None, None, "`users`"),+ (Some(" "), None, "`users`"),+ ] {+ for include_database_name in [true, false] {+ for insert_mode in [DataGridCopyInsertMode::Merged, DataGridCopyInsertMode::RowByRow] {+ let mut request = request(DataGridExtractorId::SqlInserts);+ request.database_type = Some(database_type);+ request.table_meta = Some(DataGridTableMeta {+ catalog: None,+ database: database.map(str::to_owned),+ schema: schema.map(str::to_owned),+ table_name: "users".to_owned(),+ primary_keys: vec![],+ columns: None,+ });+ request.options.sql.include_database_name = include_database_name;+ request.options.sql.insert_mode = insert_mode;+ let request = serde_json::from_value(serde_json::to_value(request).unwrap()).unwrap();+ let result = extract_data_grid_selection(request).unwrap();+ let table = if include_database_name { qualified } else { "`users`" };+ for statement in result.text.split(";\n") {+ assert!(statement.starts_with(&format!("INSERT INTO {table} (")), "{statement}");+ }+ }+ }+ }+ }+}++#[test]+fn postgres_insert_can_omit_schema_namespace() {+ for schema in [Some("dbx_dst_ccfebf6b"), None] {+ for include_database_name in [true, false] {+ let mut request = request(DataGridExtractorId::SqlInserts);+ request.database_type = Some(DatabaseType::Postgres);+ request.table_meta = Some(DataGridTableMeta {+ catalog: None,+ database: Some("app".to_owned()),+ schema: schema.map(str::to_owned),+ table_name: "users".to_owned(),+ primary_keys: vec![],+ columns: None,+ });+ request.options.sql.include_database_name = include_database_name;+ let result = extract_data_grid_selection(request).unwrap();+ let table =+ if include_database_name && schema.is_some() { r#""dbx_dst_ccfebf6b"."users""# } else { r#""users""# };+ assert!(result.text.starts_with(&format!("INSERT INTO {table} (")), "{}", result.text);+ }+ }+}+#[test]fn extracts_csv_with_minimal_standard_quoting() {let result = extract_data_grid_selection(request(DataGridExtractorId::Csv)).expect("CSV extraction");diff --git a/crates/dbx-sql/src/data_grid_sql.rs b/crates/dbx-sql/src/data_grid_sql.rsindex 832db12dfa..e7d79ba743 100644--- a/crates/dbx-sql/src/data_grid_sql.rs+++ b/crates/dbx-sql/src/data_grid_sql.rs@@ -134,10 +134,16 @@ pub struct DataGridCopyInsertStatementOptions {pub exclude_primary_keys: bool,#[serde(default)]pub include_computed_columns: bool,+ #[serde(default = "default_include_database_name")]+ pub include_database_name: bool,#[serde(default)]pub insert_mode: DataGridCopyInsertMode,}+fn default_include_database_name() -> bool {+ true+}+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]#[serde(rename_all = "kebab-case")]@@ -519,10 +525,53 @@ pub fn build_data_grid_copy_insert_statement(options: DataGridCopyInsertStatemenlet table = options.table_meta.as_ref().map_or_else(|| "table_name".to_string(),|meta| {+ // This copy option controls every namespace prefix, including+ // SQLite's main schema and external catalogs.+ if !options.include_database_name {+ return data_grid_identifier(+ options.database_type,+ &meta.table_name,+ options.identifier_quote.as_deref(),+ );+ }+ // MySQL-compatible engines can store the database in either field.+ let use_database_fallback = match options.database_type {+ Some(DatabaseType::Mysql | DatabaseType::Goldendb | DatabaseType::ClickHouse) => true,+ Some(DatabaseType::Doris | DatabaseType::StarRocks) => meta+ .catalog+ .as_deref()+ .is_none_or(|catalog| catalog.trim().is_empty() || catalog.trim() == "internal"),+ _ => false,+ };+ // MySQL table tabs store the namespace in `database` without a+ // schema. Explicit schemas still take priority for cross-database+ // sources; schema-based engines must not use this fallback.+ let schema = if use_database_fallback {+ meta.schema+ .as_deref()+ .filter(|schema| !schema.trim().is_empty())+ .or_else(|| meta.database.as_deref().filter(|database| !database.trim().is_empty()))+ } else {+ meta.schema.as_deref()+ };+ // ClickHouse uses a database qualifier rather than SQL schemas.+ if options.database_type == Some(DatabaseType::ClickHouse) {+ if let Some(database) = schema {+ return format!(+ "{}.{}",+ data_grid_identifier(options.database_type, database, options.identifier_quote.as_deref()),+ data_grid_identifier(+ options.database_type,+ &meta.table_name,+ options.identifier_quote.as_deref()+ ),+ );+ }+ }data_grid_qualified_table_name(options.database_type,meta.catalog.as_deref(),- meta.schema.as_deref(),+ schema,meta.database.as_deref(),&meta.table_name,options.identifier_quote.as_deref(),@@ -4016,6 +4065,7 @@ mod tests {rows: vec![vec![json!(1), json!("ada"), json!("Ada")], vec![json!(2), json!("linus"), json!("Linus")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(@@ -4067,6 +4117,7 @@ mod tests {rows: vec![vec![json!(1), json!("Ada")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4113,6 +4164,7 @@ mod tests {rows: vec![vec![json!("A-1"), json!("A-1"), json!("Ada")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(@@ -4169,6 +4221,7 @@ mod tests {rows: vec![vec![json!(1), json!("Ada"), json!("ADA")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(statement.as_deref(), Some("INSERT INTO `users` (`label`) VALUES ('Ada');"));@@ -4238,6 +4291,7 @@ mod tests {rows: vec![vec![json!(1), json!("2026-08-18"), json!("sweater")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(@@ -4282,6 +4336,7 @@ mod tests {rows: vec![vec![json!("AD"), json!("Andorra")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(@@ -4311,6 +4366,7 @@ mod tests {rows: vec![vec![json!(1), json!("ada")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(statement.as_deref(), Some("INSERT INTO `users` (`id`, `login_name`) VALUES (1, 'ada');"));@@ -4328,6 +4384,7 @@ mod tests {rows: vec![vec![json!(7), json!(true), json!(r#"{"name":"Ada","roles":["admin"]}"#)]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4349,6 +4406,7 @@ mod tests {rows: vec![vec![json!([1, 2, 3])]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4367,6 +4425,7 @@ mod tests {rows: vec![vec![json!([])]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4385,6 +4444,7 @@ mod tests {rows: vec![vec![json!({"a": 1})]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4498,6 +4558,7 @@ mod tests {rows: vec![vec![json!("ada"), json!("Ada")]],exclude_primary_keys: true,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4526,6 +4587,7 @@ mod tests {rows: vec![vec![json!(1), json!("ada"), json!("Ada")], vec![json!(2), json!("linus"), json!("Linus")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::RowByRow,});assert_eq!(@@ -4555,6 +4617,7 @@ mod tests {rows: vec![vec![json!(1), json!("Ada")], vec![json!(2), json!("Linus")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4587,6 +4650,7 @@ mod tests {rows: rows.clone(),exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(@@ -4654,6 +4718,7 @@ mod tests {rows: vec![vec![json!(1), json!("Hello"), json!("'hello':1A")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -4679,6 +4744,7 @@ mod tests {rows: vec![vec![json!(1), json!("2022-08-25T09:58:43Z"), json!("2022-08-25T09:58:43Z")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -6697,6 +6763,7 @@ mod tests {rows: vec![vec![json!(1), json!("login")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});@@ -8571,6 +8638,7 @@ mod tests {rows: vec![vec![json!(2), json!("new")]],exclude_primary_keys: false,include_computed_columns: false,+ include_database_name: true,insert_mode: DataGridCopyInsertMode::Merged,});assert_eq!(