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。

feat(grid): copy sql deletes and inserts for selected rows

lxk955f382082c76cf
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 6dd7038046..a2d59bb67f 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -9072,6 +9072,7 @@ function copyExtractorLabel(extractor: DataGridCopyExtractorId): string {
"one-row": t("grid.copyExtractorOneRow"),
"sql-in-list": t("grid.copyExtractorSqlInList"),
"sql-inserts": t("grid.copyExtractorSqlInserts"),
+ "sql-deletes-inserts": t("grid.copyExtractorSqlDeletesInserts"),
"sql-updates": t("grid.copyExtractorSqlUpdates"),
"sql-select": t("grid.copyExtractorSqlSelect"),
"where-clause": t("grid.copyExtractorWhereClause"),
@@ -9104,7 +9105,7 @@ const copyPreferenceMenuItems = computed(() =>
return {
value: preference,
label: copyPreferenceLabel(preference),
- disabled: extractor ? extractorUnavailableForDatabase(extractor, props.databaseType) || (extractor === "sql-updates" && !props.tableMeta?.primaryKeys.length) : false,
+ disabled: extractor ? extractorUnavailableForDatabase(extractor, props.databaseType) || ((extractor === "sql-updates" || extractor === "sql-deletes-inserts") && !props.tableMeta?.primaryKeys.length) : false,
separatorBefore: extractor ? DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS[extractor].separatorBefore : false,
};
}),
diff --git a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
index 9ee7f7f8ab..aafd0ca087 100644
--- a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
+++ b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
@@ -44,7 +44,7 @@ let previewTimer: ReturnType<typeof setTimeout> | undefined;
const draftExtractor = computed<DataGridCopyExtractorId | null>(() => (draftPreference.value === "smart" ? null : draftPreference.value));
const extractorCategory = computed(() => (draftExtractor.value ? DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS[draftExtractor.value].category : null));
const isDsv = computed(() => extractorCategory.value === "delimited");
-const isSql = computed(() => draftExtractor.value === "sql-inserts" || draftExtractor.value === "sql-updates");
+const isSql = computed(() => draftExtractor.value === "sql-inserts" || draftExtractor.value === "sql-deletes-inserts" || draftExtractor.value === "sql-updates");
const isJson = computed(() => extractorCategory.value === "json");
const optionsError = computed(() => {
if (!draftExtractor.value) return "";
@@ -210,7 +210,7 @@ function save() {
<template v-if="isSql">
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.skipComputedColumns" @change="updateSql('skipComputedColumns', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorSkipComputed") }}</label>
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.skipGeneratedColumns" @change="updateSql('skipGeneratedColumns', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorSkipGenerated") }}</label>
- <div v-if="draftExtractor === 'sql-inserts'" class="space-y-1.5">
+ <div v-if="draftExtractor === 'sql-inserts' || draftExtractor === 'sql-deletes-inserts'" class="space-y-1.5">
<Label>{{ t("grid.copyExtractorExcludePrimaryKeys") }}</Label>
<Select :model-value="draftOptions.sql.primaryKeyMode" @update:model-value="updateSql('primaryKeyMode', $event as DataGridExtractorOptions['sql']['primaryKeyMode'])">
<SelectTrigger><SelectValue /></SelectTrigger>
@@ -222,7 +222,7 @@ function save() {
</Select>
</div>
<label 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">
+ <div v-if="draftExtractor === 'sql-inserts' || draftExtractor === 'sql-deletes-inserts'" class="space-y-1.5">
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.quoteIdentifiers" @change="updateSql('quoteIdentifiers', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorQuoteIdentifiers") }}</label>
<Label>{{ t("grid.copyExtractorTemporalFormat") }}</Label>
<Select :model-value="draftOptions.sql.temporalFormat" @update:model-value="updateSql('temporalFormat', $event as DataGridExtractorOptions['sql']['temporalFormat'])">
@@ -234,7 +234,7 @@ function save() {
</Select>
<p v-if="draftOptions.sql.temporalFormat === 'string'" class="text-xs text-muted-foreground">{{ t("grid.copyExtractorTemporalStringHint") }}</p>
</div>
- <div v-if="draftExtractor === 'sql-inserts'" class="space-y-1.5">
+ <div v-if="draftExtractor === 'sql-inserts' || draftExtractor === 'sql-deletes-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'])">
<SelectTrigger><SelectValue /></SelectTrigger>
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
index 0c038ae6fe..d06b04436e 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
@@ -617,6 +617,73 @@ describe("useDataGridExport prepared row statements", () => {
expect(copyToClipboard).toHaveBeenCalledWith("UPDATE users SET `name` = 'Ada', `active` = TRUE WHERE `id` = 7;");
});
+ it("builds a SQL DELETEs/INSERTs request when primary keys and rows are present", async () => {
+ const item = { ...row([7, "Ada", true]), sourceIndex: 0 };
+ const matrix: CellSelectionMatrix = {
+ rowIndexes: [0],
+ columnIndexes: [0, 1],
+ columns: ["display_name", "active"],
+ rows: [["Ada", true]],
+ };
+ const options: UseDataGridExportOptions = {
+ columns: computed(() => ["display_name", "active"]),
+ displayItems: computed(() => [{ ...item, data: ["Ada", true], isDirtyCol: [false, false] }]),
+ allColumns: computed(() => ["id", "display_name", "active"]),
+ allDisplayItems: computed(() => [item]),
+ allSourceColumns: computed(() => ["id", "name", "active"]),
+ visibleColumnIndexes: computed(() => [1, 2]),
+ sql: computed(() => undefined),
+ tableMeta: computed(() => ({
+ tableName: "users",
+ primaryKeys: ["id"],
+ columns: [
+ { name: "id", data_type: "int", is_nullable: false, is_primary_key: true },
+ { name: "name", data_type: "varchar", is_nullable: false },
+ { name: "active", data_type: "boolean", is_nullable: false },
+ ],
+ })),
+ databaseType: computed(() => "mysql"),
+ connectionId: computed(() => "connection-1"),
+ database: computed(() => "dbx"),
+ context: computed(() => "table-data"),
+ sourceColumns: computed(() => ["name", "active"]),
+ columnTypes: computed(() => ["varchar", "boolean"]),
+ whereInput: computed(() => undefined),
+ orderBy: computed(() => undefined),
+ exportBatchSize: computed(() => 1000),
+ hasCellSelection: computed(() => true),
+ selectedCells: computed(() => matrix),
+ selectedCellMatrix: computed(() => matrix),
+ selectedRange: computed(() => ({ startRow: 0, endRow: 0, startCol: 1, endCol: 1 })),
+ contextCell: ref({ rowId: item.id, rowIndex: 0, col: 1 }),
+ contextSelectionIsSynthetic: ref(false),
+ getRowItem: (rowId) => (rowId === item.id ? item : undefined),
+ selectedRowIds: ref(new Set<number>()),
+ hasRowSelection: computed(() => false),
+ };
+ vi.mocked(extractDataGridSelection).mockResolvedValueOnce({
+ text: "DELETE FROM users WHERE `id` = 7;\nINSERT INTO users (`name`, `active`) VALUES ('Ada', TRUE);",
+ mimeType: "application/sql",
+ fileExtension: "sql",
+ rowCount: 1,
+ columnCount: 2,
+ });
+ const state = useDataGridExport(options);
+
+ expect(state.canCopyWithExtractor("sql-deletes-inserts")).toBe(true);
+ await state.copyWithExtractor("sql-deletes-inserts");
+
+ expect(extractDataGridSelection).toHaveBeenCalledWith(
+ expect.objectContaining({
+ extractor: "sql-deletes-inserts",
+ selectedColumnIndexes: [0, 1],
+ rows: [["Ada", true, 7]],
+ selectionKind: "cells",
+ }),
+ );
+ expect(copyToClipboard).toHaveBeenCalledWith("DELETE FROM users WHERE `id` = 7;\nINSERT INTO users (`name`, `active`) VALUES ('Ada', TRUE);");
+ });
+
it("builds a SELECT request for exactly one explicitly selected cell", async () => {
const matrix: CellSelectionMatrix = {
rowIndexes: [0],
@@ -948,6 +1015,7 @@ describe("useDataGridExport prepared row statements", () => {
});
expect(state.canCopyWithExtractor("sql-updates")).toBe(true);
+ expect(state.canCopyWithExtractor("sql-deletes-inserts")).toBe(true);
expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
});
diff --git a/apps/desktop/src/composables/useDataGridExtractor.ts b/apps/desktop/src/composables/useDataGridExtractor.ts
index b5f939f6f4..bee59b9fcf 100644
--- a/apps/desktop/src/composables/useDataGridExtractor.ts
+++ b/apps/desktop/src/composables/useDataGridExtractor.ts
@@ -188,7 +188,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
// INSERT and UPDATE need the complete record to retain key columns and
// writable values. Other extractors should respect the actual cell range
// that a right-click creates, just like keyboard copy does.
- const requiresFullRowContext = extractor === "sql-inserts" || (extractor === "sql-updates" && options.databaseType.value !== "mongodb");
+ const requiresFullRowContext = extractor === "sql-inserts" || extractor === "sql-deletes-inserts" || (extractor === "sql-updates" && options.databaseType.value !== "mongodb");
if (contextPredicateCell) {
const item = fullItemsById.get(contextPredicateCell.rowId);
@@ -237,7 +237,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
const hasCompleteIdentity = primaryKeys.length > 0 && identityIndexes.every((index) => index >= 0) && sourceRows.every((row) => identityIndexes.every((index) => row[index] !== null && row[index] !== undefined));
selectedSourceIndexes = hasCompleteIdentity ? identityIndexes : [...fullColumns.keys()];
requiredSourceIndexes.splice(0, requiredSourceIndexes.length, ...selectedSourceIndexes);
- } else if (extractor === "sql-updates") {
+ } else if (extractor === "sql-updates" || extractor === "sql-deletes-inserts") {
for (const primaryKey of options.tableMeta.value?.primaryKeys ?? []) {
const primaryKeyIndex = fullColumns.findIndex((displayName, index) => normalizeName(sourceNames?.[index] ?? displayName) === normalizeName(primaryKey));
if (primaryKeyIndex >= 0 && !requiredSourceIndexes.includes(primaryKeyIndex)) requiredSourceIndexes.push(primaryKeyIndex);
@@ -368,6 +368,15 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
const request = buildRequest(extractor, extractorOptions);
return request !== null && options.canCopySqlInsert(request);
}
+ if (extractor === "sql-deletes-inserts") {
+ const request = buildRequest(extractor, extractorOptions);
+ const primaryKeys = request?.tableMeta?.primaryKeys ?? [];
+ if (!request || primaryKeys.length === 0 || !options.canCopySqlInsert(request)) return false;
+ return primaryKeys.every((primaryKey) => {
+ const column = request.columns.find((candidate) => normalizeName(candidate.sourceName ?? candidate.displayName) === normalizeName(primaryKey));
+ return !!column && request.rows.every((row) => row[column.sourceIndex] !== null && row[column.sourceIndex] !== undefined);
+ });
+ }
if (extractor === "sql-updates") {
// Mongo has a dedicated updateOne path that doesn't need SQL primary keys.
if (options.databaseType.value === "mongodb") {
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 81ecfc4839..17a2523a81 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2597,6 +2597,7 @@ export default {
copyExtractorJsonArray: "JSON Array",
copyExtractorSqlInList: "SQL IN List",
copyExtractorSqlInserts: "SQL Inserts",
+ copyExtractorSqlDeletesInserts: "SQL DELETEs/INSERTs",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL Inserts (with Primary Keys)",
copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Inserts (without Generated Primary Keys)",
copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL Inserts (without Any Primary Keys)",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 38513c02e0..b4a58af7ea 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -3194,6 +3194,7 @@ export default withEnglishFallback({
binaryImportTooLarge: "El archivo es demasiado grande ({size}, límite {limit}). No se admite importar archivos grandes en una sola celda.",
cut: "Cortado",
uncommittedBlankRow: "Fila nueva sin completar, se ignorará al guardar.",
+ copyExtractorSqlDeletesInserts: "Sentencias SQL DELETEs/INSERTs",
},
exportProgress: {
streamingUnsupported: "La exportación en streaming no es compatible con esta consulta. Simplifíquela o use un controlador compatible.",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 474f01d608..dc23bce408 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -3067,6 +3067,7 @@ export default withEnglishFallback({
binaryImportTooLarge: "Il file è troppo grande ({size}, limite {limit}). L'importazione di file di grandi dimensioni in una singola cella non è supportata.",
cut: "Tagliato",
uncommittedBlankRow: "Nuova riga non compilata, verrà ignorata al salvataggio",
+ copyExtractorSqlDeletesInserts: "Istruzioni SQL DELETEs/INSERTs",
},
exportProgress: {
streamingUnsupported: "L'esportazione in streaming non è supportata per questa query. Semplificala o usa un driver supportato.",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index d63c62b304..27e8809661 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -3091,6 +3091,7 @@ export default withEnglishFallback({
binaryImportTooLarge: "ファイルが大きすぎます({size}、上限 {limit})。大きなファイルの単一セルへのインポートはサポートされていません。",
cut: "切り取りました",
uncommittedBlankRow: "未入力の新しい行は、保存時に無視されます",
+ copyExtractorSqlDeletesInserts: "SQL DELETEs/INSERTs ステートメント",
},
exportProgress: {
streamingUnsupported: "このクエリはストリーミングエクスポートに対応していません。クエリを簡略化するか、対応しているドライバーを使用してください。",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 09a93acf87..2c68e9c1ef 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -3017,6 +3017,7 @@ export default withEnglishFallback({
xlsxHeaderNameAndCommentRowsHint: "1행은 필드 이름, 2행은 주석이며 데이터는 3행부터 시작합니다. 다시 가져오기 전에 주석 행을 삭제하면 필드 이름과 일치합니다.",
batchAppendPasteNoMatchingColumns: "INSERT 문의 열 이름이 현재 결과 집합의 어떤 열과도 일치하지 않습니다.",
uncommittedBlankRow: "입력되지 않은 새 행은 저장 시 무시됩니다.",
+ copyExtractorSqlDeletesInserts: "SQL DELETEs/INSERTs 문",
},
exportProgress: {
streamingUnsupported: "이 쿼리는 스트리밍 내보내기를 지원하지 않습니다. 쿼리를 단순화하거나 지원되는 드라이버를 사용하세요.",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 5ddb56d6af..700ccecb9b 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -3067,6 +3067,7 @@ export default withEnglishFallback({
binaryImportTooLarge: "O arquivo é muito grande ({size}, limite {limit}). Não há suporte para importar arquivos grandes em uma única célula.",
cut: "Recortado",
uncommittedBlankRow: "Nova linha não preenchida, será ignorada ao salvar",
+ copyExtractorSqlDeletesInserts: "Instruções SQL DELETEs/INSERTs",
},
exportProgress: {
streamingUnsupported: "A exportação em streaming não é compatível com esta consulta. Simplifique-a ou use um driver compatível.",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 78d8384dc9..6740bbe1c5 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -3151,6 +3151,7 @@ export default withEnglishFallback({
victoriaMetricsTruncatedHint: "Результаты превысили лимит загрузки, поэтому загружены только первые {count} строк. «Строк на страницу» пагинирует только загруженные данные; сократите диапазон времени или добавьте фильтры, чтобы получить полный результат.",
cut: "Вырезать",
uncommittedBlankRow: "Незаполненная новая строка будет проигнорирована при сохранении",
+ copyExtractorSqlDeletesInserts: "SQL-операторы DELETEs/INSERTs",
},
exportProgress: {
streamingUnsupported: "Потоковый экспорт не поддерживается для этого запроса. Упростите его или используйте поддерживаемый драйвер.",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index a81683693f..387ea3b62a 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -3375,6 +3375,7 @@ export default withEnglishFallback({
filterModeOrderMoveDown: "เลื่อนตัวดำเนินการลง",
filterModeOrderReset: "คืนค่าลำดับเริ่มต้น",
uncommittedBlankRow: "แถวใหม่ที่ยังไม่ได้กรอกจะถูกละเว้นเมื่อบันทึก",
+ copyExtractorSqlDeletesInserts: "คำสั่ง SQL DELETEs/INSERTs",
},
exportProgress: {
streamingUnsupported: "ไม่รองรับการส่งออกแบบ Streaming สำหรับ Query นี้ ทำให้เรียบง่ายขึ้นหรือใช้ Driver ที่รองรับ",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 130572af74..953a282461 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2530,6 +2530,7 @@ export default withEnglishFallback({
copyExtractorJsonArray: "JSON 数组",
copyExtractorSqlInList: "SQL IN 列表",
copyExtractorSqlInserts: "SQL INSERT 语句",
+ copyExtractorSqlDeletesInserts: "SQL DELETEs/INSERTs 语句",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT 语句(含主键)",
copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 语句(不含自动生成主键)",
copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT 语句(不含任何主键)",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 09cbe0e067..834303c0ea 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2966,6 +2966,7 @@ export default withEnglishFallback({
copyExtractorJsonArray: "JSON 陣列",
copyExtractorSqlInList: "SQL IN 列表",
copyExtractorSqlInserts: "SQL INSERT 語句",
+ copyExtractorSqlDeletesInserts: "SQL DELETEs/INSERTs 語句",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT 語句(含主鍵)",
copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 語句(不含自動產生的主鍵)",
copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT 語句(不含任何主鍵)",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
index c5112d415f..a7d1f6ce76 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
-import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, normalizeDataGridCopyPreference, normalizeDataGridExtractorOptions, resolveDataGridCopyPreference, validateDataGridExtractorOptions } from "@/lib/dataGrid/dataGridCopyExtractor";
+import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, extractorUnavailableForDatabase, normalizeDataGridCopyPreference, normalizeDataGridExtractorOptions, resolveDataGridCopyPreference, validateDataGridExtractorOptions } from "@/lib/dataGrid/dataGridCopyExtractor";
describe("data-grid extractor options", () => {
it("preserves native SQL defaults and normalizes portable INSERT options", () => {
@@ -111,4 +111,15 @@ describe("data-grid extractor options", () => {
options.dsv.nullText = "x".repeat(65);
expect(validateDataGridExtractorOptions("dsv", options)).toBe("null-text-too-long");
});
+
+ it("handles sql-deletes-inserts copy preference and database availability", () => {
+ expect(normalizeDataGridCopyPreference("sql-deletes-inserts")).toBe("sql-deletes-inserts");
+ expect(resolveDataGridCopyPreference("sql-deletes-inserts", 1)).toBe("sql-deletes-inserts");
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "postgres")).toBe(false);
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "mysql")).toBe(false);
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "sqlserver")).toBe(false);
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "mongodb")).toBe(true);
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "neo4j")).toBe(true);
+ expect(extractorUnavailableForDatabase("sql-deletes-inserts", "tdengine")).toBe(true);
+ });
});
diff --git a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
index 7a9f01ee8f..c5ab3d249d 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
@@ -1,7 +1,28 @@
import type { DatabaseType } from "@/types/database";
import type { DataGridCopyInsertMode, DataGridTableMeta } from "@/lib/dataGrid/dataGridSql";
-export const DATA_GRID_COPY_EXTRACTOR_IDS = ["raw", "tsv", "tsv-with-headers", "csv", "csv-with-headers", "pipe-separated", "dsv", "json", "json-lines", "one-row", "sql-in-list", "sql-inserts", "sql-updates", "sql-select", "where-clause", "markdown", "html", "xml", "pretty"] as const;
+export const DATA_GRID_COPY_EXTRACTOR_IDS = [
+ "raw",
+ "tsv",
+ "tsv-with-headers",
+ "csv",
+ "csv-with-headers",
+ "pipe-separated",
+ "dsv",
+ "json",
+ "json-lines",
+ "one-row",
+ "sql-in-list",
+ "sql-inserts",
+ "sql-deletes-inserts",
+ "sql-updates",
+ "sql-select",
+ "where-clause",
+ "markdown",
+ "html",
+ "xml",
+ "pretty",
+] as const;
export type DataGridCopyExtractorId = (typeof DATA_GRID_COPY_EXTRACTOR_IDS)[number];
export type DataGridCopyPreference = "smart" | DataGridCopyExtractorId;
@@ -21,6 +42,7 @@ export const DATA_GRID_DEFAULT_COPY_PREFERENCES: readonly DataGridCopyPreference
"one-row",
"sql-in-list",
"sql-inserts",
+ "sql-deletes-inserts",
"sql-updates",
"where-clause",
"markdown",
@@ -47,6 +69,7 @@ export const DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS: Record<DataGridCopyExtractorI
"json-lines": { category: "json" },
"sql-in-list": { category: "sql", separatorBefore: true },
"sql-inserts": { category: "sql" },
+ "sql-deletes-inserts": { category: "sql" },
"sql-updates": { category: "sql" },
"sql-select": { category: "sql" },
"where-clause": { category: "sql" },
@@ -64,12 +87,14 @@ export type DataGridExtractorOptionsError = "column-separator-empty" | "row-sepa
* sql-updates has a Mongo-specific updateOne path, so Mongo is NOT disabled;
* where-clause has no Mongo equivalent, so Mongo IS disabled. */
const NO_SQL_UPDATE_DATABASE_TYPES: ReadonlyArray<string> = ["neo4j", "tdengine"];
+const NO_SQL_DELETES_INSERTS_DATABASE_TYPES: ReadonlyArray<string> = ["neo4j", "tdengine", "mongodb"];
const NO_WHERE_CLAUSE_DATABASE_TYPES: ReadonlyArray<string> = ["neo4j", "tdengine", "mongodb"];
/** True when the extractor emits relational SQL the database type cannot run. */
export function extractorUnavailableForDatabase(extractor: DataGridCopyExtractorId, databaseType: string | undefined | null): boolean {
const db = databaseType ?? "";
if (extractor === "sql-updates") return NO_SQL_UPDATE_DATABASE_TYPES.includes(db);
+ if (extractor === "sql-deletes-inserts") return NO_SQL_DELETES_INSERTS_DATABASE_TYPES.includes(db);
if (extractor === "where-clause" || extractor === "sql-select") return NO_WHERE_CLAUSE_DATABASE_TYPES.includes(db);
return false;
}
diff --git a/crates/dbx-core/src/data/grid_clipboard_guard.rs b/crates/dbx-core/src/data/grid_clipboard_guard.rs
index 4fffa894b7..c68df0768d 100644
--- a/crates/dbx-core/src/data/grid_clipboard_guard.rs
+++ b/crates/dbx-core/src/data/grid_clipboard_guard.rs
@@ -64,6 +64,7 @@ fn is_spreadsheet_extractor(extractor: DataGridExtractorId) -> bool {
| DataGridExtractorId::JsonLines
| DataGridExtractorId::SqlInList
| DataGridExtractorId::SqlInserts
+ | DataGridExtractorId::SqlDeletesInserts
| DataGridExtractorId::SqlUpdates
| DataGridExtractorId::SqlSelect
| DataGridExtractorId::WhereClause
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs b/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
index 3c2683a7c3..4b129b0003 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
@@ -30,6 +30,7 @@ pub enum DataGridExtractorId {
OneRow,
SqlInList,
SqlInserts,
+ SqlDeletesInserts,
SqlUpdates,
SqlSelect,
WhereClause,
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
index 2189bb8017..b7dedad28b 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
@@ -15,7 +15,10 @@ use delimited::{write_dsv, write_one_row};
use document::{write_html, write_markdown, write_pretty, write_xml};
use json::{write_json, write_json_lines};
use raw::write_raw;
-use sql::{write_sql_in_list, write_sql_inserts, write_sql_select, write_sql_updates, write_where_clause};
+use sql::{
+ write_sql_deletes_inserts, write_sql_in_list, write_sql_inserts, write_sql_select, write_sql_updates,
+ write_where_clause,
+};
const DATA_GRID_EXTRACTOR_MAX_OUTPUT_BYTES: usize = 32 * 1024 * 1024;
const DATA_GRID_EXTRACTOR_MAX_INPUT_BYTES: usize = 64 * 1024 * 1024;
@@ -312,6 +315,7 @@ fn write_extraction(
Ok(text_metadata("application/sql", "sql"))
}
DataGridExtractorId::SqlInserts => write_sql_inserts(context, output),
+ DataGridExtractorId::SqlDeletesInserts => write_sql_deletes_inserts(context, output),
DataGridExtractorId::SqlUpdates => write_sql_updates(context, output),
DataGridExtractorId::SqlSelect => {
write_sql_select(context, output)?;
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/sql.rs b/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
index db4d84255f..61f140e50e 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
@@ -5,12 +5,15 @@ use super::{
};
use crate::data_grid_sql::{
build_column_predicate, build_data_grid_copy_insert_statement_with_formatters,
- build_data_grid_copy_update_statements, data_grid_generated_table_name, format_grid_copy_insert_sql_literal,
+ build_data_grid_copy_insert_statements_with_formatters, build_data_grid_copy_update_statements, column_info_for,
+ data_grid_delete_sql, data_grid_generated_table_name, data_grid_statement, format_grid_copy_insert_sql_literal,
format_grid_sql_literal_with_identifier_quote, is_auto_generated_column, is_grid_insert_omitted_column,
is_non_identity_generated_column, is_primary_key_column, supports_relational_copy_predicates, DataGridColumnInfo,
- DataGridCopyInsertStatementOptions, DataGridCopyUpdateStatementOptions, DataGridPrimaryKeyMode, DataGridTableMeta,
+ DataGridCopyInsertMode, DataGridCopyInsertStatementOptions, DataGridCopyUpdateStatementOptions,
+ DataGridPrimaryKeyMode, DataGridTableMeta,
};
use crate::models::connection::DatabaseType;
+use crate::sql_dialect::uses_single_row_insert_statements;
use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime};
use dbx_types::types::is_opaque_aggregate_state_type;
use serde_json::Value;
@@ -207,6 +210,168 @@ pub(super) fn write_sql_updates(
Ok(sql_metadata(data.omitted_columns))
}
+pub(super) fn write_sql_deletes_inserts(
+ context: &ExtractContext<'_>,
+ output: &mut dyn Write,
+) -> Result<WriteMetadata, DataGridExtractError> {
+ ensure_sql_builder_budget(context)?;
+ reject_selected_opaque_aggregate_states(context)?;
+ let table_meta = context.request.table_meta.as_ref().ok_or_else(|| {
+ DataGridExtractError::new(
+ DataGridExtractErrorCode::MissingTableMetadata,
+ "SQL DELETEs/INSERTs requires table metadata.",
+ )
+ })?;
+ if table_meta.primary_keys.is_empty() {
+ return Err(DataGridExtractError::new(
+ DataGridExtractErrorCode::MissingPrimaryKey,
+ "SQL DELETEs/INSERTs requires at least one primary key column.",
+ ));
+ }
+ if !supports_relational_copy_predicates(context.request.database_type) {
+ return Err(DataGridExtractError::new(
+ DataGridExtractErrorCode::UnsupportedDatabase,
+ "SQL DELETEs/INSERTs is not supported for this database type.",
+ ));
+ }
+
+ let mut primary_key_indices = Vec::with_capacity(table_meta.primary_keys.len());
+ for primary_key in &table_meta.primary_keys {
+ let col = context
+ .request
+ .columns
+ .iter()
+ .find(|column| {
+ normalized_name_eq(column.source_name.as_deref().unwrap_or(&column.display_name), primary_key)
+ })
+ .ok_or_else(|| {
+ DataGridExtractError::new(
+ DataGridExtractErrorCode::MissingPrimaryKey,
+ format!("Primary key column '{primary_key}' is not present in the result set."),
+ )
+ })?;
+ primary_key_indices.push((primary_key.as_str(), col.source_index));
+ }
+
+ for (row_index, row) in context.request.rows.iter().enumerate() {
+ for (pk_name, src_idx) in &primary_key_indices {
+ let val = row.get(*src_idx).unwrap_or(&Value::Null);
+ if val.is_null() {
+ return Err(DataGridExtractError::new(
+ DataGridExtractErrorCode::NullPrimaryKey,
+ format!("Row {row_index} has a NULL value for primary key '{pk_name}'."),
+ ));
+ }
+ }
+ }
+
+ let data = sql_selected_data(context, false)?;
+ let insert_statements = build_data_grid_copy_insert_statements_with_formatters(
+ DataGridCopyInsertStatementOptions {
+ database_type: context.request.database_type,
+ identifier_quote: context.request.identifier_quote.clone(),
+ table_meta: context.request.table_meta.clone(),
+ columns: data.columns,
+ column_types: Some(data.column_types),
+ source_columns: Some(data.source_columns),
+ rows: data.rows,
+ primary_key_mode: context.request.options.sql.primary_key_mode,
+ 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,
+ },
+ |reference| {
+ if context.request.options.sql.quote_identifiers {
+ reference
+ } else {
+ identifiers::unquote_optional_identifiers(
+ reference,
+ context.request.database_type,
+ context.request.identifier_quote.as_deref(),
+ )
+ }
+ },
+ |value, database_type, info, identifier_quote| {
+ if context.request.options.sql.temporal_format == DataGridTemporalFormat::String {
+ if let Some(literal) = portable_temporal_literal(value, database_type, info) {
+ return literal;
+ }
+ }
+ format_grid_copy_insert_sql_literal(value, database_type, info, identifier_quote)
+ },
+ )
+ .ok_or_else(|| {
+ DataGridExtractError::new(
+ DataGridExtractErrorCode::NoWritableColumns,
+ "No insertable columns remain after applying extractor column rules.",
+ )
+ })?;
+
+ let table = data_grid_generated_table_name(
+ context.request.database_type,
+ table_meta.catalog.as_deref(),
+ table_meta.schema.as_deref(),
+ table_meta.database.as_deref(),
+ &table_meta.table_name,
+ context.request.identifier_quote.as_deref(),
+ context.request.options.sql.include_database_name,
+ );
+ let table = if context.request.options.sql.quote_identifiers {
+ table
+ } else {
+ identifiers::unquote_optional_identifiers(
+ table,
+ context.request.database_type,
+ context.request.identifier_quote.as_deref(),
+ )
+ };
+
+ let column_info = table_meta.columns.as_deref().unwrap_or(&[]);
+ let primary_key_info: Vec<Option<&DataGridColumnInfo>> =
+ primary_key_indices.iter().map(|(pk_name, _)| column_info_for(column_info, pk_name)).collect();
+
+ let delete_statements: Vec<String> = context
+ .request
+ .rows
+ .iter()
+ .map(|row| {
+ let where_clause = primary_key_indices
+ .iter()
+ .enumerate()
+ .map(|(pk_index, (pk_name, src_idx))| {
+ let val = row.get(*src_idx).unwrap_or(&Value::Null);
+ let info = primary_key_info[pk_index];
+ let quote = if context.request.options.sql.quote_identifiers {
+ context.request.identifier_quote.as_deref()
+ } else {
+ None
+ };
+ build_column_predicate(context.request.database_type, pk_name, val, info, false, quote)
+ })
+ .collect::<Vec<_>>()
+ .join(" AND ");
+ data_grid_statement(
+ context.request.database_type,
+ data_grid_delete_sql(context.request.database_type, &table, &where_clause),
+ )
+ })
+ .collect();
+
+ let is_row_by_row = context.request.options.sql.insert_mode == DataGridCopyInsertMode::RowByRow
+ || context.request.database_type.is_some_and(uses_single_row_insert_statements);
+
+ let statements = if is_row_by_row && delete_statements.len() == insert_statements.len() {
+ delete_statements.into_iter().zip(insert_statements).flat_map(|(del, ins)| [del, ins]).collect::<Vec<_>>()
+ } else {
+ let mut combined = delete_statements;
+ combined.extend(insert_statements);
+ combined
+ };
+
+ write_bytes(output, statements.join("\n").as_bytes())?;
+ Ok(sql_metadata(data.omitted_columns))
+}
+
fn reject_selected_opaque_aggregate_states(context: &ExtractContext<'_>) -> Result<(), DataGridExtractError> {
if context.selected_column_info.iter().flatten().any(|info| is_opaque_aggregate_state_type(&info.data_type)) {
return Err(DataGridExtractError::new(
@@ -245,6 +410,7 @@ fn ensure_sql_builder_budget(context: &ExtractContext<'_>) -> Result<(), DataGri
// the same predicate builder) repeats every selected column's identifier
// once per row via OR'd row groups, just like SqlUpdates/row-by-row insert.
let repeats_identifiers_per_row = context.request.extractor == super::DataGridExtractorId::SqlUpdates
+ || context.request.extractor == super::DataGridExtractorId::SqlDeletesInserts
|| context.request.options.sql.insert_mode == crate::data_grid_sql::DataGridCopyInsertMode::RowByRow
|| context.request.extractor == super::DataGridExtractorId::WhereClause
|| (context.request.extractor == super::DataGridExtractorId::SqlSelect
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
index 3766235db5..a753c78e1f 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
@@ -1991,7 +1991,9 @@ fn sql_copy_reports_selected_opaque_aggregate_states_before_generic_builder_erro
column_default: None,
extra: None,
};
- for extractor in [DataGridExtractorId::SqlInserts, DataGridExtractorId::SqlUpdates] {
+ for extractor in
+ [DataGridExtractorId::SqlInserts, DataGridExtractorId::SqlDeletesInserts, DataGridExtractorId::SqlUpdates]
+ {
let mut request = request(extractor);
request.columns = vec![column("v2", 0)];
request.selected_column_indexes = vec![0];
@@ -2067,3 +2069,211 @@ fn rejects_estimated_oversized_sql_before_building_the_statement() {
assert_eq!(error.code, DataGridExtractErrorCode::OutputTooLarge);
}
+
+#[test]
+fn builds_deletes_inserts_merged_mode() {
+ let mut request = request(DataGridExtractorId::SqlDeletesInserts);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: Some("public".to_string()),
+ table_name: "users".to_string(),
+ primary_keys: vec!["id".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "varchar".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ let result = extract_data_grid_selection(request).expect("SQL DELETEs/INSERTs extraction");
+ assert_eq!(
+ result.text,
+ "DELETE FROM \"public\".\"users\" WHERE \"id\" = 1;\nDELETE FROM \"public\".\"users\" WHERE \"id\" = 2;\nINSERT INTO \"public\".\"users\" (\"id\", \"name\") VALUES\n(1, 'Ada'),\n(2, 'Grace, Hopper');"
+ );
+}
+
+#[test]
+fn builds_deletes_inserts_row_by_row_mode() {
+ let mut request = request(DataGridExtractorId::SqlDeletesInserts);
+ request.options.sql.insert_mode = crate::data_grid_sql::DataGridCopyInsertMode::RowByRow;
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: Some("public".to_string()),
+ table_name: "users".to_string(),
+ primary_keys: vec!["id".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "varchar".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ let result = extract_data_grid_selection(request).expect("SQL DELETEs/INSERTs row-by-row extraction");
+ assert_eq!(
+ result.text,
+ "DELETE FROM \"public\".\"users\" WHERE \"id\" = 1;\nINSERT INTO \"public\".\"users\" (\"id\", \"name\") VALUES (1, 'Ada');\nDELETE FROM \"public\".\"users\" WHERE \"id\" = 2;\nINSERT INTO \"public\".\"users\" (\"id\", \"name\") VALUES (2, 'Grace, Hopper');"
+ );
+}
+
+#[test]
+fn builds_deletes_inserts_with_composite_primary_key() {
+ let mut request = request(DataGridExtractorId::SqlDeletesInserts);
+ request.columns = vec![column("tenant_id", 0), column("user_id", 1), column("role", 2)];
+ request.selected_column_indexes = vec![0, 1, 2];
+ request.rows = vec![vec![json!(10), json!(1), json!("admin")], vec![json!(10), json!(2), json!("member")]];
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "members".to_string(),
+ primary_keys: vec!["tenant_id".to_string(), "user_id".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "tenant_id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "user_id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "role".to_string(),
+ data_type: "varchar".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ let result = extract_data_grid_selection(request).expect("composite key SQL DELETEs/INSERTs");
+ assert_eq!(
+ result.text,
+ "DELETE FROM \"members\" WHERE \"tenant_id\" = 10 AND \"user_id\" = 1;\nDELETE FROM \"members\" WHERE \"tenant_id\" = 10 AND \"user_id\" = 2;\nINSERT INTO \"members\" (\"tenant_id\", \"user_id\", \"role\") VALUES\n(10, 1, 'admin'),\n(10, 2, 'member');"
+ );
+}
+
+#[test]
+fn builds_deletes_inserts_with_hidden_primary_keys() {
+ let mut request = request(DataGridExtractorId::SqlDeletesInserts);
+ request.columns = vec![column("id", 0), column("name", 1)];
+ // User only selected the "name" column (col 1), not "id" (col 0)
+ request.selected_column_indexes = vec![1];
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["id".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "varchar".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ let result = extract_data_grid_selection(request).expect("hidden PK SQL DELETEs/INSERTs");
+ assert_eq!(
+ result.text,
+ "DELETE FROM \"users\" WHERE \"id\" = 1;\nDELETE FROM \"users\" WHERE \"id\" = 2;\nINSERT INTO \"users\" (\"name\") VALUES\n('Ada'),\n('Grace, Hopper');"
+ );
+}
+
+#[test]
+fn deletes_inserts_requires_table_meta_and_primary_key() {
+ let missing_table = request(DataGridExtractorId::SqlDeletesInserts);
+ assert_eq!(
+ extract_data_grid_selection(missing_table).expect_err("missing table metadata").code,
+ DataGridExtractErrorCode::MissingTableMetadata
+ );
+
+ let mut missing_pk = request(DataGridExtractorId::SqlDeletesInserts);
+ missing_pk.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: Vec::new(),
+ columns: None,
+ });
+ assert_eq!(
+ extract_data_grid_selection(missing_pk).expect_err("missing primary key").code,
+ DataGridExtractErrorCode::MissingPrimaryKey
+ );
+
+ let mut null_pk = request(DataGridExtractorId::SqlDeletesInserts);
+ null_pk.rows = vec![vec![serde_json::Value::Null, json!("Ada")]];
+ null_pk.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["id".to_string()],
+ columns: None,
+ });
+ assert_eq!(
+ extract_data_grid_selection(null_pk).expect_err("null primary key").code,
+ DataGridExtractErrorCode::NullPrimaryKey
+ );
+
+ let mut nosql = request(DataGridExtractorId::SqlDeletesInserts);
+ nosql.database_type = Some(DatabaseType::MongoDb);
+ nosql.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["id".to_string()],
+ columns: None,
+ });
+ assert_eq!(
+ extract_data_grid_selection(nosql).expect_err("nosql unsupported").code,
+ DataGridExtractErrorCode::UnsupportedDatabase
+ );
+}
diff --git a/crates/dbx-sql-data/src/data_grid_sql.rs b/crates/dbx-sql-data/src/data_grid_sql.rs
index 8fc5921302..4aee58ae4e 100644
--- a/crates/dbx-sql-data/src/data_grid_sql.rs
+++ b/crates/dbx-sql-data/src/data_grid_sql.rs
@@ -605,6 +605,15 @@ pub(crate) fn build_data_grid_copy_insert_statement_with_formatters(
format_reference: impl Fn(String) -> String,
format_literal: impl Fn(&Value, Option<DatabaseType>, Option<&DataGridColumnInfo>, Option<&str>) -> String,
) -> Option<String> {
+ build_data_grid_copy_insert_statements_with_formatters(options, format_reference, format_literal)
+ .map(|statements| statements.join("\n"))
+}
+
+pub(crate) fn build_data_grid_copy_insert_statements_with_formatters(
+ options: DataGridCopyInsertStatementOptions,
+ format_reference: impl Fn(String) -> String,
+ format_literal: impl Fn(&Value, Option<DatabaseType>, Option<&DataGridColumnInfo>, Option<&str>) -> String,
+) -> Option<Vec<String>> {
let save_columns = effective_copy_columns(options.source_columns.as_deref(), &options.columns);
let column_info = options.table_meta.as_ref().and_then(|meta| meta.columns.as_deref()).unwrap_or(&[]);
let primary_keys = options.table_meta.as_ref().map(|meta| meta.primary_keys.as_slice()).unwrap_or_default();
@@ -781,15 +790,14 @@ pub(crate) fn build_data_grid_copy_insert_statement_with_formatters(
if needs_identity_insert_wrapper {
return Some(
statements
- .iter()
+ .into_iter()
.map(|statement| {
format!("SET IDENTITY_INSERT {table} ON;\n{statement}\nSET IDENTITY_INSERT {table} OFF;")
})
- .collect::<Vec<_>>()
- .join("\n"),
+ .collect(),
);
}
- Some(statements.join("\n"))
+ Some(statements)
}
pub fn build_data_grid_context_filter_condition(options: DataGridContextFilterConditionOptions) -> Option<String> {
@@ -3969,7 +3977,7 @@ fn mysql_json_predicate_literal(
}
}
-fn data_grid_statement(database_type: Option<DatabaseType>, sql: String) -> String {
+pub(crate) fn data_grid_statement(database_type: Option<DatabaseType>, sql: String) -> String {
if database_type == Some(DatabaseType::OceanbaseOracle) {
if let Some(statement) = oceanbase_blob_statement(&sql, false) {
return statement;
@@ -4154,7 +4162,7 @@ fn data_grid_update_sql(database_type: Option<DatabaseType>, table: &str, sets:
}
}
-fn data_grid_delete_sql(database_type: Option<DatabaseType>, table: &str, where_clause: &str) -> String {
+pub(crate) fn data_grid_delete_sql(database_type: Option<DatabaseType>, table: &str, where_clause: &str) -> String {
if database_type == Some(DatabaseType::ClickHouse) {
format!("ALTER TABLE {table} DELETE WHERE {where_clause}")
} else {