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(mysql): add read-only decoding for legacy text encodings

Guoyu Su301998b6ddf5
diff --git a/Cargo.lock b/Cargo.lock
index 3628947709..507540ffc8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2389,6 +2389,7 @@ dependencies = [
"dbx-sql-core",
"dbx-sql-dialect",
"dbx-types",
+ "encoding_rs",
"futures",
"log",
"mysql_async",
diff --git a/agents/drivers/duckdb/Cargo.lock b/agents/drivers/duckdb/Cargo.lock
index 5d11625479..6c7600ebfb 100644
--- a/agents/drivers/duckdb/Cargo.lock
+++ b/agents/drivers/duckdb/Cargo.lock
@@ -1404,6 +1404,7 @@ dependencies = [
"dbx-sql-core",
"dbx-sql-dialect",
"dbx-types",
+ "encoding_rs",
"futures",
"log",
"mysql_async",
diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index f9595fd996..8fb6043065 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -109,6 +109,7 @@ import {
type ConnectionDeepLinkUpdate,
} from "@/lib/connection/connectionDeepLink";
import { connectionUrlPlaceholder as getUrlPlaceholder } from "@/lib/connection/connectionPresentation";
+import { MYSQL_DATA_CHARSETS, mysqlDataCharset, setMysqlDataCharset, mysqlDataCharsetValidation, supportsMysqlDataCharset } from "@/lib/connection/mysqlDataCharset";
import { parseGaussdbHosts, serializeGaussdbHosts, type GaussdbHostEntry } from "@/lib/connection/gaussdbHosts";
import { h2ConnectionModeForConfig, h2FileJdbcUrlWithPath, h2FilePathFromJdbcUrl, isH2SplitJdbcUrl, type H2ConnectionMode } from "@/lib/database/h2Connection";
import { firstZooKeeperEndpoint, normalizeZooKeeperConnectString } from "@/lib/zookeeper/zookeeperConnection";
@@ -4088,6 +4089,16 @@ const firebirdCharset = computed({
},
});
const FIREBIRD_DATA_CHARSET_OPTIONS = ["GBK", "GB18030", "BIG5"];
+const mysqlDataCharsetValue = computed({
+ get: () => mysqlDataCharset(form.value.url_params),
+ set: (value: string) => {
+ form.value.url_params = setMysqlDataCharset(form.value.url_params, value);
+ },
+});
+const mysqlDataCharsetItems = computed(() => {
+ const current = mysqlDataCharsetValue.value;
+ return current !== "default" && !MYSQL_DATA_CHARSETS.some((value) => value === current) ? [current, ...MYSQL_DATA_CHARSETS] : MYSQL_DATA_CHARSETS;
+});
const firebirdDataCharsetItems = computed(() => {
const current = getUrlParam(form.value.url_params, "dataCharset");
return current && !FIREBIRD_DATA_CHARSET_OPTIONS.includes(current) ? [current, ...FIREBIRD_DATA_CHARSET_OPTIONS] : FIREBIRD_DATA_CHARSET_OPTIONS;
@@ -5594,6 +5605,8 @@ function connectionConfigForSubmit(id: string, generatedName = "", validatePlugi
if (config.agent_java_options && config.agent_java_options.length === 0) config.agent_java_options = undefined;
// Pasted credentials may carry invisible characters that trim() keeps (#9043).
sanitizeConnectionCredentials(config);
+ const mysqlCharsetError = mysqlDataCharsetValidation(config);
+ if (mysqlCharsetError) throw new Error(t(mysqlCharsetError));
return config as ConnectionConfig;
}
@@ -9824,6 +9837,21 @@ function openExternalUrl(url: string) {
</div>
</div>
+ <div v-if="supportsMysqlDataCharset(form)" class="grid grid-cols-4 items-start gap-4">
+ <Label :class="connectionLabelTopClass">{{ t("connection.mysqlDataCharset") }}</Label>
+ <div class="col-span-3 space-y-1.5">
+ <Select v-model="mysqlDataCharsetValue">
+ <SelectTrigger id="mysql-data-charset" class="h-9"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem value="default">{{ t("common.default") }}</SelectItem>
+ <SelectItem v-for="charset in mysqlDataCharsetItems" :key="charset" :value="charset">{{ charset }}</SelectItem>
+ </SelectContent>
+ </Select>
+ <p class="text-xs leading-5 text-muted-foreground">{{ t("connection.mysqlDataCharsetHint") }}</p>
+ <p v-if="mysqlDataCharsetValue !== 'default'" class="text-xs leading-5 text-muted-foreground">{{ t("connection.mysqlDataCharsetReadOnly") }} {{ t("connection.mysqlDataCharsetExportHint") }}</p>
+ </div>
+ </div>
+
<div v-if="supportsGenericUrlParams" class="connection-url-params-row grid grid-cols-4 items-start gap-4" :class="{ 'connection-url-params-row--compact': !showGenericUrlParamsHint, 'connection-url-params-row--with-hint': showGenericUrlParamsHint }">
<Label :class="[connectionLabelClass, 'connection-url-params-label']">{{ t("connection.urlParams") }}</Label>
<div class="col-span-3 space-y-1.5">
diff --git a/apps/desktop/src/components/connection/ReadOnlySessionControl.vue b/apps/desktop/src/components/connection/ReadOnlySessionControl.vue
index 4bac382d83..ee169097ec 100644
--- a/apps/desktop/src/components/connection/ReadOnlySessionControl.vue
+++ b/apps/desktop/src/components/connection/ReadOnlySessionControl.vue
@@ -6,6 +6,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { useConnectionStore } from "@/stores/connectionStore";
import { useReadOnlyUnlockStore } from "@/stores/readOnlyUnlockStore";
import { formatWriteUnlockRemaining } from "@/lib/database/readOnlyWriteAccess";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
const props = defineProps<{
connectionId: string;
@@ -17,16 +18,19 @@ const { t } = useI18n();
const connectionStore = useConnectionStore();
const unlockStore = useReadOnlyUnlockStore();
-const persistentlyReadOnly = computed(() => connectionStore.getConfig(props.connectionId)?.read_only === true);
+const compatibilityReadOnly = computed(() => mysqlDataCharsetEnabled(connectionStore.getConfig(props.connectionId)));
+const persistentlyReadOnly = computed(() => compatibilityReadOnly.value || connectionStore.getConfig(props.connectionId)?.read_only === true);
const remainingMs = computed(() => unlockStore.remainingMs(props.connectionId));
-const unlocked = computed(() => remainingMs.value > 0);
+const unlocked = computed(() => !compatibilityReadOnly.value && remainingMs.value > 0);
const remainingLabel = computed(() => formatWriteUnlockRemaining(remainingMs.value));
const tooltip = computed(() => {
+ if (compatibilityReadOnly.value) return t("connection.mysqlDataCharsetReadOnly");
if (unlocked.value) return `${t("readOnlyUnlock.unlockedBadge")} · ${t("readOnlyUnlock.remaining", { time: remainingLabel.value })}`;
return t("connection.readOnlyBadge");
});
async function onActivate() {
+ if (compatibilityReadOnly.value) return;
if (!persistentlyReadOnly.value) return;
if (unlocked.value) {
await unlockStore.lockNow(props.connectionId);
@@ -58,8 +62,9 @@ onMounted(() => {
type="button"
class="inline-flex items-center gap-0.5 rounded text-muted-foreground hover:bg-muted-foreground/15 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
:class="compact ? 'h-4 px-0.5' : 'h-4 px-1'"
- :aria-label="unlocked ? t('readOnlyUnlock.lockNow') : t('readOnlyUnlock.unlockAction')"
- :title="unlocked ? t('readOnlyUnlock.lockNow') : t('readOnlyUnlock.unlockAction')"
+ :aria-disabled="compatibilityReadOnly"
+ :aria-label="compatibilityReadOnly ? tooltip : unlocked ? t('readOnlyUnlock.lockNow') : t('readOnlyUnlock.unlockAction')"
+ :title="compatibilityReadOnly ? tooltip : unlocked ? t('readOnlyUnlock.lockNow') : t('readOnlyUnlock.unlockAction')"
@click.stop.prevent="onActivate"
>
<Unlock v-if="unlocked" class="h-3 w-3 shrink-0 text-amber-600 dark:text-amber-400" />
diff --git a/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts b/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
index f2d9d0d38e..f27683c3b9 100644
--- a/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
+++ b/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
@@ -389,6 +389,34 @@ describe("ConnectionDialog deep-link edit confirmation", () => {
});
});
+ it("preserves the MySQL data charset through save and reopen without changing stored readonly", async () => {
+ const saved = savedConnection({ url_params: "charset=utf8mb4&dataCharset=GBK", read_only: false });
+ await mountDialog(saved, "");
+ expect(document.querySelector("#mysql-data-charset")?.textContent).toContain("GBK");
+ const save = [...document.querySelectorAll("button")].find((button) => button.textContent?.trim() === "Save");
+ save!.click();
+ await settle();
+ expect(store.updateConnection).toHaveBeenCalledWith(expect.objectContaining({ url_params: "charset=utf8mb4&dataCharset=GBK", read_only: undefined }));
+ const persisted = store.updateConnection.mock.calls[0]![0] as ConnectionConfig;
+ for (const app of mountedApps.splice(0)) app.unmount();
+ document.body.innerHTML = "";
+ await mountDialog(persisted, "");
+ expect(document.querySelector("#mysql-data-charset")?.textContent).toContain("GBK");
+ });
+
+ it("rejects conflicting session charset on save instead of silently changing it", async () => {
+ await mountDialog(savedConnection({ url_params: "charset=latin1&dataCharset=GBK" }), "");
+ const save = [...document.querySelectorAll("button")].find((button) => button.textContent?.trim() === "Save");
+ save!.click();
+ await settle();
+ expect(store.updateConnection).not.toHaveBeenCalled();
+ expect(document.body.textContent).toContain("dataCharset requires the default");
+ });
+
+ it("does not expose the MySQL data charset selector for MariaDB", async () => {
+ await mountDialog(savedConnection({ driver_profile: "mariadb", driver_label: "MariaDB" }), "");
+ expect(document.querySelector("#mysql-data-charset")).toBeNull();
+ });
it("shows the global Redis preview limit in advanced settings and persists it", async () => {
visibleTab.value = "advanced";
settings.editorSettings.redisValuePreviewLimitKiB = 64;
diff --git a/apps/desktop/src/components/export/DatabaseExportDialog.vue b/apps/desktop/src/components/export/DatabaseExportDialog.vue
index cc3c733e92..62462d4c79 100644
--- a/apps/desktop/src/components/export/DatabaseExportDialog.vue
+++ b/apps/desktop/src/components/export/DatabaseExportDialog.vue
@@ -6,6 +6,7 @@ import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { useConnectionStore } from "@/stores/connectionStore";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import DatabaseIcon from "@/components/icons/DatabaseIcon.vue";
import ConnectionGroupBadge from "@/components/connection/ConnectionGroupBadge.vue";
import * as api from "@/lib/backend/api";
@@ -183,6 +184,7 @@ const exportElapsedText = computed(() => {
const sqlConnections = computed(() => store.connections.filter((c) => !["redis", "mongodb", "elasticsearch", "easysearch", "meilisearch", "solr", "couchdb", "qdrant", "milvus", "weaviate", "chromadb", "etcd", "zookeeper", "consul", "mq", "nacos", "salesforce"].includes(c.db_type)));
const canExport = computed(() => {
+ if (mysqlDataCharsetEnabled(store.getConfig(connectionId.value))) return false;
const hasContent = includeStructure.value || includeData.value || includeObjects.value;
if (!connectionId.value || !hasContent || isExporting.value) return false;
if (exportAllDatabases.value) return selectedDatabases.value.length > 0 && !loadingMeta.value;
@@ -629,6 +631,7 @@ async function startDesktopExport() {
}
async function startExport() {
+ if (mysqlDataCharsetEnabled(store.getConfig(connectionId.value))) return;
if (!canExport.value) return;
if (isTauriRuntime()) {
await startDesktopExport();
@@ -1145,6 +1148,7 @@ watch([includeStructure, includeData, insertDialect, insertMode, includeObjects,
</DialogHeader>
<div class="flex-1 min-h-0 overflow-auto space-y-4 py-2">
+ <p v-if="mysqlDataCharsetEnabled(store.getConfig(connectionId))" class="text-xs text-muted-foreground">{{ t("connection.mysqlDataCharsetExportHint") }}</p>
<!-- Connection / Database / Schema Selection -->
<div v-if="!isExporting && !exportDone && !exportError && !exportCancelled" class="space-y-3">
<div class="space-y-1.5">
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 636bce6b4b..98aff9f877 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -116,6 +116,7 @@ import { tableInfoTabForDrawerToggle } from "@/lib/table/tableInfoTabPreference"
import { findTableStatistics } from "@/lib/dataGrid/tableInfoOverview";
import * as api from "@/lib/backend/api";
import type { SqlInsertMode } from "@/lib/export/sqlInsertMode";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { dataGridCellDisplayText, dataGridCellEditorText } from "@/lib/dataGrid/dataGridCellCoercion";
import { resolveDataGridBusyStartedAt } from "@/lib/dataGrid/dataGridBusyElapsed";
import { createColumnDrafts } from "@/lib/table/tableStructureEditorState";
@@ -891,6 +892,8 @@ const columnTypeMap = computed(() => {
return map;
});
const resolvedConnectionConfig = computed(() => connectionStore.getConfig(props.connectionId ?? ""));
+const compatibilityReadOnly = computed(() => mysqlDataCharsetEnabled(resolvedConnectionConfig.value));
+const effectiveEditable = computed(() => !!props.editable && !compatibilityReadOnly.value);
const resolvedDatabaseType = computed(() => props.databaseType ?? effectiveDatabaseTypeForConnection(resolvedConnectionConfig.value));
const tableRelationsSection = ref<ObjectDetailsSection>("dependencies");
const tableDependencyTarget = computed(() => {
@@ -3962,9 +3965,9 @@ watch(
}
},
);
-const showQueryEditReadOnlyBadge = computed(() => isResultsContext.value && hasData.value && !props.editable && !!props.queryEditabilityReason);
+const showQueryEditReadOnlyBadge = computed(() => isResultsContext.value && hasData.value && !effectiveEditable.value && !!props.queryEditabilityReason);
const queryEditReadOnlyReason = computed(() => (props.queryEditabilityReason ? t(`grid.queryEditUnsupported.${props.queryEditabilityReason}`) : ""));
-const showKeylessEditWarning = computed(() => !!props.editable && !!props.tableMeta && showsKeylessEditWarning(props.databaseType, props.tableMeta.primaryKeys ?? [], props.tableMeta.tableType));
+const showKeylessEditWarning = computed(() => !!effectiveEditable.value && !!props.tableMeta && showsKeylessEditWarning(props.databaseType, props.tableMeta.primaryKeys ?? [], props.tableMeta.tableType));
type DataGridTableMeta = NonNullable<typeof props.tableMeta>;
const hiveTableTransactional = ref<boolean | undefined>(undefined);
const resultSourceColumns = computed(() => props.result.columns.map((column, index) => props.sourceColumns?.[index] ?? column));
@@ -3980,7 +3983,7 @@ const hasDataGridInsertTarget = computed(() => {
if (handler) return handler.supportsInsert === true || handler.canInsert === true;
return !!props.tableMeta && canInsertTableRows(props.databaseType);
});
-const canInsertRows = computed(() => !!props.editable && hasDataGridInsertTarget.value);
+const canInsertRows = computed(() => !!effectiveEditable.value && hasDataGridInsertTarget.value);
const canDeleteRows = computed(() => props.allowDeleteRows !== false && (!props.customSaveHandler || props.customSaveHandler.canDelete !== false));
const canDeleteExistingRows = computed(() => !!props.customSaveHandler || canDeleteExistingTdengineRows(props.databaseType, props.tableMeta?.primaryKeys ?? []));
watch(
@@ -4700,7 +4703,7 @@ watch(saveConfirmOpen, (isOpen) => {
const editor = useDataGridEditor({
result: computed(() => props.result),
- editable: computed(() => props.editable),
+ editable: computed(() => effectiveEditable.value),
databaseType: computed(() => props.databaseType),
connectionId: computed(() => props.connectionId),
database: computed(() => props.executionDatabase ?? props.database),
@@ -4943,7 +4946,7 @@ const saveActionMode = computed(() =>
const previewLabelKey = computed(() => dataGridPreviewLabelKey(resolvedDatabaseType.value));
const saveToolbarState = computed(() =>
dataGridSaveToolbarState({
- editable: props.editable,
+ editable: effectiveEditable.value,
hasSaveTarget: hasDataGridSaveTarget.value,
hasPendingChanges: hasPendingChanges.value,
isSaving: isSaving.value,
@@ -4991,7 +4994,7 @@ function clearVirtualRowIdentifier() {
const quickEntryEnabled = computed(() => settingsStore.editorSettings.dataGridQuickEntry);
const showQuickEntryDraftRow = computed(() =>
shouldShowQuickEntryDraftRow({
- editable: !!props.editable,
+ editable: !!effectiveEditable.value,
hasInsertTarget: hasDataGridInsertTarget.value,
quickEntryEnabled: quickEntryEnabled.value,
rowStatusFilter: rowStatusFilter.value,
@@ -5000,7 +5003,7 @@ const showQuickEntryDraftRow = computed(() =>
);
const showDataGridTopbar = computed(
() =>
- (useTransaction.value && !!props.editable && hasDataGridSaveTarget.value) ||
+ (useTransaction.value && !!effectiveEditable.value && hasDataGridSaveTarget.value) ||
hasLocalColumnFilters.value ||
canShowWhereSearch.value ||
hasSearchBarSlot.value ||
@@ -5009,13 +5012,13 @@ const showDataGridTopbar = computed(
showVirtualRowIdentifierControl.value ||
showQueryEditReadOnlyBadge.value ||
props.context !== "results" ||
- (!!props.editable && hasDataGridSaveTarget.value) ||
+ (!!effectiveEditable.value && hasDataGridSaveTarget.value) ||
transactionActive.value ||
saveToolbarState.value.showActions,
);
function canEditRowItem(item: RowItem | undefined): boolean {
- return !isConditionalUpdateActive.value && !!props.editable && !!item && !item.isDeleted && (item.isNew || item.isDraft || canEditExistingRows.value);
+ return !isConditionalUpdateActive.value && !!effectiveEditable.value && !!item && !item.isDeleted && (item.isNew || item.isDraft || canEditExistingRows.value);
}
function canEditCellItem(item: RowItem | undefined, columnIndex: number): boolean {
@@ -5286,7 +5289,7 @@ function canDeleteRowItem(item: RowItem | undefined): boolean {
if (!item) return false;
if (!item.isNew && canUseKeylessRowPredicate(props.databaseType, props.tableMeta?.primaryKeys ?? []) && hasUnsafeOpaqueAggregateStatePredicate(allColumnTypes.value, item.data)) return false;
const canDelete = canDeleteGridRowItem({
- editable: !!props.editable && canDeleteRows.value,
+ editable: !!effectiveEditable.value && canDeleteRows.value,
isDraft: !!item.isDraft,
isDeleted: item.isDeleted,
isNew: item.isNew,
@@ -5510,7 +5513,7 @@ const addRowToolbarCapability = computed<DataGridToolbarAddRowCapability>(() =>
const deleteRowToolbarTargetCount = computed(() => deletableRowIds(selectedOrCurrentRowIds()).length);
const deleteRowToolbarState = computed(() =>
dataGridDeleteRowToolbarState({
- editable: !!props.editable,
+ editable: !!effectiveEditable.value,
canDeleteRows: canDeleteRows.value,
canDeleteExistingRows: canDeleteExistingRows.value,
deletableTargetCount: deleteRowToolbarTargetCount.value,
@@ -6384,7 +6387,7 @@ const largeValueRuntimeInstance = useDataGridLargeValues({
cloneRows: cloneEditorRows,
});
largeValueRuntime = largeValueRuntimeInstance;
-const { isLargeValuePreview, largeValueOriginalBytes, formatGridItemCell, formatGridItemCellForConfirmation, visibleLargeValuePreviewValue, resolveLargeValueCells, hydrateLargeValueCells, reportLargeValueLoadError, cloneRow, cloneRows } = largeValueRuntimeInstance;
+const { isLargeValuePreview, isPendingDecode, formatGridItemCell, formatGridItemCellForConfirmation, resolveLargeValueCells, hydrateLargeValueCells, reportLargeValueLoadError, cloneRow, cloneRows } = largeValueRuntimeInstance;
// Pagination/refresh replaces tab.result without remounting the grid, so the
// page-scoped full-text state must follow the result it was loaded for; the
@@ -7608,6 +7611,7 @@ function cellDetailFor(rowIndex: number, columnIndex: number): DataGridCellDetai
}),
databaseType: resolvedDatabaseType.value,
isValuePreviewTruncated: isLargeValuePreview(item, columnIndex),
+ pendingDecodePlaceholder: isPendingDecode(item, columnIndex) ? t("grid.largeValuePendingDecode") : undefined,
});
}
@@ -7699,6 +7703,7 @@ const rowDetail = computed(() => {
isDraft: !!item.isDraft,
}),
isValuePreviewTruncated: (columnIndex) => isLargeValuePreview(item, columnIndex),
+ pendingDecodePlaceholder: (columnIndex) => (isPendingDecode(item, columnIndex) ? t("grid.largeValuePendingDecode") : undefined),
});
});
@@ -7717,6 +7722,7 @@ const columnDetail = computed(() => {
isDraft: !!item.isDraft,
}),
isValuePreviewTruncated: isLargeValuePreview(item, columnIndex),
+ pendingDecodePlaceholder: isPendingDecode(item, columnIndex) ? t("grid.largeValuePendingDecode") : undefined,
})),
columns: props.result.columns,
columnIndex,
@@ -9376,7 +9382,7 @@ function drawCanvasGrid() {
currentSearchMatch: currentSearchMatch.value,
duplicateHighlightKeys: duplicateHighlightKeys.value,
nullHighlightKeys: nullHighlightKeys.value,
- formatCell: (value, columnIndex, row) => formatCellCached(visibleLargeValuePreviewValue(row, columnIndex, value), columnIndex, largeValueOriginalBytes(row, columnIndex)),
+ formatCell: (_value, columnIndex, row) => formatGridItemCell(row, columnIndex, false),
isNullValue: (value) => value === null || (usesMongoDocumentGridValues.value && value === MONGO_DOCUMENT_GRID_NULL),
newRowCellPlaceholder,
isRowActive,
@@ -9727,6 +9733,7 @@ const {
exportTxt,
exportCurrentPageTxt,
} = useDataGridExport({
+ mysqlDataCharsetReadOnly: compatibilityReadOnly,
columns: visibleColumns,
displayItems: visibleDisplayItems,
allColumns: computed(() => props.result.columns),
@@ -10006,7 +10013,7 @@ const pageSizeMenuItems = computed(() =>
})),
);
-const exportMenuItems = computed(() => {
+const unrestrictedExportMenuItems = computed(() => {
const hasFullResultExport = !!props.fullExportResult;
const canIncludeSql = props.context === "results" && !!(props.exportSql || props.sql)?.trim();
const canTransferToDatabase = props.context === "results" && !!props.transferQueryResult;
@@ -10176,11 +10183,14 @@ const exportMenuItems = computed(() => {
];
});
+const exportMenuItems = computed(() => unrestrictedExportMenuItems.value.filter((item) => !compatibilityReadOnly.value || /(?:^|-)(?:csv|json|xlsx)(?:-with-sql)?$/.test(item.value)));
+
function selectPageSizeMenuItem(value: string) {
changePageSize(Number(value));
}
function selectExportMenuItem(value: string) {
+ if (compatibilityReadOnly.value && !exportMenuItems.value.some((item) => item.value === value)) return;
const actions: Record<string, () => void> = {
database: () => props.transferQueryResult?.(),
"page-csv": exportCurrentPageCsv,
@@ -10453,7 +10463,7 @@ function clipboardShortcut(event: KeyboardEvent, key: string): boolean {
const clipboardNullText = computed(() => settingsStore.editorSettings.dataGridExtractorOptions.dsv.nullText);
async function pasteClipboardIntoSelection() {
- if (!props.editable) return;
+ if (!effectiveEditable.value) return;
const operation = dataGridResultLifecycle.beginOperation();
const lifecycle = gridClipboardLifecycle;
const text = await readTextFromClipboard();
@@ -10508,7 +10518,7 @@ function batchAppendPasteTargetRowId(): number | null {
}
function canAppendPastedRows(): boolean {
- return !!props.editable && batchAppendPasteTargetRowId() !== null;
+ return !!effectiveEditable.value && batchAppendPasteTargetRowId() !== null;
}
function batchAppendPasteError(reason: string): string {
@@ -10644,7 +10654,7 @@ function pasteRowsIntoSelection(rows: readonly (readonly (string | null)[])[]):
}
function onGridPaste(event: ClipboardEvent) {
- const intent = claimDataGridPaste(event, props.editable, !!selectedRange.value || hasColumnSelection.value || canAppendPastedRows());
+ const intent = claimDataGridPaste(event, effectiveEditable.value, !!selectedRange.value || hasColumnSelection.value || canAppendPastedRows());
if (intent === "native") return;
if (intent === "block") return;
const text = event.clipboardData?.getData("text/plain");
@@ -10683,7 +10693,7 @@ function selectedRangeTargetsOnlyDraftRow(): boolean {
return displayItemAt(range.startRow)?.isDraft === true;
}
-const replaceAvailable = computed(() => !!props.editable && hasDataGridSaveTarget.value && canUpdateExistingRows.value && !resolvedConnectionConfig.value?.read_only && !isConditionalUpdateActive.value);
+const replaceAvailable = computed(() => !!effectiveEditable.value && hasDataGridSaveTarget.value && canUpdateExistingRows.value && !resolvedConnectionConfig.value?.read_only && !isConditionalUpdateActive.value);
const replaceResolving = ref(false);
const replaceBusy = computed(() => replaceResolving.value || isSaving.value || gridSurfaceBusy.value || props.loading === true);
@@ -10858,12 +10868,12 @@ function selectionHasEditableCells(): boolean {
}
function setSelectionNull() {
- if (!props.editable || !selectionHasEditableCells()) return;
+ if (!effectiveEditable.value || !selectionHasEditableCells()) return;
fillSelectionWithValue(null);
}
function openBulkEditDialog() {
- if (!props.editable || !selectionHasEditableCells()) return;
+ if (!effectiveEditable.value || !selectionHasEditableCells()) return;
const currentWhere = currentWhereInput()?.trim() ?? "";
bulkEditValue.value = "";
bulkEditScope.value = "selection";
@@ -11050,7 +11060,7 @@ function editableSelectionCells(): EditableSelectionCell[] {
}
function beginInlineBulkEdit(initialValue: string): boolean {
- if (!props.editable) return false;
+ if (!effectiveEditable.value) return false;
const target = editableSelectionCells()[0];
if (!target || selectedCellCount.value <= 1) return false;
const actualCol = actualColumnIndex(target.visibleCol);
@@ -11062,7 +11072,7 @@ function beginInlineBulkEdit(initialValue: string): boolean {
}
function applyGeneratedSelectionValue(kind: CellValueGenerationKind, generationOptions?: CellValueGenerationOptions | bigint): boolean {
- if (!props.editable) return false;
+ if (!effectiveEditable.value) return false;
const cells = editableSelectionCells();
if (!cells.length) return false;
const options = typeof generationOptions === "bigint" ? { startValue: generationOptions } : (generationOptions ?? {});
@@ -11107,7 +11117,7 @@ function generatedGridValue(kind: CellValueGenerationKind, value: string | null)
}
function openGenerateIncrementDialog(target: "selection" | "detail") {
- if (target === "selection" && (!props.editable || !selectionHasEditableCells())) return;
+ if (target === "selection" && (!effectiveEditable.value || !selectionHasEditableCells())) return;
if (target === "detail" && !activeCellDetail.value?.isEditable) return;
generateIncrementTarget.value = target;
generateIncrementStartValue.value = "1";
@@ -11236,7 +11246,7 @@ function generateSelectionMenuItems(disabled: boolean): ContextMenuItem[] {
}
async function cutSelection() {
- if (!props.editable || !selectedRange.value) return;
+ if (!effectiveEditable.value || !selectedRange.value) return;
const range = selectedRange.value;
if (!(await copyWithExtractor("tsv"))) return;
const allowDraftSelectionValue = selectedRangeTargetsOnlyDraftRow();
@@ -11720,7 +11730,7 @@ function addRowFromArrowDown(): boolean {
// 顺序对齐 DBeaver 的 ESC = Reset cell changes:先撤掉「刚新增且从未写入」的整行,
// 再把单格的待保存改动回退为原值。多格 / 整行 / 整列选区不参与:一次 Esc 不应抹掉一整片改动。
function cancelPendingRowOrRestoreCell(): boolean {
- if (isTransposeMode.value || editingCell.value || !props.editable) return false;
+ if (isTransposeMode.value || editingCell.value || !effectiveEditable.value) return false;
// 保存进行中不得改动待提交状态:这一轮保存的快照已经捕获了当前值,此刻回退只会让用户以为
// 改动被撤销,数据库仍会写入(同层的 stageCellReplacements / rowPreparationIsCurrent 都做了
// 同样的 !isSaving 门槛)。
@@ -11792,7 +11802,7 @@ async function onGridKeydown(event: KeyboardEvent) {
return;
}
if ((event.metaKey || event.ctrlKey) && !event.shiftKey && event.key.toLowerCase() === "n") {
- if (props.editable && hasDataGridInsertTarget.value && canInsertRows.value) {
+ if (effectiveEditable.value && hasDataGridInsertTarget.value && canInsertRows.value) {
event.preventDefault();
event.stopPropagation();
addRow();
@@ -11925,13 +11935,13 @@ async function onGridKeydown(event: KeyboardEvent) {
return;
}
if (clipboardShortcut(event, "x")) {
- if (!props.editable || !selectedRange.value) return;
+ if (!effectiveEditable.value || !selectedRange.value) return;
event.preventDefault();
await cutSelection();
return;
}
if (clipboardShortcut(event, "v")) {
- const intent = claimDataGridPaste(event, props.editable, !!selectedRange.value || hasColumnSelection.value || canAppendPastedRows());
+ const intent = claimDataGridPaste(event, effectiveEditable.value, !!selectedRange.value || hasColumnSelection.value || canAppendPastedRows());
if (intent === "native") return;
// A focused grid owns the shortcut even when read-only; otherwise the webview may paste into the previously focused SQL editor.
if (intent === "block") return;
@@ -14721,6 +14731,7 @@ function buildExtractorContextItems(destination: "copy" | "export" = "copy"): Co
let separatorPending = false;
for (const extractor of DATA_GRID_COPY_EXTRACTOR_IDS) {
if (destination === "copy" && !settingsStore.editorSettings.dataGridVisibleCopyExtractors.includes(extractor)) continue;
+ if (compatibilityReadOnly.value && (destination === "export" ? !["csv", "csv-with-headers", "json"].includes(extractor) : extractor.startsWith("sql-") || extractor === "where-clause")) continue;
if (extractor === "raw" && !canCopyWithExtractor(extractor)) continue;
const descriptor = DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS[extractor];
if (descriptor.separatorBefore) {
@@ -14807,6 +14818,17 @@ function copySubmenu(): ContextMenuItem {
}
function exportSubmenu(): ContextMenuItem {
+ if (compatibilityReadOnly.value) {
+ return {
+ label: t("grid.export"),
+ icon: Upload,
+ children: [
+ { label: t("grid.exportCsv"), action: exportCsv },
+ { label: t("grid.exportXlsx"), action: exportXlsx },
+ { label: t("grid.exportJson"), action: exportJson },
+ ],
+ };
+ }
const items: ContextMenuItem[] = [
...(props.context === "results" && props.transferQueryResult ? [{ label: t("grid.exportDatabase"), action: props.transferQueryResult }] : []),
{ label: t("grid.exportCsv"), action: exportCsv },
@@ -15069,7 +15091,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
hasCell: !!contextCell.value,
hasColumn: !!contextColumn.value,
headerColumn: !!contextHeaderColumn.value,
- editable: props.editable,
+ editable: effectiveEditable.value,
hasCellSelection: hasCellSelection.value,
hasEditableSelection,
hasSelection: hasCellSelection.value,
@@ -15123,7 +15145,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
},
],
createDataGridRowContextMenuItems({
- editable: props.editable,
+ editable: effectiveEditable.value,
hasRow: !!row,
canClone: !!row && canInsertRows.value && !row.isDraft,
deleted: !!row?.isDeleted,
@@ -15234,6 +15256,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
@paste="onGridPaste"
@focusin="onGridFocusIn"
>
+ <p v-if="compatibilityReadOnly" class="shrink-0 border-b px-3 py-1 text-xs text-muted-foreground" :title="t('connection.mysqlDataCharsetReadOnly')">{{ t("connection.mysqlDataCharsetExportHint") }}</p>
<CustomContextMenu :items="currentGridContextMenuItems" @open="onGridContextMenuOpen" @close="onGridContextMenuClose" v-slot="{ onContextMenu }">
<div v-if="hasData || canShowWhereSearch" class="flex-1 flex flex-col overflow-hidden" @contextmenu="onContextMenu">
<!-- Search bar -->
@@ -15251,7 +15274,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<!-- Clip both axes instead of creating a hidden scroll container around the toolbar controls. -->
<div data-grid-topbar-row="filters" class="data-grid-topbar-scroll min-w-0 overflow-clip" :class="splitDataGridToolbar ? 'data-grid-topbar-scroll--row-divider col-span-2 row-start-2' : 'flex-1'">
<div class="data-grid-topbar flex items-stretch relative" :class="{ 'data-grid-topbar--compact': compactDataGridToolbar }">
- <div v-if="useTransaction && editable && hasDataGridSaveTarget" class="flex items-center px-2 py-0.5 border-r shrink-0">
+ <div v-if="useTransaction && effectiveEditable && hasDataGridSaveTarget" class="flex items-center px-2 py-0.5 border-r shrink-0">
<Select :model-value="rowStatusFilter" @update:model-value="(value: any) => setRowStatusFilter(String(value))">
<SelectTrigger class="h-5 max-w-28 border-0 bg-transparent px-0 py-0 text-xs font-medium text-foreground/70 shadow-none focus-visible:ring-0 data-[state=open]:text-foreground dark:bg-transparent dark:hover:bg-transparent [&_svg]:size-3">
<SelectValue :placeholder="t('grid.filterRows')" />
@@ -15290,7 +15313,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
:history-scope="conditionHistoryScope"
:can-use-where-search="canUseWhereSearch"
:compact="compactDataGridToolbar"
- :leading-border="!!(useTransaction && editable && hasDataGridSaveTarget)"
+ :leading-border="!!(useTransaction && effectiveEditable && hasDataGridSaveTarget)"
:filter-button-active="filterButtonActive"
:filter-button-count="filterButtonCount"
:sort-button-active="sortButtonActive"
@@ -17301,7 +17324,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<QueryTimingDetails v-if="isResultsContext" :result="result" :render-ms="resultViewUpdateMs" />
<span v-else class="shrink-0">{{ formatQueryDuration(result.execution_time_ms) }}</span>
- <template v-if="editable && hasDataGridSaveTarget">
+ <template v-if="effectiveEditable && hasDataGridSaveTarget">
<span v-if="hasPendingChanges" class="shrink-0 text-foreground">
{{ t("grid.pendingChanges", { count: pendingChangeCount }) }}
</span>
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index 8f78decef6..00c35f40c9 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -232,6 +232,7 @@ import { isOracleFamilyTypeSource } from "@/lib/database/databaseObjectCapabilit
import { requestOracleTypeManagement } from "@/lib/table/oracleTypeManagementRequest";
import { sqlStatementParameterOptionsForCompatibility } from "@/lib/sql/sqlStatementRanges";
import { connectionIsEffectivelyReadOnly } from "@/lib/database/readOnlyWriteAccess";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { isAiRedisConsoleTarget, type AiConversationBinding } from "@/lib/ai/aiConversationBinding";
type DataGridHandle = DataGridColumnLayoutHandle & {
@@ -3284,7 +3285,7 @@ defineExpose({
<DropdownMenuSubContent>
<DropdownMenuItem @click="dataGridRef?.exportCsv()"> CSV </DropdownMenuItem>
<DropdownMenuItem @click="dataGridRef?.exportJson()"> JSON </DropdownMenuItem>
- <DropdownMenuItem @click="dataGridRef?.exportSql()"> SQL INSERT </DropdownMenuItem>
+ <DropdownMenuItem v-if="!mysqlDataCharsetEnabled(activeConnection)" @click="dataGridRef?.exportSql()"> SQL INSERT </DropdownMenuItem>
<DropdownMenuItem @click="dataGridRef?.exportXlsx()"> XLSX </DropdownMenuItem>
</DropdownMenuSubContent>
</DropdownMenuPortal>
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index fcc775968f..a29d561f26 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -186,6 +186,7 @@ import { executeWithProductionSqlGuard } from "@/lib/database/productionExecutio
import { exactOracleTriggerMetadata, oracleTriggerObjectReadOptions, oracleTriggerReadOptions } from "@/lib/database/oracleTriggerIdentity";
import { tablePageRowAnchorKey } from "@/lib/table/tableTree";
import { connectionIsEffectivelyReadOnly } from "@/lib/database/readOnlyWriteAccess";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { buildXuguCompileSql } from "@/lib/database/xuguCompileSql";
import { buildDamengCompileViewSql } from "@/lib/database/damengCompileSql";
import { formatShortcut } from "@/lib/editor/shortcutRegistry";
@@ -3820,6 +3821,10 @@ async function exportDataLegacy(row: ObjectBrowserRow, format: "json") {
}
async function exportData(row: ObjectBrowserRow, format: "csv" | "json" | "sql", insertDialect: SqlInsertDialect = "source") {
+ if (format === "sql" && mysqlDataCharsetEnabled(props.connection)) {
+ toast(t("connection.mysqlDataCharsetExportHint"), 5000);
+ return;
+ }
if (format === "json" && !isTauriRuntime()) {
await exportDataLegacy(row, format);
return;
@@ -5548,7 +5553,7 @@ function exportDataSubmenu(item: ObjectBrowserRow): ContextMenuItem {
{ label: "CSV", action: () => exportData(item, "csv") },
{ label: "JSON", action: () => exportData(item, "json") },
];
- if (!isVictoriaMetrics.value) {
+ if (!isVictoriaMetrics.value && !mysqlDataCharsetEnabled(props.connection)) {
formats.push({ label: "SQL INSERT", action: () => exportData(item, "sql", "source") });
formats.push({ sidebarActionId: "contextMenu.standardSqlInsert", label: t("contextMenu.standardSqlInsert"), action: () => exportData(item, "sql", "standard") });
}
diff --git a/apps/desktop/src/components/plugins/PluginBottomDock.vue b/apps/desktop/src/components/plugins/PluginBottomDock.vue
index b56a97d6e1..48d57c5e19 100644
--- a/apps/desktop/src/components/plugins/PluginBottomDock.vue
+++ b/apps/desktop/src/components/plugins/PluginBottomDock.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
// PR-A4/P2 global bottom panel dock (HOST_PLUGIN_UI_SPEC §8.3) — a generic host container:
// it only provides the panel frame (tab strip, drag-resize height, collapse/maximize/hide) and hosts any plugin's
// panel webviews, with zero plugin business inside; multi-terminal/shell selection/connection switching all live in the plugin
@@ -274,7 +275,7 @@ function onPlusAction(value: string) {
host: connection.host,
port: connection.port,
username: connection.username,
- readOnly: connection.read_only === true,
+ readOnly: mysqlDataCharsetEnabled(connection) || connection.read_only === true,
},
},
});
diff --git a/apps/desktop/src/components/plugins/PluginWorkbenchHost.vue b/apps/desktop/src/components/plugins/PluginWorkbenchHost.vue
index dcab7b5d3a..dc8ff4cac0 100644
--- a/apps/desktop/src/components/plugins/PluginWorkbenchHost.vue
+++ b/apps/desktop/src/components/plugins/PluginWorkbenchHost.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { computed, inject, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue";
import { AlertTriangle, Loader2 } from "@lucide/vue";
import * as api from "@/lib/backend/api";
@@ -601,7 +602,7 @@ function createBridge() {
databaseType: connection.db_type,
connected,
isConnected: connected,
- readOnly: connection.read_only === true,
+ readOnly: mysqlDataCharsetEnabled(connection) || connection.read_only === true,
database: connection.database,
schema: connection.default_schema,
providerId: connection.plugin_connection_provider ?? "",
@@ -626,7 +627,7 @@ function createBridge() {
isConnected: connected,
providerId: connection.plugin_connection_provider ?? "",
connectionType: connection.plugin_connection_type,
- readOnly: connection.read_only === true,
+ readOnly: mysqlDataCharsetEnabled(connection) || connection.read_only === true,
database: connection.database,
schema: connection.default_schema,
// #193b — dock/tab titles bound to the connection (dock first), so plugins can label session rows after renamed terminals.
@@ -648,7 +649,7 @@ function createBridge() {
databaseType: connection.db_type,
connected,
isConnected: connected,
- readOnly: connection.read_only === true,
+ readOnly: mysqlDataCharsetEnabled(connection) || connection.read_only === true,
database: connection.database,
schema: connection.default_schema,
providerId: connection.plugin_connection_provider ?? "",
diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
index 932e99a6c5..5aa0214e26 100644
--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
@@ -11,6 +11,7 @@ import { useSidebarConnectionMutationRuntime } from "@/composables/useSidebarCon
import { useSidebarDatabaseSpecificMutationRuntime } from "@/composables/useSidebarDatabaseSpecificMutationRuntime";
import { useSidebarTableMutationRuntime } from "@/composables/useSidebarTableMutationRuntime";
import { useSidebarTreeExportRuntime } from "@/composables/useSidebarTreeExportRuntime";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { useSidebarTreeToolRuntime } from "@/composables/useSidebarTreeToolRuntime";
import { canDropDatabaseNode, notifyDatabaseBrowserMutation } from "@/lib/database/databaseBrowserActions";
import { canDropDatabaseTables, canEmptyDatabaseTables, useDatabaseTableEmpty } from "@/composables/useDatabaseTableEmpty";
@@ -7136,6 +7137,7 @@ function addToAiMenuItem(node: TreeNode): ContextMenuItem {
}
function exportDataSubmenu(includeSqlInsert = true): ContextMenuItem {
+ if (sidebarTableDataExportTargets(activeNode.value, connectionStore.treeNodes, acceptedSelectionIds ?? connectionStore.selectedTreeNodeIds).some((target) => mysqlDataCharsetEnabled(connectionStore.getConfig(target.connectionId ?? "")))) includeSqlInsert = false;
const count = selectedDataExportTargetCount();
const children: ContextMenuItem[] = [
{ label: "CSV", action: () => exportData("csv") },
diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue
index 61901838ae..aeb22048ad 100644
--- a/apps/desktop/src/components/sidebar/TreeItem.vue
+++ b/apps/desktop/src/components/sidebar/TreeItem.vue
@@ -43,6 +43,7 @@ import {
import OracleDatabaseLinksDialog from "@/components/objects/OracleDatabaseLinksDialog.vue";
const showDatabaseLinks = ref(false);
import { useConnectionStore } from "@/stores/connectionStore";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { useQueryStore } from "@/stores/queryStore";
import { useSettingsStore } from "@/stores/settingsStore";
import { useToast } from "@/composables/useToast";
@@ -915,7 +916,7 @@ const isConnecting = computed(() => activeNode.value.type === "connection" && !!
// database colors entirely; the trailing green dot still marks active ones.
const connectionIconInactiveClass = computed(() => (activeNode.value.type === "connection" && activeNode.value.connectionId && !connectionStore.connectedIds.has(activeNode.value.connectionId) ? "saturate-50 opacity-70" : ""));
-const isConnectionReadonly = computed(() => activeNode.value.type === "connection" && !!activeNode.value.connectionId && (connectionStore.getConfig(activeNode.value.connectionId)?.read_only ?? false));
+const isConnectionReadonly = computed(() => activeNode.value.type === "connection" && !!activeNode.value.connectionId && (mysqlDataCharsetEnabled(connectionStore.getConfig(activeNode.value.connectionId)) || (connectionStore.getConfig(activeNode.value.connectionId)?.read_only ?? false)));
const databaseOpenVisual = computed(() => {
const databaseOpen = isSidebarDatabaseOpenForVisual(activeNode.value, connectionStore.isTreeNodeChildrenLoaded, queryStore.openDatabaseKeys);
diff --git a/apps/desktop/src/components/transfer/DataTransferDialog.vue b/apps/desktop/src/components/transfer/DataTransferDialog.vue
index d46bd3f1db..45f764428c 100644
--- a/apps/desktop/src/components/transfer/DataTransferDialog.vue
+++ b/apps/desktop/src/components/transfer/DataTransferDialog.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from "vue";
import { uuid } from "@/lib/common/utils";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { useI18n } from "vue-i18n";
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
import { Button } from "@/components/ui/button";
@@ -108,7 +109,7 @@ const transferDialogStyle = {
const store = useConnectionStore();
const DEFAULT_TRANSFER_OPERATION_TIMEOUT_SECS = 600;
-const sqlConnections = computed(() => store.connections.filter((c) => supportsTransfer(transferDatabaseTypeForConnection(c))));
+const sqlConnections = computed(() => store.connections.filter((c) => !mysqlDataCharsetEnabled(c) && supportsTransfer(transferDatabaseTypeForConnection(c))));
const sourceConnections = computed(() => {
const targetType = transferDatabaseTypeForConnection(store.getConfig(targetConnectionId.value));
return sqlConnections.value.filter((connection) => isTransferPairSupported(transferDatabaseTypeForConnection(connection), targetType));
@@ -420,6 +421,7 @@ const operationTimeoutHint = computed(() => {
});
const canStart = computed(() => {
+ if (mysqlDataCharsetEnabled(store.getConfig(sourceConnectionId.value)) || mysqlDataCharsetEnabled(store.getConfig(targetConnectionId.value))) return false;
const effectiveSourceSchema = sourceSchema.value || sourceDatabaseName.value;
const effectiveTargetSchema = targetSchema.value || targetDatabaseName.value;
const sameCatalogAndDatabase = isSameTransferDatabase(
@@ -1183,7 +1185,7 @@ watch(
watch(
() => {
const connection = store.getConfig(targetConnectionId.value);
- return JSON.stringify([connection?.read_only, connection?.is_production, connection?.production_databases]);
+ return JSON.stringify([connection?.read_only, connection?.is_production, connection?.production_databases, mysqlDataCharsetEnabled(connection), mysqlDataCharsetEnabled(store.getConfig(sourceConnectionId.value))]);
},
cancelPendingTransfer,
{ flush: "sync" },
@@ -1981,6 +1983,7 @@ async function saveConfigTask() {
</div>
<DialogFooter class="shrink-0">
+ <p v-if="mysqlDataCharsetEnabled(store.getConfig(sourceConnectionId)) || mysqlDataCharsetEnabled(store.getConfig(targetConnectionId))" class="text-xs text-muted-foreground">{{ t("connection.mysqlDataCharsetExportHint") }}</p>
<Button variant="outline" size="sm" @click="open = false">
{{ t("transfer.cancel") }}
</Button>
diff --git a/apps/desktop/src/components/transfer/QueryResultTransferDialog.vue b/apps/desktop/src/components/transfer/QueryResultTransferDialog.vue
index ccc1f39276..71b50b3425 100644
--- a/apps/desktop/src/components/transfer/QueryResultTransferDialog.vue
+++ b/apps/desktop/src/components/transfer/QueryResultTransferDialog.vue
@@ -11,6 +11,7 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import ConnectionTreeSelect from "@/components/connection/ConnectionTreeSelect.vue";
import { useConnectionStore } from "@/stores/connectionStore";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { isSchemaAware } from "@/lib/database/databaseFeatureSupport";
import { productionContextForDatabase } from "@/lib/database/productionSafety";
import { normalizeSqliteNamespace } from "@/lib/database/sqliteNamespace";
@@ -171,7 +172,7 @@ onBeforeUnmount(() => {
sourceRevision += 1;
});
-const sqlConnections = computed(() => connections.connections.filter((item) => supportsQueryResultTransfer(item)));
+const sqlConnections = computed(() => connections.connections.filter((item) => !mysqlDataCharsetEnabled(item) && supportsQueryResultTransfer(item)));
const targetConfig = computed<ConnectionConfig | undefined>(() => (targetConnectionId.value ? connections.getConfig(targetConnectionId.value) : undefined));
const targetDatabaseType = computed(() => queryResultTransferDatabaseType(targetConfig.value));
const reviewMode = ref<"preview" | "confirm" | null>(null);
@@ -181,7 +182,10 @@ const reviewOpen = computed({
if (!value) reviewMode.value = null;
},
});
-const canTransfer = computed(() => open.value && !!targetConfig.value && !!targetDatabaseType.value && !!targetDatabase.value.trim() && !!targetTable.value.trim() && (!isSchemaAware(targetDatabaseType.value) || !!targetSchema.value.trim()) && !submitting.value && !databasesLoading.value);
+const compatibilityBlocked = computed(() => mysqlDataCharsetEnabled(connections.getConfig(props.sourceConnectionId)) || mysqlDataCharsetEnabled(targetConfig.value));
+const canTransfer = computed(
+ () => !compatibilityBlocked.value && open.value && !!targetConfig.value && !!targetDatabaseType.value && !!targetDatabase.value.trim() && !!targetTable.value.trim() && (!isSchemaAware(targetDatabaseType.value) || !!targetSchema.value.trim()) && !submitting.value && !databasesLoading.value,
+);
const sourceLocation = computed(() => [connections.getConfig(props.sourceConnectionId)?.name || props.sourceConnectionId, props.sourceDatabase, props.sourceSchema, props.sourceTable || props.result.sourceLabel].filter(Boolean).join(" / "));
const targetLocation = computed(() => [targetConfig.value?.name, targetDatabase.value.trim(), isSchemaAware(targetDatabaseType.value) ? targetSchema.value.trim() : undefined, targetTable.value.trim()].filter(Boolean).join(" / "));
const operationSummary = computed(() => t(createTable.value ? "grid.exportDatabasePlanCreate" : mode.value === "overwrite" ? "grid.exportDatabasePlanOverwrite" : "grid.exportDatabasePlanAppend"));
@@ -278,6 +282,7 @@ function requestCancel() {
}
async function transfer() {
+ if (compatibilityBlocked.value) return;
const config = targetConfig.value;
const databaseType = targetDatabaseType.value;
const database = targetDatabase.value.trim();
@@ -535,6 +540,7 @@ async function transfer() {
<label class="flex items-center gap-2"><input v-model="mode" :disabled="submitting" type="radio" value="overwrite" />{{ t("grid.exportDatabaseModeOverwrite") }}</label>
</div>
<p v-if="progress" class="text-xs text-muted-foreground">{{ progress }}</p>
+ <p v-if="compatibilityBlocked" class="text-xs text-muted-foreground">{{ t("connection.mysqlDataCharsetExportHint") }}</p>
</div>
<DialogFooter>
<Button variant="outline" size="sm" :disabled="submitting && !canCancel" @click="requestCancel">{{ t("transfer.cancel") }}</Button>
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
index 8218b39895..4fe156cc9c 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
@@ -8,7 +8,7 @@ import { copyRichTextToClipboard, copyToClipboard } from "@/lib/common/clipboard
import type { DataGridTableMeta } from "@/lib/dataGrid/dataGridSql";
import type { CellSelectionMatrix, SelectionData } from "@/lib/dataGrid/gridSelection";
import type { CellValue } from "@/lib/dataGrid/cellValue";
-import { cancelQuery, extractDataGridSelection, exportQueryResultCsv, exportQueryResultJson, exportQueryResultMarkdown, exportQueryResultXlsx, exportSnapshotResult, readLargeValueChunk } from "@/lib/backend/api";
+import { cancelQuery, extractDataGridSelection, exportQueryResultCsv, exportQueryResultJson, exportQueryResultMarkdown, exportQueryResultXlsx, exportQueryResultsXlsx, exportSnapshotResult, readLargeValueChunk } from "@/lib/backend/api";
import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS } from "@/lib/dataGrid/dataGridCopyExtractor";
import { clearDataGridClipboardCopy, parseDataGridClipboard } from "@/lib/dataGrid/dataGridClipboard";
import { MONGO_DOCUMENT_GRID_NULL, mongoDocumentGridExternalValue } from "@/lib/mongo/mongoDocumentValues";
@@ -55,6 +55,7 @@ vi.mock("@/lib/backend/api", async (importOriginal) => {
exportQueryResultJson: vi.fn(),
exportQueryResultMarkdown: vi.fn(),
exportQueryResultXlsx: vi.fn(),
+ exportQueryResultsXlsx: vi.fn(),
exportSnapshotResult: vi.fn(),
readLargeValueChunk: vi.fn(),
cancelQuery: vi.fn(),
@@ -186,6 +187,55 @@ function createExportState(
}
describe("original LOB result exports", () => {
+ it("rejects unresolved legacy text in multi-sheet XLSX before writing any sheet", async () => {
+ const { original, state } = snapshotState({ mysqlDataCharsetReadOnly: computed(() => true), context: computed(() => "results") });
+ original.large_value_cells = [{ row_index: 0, column_index: 1, original_bytes: 20000, pending_decode: true }];
+ await state.exportResultSheetsXlsx([{ sheetName: "pending", result: original }]);
+ expect(exportQueryResultsXlsx).not.toHaveBeenCalled();
+ expect(toast).toHaveBeenCalledWith(expect.stringContaining("grid.largeValuePendingDecodeExport"), 5000);
+ });
+
+ it.each(["csv", "json"] as const)("rejects unresolved legacy text in complete-local %s instead of exporting a carrier prefix", async (format) => {
+ const { original, state } = snapshotState({ mysqlDataCharsetReadOnly: computed(() => true), context: computed(() => "results") });
+ original.large_value_cells = [{ row_index: 0, column_index: 1, original_bytes: 20000, pending_decode: true }];
+ await (format === "csv" ? state.exportCsv() : state.exportJson());
+ expect(exportSnapshotResult).not.toHaveBeenCalled();
+ expect(exportQueryResultCsv).not.toHaveBeenCalled();
+ expect(exportQueryResultJson).not.toHaveBeenCalled();
+ expect(toast).toHaveBeenCalledWith(expect.stringContaining("grid.largeValuePendingDecodeExport"), 5000);
+ });
+
+ it("exports selected legacy text only after full-value resolution", async () => {
+ const resolveSourceValues = vi.fn(async () => new Map([[1, new Map([[1, "缤纷彩虹完整值"]])]]));
+ const { original, state } = snapshotState({ mysqlDataCharsetReadOnly: computed(() => true), resolveSourceValues });
+ original.large_value_cells = [{ row_index: 0, column_index: 1, original_bytes: 20000, pending_decode: true }];
+ await state.exportCurrentPageCsv();
+ expect(resolveSourceValues).toHaveBeenCalledWith([1], [0, 1]);
+ expect(exportQueryResultCsv).toHaveBeenCalledWith(expect.any(String), ["id", "name"], [[1, "缤纷彩虹完整值"]], expect.anything(), expect.anything());
+ });
+
+ it("blocks compatibility SQL and unsupported local exports before extraction or saving", async () => {
+ setActivePinia(createPinia());
+ vi.clearAllMocks();
+ const { state } = snapshotState({ mysqlDataCharsetReadOnly: computed(() => true), hasCellSelection: computed(() => true), selectedCellMatrix: computed(() => ({ columns: ["name"], rows: [["缤纷彩虹"]], rowIds: [1], columnIndexes: [1] })) });
+ await state.exportSql();
+ await state.exportCurrentPageSql();
+ await state.exportMarkdown();
+ await state.exportCurrentPageMarkdown();
+ await state.exportHtml();
+ await state.exportCurrentPageHtml();
+ await state.exportTxt();
+ await state.exportCurrentPageTxt();
+ expect(await state.exportWithExtractor("sql-inserts")).toBe(false);
+ expect(await state.copyWithExtractor("sql-inserts")).toBe(false);
+ expect(await state.copyWithExtractor("where-clause")).toBe(false);
+ expect(state.canCopyWithExtractor("sql-updates")).toBe(false);
+ expect(state.canCopyWithExtractor("csv")).toBe(true);
+ expect(saveTextFile).not.toHaveBeenCalled();
+ expect(extractDataGridSelection).not.toHaveBeenCalled();
+ expect(copyToClipboard).not.toHaveBeenCalled();
+ });
+
beforeEach(() => {
vi.clearAllMocks();
setActivePinia(createPinia());
diff --git a/apps/desktop/src/composables/__tests__/useDataGridLargeValues.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridLargeValues.spec.ts
index e5f7866ebc..efec6db372 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridLargeValues.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridLargeValues.spec.ts
@@ -6,6 +6,7 @@ import { binaryCellDisplayText, binaryCellDownloadPayload } from "@/lib/dataGrid
import { useDataGridLargeValues } from "@/composables/useDataGridLargeValues";
import { useDataGridEditor } from "@/composables/useDataGridEditor";
import { createDataGridRuntimeScope } from "@/lib/dataGrid/dataGridRuntime";
+import { fetchLegacyLargeValueRequestChunk, type LegacyLargeValueContext, type LegacyResolvedLargeValueCells } from "@/lib/dataGrid/legacyLargeValueExport";
import type { ConnectionConfig, DatabaseType, QueryResult } from "@/types/database";
const mocks = vi.hoisted(() => ({
@@ -40,10 +41,11 @@ const disposers: Array<() => void> = [];
afterEach(() => {
for (const dispose of disposers.splice(0)) dispose();
vi.resetAllMocks();
+ vi.useRealTimers();
});
-function mountLargeValues(databaseType: DatabaseType, result: Ref<QueryResult>, withEditor = false) {
- const config = ref({ id: `${databaseType}-1`, name: "Test", db_type: databaseType, host: "original" } as ConnectionConfig);
+function mountLargeValues(databaseType: DatabaseType, result: Ref<QueryResult>, withEditor = false, settings: { primaryKeys?: string[]; visible?: boolean; legacy?: boolean } = {}) {
+ const config = ref({ id: `${databaseType}-1`, name: "Test", db_type: databaseType, host: "original", url_params: settings.legacy ? "dataCharset=GBK" : undefined } as ConnectionConfig);
const runtimeScope = createDataGridRuntimeScope();
const toast = vi.fn();
const formatCell = (value: unknown, columnIndex?: number, originalBytes?: number) => binaryCellDisplayText(value, result.value.column_types?.[columnIndex ?? 0], originalBytes, databaseType) ?? String(value ?? "");
@@ -60,18 +62,18 @@ function mountLargeValues(databaseType: DatabaseType, result: Ref<QueryResult>,
tableName: "APP_DATA",
tableType: "TABLE",
columns: result.value.columns.map((name, index) => ({ name, data_type: result.value.column_types![index]!, is_nullable: index !== 0, column_default: null, is_primary_key: index === 0, extra: null })),
- primaryKeys: ["ID"],
+ primaryKeys: settings.primaryKeys ?? ["ID"],
})),
databaseType: computed(() => databaseType),
connectionId: computed(() => `${databaseType}-1`),
executionDatabase: computed(() => "MAXIMO"),
resultSourceColumns: computed(() => result.value.columns),
allColumnTypes: computed(() => result.value.column_types ?? []),
- renderedGridColumns: computed(() => []),
+ renderedGridColumns: computed(() => (settings.visible ? result.value.columns.map((_, actualColIdx) => ({ actualColIdx })) : [])),
showTranspose: ref(false),
- displayRowCount: computed(() => 1),
- gridScrollerElement: () => null,
- displayItemAt: () => undefined,
+ displayRowCount: computed(() => result.value.rows.length),
+ gridScrollerElement: () => (settings.visible ? ({ scrollTop: 0, clientHeight: 200 } as HTMLElement) : null),
+ displayItemAt: (index) => item(index + 1),
getRowItem: (rowId) => (rowId >= 1 && rowId <= result.value.rows.length ? item(rowId) : undefined),
tableColumnForGridColumn: () => undefined,
formatCell,
@@ -252,6 +254,176 @@ describe("useDataGridLargeValues", () => {
await expect(largeValues.captureSourceValues([{ rowId: 1, sourceIndex: 0, columnIndex: 1 }])(new AbortController().signal)).rejects.toMatchObject({ status: "failed" });
});
+ it("renders pending text without mutating data or automatically fetching a prefix, then decodes on explicit full read", async () => {
+ vi.useFakeTimers();
+ const result = previewResult("TEXT", "unvalidated carrier prefix", 20000);
+ result.value.rows[0]![0] = "缤纷";
+ result.value.raw_key_cells = [{ row_index: 0, column_index: 0, value: "çÍ·×" }];
+ result.value.large_value_cells![0]!.pending_decode = true;
+ const { largeValues, item } = mountLargeValues("mysql", result, false, { visible: true, legacy: true });
+ expect(largeValues.formatGridItemCell(item(), 1)).toBe("grid.largeValuePendingDecode");
+ expect(result.value.rows[0]![1]).toBe("unvalidated carrier prefix");
+ await nextTick();
+ await vi.advanceTimersByTimeAsync(200);
+ expect(mocks.executeMulti).not.toHaveBeenCalled();
+ mocks.buildDataGridContextFilterCondition.mockResolvedValue("`ID` = 'çÍ·×'");
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT ID, APP FROM APP_DATA");
+ mocks.executeMulti.mockResolvedValue([{ columns: ["ID", "APP"], rows: [["缤纷", "完整文本"]], raw_key_cells: [{ row_index: 0, column_index: 0, value: "çÍ·×" }] }]);
+ expect(await largeValues.hydrateLargeValueCell(1, 1)).toBe(true);
+ expect(mocks.buildDataGridContextFilterCondition).toHaveBeenCalledWith(expect.objectContaining({ value: "çÍ·×" }));
+ expect(mocks.executeMulti).toHaveBeenCalledWith("mysql-1", "MAXIMO", expect.any(String), undefined, "execution-1", expect.objectContaining({ resultKeyColumns: ["ID"] }));
+ expect(result.value.large_value_cells).toEqual([]);
+ expect(result.value.raw_key_cells).toEqual([{ row_index: 0, column_index: 0, value: "çÍ·×" }]);
+ expect(largeValues.formatGridItemCell(item(), 1)).toBe("完整文本");
+ });
+
+ it("captures original charset keys for deferred exports after the grid result changes", async () => {
+ const result = previewResult("TEXT", "prefix", 20000);
+ result.value.rows[0]![0] = "缤纷";
+ result.value.raw_key_cells = [{ row_index: 0, column_index: 0, value: "çÍ·×" }];
+ result.value.large_value_cells![0]!.pending_decode = true;
+ const { largeValues } = mountLargeValues("mysql", result, false, { legacy: true });
+ const read = largeValues.captureSourceValues([{ rowId: 1, sourceIndex: 0, columnIndex: 1 }]);
+ result.value.raw_key_cells[0]!.value = "changed";
+ result.value = { ...result.value, rows: [["another", "new page"]] };
+ mocks.buildDataGridContextFilterCondition.mockResolvedValue("predicate");
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT ID, APP FROM APP_DATA");
+ mocks.executeMulti.mockResolvedValue([{ columns: ["ID", "APP"], rows: [["缤纷", "完整文本"]], raw_key_cells: [{ row_index: 0, column_index: 0, value: "çÍ·×" }] }]);
+ const resolved = await read(new AbortController().signal);
+ expect(mocks.buildDataGridContextFilterCondition).toHaveBeenCalledWith(expect.objectContaining({ value: "çÍ·×" }));
+ expect(mocks.executeMulti).toHaveBeenCalledWith("mysql-1", "MAXIMO", expect.any(String), undefined, "execution-1", expect.objectContaining({ resultKeyColumns: ["ID"] }));
+ expect(resolved.get(1)?.get(1)).toBe("完整文本");
+ });
+
+ it("indexes captured original keys once per full export batch while matching reordered results", async () => {
+ const rowCount = 200;
+ let keyReads = 0;
+ const rawKeyCells = Array.from({ length: rowCount }, (_, row_index) => ({
+ row_index,
+ column_index: 0,
+ get value() {
+ keyReads++;
+ return `carrier-${row_index}`;
+ },
+ }));
+ const context: LegacyLargeValueContext = {
+ databaseType: "mysql",
+ connectionId: "mysql-1",
+ executionDatabase: "app",
+ tableMeta: { tableName: "items", columns: [], primaryKeys: ["id"] },
+ sourceColumns: ["id", "body"],
+ rows: Array.from({ length: rowCount }, () => ["same decoded key", "prefix"]),
+ rawKeyCells,
+ requiresOriginalKeys: true,
+ identifierQuote: "`",
+ serverVersion: undefined,
+ includeDatabaseName: true,
+ includeRowId: false,
+ timeoutSecs: 30,
+ };
+ mocks.buildDataGridContextFilterCondition.mockResolvedValue("predicate");
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT id, body FROM items");
+ mocks.executeMulti.mockResolvedValue([
+ {
+ columns: ["id", "body"],
+ rows: Array.from({ length: rowCount }, (_, index) => ["same decoded key", `full-${rowCount - index - 1}`]),
+ raw_key_cells: Array.from({ length: rowCount }, (_, row_index) => ({ row_index, column_index: 0, value: `carrier-${rowCount - row_index - 1}` })),
+ },
+ ]);
+ const requests = Array.from({ length: rowCount }, (_, sourceIndex) => ({ rowId: sourceIndex + 1, sourceIndex, columnIndex: 1, originalBytes: 20000 }));
+ const resolved: LegacyResolvedLargeValueCells = new Map();
+ await fetchLegacyLargeValueRequestChunk(context, 1, requests, [0], resolved, { uuid: () => "export", translate: (key) => key, translateBackendError: String });
+ expect(keyReads).toBe(rowCount);
+ expect(mocks.buildDataGridContextFilterCondition).toHaveBeenCalledTimes(rowCount);
+ for (let index = 0; index < rowCount; index++) expect(resolved.get(index + 1)?.get(1)).toBe(`full-${index}`);
+ });
+
+ it("matches composite original keys when different carriers have identical decoded display keys", async () => {
+ const result = previewResult("TEXT", "prefix", 20000);
+ result.value.columns = ["ID", "PART", "APP"];
+ result.value.column_types = ["VARCHAR", "INT", "TEXT"];
+ result.value.rows = [
+ ["缤纷", 1, "prefix A"],
+ ["缤纷", 1, "prefix B"],
+ ];
+ result.value.raw_key_cells = [
+ { row_index: 0, column_index: 0, value: "çÍ·×" },
+ { row_index: 0, column_index: 1, value: 1 },
+ { row_index: 1, column_index: 0, value: "缤纷" },
+ { row_index: 1, column_index: 1, value: 1 },
+ ];
+ result.value.large_value_cells = [0, 1].map((row_index) => ({ row_index, column_index: 2, original_bytes: 20000, pending_decode: true }));
+ const { largeValues } = mountLargeValues("mysql", result, false, { primaryKeys: ["ID", "PART"], legacy: true });
+ mocks.buildDataGridContextFilterCondition.mockResolvedValue("predicate");
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT ID, PART, APP FROM APP_DATA");
+ mocks.executeMulti.mockResolvedValue([
+ {
+ columns: ["ID", "PART", "APP"],
+ rows: [
+ ["缤纷", 1, "full B"],
+ ["缤纷", 1, "full A"],
+ ],
+ raw_key_cells: result.value.raw_key_cells.map((cell) => ({ ...cell, row_index: 1 - cell.row_index })),
+ },
+ ]);
+ const resolved = await largeValues.resolveLargeValueCells([1, 2], [2]);
+ expect(resolved.get(1)?.get(2)).toBe("full A");
+ expect(resolved.get(2)?.get(2)).toBe("full B");
+ expect(result.value.rows.map((row) => row[2])).toEqual(["prefix A", "prefix B"]);
+ expect(mocks.buildDataGridContextFilterCondition.mock.calls.map(([request]) => request.value)).toEqual(["çÍ·×", 1, "缤纷", 1]);
+ });
+
+ it("rejects ambiguous projected key columns instead of picking the first display column", async () => {
+ const result = previewResult("TEXT", "prefix", 20000);
+ result.value.columns.push("ID");
+ result.value.rows[0]!.push(2);
+ result.value.raw_key_cells = [
+ { row_index: 0, column_index: 0, value: 1 },
+ { row_index: 0, column_index: 2, value: 2 },
+ ];
+ result.value.large_value_cells![0]!.pending_decode = true;
+ const { largeValues } = mountLargeValues("mysql", result, false, { legacy: true });
+ expect(await largeValues.hydrateLargeValueCell(1, 1)).toBe(false);
+ expect(mocks.executeMulti).not.toHaveBeenCalled();
+ expect(result.value.rows[0]![1]).toBe("prefix");
+ });
+
+ it.each(["missing source", "duplicate source", "missing response", "duplicate response", "pending response"])("rejects %s metadata without publishing a guessed value", async (scenario) => {
+ const result = previewResult("TEXT", "prefix", 20000);
+ result.value.large_value_cells![0]!.pending_decode = true;
+ result.value.raw_key_cells = scenario === "missing source" ? [] : [{ row_index: 0, column_index: 0, value: 1 }];
+ if (scenario === "duplicate source") result.value.raw_key_cells.push({ row_index: 0, column_index: 0, value: 2 });
+ const { largeValues } = mountLargeValues("mysql", result, false, { legacy: true });
+ mocks.buildDataGridContextFilterCondition.mockResolvedValue("predicate");
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT ID, APP FROM APP_DATA");
+ mocks.executeMulti.mockResolvedValue([
+ {
+ columns: ["ID", "APP"],
+ rows:
+ scenario === "duplicate response"
+ ? [
+ [1, "first"],
+ [1, "second"],
+ ]
+ : [[1, "full"]],
+ raw_key_cells:
+ scenario === "missing response"
+ ? []
+ : scenario === "duplicate response"
+ ? [
+ { row_index: 0, column_index: 0, value: 1 },
+ { row_index: 1, column_index: 0, value: 1 },
+ ]
+ : [{ row_index: 0, column_index: 0, value: 1 }],
+ large_value_cells: scenario === "pending response" ? [{ row_index: 0, column_index: 1, original_bytes: 20000, pending_decode: true }] : [],
+ },
+ ]);
+ expect(await largeValues.hydrateLargeValueCell(1, 1)).toBe(false);
+ expect(result.value.rows[0]![1]).toBe("prefix");
+ expect(result.value.large_value_cells![0]!.pending_decode).toBe(true);
+ if (scenario.endsWith("source")) expect(mocks.executeMulti).not.toHaveBeenCalled();
+ });
+
it.each(["result", "locator", "clientSessionId", "txnSessionId", "catalog", "disposal"] as const)("rejects a captured download target after its %s changes", async (change) => {
const result = previewResult("CLOB", "preview", 5000);
result.value.large_value_context = { connectionId: "oceanbase-oracle-1", database: "MAXIMO", clientSessionId: "original-session" };
diff --git a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
index d06c3c7f15..8b98130fea 100644
--- a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
@@ -739,6 +739,22 @@ describe("useSidebarTreeExportRuntime", () => {
expect(apiMock.startTableExport).toHaveBeenLastCalledWith(expect.objectContaining({ format: "sql", omitDatabaseQualifier: false }), expect.any(Function));
});
+ it("rejects compatibility SQL export before creating output or connecting", async () => {
+ const activeNode = shallowRef({ id: "table-1", type: "table", label: "events", connectionId: "conn-1", database: "warehouse", schema: "warehouse", children: [] } as TreeNode);
+ const connectionStore = {
+ ensureConnected: vi.fn(),
+ getConfig: () => ({ db_type: "mysql", url_params: "dataCharset=GBK" }),
+ connectionIdentifierQuote: () => "`",
+ treeNodes: [],
+ selectedTreeNodeIds: [],
+ };
+ const runtime = useSidebarTreeExportRuntime({ activeNode, connectionStore: connectionStore as never, settingsStore: exportSettings() as never, acceptedSelectionIds: () => null });
+ await runtime.exportData("sql");
+ expect(connectionStore.ensureConnected).not.toHaveBeenCalled();
+ expect(apiMock.startTableExport).not.toHaveBeenCalled();
+ expect(toastMock).toHaveBeenCalledWith("connection.mysqlDataCharsetExportHint", 5000);
+ });
+
it.each([
["source", undefined],
["standard", "standard"],
diff --git a/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts b/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts
index 71e08fe85f..b2a910861c 100644
--- a/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts
@@ -13,9 +13,14 @@ import type { ConnectionConfig, QueryTab } from "@/types/database";
import { formatSqlText } from "@/lib/sql/sqlFormatter";
import { normalizeSqlVariableSyntaxOverrides, updateSqlVariableSyntaxToggle } from "@/lib/sql/sqlVariableSyntax";
import type { SqlExecutionSnapshot } from "@/lib/sql/sqlExecutionTarget";
+import { useReadOnlyUnlockStore } from "@/stores/readOnlyUnlockStore";
+import * as api from "@/lib/backend/api";
+
+const { toast } = vi.hoisted(() => ({ toast: vi.fn() }));
+vi.mock("@/composables/useToast", () => ({ useToast: () => ({ toast }) }));
vi.mock("vue-i18n", () => ({
- createI18n: () => ({ global: { locale: { value: "en" }, setLocaleMessage: vi.fn() } }),
+ createI18n: () => ({ global: { locale: { value: "en" }, setLocaleMessage: vi.fn(), t: (key: string) => key } }),
useI18n: () => ({ t: (key: string) => key }),
}));
@@ -69,6 +74,88 @@ function queryTab(database = ""): QueryTab {
};
}
+describe("compatibility write denial outcomes", () => {
+ beforeEach(() => {
+ installLocalStorage();
+ setActivePinia(createPinia());
+ vi.clearAllMocks();
+ });
+
+ function setup(legacy = true, sql = "UPDATE users SET name='test' WHERE id=1") {
+ const tab = ref<QueryTab>({ ...queryTab("app"), sql });
+ const config = ref<ConnectionConfig>({ ...connection("mysql"), url_params: legacy ? "dataCharset=GBK" : "" });
+ vi.spyOn(useConnectionStore(), "getConfig").mockImplementation(() => config.value);
+ const store = useQueryStore();
+ const executeCurrentSql = vi.spyOn(store, "executeCurrentSql").mockResolvedValue(undefined);
+ const executeTabSql = vi.spyOn(store, "executeTabSql").mockResolvedValue(undefined);
+ vi.spyOn(useHistoryStore(), "add").mockResolvedValue(undefined);
+ const onDeferredExecutionSettled = vi.fn();
+ const execution = useSqlExecution({ activeTab: computed(() => tab.value), activeConnection: computed(() => config.value), executableSql: computed(() => sql), activeOutputView: ref("result"), onDeferredExecutionSettled });
+ return { tab, config, execution, executeCurrentSql, executeTabSql, onDeferredExecutionSettled };
+ }
+
+ it.each([false, true])("reports blocked without submitting SQL or unlocking (new result: %s)", async (newResult) => {
+ const { config, execution, executeCurrentSql, executeTabSql } = setup();
+ useReadOnlyUnlockStore().rememberWindow(config.value.id, 60000);
+ const before = { ...config.value };
+ const result = await (newResult ? execution.tryExecuteInNewResultTab() : execution.tryExecute());
+ expect(result).toEqual({ status: "not-started", reason: "blocked", tabId: "tab-1" });
+ expect(toast).toHaveBeenCalledExactlyOnceWith("connection.mysqlDataCharsetWriteBlocked", 5000);
+ expect(executeCurrentSql).not.toHaveBeenCalled();
+ expect(executeTabSql).not.toHaveBeenCalled();
+ expect(api.unlockConnectionWrites).not.toHaveBeenCalled();
+ expect(useReadOnlyUnlockStore().pending).toBeUndefined();
+ expect(config.value).toEqual(before);
+ });
+
+ it.each([true, false])("allows SELECT silently (compatibility: %s)", async (legacy) => {
+ const { execution, executeCurrentSql } = setup(legacy, "SELECT 1");
+ await execution.tryExecute();
+ expect(executeCurrentSql).toHaveBeenCalledOnce();
+ expect(toast).not.toHaveBeenCalled();
+ });
+
+ it("preserves ordinary write execution without the compatibility notification", async () => {
+ const { execution, executeCurrentSql } = setup(false);
+ useSettingsStore().editorSettings.confirmDangerousSqlExecution = false;
+ await execution.tryExecute();
+ expect(executeCurrentSql).toHaveBeenCalledOnce();
+ expect(toast).not.toHaveBeenCalled();
+ });
+
+ it("keeps ordinary unlock dismissal cancelled", async () => {
+ const { config, execution, executeCurrentSql } = setup(false);
+ config.value.read_only = true;
+ const running = execution.tryExecute();
+ await vi.waitFor(() => expect(useReadOnlyUnlockStore().pending).toBeDefined());
+ useReadOnlyUnlockStore().cancel();
+ expect(await running).toEqual({ status: "not-started", reason: "cancelled", tabId: "tab-1" });
+ expect(executeCurrentSql).not.toHaveBeenCalled();
+ expect(toast).not.toHaveBeenCalled();
+ });
+
+ it("rechecks compatibility after danger confirmation and reports blocked", async () => {
+ const { config, execution, executeCurrentSql, onDeferredExecutionSettled } = setup(false);
+ useSettingsStore().editorSettings.confirmDangerousSqlExecution = true;
+ expect(await execution.tryExecute()).toMatchObject({ status: "deferred" });
+ config.value.url_params = "dataCharset=GBK";
+ await execution.onDangerConfirm();
+ expect(onDeferredExecutionSettled).toHaveBeenCalledWith({ status: "not-started", reason: "blocked", tabId: "tab-1" });
+ expect(executeCurrentSql).not.toHaveBeenCalled();
+ expect(toast).toHaveBeenCalledExactlyOnceWith("connection.mysqlDataCharsetWriteBlocked", 5000);
+ });
+
+ it("reports the explicit compatibility reason for multi-database denial", async () => {
+ const { config, tab, execution, executeCurrentSql, executeTabSql } = setup();
+ const result = await execution.executeTargetSql({ tab: tab.value, connection: config.value, sql: tab.value.sql });
+ expect(result).toMatchObject({ status: "skipped", errorMessage: "connection.mysqlDataCharsetWriteBlocked" });
+ expect(executeCurrentSql).not.toHaveBeenCalled();
+ expect(executeTabSql).not.toHaveBeenCalled();
+ expect(api.unlockConnectionWrites).not.toHaveBeenCalled();
+ expect(toast).toHaveBeenCalledExactlyOnceWith("connection.mysqlDataCharsetWriteBlocked", 5000);
+ });
+});
+
describe("requiresDatabaseSelection", () => {
beforeEach(() => {
installLocalStorage();
diff --git a/apps/desktop/src/composables/useDataGridEditor.ts b/apps/desktop/src/composables/useDataGridEditor.ts
index 86070e48f4..e8e5891a42 100644
--- a/apps/desktop/src/composables/useDataGridEditor.ts
+++ b/apps/desktop/src/composables/useDataGridEditor.ts
@@ -17,6 +17,7 @@ import { useHistoryStore } from "@/stores/historyStore";
import { useProductionSafetyStore } from "@/stores/productionSafetyStore";
import { assessProductionSql, productionContextForDatabase } from "@/lib/database/productionSafety";
import { ensureReadOnlyWriteAccess, isWriteUnlockActive } from "@/lib/database/readOnlyWriteAccess";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import type { ColumnInfo, DatabaseType } from "@/types/database";
import { DBX_NEO4J_ELEMENT_ID_COLUMN, usesSyntheticRowIdKey } from "@/lib/table/tableEditing";
import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
@@ -2455,6 +2456,7 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
}
const customHandler = customSaveHandler?.value;
const connection = connectionStore.getConfig(connectionId.value ?? "");
+ if (mysqlDataCharsetEnabled(connection)) return;
if (connection?.read_only) {
if (saveOptions.autoSave && !isWriteUnlockActive(connection.id)) return;
if (!(await ensureReadOnlyWriteAccess({ connection, sql: describeDataGridChanges(snapshot), source: i18n.global.t("readOnlyUnlock.sourceDataEditor"), treatAsMutation: true }))) {
diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts
index 3eccc18167..2ecc679687 100644
--- a/apps/desktop/src/composables/useDataGridExport.ts
+++ b/apps/desktop/src/composables/useDataGridExport.ts
@@ -2,6 +2,7 @@ import { computed, type ComputedRef, type Ref, createApp, watch, getCurrentScope
import { getActivePinia } from "pinia";
import { useI18n } from "vue-i18n";
import { useDataGridExtractor } from "@/composables/useDataGridExtractor";
+import { mysqlDataCharsetAllowsExport } from "@/lib/connection/mysqlDataCharset";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { promptExportSavePath } from "@/lib/export/exportPath";
import { saveTextFile, sanitizeExportBaseName, compactLocalTimestamp } from "@/lib/export/saveTextFile";
@@ -110,6 +111,7 @@ export interface MongoCopyUpdateTarget {
}
export interface UseDataGridExportOptions {
+ mysqlDataCharsetReadOnly?: ComputedRef<boolean>;
columns: ComputedRef<string[]>;
displayItems: ComputedRef<RowItem[]>;
allColumns?: ComputedRef<string[]>;
@@ -236,6 +238,11 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const tracker = useExportTracker();
const exportGuard: ActionActivationGuard = {};
let currentExportViewId: string | undefined;
+ function allowExport(format: string): boolean {
+ if (mysqlDataCharsetAllowsExport(options.mysqlDataCharsetReadOnly?.value === true, format)) return true;
+ toast(t("connection.mysqlDataCharsetExportHint"), 5000);
+ return false;
+ }
const {
columns,
@@ -342,6 +349,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function materializeExportSnapshot(result: QueryResult, isResultCurrent: () => boolean): Promise<QueryResult["rows"]> {
+ if (result.large_value_cells?.some((cell) => cell.pending_decode)) throw new Error(t("grid.largeValuePendingDecodeExport"));
if (!result.large_value_cells?.some((cell) => cell.value_ref)) return result.rows;
const originalConnectionId = connectionId.value;
const originalDatabase = database.value;
@@ -571,6 +579,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const formattedIndexes = new Set(allColumns.value.map((_, index) => index).filter((index) => shouldApplyColumnFormatter(index)));
const display = options.captureColumnFormatterDisplay?.() ?? options.displayValue;
return (result: QueryResult): Awaited<ReturnType<typeof resultToExport>> => {
+ if (result.large_value_cells?.some((cell) => cell.pending_decode)) throw new Error(t("grid.largeValuePendingDecodeExport"));
const projected = isMongo || columnIndexes !== undefined ? projectResultColumns(result, targetColumns, sourceIndexes) : undefined;
const exportedColumns = projected?.columns ?? result.columns;
const exportedTypes = projected?.columnTypes ?? result.column_types ?? [];
@@ -627,6 +636,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const project = captureFullResultProjection(columnIndexes, formatDateTime, headerMode, preserveMongoExtendedJson);
const result = await fullExportResult(onProgress);
if (result) {
+ if (result.large_value_cells?.some((cell) => cell.pending_decode)) throw new Error(t("grid.largeValuePendingDecodeExport"));
// fullExportResult returns source rows, not the collection grid's
// marker-encoded rows. Applying the Mongo externalCellValue decode here would
// mistake a real BSON string in the reserved namespace for a grid marker and
@@ -1038,6 +1048,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
const { extractWithExtractor, copyWithExtractor, copyWithPreference, previewWithExtractor, previewWithPreference, canCopyWithExtractor } = useDataGridExtractor({
+ allowExtractor: (extractor) => !options.mysqlDataCharsetReadOnly?.value || (!extractor.startsWith("sql-") && extractor !== "where-clause"),
columns,
displayItems,
allColumns,
@@ -1115,6 +1126,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportWithExtractor(extractor: DataGridCopyExtractorId, extractorOptions: DataGridExtractorOptions = extractorOptionsOption?.value ?? DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS): Promise<boolean> {
+ if (!allowExport(extractor === "csv-with-headers" ? "csv" : extractor)) return false;
let exported = false;
await runExclusiveExport(async () => {
if (!canCopyWithExtractor(extractor, extractorOptions)) return;
@@ -1641,6 +1653,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportMarkdown(target?: ExportTargetParam, columnIndexesParam?: number[]) {
+ if (!allowExport("markdown")) return;
const { rowIds, columnIndexes } = normalizeExportTarget(target, columnIndexesParam);
await runExclusiveExport(async () => {
try {
@@ -1668,6 +1681,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportCurrentPageMarkdown(columnIndexes?: number[]) {
+ if (!allowExport("markdown")) return;
await runExclusiveExport(async () => {
try {
if (await exportLocalSnapshot("markdown", undefined, columnIndexes, false)) return;
@@ -1692,6 +1706,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportTxt(target?: ExportTargetParam, columnIndexesParam?: number[]) {
+ if (!allowExport("txt")) return;
const { rowIds, columnIndexes } = normalizeExportTarget(target, columnIndexesParam);
await runExclusiveExport(async () => {
try {
@@ -1711,6 +1726,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportHtml(target?: ExportTargetParam, openAfterExport = false, columnIndexesParam?: number[]) {
+ if (!allowExport("html")) return;
const { rowIds, columnIndexes } = normalizeExportTarget(target, columnIndexesParam);
await runExclusiveExport(async () => {
try {
@@ -1740,6 +1756,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportCurrentPageHtml(columnIndexes?: number[]) {
+ if (!allowExport("html")) return;
await runExclusiveExport(async () => {
try {
if (await exportLocalSnapshot("html", undefined, columnIndexes, false)) return;
@@ -1764,6 +1781,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportCurrentPageTxt(columnIndexes?: number[]) {
+ if (!allowExport("txt")) return;
await runExclusiveExport(async () => {
try {
if (await exportLocalSnapshot("txt", undefined, columnIndexes, false)) return;
@@ -2618,6 +2636,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
}
async function exportSql(target?: ExportTargetParam, columnIndexesParam?: number[]) {
+ if (!allowExport("sql")) return;
const { rowIds, columnIndexes } = normalizeExportTarget(target, columnIndexesParam);
const isSourceCurrent = captureExportConfirmationSource();
await runExclusiveExport(async () => {
@@ -2741,6 +2760,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
async function exportCurrentPageSql(columnIndexes?: number[]) {
const isSourceCurrent = captureExportConfirmationSource();
+ if (!allowExport("sql")) return;
await runExclusiveExport(async () => {
const chosenColumns = columnIndexes !== undefined ? columnIndexes.map((i) => columns.value[i]).filter((c): c is string => !!c) : undefined;
const selectedSqlExportOptions = (await showSqlInsertModeDialog({ columns: sqlExportChoices(false, chosenColumns), showExecutionMode: isTauriRuntime() })) as SqlExportOptions | SqlInsertMode | null;
diff --git a/apps/desktop/src/composables/useDataGridExtractor.ts b/apps/desktop/src/composables/useDataGridExtractor.ts
index 02c9dedcf1..73ec69872b 100644
--- a/apps/desktop/src/composables/useDataGridExtractor.ts
+++ b/apps/desktop/src/composables/useDataGridExtractor.ts
@@ -59,6 +59,7 @@ interface ResolvedDataGridExtraction {
const NUMERIC_COLUMN_TYPES = new Set(["int", "integer", "smallint", "bigint", "tinyint", "mediumint", "decimal", "numeric", "number", "float", "double", "real", "serial", "smallserial", "bigserial", "money", "smallmoney", "dec", "fixed"]);
interface UseDataGridExtractorOptions {
+ allowExtractor?: (extractor: DataGridCopyExtractorId) => boolean;
columns: ComputedRef<string[]>;
displayItems: ComputedRef<ExtractorRowItem[]>;
allColumns: ComputedRef<string[]>;
@@ -411,6 +412,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
}
function canCopyWithExtractor(extractor: DataGridCopyExtractorId, extractorOptions: DataGridExtractorOptions = options.extractorOptions?.value ?? DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS): boolean {
+ if (options.allowExtractor?.(extractor) === false) return false;
const contextPredicateTarget = hasContextPredicateTarget(extractor);
if (hasUnsupportedDiscreteSelection.value && !contextPredicateTarget) return false;
if (!options.hasRowSelection.value && !options.hasCellSelection.value && !options.contextCell.value) return false;
@@ -486,6 +488,7 @@ export function useDataGridExtractor(options: UseDataGridExtractorOptions) {
}
async function extractWithExtractor(extractor: DataGridCopyExtractorId, extractorOptions: DataGridExtractorOptions = options.extractorOptions?.value ?? DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, maxRows?: number): Promise<ResolvedDataGridExtraction | null> {
+ if (options.allowExtractor?.(extractor) === false) return null;
const initialRequest = buildRequest(extractor, extractorOptions);
if (!initialRequest) return null;
const rowLimit = maxRows === undefined ? undefined : Math.min(initialRequest.rows.length, maxRows);
diff --git a/apps/desktop/src/composables/useDataGridLargeValues.ts b/apps/desktop/src/composables/useDataGridLargeValues.ts
index b13f885121..48100f00c3 100644
--- a/apps/desktop/src/composables/useDataGridLargeValues.ts
+++ b/apps/desktop/src/composables/useDataGridLargeValues.ts
@@ -1,7 +1,7 @@
import { computed, nextTick, onActivated, onDeactivated, ref, watch, type ComputedRef, type Ref } from "vue";
import * as api from "@/lib/backend/api";
import type { CellValue } from "@/lib/dataGrid/cellValue";
-import { chunkLegacyLargeValueRequests, fetchLegacyLargeValueRequestChunk, legacyLargeValueIdentityKey as largeValueIdentityKey, legacyLargeValueRowPredicate, resolveCapturedLegacyLargeValueCells, type LegacyLargeValueContext } from "@/lib/dataGrid/legacyLargeValueExport";
+import { chunkLegacyLargeValueRequests, fetchLegacyLargeValueRequestChunk, legacyLargeValueRowPredicate, resolveCapturedLegacyLargeValueCells, type LegacyLargeValueContext } from "@/lib/dataGrid/legacyLargeValueExport";
import { buildTableSelectSql } from "@/lib/table/tableSelectSql";
import { shouldIncludeSyntheticRowId } from "@/lib/table/tableEditing";
import { rowIdLocatorUnsupported } from "@/lib/table/tableRowIdSupport";
@@ -25,6 +25,8 @@ import {
type ResultScopedRowCache,
} from "@/lib/dataGrid/dataGridLargeValues";
import { CANVAS_DATA_GRID_ROW_HEIGHT } from "@/lib/dataGrid/canvasDataGridRenderer";
+import { createResultKeyLocator } from "@/lib/dataGrid/resultKeyLocator";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
interface LargeValueRowItem {
id: number;
@@ -148,10 +150,15 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
return largeValueCellsByKey.value.get(largeValueCellKey(item.sourceIndex, columnIndex))?.original_bytes;
}
- function formatGridItemCell(item: LargeValueRowItem, columnIndex: number): string {
+ function formatGridItemCell(item: LargeValueRowItem, columnIndex: number, includeSnapshotLabel = true): string {
void visibleLargeValuePreviewVersion.value;
+ if (isPendingDecode(item, columnIndex)) return options.translate("grid.largeValuePendingDecode");
const text = options.formatCellCached(visibleLargeValuePreviewValue(item, columnIndex, item.data[columnIndex] ?? null), columnIndex, largeValueOriginalBytes(item, columnIndex));
- return snapshotReference(item, columnIndex) ? options.translate("grid.largeValueSnapshotPreview", { value: text }) : text;
+ return includeSnapshotLabel && snapshotReference(item, columnIndex) ? options.translate("grid.largeValueSnapshotPreview", { value: text }) : text;
+ }
+
+ function isPendingDecode(item: LargeValueRowItem | undefined, columnIndex: number): boolean {
+ return !!item && isLargeValuePreview(item, columnIndex) && largeValueCellsByKey.value.get(largeValueCellKey(item.sourceIndex!, columnIndex))?.pending_decode === true;
}
function snapshotReference(item: LargeValueRowItem | undefined, columnIndex: number): string | undefined {
@@ -205,12 +212,20 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
}
function formatGridItemCellForConfirmation(item: LargeValueRowItem, columnIndex: number): string {
+ if (isPendingDecode(item, columnIndex)) return options.translate("grid.largeValuePendingDecode");
return options.formatCell(item.data[columnIndex], columnIndex, largeValueOriginalBytes(item, columnIndex), false);
}
+ function requiresOriginalKeys(result = options.result.value): boolean {
+ const id = options.connectionId.value;
+ return !!result.raw_key_cells?.length || !!result.large_value_cells?.some((cell) => cell.pending_decode) || (!!id && mysqlDataCharsetEnabled(options.getConnectionConfig(id)));
+ }
+
function largeValueSourceColumnIndex(columnName: string): number {
const normalized = columnName.toLocaleLowerCase();
- return options.resultSourceColumns.value.findIndex((column) => column.toLocaleLowerCase() === normalized);
+ const indexes = options.resultSourceColumns.value.flatMap((column, index) => (column.toLocaleLowerCase() === normalized ? [index] : []));
+ if (requiresOriginalKeys() && indexes.length !== 1) return -1;
+ return indexes[0] ?? -1;
}
function visibleLargeValuePreviewCache(result: QueryResult): ResultScopedRowCache<CellValue> {
@@ -304,7 +319,7 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
cache.touch(item.sourceIndex);
const initialValues = new Map<number, { value: CellValue; revision: number }>();
for (const columnIndex of targetColumnIndexes) {
- if (!isLargeValuePreview(item, columnIndex) || cache.has(item.sourceIndex, columnIndex)) continue;
+ if (!isLargeValuePreview(item, columnIndex) || isPendingDecode(item, columnIndex) || cache.has(item.sourceIndex, columnIndex)) continue;
initialValues.set(columnIndex, {
value: item.data[columnIndex] ?? null,
revision: visibleLargeValuePreviewCellRevision(sourceResult, item.sourceIndex, columnIndex),
@@ -330,6 +345,8 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
if (sourceColumn && !selectedColumns.some((column) => column.toLocaleLowerCase() === sourceColumn.toLocaleLowerCase())) selectedColumns.push(sourceColumn);
}
const selectedColumnTypes = selectedColumns.map((column) => tableMeta.columns.find((candidate) => candidate.name.toLocaleLowerCase() === column.toLocaleLowerCase())?.data_type ?? "");
+ const originalKeys = requiresOriginalKeys(sourceResult);
+ const sourceLocator = createResultKeyLocator(sourceResult, primaryKeyIndexes, originalKeys, options.translate("grid.largeValueOriginalKeyUnavailable"));
const predicates = await Promise.all([...requests.values()].map((request) => largeValueRowPredicate(request.sourceIndex, primaryKeyIndexes)));
if (!visibleLargeValuePreviewActive || generation !== visibleLargeValuePreviewRequestedGeneration || options.result.value !== sourceResult) return;
const sql = await buildTableSelectSql({
@@ -377,22 +394,30 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
});
if (resultColumnIndexes.some((index) => index < 0)) throw new Error(options.translate("grid.largeValueColumnUnavailable"));
const resultPrimaryKeyIndexes = resultColumnIndexes.slice(0, tableMeta.primaryKeys.length);
- const valuesByIdentity = new Map(result.rows.map((row) => [largeValueIdentityKey(row, resultPrimaryKeyIndexes), row]));
+ const resultLocator = createResultKeyLocator(result, resultPrimaryKeyIndexes, originalKeys, options.translate("grid.largeValueOriginalKeyUnavailable"));
+ const valuesByIdentity = new Map<string, { row: CellValue[]; rowIndex: number }>();
+ result.rows.forEach((row, rowIndex) => {
+ const identity = resultLocator.identity(rowIndex);
+ if (valuesByIdentity.has(identity)) throw new Error(options.translate("grid.largeValueOriginalKeyUnavailable"));
+ valuesByIdentity.set(identity, { row, rowIndex });
+ });
+ const resolvedLargeCells = largeValueCellMap(result);
const currentLargeValueCells = largeValueCellMap(sourceResult);
let changed = false;
for (const request of requests.values()) {
const currentRow = sourceResult.rows[request.sourceIndex];
if (!currentRow) continue;
- const identity = largeValueIdentityKey(currentRow, primaryKeyIndexes);
- const resolvedRow = valuesByIdentity.get(identity);
- if (!resolvedRow) continue;
+ const identity = sourceLocator.identity(request.sourceIndex);
+ const resolved = valuesByIdentity.get(identity);
+ if (!resolved) continue;
for (const [columnIndex, initialValue] of request.initialValues) {
if (!currentLargeValueCells.has(largeValueCellKey(request.sourceIndex, columnIndex)) || currentRow[columnIndex] !== initialValue.value || visibleLargeValuePreviewCellRevision(sourceResult, request.sourceIndex, columnIndex) !== initialValue.revision) continue;
const sourceColumn = options.resultSourceColumns.value[columnIndex];
const selectedIndex = selectedColumns.findIndex((column) => column.toLocaleLowerCase() === sourceColumn?.toLocaleLowerCase());
const resultIndex = resultColumnIndexes[selectedIndex];
if (resultIndex === undefined || resultIndex < 0) continue;
- const previewValue = resolvedRow[resultIndex] ?? null;
+ if (resolvedLargeCells.get(largeValueCellKey(resolved.rowIndex, resultIndex))?.pending_decode) continue;
+ const previewValue = resolved.row[resultIndex] ?? null;
cache.remember(request.sourceIndex, columnIndex, previewValue);
changed = true;
}
@@ -459,6 +484,7 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
options.runtimeScope.addCleanup(pauseVisibleLargeValuePreviewHydration);
function captureLegacyContext(sourceIndexes: number[]): LegacyLargeValueContext {
+ const selectedSourceIndexes = new Set(sourceIndexes);
const connectionId = options.connectionId.value;
const connection = connectionId ? options.getConnectionConfig(connectionId) : undefined;
const tableMeta = options.tableMeta.value;
@@ -468,6 +494,8 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
executionDatabase: options.executionDatabase.value,
tableMeta: tableMeta ? JSON.parse(JSON.stringify(tableMeta)) : undefined,
sourceColumns: [...options.resultSourceColumns.value],
+ requiresOriginalKeys: requiresOriginalKeys(),
+ rawKeyCells: options.result.value.raw_key_cells?.filter((cell) => selectedSourceIndexes.has(cell.row_index)).map((cell) => ({ ...cell })),
rows: sourceIndexes.reduce<CellValue[][]>((rows, index) => {
const row = options.result.value.rows[index];
if (row) rows[index] = JSON.parse(JSON.stringify(row));
@@ -784,6 +812,7 @@ export function useDataGridLargeValues(options: UseDataGridLargeValuesOptions) {
return {
captureSourceValues,
+ isPendingDecode,
snapshotReference,
captureSnapshotDownloadTarget,
isSnapshotDownloadTargetCurrent,
diff --git a/apps/desktop/src/composables/useSidebarDataOpenRuntime.ts b/apps/desktop/src/composables/useSidebarDataOpenRuntime.ts
index 4bf7914830..45c9dc10da 100644
--- a/apps/desktop/src/composables/useSidebarDataOpenRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarDataOpenRuntime.ts
@@ -197,6 +197,7 @@ export function useSidebarDataOpenRuntime() {
tab.resultSortMode = undefined;
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
tab.resultSortedSql = undefined;
diff --git a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
index bb3500a3b1..c17482232f 100644
--- a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
@@ -42,6 +42,7 @@ import { showExportExecutionModeDialog } from "@/lib/export/exportExecutionMode"
import { connectionConfigFingerprint } from "@/lib/connection/connectionDatabaseInfo";
import { SnapshotCompletionError } from "@/lib/export/snapshotCompletion";
import type { ManualExportMode } from "@/lib/export/manualExportQueue";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
type StructureCopyFormat = "tsv" | "markdown";
@@ -941,6 +942,10 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
async function exportData(format: "csv" | "json" | "sql", insertDialect: SqlInsertDialect = "source") {
const targets = currentTableExportTargets();
if (!targets.length) return;
+ if (format === "sql" && targets.some((target) => mysqlDataCharsetEnabled(connectionStore.getConfig(target.connectionId)))) {
+ toast(t("connection.mysqlDataCharsetExportHint"), 5000);
+ return;
+ }
const mode = isTauriRuntime() ? await showExportExecutionModeDialog() : undefined;
if (mode === null) return;
diff --git a/apps/desktop/src/composables/useSqlExecution.ts b/apps/desktop/src/composables/useSqlExecution.ts
index b30512f1d8..33b0ee9a5f 100644
--- a/apps/desktop/src/composables/useSqlExecution.ts
+++ b/apps/desktop/src/composables/useSqlExecution.ts
@@ -27,6 +27,7 @@ import { expandSqlVariables } from "@/lib/sql/sqlVariables";
import { enabledSqlParameterSyntaxes, resolveSqlVariableSyntaxToggles } from "@/lib/sql/sqlVariableSyntax";
import { assessProductionSql } from "@/lib/database/productionSafety";
import { ensureReadOnlyWriteAccess } from "@/lib/database/readOnlyWriteAccess";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { useProductionSafetyStore } from "@/stores/productionSafetyStore";
import type { SqlExecutionDangerRequest } from "@/stores/sqlExecutionDangerStore";
import type { ConnectionConfig, DatabaseType, QueryResult, QueryTab } from "@/types/database";
@@ -357,10 +358,10 @@ export function useSqlExecution(deps: {
return notStarted("no-tab", context.tabId);
}
if (!(await ensureReadOnlyWriteAccess({ connection: context.connection, sql, source: t("production.sourceSqlEditor") }))) {
- // The read-only unlock dialog was dismissed: the user saw UI, so the panel
- // adds nothing (see aiSqlActionFeedback).
+ // Compatibility denial is a policy block; ordinary unlock dismissal
+ // remains cancellation. The shared guard owns the denial notification.
cancelEditorViewportRequest(options.editorViewportRequestId);
- return notStarted("cancelled", context.tabId);
+ return notStarted(mysqlDataCharsetEnabled(context.connection) ? "blocked" : "cancelled", context.tabId);
}
// Redis: block dangerous commands when toggle is on (scan entire batch for highest safety level)
if (context.connection?.db_type === "redis" && deps.blockDangerousRedisCommands?.value !== false) {
@@ -658,7 +659,7 @@ export function useSqlExecution(deps: {
if (cancelRequested()) return finish({ status: "cancelled" });
if (!sql.trim()) return finish({ status: "failed", errorMessage: t("explain.emptySql") });
if (!(await ensureReadOnlyWriteAccess({ connection, sql, source: t("production.sourceMultiDbSql") }))) {
- return finish({ status: "skipped", errorMessage: t("dangerDialog.cancel") });
+ return finish({ status: "skipped", errorMessage: t(mysqlDataCharsetEnabled(connection) ? "connection.mysqlDataCharsetWriteBlocked" : "dangerDialog.cancel") });
}
if (requiresConnectionSelection(executionTab, connection)) {
deps.onMissingConnection?.(executionTab.id);
@@ -1043,7 +1044,7 @@ export function useSqlExecution(deps: {
const connection = connectionStore.getConfig(tab.connectionId);
if (!(await ensureReadOnlyWriteAccess({ connection, sql, source: t("production.sourceSqlEditor") }))) {
cancelEditorViewportRequest(editorViewportRequestId);
- reportDeferredExecution(notStarted("cancelled", tab.id));
+ reportDeferredExecution(notStarted(mysqlDataCharsetEnabled(connection) ? "blocked" : "cancelled", tab.id));
return;
}
try {
diff --git a/apps/desktop/src/i18n/backend-errors.ts b/apps/desktop/src/i18n/backend-errors.ts
index 34cd1e04cb..c6721fd388 100644
--- a/apps/desktop/src/i18n/backend-errors.ts
+++ b/apps/desktop/src/i18n/backend-errors.ts
@@ -82,6 +82,10 @@ const taggedAiCliErrorKeys: Record<string, string> = {
};
const exactMessageKeys: Record<string, string> = {
+ MYSQL_DATA_CHARSET_READ_ONLY: "connection.mysqlDataCharsetReadOnly",
+ MYSQL_DATA_CHARSET_EXPORT_UNSUPPORTED: "connection.mysqlDataCharsetExportHint",
+ MYSQL_DATA_CHARSET_TRANSFER_UNSUPPORTED: "connection.mysqlDataCharsetExportHint",
+ MYSQL_DATA_CHARSET_SESSION_CHANGE_UNSUPPORTED: "connection.mysqlDataCharsetConflict",
"Folder name must not contain a path": "sqlFileTree.folderNameInvalid",
"This folder name is excluded from the SQL file browser": "sqlFileTree.folderNameExcluded",
"The maximum SQL folder depth has been reached": "sqlFileTree.folderDepthExceeded",
@@ -96,6 +100,10 @@ const exactMessageKeys: Record<string, string> = {
};
const patterns: [RegExp, string][] = [
+ [/^MYSQL_DATA_CHARSET_READ_ONLY(?::[\s\S]*)?$/, "connection.mysqlDataCharsetReadOnly"],
+ [/^MYSQL_DATA_CHARSET_EXPORT_UNSUPPORTED(?::[\s\S]*)?$/, "connection.mysqlDataCharsetExportHint"],
+ [/^MYSQL_DATA_CHARSET_TRANSFER_UNSUPPORTED(?::[\s\S]*)?$/, "connection.mysqlDataCharsetExportHint"],
+ [/^MYSQL_DATA_CHARSET_SESSION_CHANGE_UNSUPPORTED(?::[\s\S]*)?$/, "connection.mysqlDataCharsetConflict"],
[/^Plugin update blocked by active connections: ([\s\S]+)$/, "pluginPlatform.updateBlockedByConnections"],
// src-tauri/src/commands/plugins.rs and crates/dbx-web/src/routes/plugins.rs uninstall guard.
[/^Cannot uninstall plugin '(.+?)' while these connections still use it: ([\s\S]+)$/, "pluginPlatform.uninstallBlockedByConnections"],
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 5291cbd4fe..8307e31284 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -631,6 +631,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "Məlumat kodlaması uyğunluq rejimi yalnız oxuma girişini məcburi edir. Yazma və müvəqqəti kilid açma mümkün deyil.",
+ mysqlDataCharsetUnsupported: "dataCharset yalnız yerli MySQL profili üçün dəstəklənir; MariaDB, TiDB və digər profillər üçün deyil.",
+ mysqlDataCharsetCloseTabs: "Məlumat kodlamasını dəyişməzdən əvvəl bu bağlantının məlumat/struktur vərəqlərini bağlayın və sorğu nəticələrini təmizləyin. Aktiv sorğuları və tranzaksiyaları bitirin. SQL qaralamaları saxlanılır; yadda saxlamazdan əvvəl köhnə bağlantı kəsiləcək.",
+ mysqlDataCharset: "Məlumat kodlaması (yalnız oxuma)",
+ mysqlDataCharsetHint: "latin1 mətn sütunlarında saxlanan köhnə GBK/GB18030/BIG5 baytları üçündür. Standart və ya açıq charset=utf8mb4 sessiyası tələb olunur. Avtomatik aşkarlama deyil: adi Qərb mətni yenidən şərh oluna bilər; dekodlama uğursuz olduqda orijinal mətn saxlanılır.",
+ mysqlDataCharsetReadOnly: "Bu uyğunluq rejimi yalnız oxuma üçündür və kilidi açıla bilməz. Redaktə, idxal və sessiya SET əmrləri deaktivdir. Çin dilində WHERE/LIKE şərtləri çevrilmir. Server səviyyəsində qoruma üçün yalnız SELECT icazəli hesabdan istifadə edin.",
+ mysqlDataCharsetExportHint: "Yalnız dekodlanmış CSV, JSON və XLSX təqdimat ixracları dəstəklənir; bunlar baytların geri qaytarıla bilən ehtiyat nüsxələri deyil. SQL ixracı/ehtiyat nüsxələri və məlumat köçürməsi deaktivdir.",
+ mysqlDataCharsetInvalid: "Yalnız bir dataCharset seçimi istifadə edin: GBK, GB18030 və ya BIG5; standart davranış üçün onu silin.",
+ mysqlDataCharsetConflict: "dataCharset standart və ya bir açıq charset=utf8mb4 seçimi tələb edir. Ziddiyyətli charset parametrlərini silin; bu rejimdə sessiya SET əmrləri əlçatan deyil. Standart sessiya qurulması tələb olunur: sessionVariables və proxySql rejimi olmamalıdır.",
title: "Yeni əlaqə",
name: "Ad",
namePlaceholder: "Əlaqənin adı, boş olarsa avtomatik yaradılır",
@@ -2577,6 +2586,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Sətri verilənlər bazasında tapmaq mümkün olmadı. Önbaxış dəyərindən istifadə edilmədən əməliyyat ləğv edildi.",
largeValueColumnUnavailable: "Bu böyük dəyərin mənbə sütununu tapmaq mümkün olmadı.",
largeValueLoadFailed: "Böyük sahənin tam dəyərini yükləmək mümkün olmadı.",
+ largeValuePendingDecode: "Dekodlama üçün tam dəyəri oxuyun",
+ largeValueOriginalKeyUnavailable: "Orijinal sətir açarları yoxdur və ya qeyri-müəyyəndir. Tam dəyəri oxumazdan əvvəl nəticəni yenidən yükləyin.",
+ largeValuePendingDecodeExport: "Bəzi mətnlər hələ tam dekodlama tələb edir. Əvvəl bu dəyərləri yükləyin və ya birbaşa verilənlər bazasından ixrac edin.",
largeValueNeedsStableKey: "Bu cədvəldə istifadə edilə bilən əsas açar yoxdur, ona görə böyük sahənin tam dəyərini təhlükəsiz yükləmək mümkün deyil. Əməliyyat ləğv edildi.",
largeValueLoadFailedWithMessage: "Böyük sahənin tam dəyərini yükləmək mümkün olmadı: {message}",
largeValueLocalSortUnavailable: "Bu sütunda böyük dəyərlərin önbaxışları var və onu önbaxış məzmununa görə yerli olaraq sıralamaq mümkün deyil. Verilənlər bazası sıralamasından istifadə edin.",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 56955bc4a3..4ad98bada1 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1523,6 +1523,15 @@ export default {
},
connection: {
+ mysqlDataCharsetWriteBlocked: "Data character set compatibility mode enforces read-only access. Writes and temporary unlocking are unavailable.",
+ mysqlDataCharsetUnsupported: "dataCharset is supported only by the native MySQL profile, not MariaDB, TiDB or other database profiles.",
+ mysqlDataCharsetCloseTabs: "Before changing the data character set, close this connection's data/structure tabs and clear query results. Finish active queries and transactions first. SQL drafts are kept; the old connection will be disconnected before saving.",
+ mysqlDataCharset: "Data character set (read-only)",
+ mysqlDataCharsetHint: "For legacy GBK/GB18030/BIG5 bytes stored in latin1 text columns. Requires the default or explicit charset=utf8mb4 session. This is not automatic detection: genuine Western text may be reinterpreted; failed decoding keeps the original text.",
+ mysqlDataCharsetReadOnly: "This compatibility mode is read-only and cannot be unlocked. Editing, imports and session SET commands are disabled. Chinese WHERE/LIKE conditions are not converted. Use a SELECT-only database account for server-enforced protection.",
+ mysqlDataCharsetExportHint: "Only decoded CSV, JSON and XLSX presentation exports are supported, not reversible byte backups. SQL exports/backups and data transfer are disabled.",
+ mysqlDataCharsetInvalid: "Use one dataCharset option: GBK, GB18030 or BIG5; remove it for the default behavior.",
+ mysqlDataCharsetConflict: "dataCharset requires the default or one explicit charset=utf8mb4 option. Remove conflicting charset settings; session SET commands are unavailable in this mode. Standard session setup is required: no sessionVariables or proxySql mode.",
title: "New Connection",
name: "Name",
namePlaceholder: "Connection name, auto-generated if empty",
@@ -3740,6 +3749,9 @@ export default {
largeValueRowUnavailable: "The row could not be located in the database. The operation was canceled without using the preview value.",
largeValueColumnUnavailable: "The source column for this large value could not be located.",
largeValueLoadFailed: "Failed to load the full large-field value.",
+ largeValuePendingDecode: "Read the full value to decode",
+ largeValueOriginalKeyUnavailable: "Original row keys are missing or ambiguous. Reload the result before reading the full value.",
+ largeValuePendingDecodeExport: "Some text values still need full decoding. Load those values first, or export directly from the database.",
largeValueNeedsStableKey: "This table has no usable primary key, so the full large-field value cannot be loaded safely. The operation was canceled.",
largeValueNeedsRowIdentifier: "This table has no usable stable row identifier, so the full large-field value cannot be loaded safely. The operation was canceled.",
virtualRowIdentifier: "Virtual Key",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index a529d5e1bc..ecc4a26bfa 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -1322,6 +1322,16 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "El modo de compatibilidad del juego de caracteres impone acceso de solo lectura. No permite escrituras ni desbloqueo temporal.",
+ mysqlDataCharsetUnsupported: "dataCharset solo es compatible con el perfil MySQL nativo, no con MariaDB, TiDB ni otros perfiles de base de datos.",
+ mysqlDataCharsetCloseTabs: "Antes de cambiar el juego de caracteres, cierre las pestañas de datos/estructura y borre los resultados de esta conexión. Finalice consultas y transacciones activas. Se conservan los borradores SQL; la conexión anterior se desconecta antes de guardar.",
+ mysqlDataCharset: "Juego de caracteres de datos (solo lectura)",
+ mysqlDataCharsetHint: "Para bytes heredados GBK/GB18030/BIG5 en columnas de texto latin1. Requiere la sesión predeterminada o charset=utf8mb4 explícito. No es detección automática: puede reinterpretar texto occidental normal; si falla la decodificación, conserva el texto original.",
+ mysqlDataCharsetReadOnly: "Este modo es de solo lectura y no se puede desbloquear. Desactiva edición, importaciones y comandos SET de sesión. No convierte condiciones WHERE/LIKE en chino. Use una cuenta con solo permiso SELECT para protección del servidor.",
+ mysqlDataCharsetExportHint: "Solo admite exportaciones de presentación CSV, JSON y XLSX decodificadas, no copias reversibles de bytes. Las exportaciones/copias SQL y transferencias de datos están desactivadas.",
+ mysqlDataCharsetInvalid: "Use una sola opción dataCharset: GBK, GB18030 o BIG5; elimínela para restaurar el comportamiento predeterminado.",
+ mysqlDataCharsetConflict:
+ "dataCharset requiere la sesión predeterminada o una única opción charset=utf8mb4 explícita. Elimine ajustes charset incompatibles; los comandos SET de sesión no están disponibles en este modo. Requiere inicialización de sesión estándar, sin sessionVariables ni modo proxySql.",
title: "Nueva conexión",
name: "Nombre",
namePlaceholder: "Nombre de conexión, se genera automáticamente si está vacío",
@@ -3287,6 +3297,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "No se pudo localizar la fila en la base de datos. La operación se canceló sin usar el valor de vista previa.",
largeValueColumnUnavailable: "No se pudo localizar la columna de origen de este valor grande.",
largeValueLoadFailed: "No se pudo cargar el valor completo del campo grande.",
+ largeValuePendingDecode: "Leer el valor completo para decodificar",
+ largeValueOriginalKeyUnavailable: "Faltan claves originales de fila o son ambiguas. Recargue el resultado antes de leer el valor completo.",
+ largeValuePendingDecodeExport: "Algunos textos requieren decodificación completa. Cargue esos valores primero o exporte directamente desde la base de datos.",
largeValueNeedsStableKey: "Esta tabla no tiene una clave primaria utilizable, por lo que el valor completo del campo grande no se puede cargar de forma segura. La operación se canceló.",
largeValueLoadFailedWithMessage: "No se pudo cargar el valor completo del campo grande: {message}",
largeValueLocalSortUnavailable: "Esta columna contiene vistas previas de valores grandes y no se puede ordenar localmente por su contenido. Use la ordenación de la base de datos.",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index a78a84258b..c5537fdb55 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -834,6 +834,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "Mode kompatibilitas pengodean data mewajibkan akses hanya baca. Penulisan dan pembukaan kunci sementara tidak tersedia.",
+ mysqlDataCharsetUnsupported: "dataCharset hanya didukung oleh profil MySQL native, bukan MariaDB, TiDB, atau profil lainnya.",
+ mysqlDataCharsetCloseTabs: "Sebelum mengubah pengodean data, tutup tab data/struktur koneksi ini dan hapus hasil kueri. Selesaikan kueri dan transaksi aktif terlebih dahulu. Draf SQL tetap disimpan; koneksi lama akan diputus sebelum penyimpanan.",
+ mysqlDataCharset: "Pengodean data (hanya baca)",
+ mysqlDataCharsetHint: "Untuk byte lama GBK/GB18030/BIG5 dalam kolom teks latin1. Memerlukan sesi default atau charset=utf8mb4 eksplisit. Ini bukan deteksi otomatis: teks Barat biasa dapat ditafsirkan ulang; kegagalan dekode mempertahankan teks asli.",
+ mysqlDataCharsetReadOnly: "Mode kompatibilitas ini hanya baca dan tidak dapat dibuka kuncinya. Penyuntingan, impor, dan perintah SET sesi dinonaktifkan. Kondisi WHERE/LIKE berbahasa Mandarin tidak dikonversi. Gunakan akun database dengan izin SELECT saja untuk perlindungan di server.",
+ mysqlDataCharsetExportHint: "Hanya ekspor tampilan CSV, JSON, dan XLSX yang telah didekode yang didukung, bukan cadangan byte yang dapat dipulihkan persis. Ekspor/cadangan SQL dan transfer data dinonaktifkan.",
+ mysqlDataCharsetInvalid: "Gunakan satu opsi dataCharset: GBK, GB18030, atau BIG5; hapus untuk perilaku default.",
+ mysqlDataCharsetConflict: "dataCharset memerlukan opsi default atau satu charset=utf8mb4 eksplisit. Hapus pengaturan charset yang bertentangan; perintah SET sesi tidak tersedia dalam mode ini. Pengaturan sesi standar diperlukan: tanpa sessionVariables atau mode proxySql.",
title: "Koneksi Baru",
name: "Nama",
namePlaceholder: "Nama koneksi, dibuat otomatis jika kosong",
@@ -2886,6 +2895,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Baris tidak dapat ditemukan di database. Operasi dibatalkan tanpa menggunakan nilai pratinjau.",
largeValueColumnUnavailable: "Kolom sumber untuk nilai besar ini tidak dapat ditemukan.",
largeValueLoadFailed: "Gagal memuat nilai lengkap bidang besar.",
+ largeValuePendingDecode: "Baca nilai lengkap untuk mendekode",
+ largeValueOriginalKeyUnavailable: "Kunci baris asli hilang atau ambigu. Muat ulang hasil sebelum membaca nilai lengkap.",
+ largeValuePendingDecodeExport: "Sebagian teks masih memerlukan dekode lengkap. Muat nilai tersebut dahulu atau ekspor langsung dari database.",
largeValueNeedsStableKey: "Tabel ini tidak memiliki kunci utama yang dapat digunakan, sehingga nilai lengkap bidang besar tidak dapat dimuat dengan aman. Operasi dibatalkan.",
largeValueLoadFailedWithMessage: "Gagal memuat nilai lengkap bidang besar: {message}",
largeValueLocalSortUnavailable: "Kolom ini berisi pratinjau nilai besar dan tidak dapat diurutkan secara lokal berdasarkan isi pratinjau. Gunakan pengurutan database sebagai gantinya.",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 1646157c46..5ca01db6db 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -1310,6 +1310,17 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "La modalità di compatibilità del set di caratteri impone l'accesso in sola lettura. Scrittura e sblocco temporaneo non sono disponibili.",
+ mysqlDataCharsetUnsupported: "dataCharset è supportato solo dal profilo MySQL nativo, non da MariaDB, TiDB o altri profili di database.",
+ mysqlDataCharsetCloseTabs: "Prima di cambiare il set di caratteri, chiudere le schede dati/struttura e cancellare i risultati di questa connessione. Terminare query e transazioni attive. Le bozze SQL vengono conservate; la vecchia connessione viene disconnessa prima del salvataggio.",
+ mysqlDataCharset: "Set di caratteri dati (sola lettura)",
+ mysqlDataCharsetHint:
+ "Per byte legacy GBK/GB18030/BIG5 in colonne di testo latin1. Richiede la sessione predefinita o charset=utf8mb4 esplicito. Non è rilevamento automatico: il testo occidentale normale può essere reinterpretato; se la decodifica fallisce, il testo originale viene conservato.",
+ mysqlDataCharsetReadOnly: "Questa modalità è di sola lettura e non può essere sbloccata. Modifica, importazione e comandi SET di sessione sono disabilitati. Le condizioni WHERE/LIKE in cinese non vengono convertite. Usare un account con solo permesso SELECT per la protezione lato server.",
+ mysqlDataCharsetExportHint: "Sono supportate solo esportazioni di presentazione CSV, JSON e XLSX decodificate, non backup reversibili dei byte. Esportazioni/backup SQL e trasferimenti dati sono disabilitati.",
+ mysqlDataCharsetInvalid: "Usare una sola opzione dataCharset: GBK, GB18030 o BIG5; rimuoverla per ripristinare il comportamento predefinito.",
+ mysqlDataCharsetConflict:
+ "dataCharset richiede la sessione predefinita o una sola opzione charset=utf8mb4 esplicita. Rimuovere impostazioni charset incompatibili; i comandi SET di sessione non sono disponibili in questa modalità. Richiede inizializzazione di sessione standard, senza sessionVariables o modalità proxySql.",
title: "Nuova Connessione",
name: "Nome",
namePlaceholder: "Nome connessione, generato automaticamente se vuoto",
@@ -3180,6 +3191,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Impossibile individuare la riga nel database. L'operazione è stata annullata senza usare il valore di anteprima.",
largeValueColumnUnavailable: "Impossibile individuare la colonna di origine per questo valore di grandi dimensioni.",
largeValueLoadFailed: "Impossibile caricare il valore completo del campo di grandi dimensioni.",
+ largeValuePendingDecode: "Leggere il valore completo per decodificare",
+ largeValueOriginalKeyUnavailable: "Le chiavi originali della riga sono mancanti o ambigue. Ricaricare il risultato prima di leggere il valore completo.",
+ largeValuePendingDecodeExport: "Alcuni testi richiedono la decodifica completa. Caricare prima questi valori o esportare direttamente dal database.",
largeValueNeedsStableKey: "Questa tabella non dispone di una chiave primaria utilizzabile, quindi il valore completo del campo non può essere caricato in modo sicuro. L'operazione è stata annullata.",
largeValueLoadFailedWithMessage: "Impossibile caricare il valore completo del campo di grandi dimensioni: {message}",
largeValueLocalSortUnavailable: "Questa colonna contiene anteprime di valori di grandi dimensioni e non può essere ordinata localmente in base all'anteprima. Usa l'ordinamento del database.",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index c832007489..2cd7d4f3f9 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -1310,6 +1310,15 @@ export default withEnglishFallback({
matchPreviewLimit: "一致する全 {total} 行のうち、先頭 {limit} 行のみプレビューできます。",
},
connection: {
+ mysqlDataCharsetWriteBlocked: "データ文字セット互換モードでは読み取り専用が強制されます。書き込みや一時的なロック解除はできません。",
+ mysqlDataCharsetUnsupported: "dataCharset はネイティブ MySQL プロファイル専用です。MariaDB、TiDB、その他のデータベースプロファイルには対応していません。",
+ mysqlDataCharsetCloseTabs: "データ文字セットを変更する前に、この接続のデータ・構造タブを閉じ、クエリ結果を消去してください。実行中のクエリとトランザクションを先に終了してください。SQL の下書きは保持され、保存前に旧接続が切断されます。",
+ mysqlDataCharset: "データ文字セット(読み取り専用)",
+ mysqlDataCharsetHint: "latin1 テキスト列に格納された GBK/GB18030/BIG5 の旧形式バイト用です。既定または明示的な charset=utf8mb4 セッションが必要です。自動検出ではありません。通常の西欧文字列も再解釈される場合があります。デコード失敗時は元の文字列を保持します。",
+ mysqlDataCharsetReadOnly: "この互換モードは読み取り専用で、解除できません。編集、インポート、セッションの SET コマンドは無効です。中国語の WHERE/LIKE 条件は変換しません。サーバー側の保護には SELECT 権限のみのアカウントを使用してください。",
+ mysqlDataCharsetExportHint: "デコード後の CSV、JSON、XLSX 表示用エクスポートのみ対応します。元のバイトを復元できるバックアップではありません。SQL エクスポート、バックアップ、データ転送は無効です。",
+ mysqlDataCharsetInvalid: "dataCharset は GBK、GB18030、BIG5 のいずれかを一つだけ設定してください。削除すると既定の動作に戻ります。",
+ mysqlDataCharsetConflict: "dataCharset には既定または一つの明示的な charset=utf8mb4 が必要です。競合する charset 設定を削除してください。このモードではセッションの SET コマンドを使用できません。 標準のセッション初期化が必要です。sessionVariables と proxySql モードには対応していません。",
title: "新しい接続",
name: "名前",
namePlaceholder: "接続名(空の場合は自動生成)",
@@ -3184,6 +3193,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "データベース内で行を特定できません。プレビュー値を使用せず、操作をキャンセルしました。",
largeValueColumnUnavailable: "大きな値に対応するソース列を特定できません。",
largeValueLoadFailed: "大きなフィールドの完全な値を読み込めませんでした。",
+ largeValuePendingDecode: "完全な値を読み込んでデコード",
+ largeValueOriginalKeyUnavailable: "元の行キーがないか曖昧です。結果を再読み込みしてから完全な値を取得してください。",
+ largeValuePendingDecodeExport: "完全な値の読み込みとデコードが必要なテキストがあります。先に値を読み込むか、データベースから直接エクスポートしてください。",
largeValueNeedsStableKey: "このテーブルには使用可能な主キーがないため、大きなフィールドの完全な値を安全に読み込めません。操作をキャンセルしました。",
largeValueLoadFailedWithMessage: "大きなフィールドの完全な値を読み込めませんでした: {message}",
largeValueLocalSortUnavailable: "この列には大きな値のプレビューが含まれるため、プレビュー内容による現在のページの並べ替えはできません。データベース並べ替えを使用してください。",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 2eeb92edb2..6d5c53a120 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -1316,6 +1316,15 @@ export default withEnglishFallback({
matchPreviewLimit: "일치하는 총 {total}개 줄 중 처음 {limit}개 줄만 미리 볼 수 있습니다.",
},
connection: {
+ mysqlDataCharsetWriteBlocked: "데이터 문자 집합 호환 모드에서는 읽기 전용이 강제됩니다. 쓰기와 임시 잠금 해제는 사용할 수 없습니다.",
+ mysqlDataCharsetUnsupported: "dataCharset은 네이티브 MySQL 프로필에서만 지원됩니다. MariaDB, TiDB 및 다른 프로필은 지원하지 않습니다.",
+ mysqlDataCharsetCloseTabs: "데이터 문자 집합을 변경하기 전에 이 연결의 데이터/구조 탭을 닫고 쿼리 결과를 지우세요. 실행 중인 쿼리와 트랜잭션을 먼저 완료하세요. SQL 초안은 유지되며 저장 전에 기존 연결이 해제됩니다.",
+ mysqlDataCharset: "데이터 문자 집합 (읽기 전용)",
+ mysqlDataCharsetHint: "latin1 텍스트 열에 저장된 GBK/GB18030/BIG5 레거시 바이트용입니다. 기본 또는 명시적인 charset=utf8mb4 세션이 필요합니다. 자동 감지가 아니므로 일반 서양 문자도 재해석될 수 있습니다. 디코딩 실패 시 원문을 유지합니다.",
+ mysqlDataCharsetReadOnly: "이 호환 모드는 읽기 전용이며 잠금을 해제할 수 없습니다. 편집, 가져오기, 세션 SET 명령이 비활성화됩니다. 중국어 WHERE/LIKE 조건은 변환되지 않습니다. 서버 수준 보호를 위해 SELECT 권한만 있는 계정을 사용하세요.",
+ mysqlDataCharsetExportHint: "디코딩된 CSV, JSON, XLSX 표시용 내보내기만 지원되며 원본 바이트를 복원하는 백업이 아닙니다. SQL 내보내기/백업과 데이터 전송은 비활성화됩니다.",
+ mysqlDataCharsetInvalid: "dataCharset 옵션은 GBK, GB18030, BIG5 중 하나만 사용하세요. 기본 동작으로 돌아가려면 제거하세요.",
+ mysqlDataCharsetConflict: "dataCharset에는 기본 설정 또는 하나의 명시적인 charset=utf8mb4 옵션이 필요합니다. 충돌하는 charset 설정을 제거하세요. 이 모드에서는 세션 SET 명령을 사용할 수 없습니다. sessionVariables나 proxySql 모드 없이 표준 세션 설정을 사용해야 합니다.",
title: "새 연결",
name: "이름",
namePlaceholder: "연결 이름, 비워두면 자동 생성",
@@ -3290,6 +3299,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "데이터베이스에서 행을 찾을 수 없습니다. 미리보기 값을 사용하지 않고 작업을 취소했습니다.",
largeValueColumnUnavailable: "큰 값에 해당하는 원본 열을 찾을 수 없습니다.",
largeValueLoadFailed: "큰 필드의 전체 값을 불러오지 못했습니다.",
+ largeValuePendingDecode: "전체 값을 읽은 후 디코딩",
+ largeValueOriginalKeyUnavailable: "원본 행 키가 없거나 모호합니다. 전체 값을 읽기 전에 결과를 다시 불러오세요.",
+ largeValuePendingDecodeExport: "일부 텍스트는 전체 디코딩이 필요합니다. 먼저 해당 값을 불러오거나 데이터베이스에서 직접 내보내세요.",
largeValueNeedsStableKey: "이 테이블에는 사용할 수 있는 기본 키가 없어 큰 필드의 전체 값을 안전하게 불러올 수 없습니다. 작업을 취소했습니다.",
largeValueLoadFailedWithMessage: "큰 필드의 전체 값을 불러오지 못했습니다: {message}",
largeValueLocalSortUnavailable: "이 열에는 큰 값 미리보기가 포함되어 있어 미리보기 내용으로 현재 페이지를 정렬할 수 없습니다. 데이터베이스 정렬을 사용하세요.",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 1fb834cfed..a72d1976a5 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -1311,6 +1311,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "O modo de compatibilidade do conjunto de caracteres impõe acesso somente leitura. Gravações e desbloqueio temporário não estão disponíveis.",
+ mysqlDataCharsetUnsupported: "dataCharset é compatível apenas com o perfil MySQL nativo, não com MariaDB, TiDB ou outros perfis de banco de dados.",
+ mysqlDataCharsetCloseTabs: "Antes de alterar o conjunto de caracteres, feche as abas de dados/estrutura e limpe os resultados desta conexão. Finalize consultas e transações ativas. Rascunhos SQL são preservados; a conexão anterior é desconectada antes de salvar.",
+ mysqlDataCharset: "Conjunto de caracteres dos dados (somente leitura)",
+ mysqlDataCharsetHint: "Para bytes legados GBK/GB18030/BIG5 em colunas de texto latin1. Exige a sessão padrão ou charset=utf8mb4 explícito. Não é detecção automática: texto ocidental normal pode ser reinterpretado; falhas de decodificação preservam o texto original.",
+ mysqlDataCharsetReadOnly: "Este modo é somente leitura e não pode ser desbloqueado. Edição, importação e comandos SET de sessão estão desativados. Condições WHERE/LIKE em chinês não são convertidas. Use uma conta com apenas permissão SELECT para proteção no servidor.",
+ mysqlDataCharsetExportHint: "Somente exportações de apresentação CSV, JSON e XLSX decodificadas são suportadas, não backups reversíveis dos bytes. Exportações/backups SQL e transferências de dados estão desativados.",
+ mysqlDataCharsetInvalid: "Use uma única opção dataCharset: GBK, GB18030 ou BIG5; remova-a para restaurar o comportamento padrão.",
+ mysqlDataCharsetConflict: "dataCharset exige a sessão padrão ou uma única opção charset=utf8mb4 explícita. Remova configurações charset incompatíveis; comandos SET de sessão não estão disponíveis neste modo. Exige inicialização de sessão padrão, sem sessionVariables ou modo proxySql.",
title: "Nova Conexão",
name: "Nome",
namePlaceholder: "Nome da conexão, gerado automaticamente se vazio",
@@ -3180,6 +3189,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Não foi possível localizar a linha no banco de dados. A operação foi cancelada sem usar o valor de visualização.",
largeValueColumnUnavailable: "Não foi possível localizar a coluna de origem deste valor grande.",
largeValueLoadFailed: "Falha ao carregar o valor completo do campo grande.",
+ largeValuePendingDecode: "Ler o valor completo para decodificar",
+ largeValueOriginalKeyUnavailable: "As chaves originais da linha estão ausentes ou são ambíguas. Recarregue o resultado antes de ler o valor completo.",
+ largeValuePendingDecodeExport: "Alguns textos ainda precisam de decodificação completa. Carregue esses valores primeiro ou exporte diretamente do banco de dados.",
largeValueNeedsStableKey: "Esta tabela não tem uma chave primária utilizável, portanto o valor completo do campo grande não pode ser carregado com segurança. A operação foi cancelada.",
largeValueLoadFailedWithMessage: "Falha ao carregar o valor completo do campo grande: {message}",
largeValueLocalSortUnavailable: "Esta coluna contém visualizações de valores grandes e não pode ser ordenada localmente pelo conteúdo da visualização. Use a ordenação do banco de dados.",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index de66110563..6159afe374 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -1290,6 +1290,15 @@ export default withEnglishFallback({
matchPreviewLimit: "Предпросмотр ограничен первыми {limit} из {total} совпадающих строк.",
},
connection: {
+ mysqlDataCharsetWriteBlocked: "Режим совместимости кодировки данных принудительно разрешает только чтение. Запись и временная разблокировка недоступны.",
+ mysqlDataCharsetUnsupported: "dataCharset поддерживается только нативным профилем MySQL, но не MariaDB, TiDB и другими профилями.",
+ mysqlDataCharsetCloseTabs: "Перед сменой кодировки данных закройте вкладки данных/структуры этого подключения и очистите результаты запросов. Сначала завершите активные запросы и транзакции. Черновики SQL сохранятся; старое подключение будет отключено перед сохранением.",
+ mysqlDataCharset: "Кодировка данных (только чтение)",
+ mysqlDataCharsetHint: "Для байтов GBK/GB18030/BIG5, хранящихся в текстовых столбцах latin1. Требуется стандартный сеанс или явный charset=utf8mb4. Это не автоопределение: обычный западный текст может быть переинтерпретирован; при ошибке декодирования сохраняется исходный текст.",
+ mysqlDataCharsetReadOnly: "Этот режим совместимости доступен только для чтения, разблокировка невозможна. Редактирование, импорт и команды SET сеанса отключены. Китайский текст в условиях WHERE/LIKE не преобразуется. Для защиты на сервере используйте учётную запись только с правом SELECT.",
+ mysqlDataCharsetExportHint: "Поддерживается только экспорт декодированного текста в CSV, JSON и XLSX для отображения, а не обратимые побайтовые резервные копии. Экспорт/резервное копирование SQL и перенос данных отключены.",
+ mysqlDataCharsetInvalid: "Используйте один параметр dataCharset: GBK, GB18030 или BIG5; удалите его для стандартного поведения.",
+ mysqlDataCharsetConflict: "dataCharset требует стандартной настройки или одного явного параметра charset=utf8mb4. Удалите конфликтующие настройки charset; команды SET сеанса в этом режиме недоступны. Требуется стандартная настройка сеанса без sessionVariables и режима proxySql.",
title: "Новое подключение",
name: "Имя",
namePlaceholder: "Имя подключения; создаётся автоматически, если пусто",
@@ -3421,6 +3430,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Не удалось найти строку в базе данных. Операция отменена без использования значения из предпросмотра.",
largeValueColumnUnavailable: "Не удалось найти исходный столбец для этого большого значения.",
largeValueLoadFailed: "Не удалось загрузить полное значение большого поля.",
+ largeValuePendingDecode: "Прочитайте полное значение для декодирования",
+ largeValueOriginalKeyUnavailable: "Исходные ключи строки отсутствуют или неоднозначны. Перезагрузите результат перед чтением полного значения.",
+ largeValuePendingDecodeExport: "Часть текста ещё требует полного декодирования. Сначала загрузите эти значения или экспортируйте напрямую из базы данных.",
largeValueNeedsStableKey: "У этой таблицы нет пригодного первичного ключа, поэтому полное значение большого поля нельзя безопасно загрузить. Операция отменена.",
largeValueLoadFailedWithMessage: "Не удалось загрузить полное значение большого поля: {message}",
largeValueLocalSortUnavailable: "Этот столбец содержит предпросмотры больших значений, поэтому его нельзя сортировать локально по содержимому предпросмотра. Используйте сортировку средствами базы данных.",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index ad00edb67d..01b3877407 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -1390,6 +1390,15 @@ export default withEnglishFallback({
matchPreviewLimit: "แสดงตัวอย่างได้เฉพาะ {limit} บรรทัดแรกจากทั้งหมด {total} บรรทัดที่ตรงกัน",
},
connection: {
+ mysqlDataCharsetWriteBlocked: "โหมดความเข้ากันได้ของชุดอักขระข้อมูลบังคับให้อ่านอย่างเดียว ไม่สามารถเขียนหรือปลดล็อกชั่วคราวได้",
+ mysqlDataCharsetUnsupported: "รองรับ dataCharset เฉพาะโปรไฟล์ MySQL แบบเนทีฟ ไม่รองรับ MariaDB, TiDB หรือโปรไฟล์อื่น",
+ mysqlDataCharsetCloseTabs: "ก่อนเปลี่ยนชุดอักขระข้อมูล ให้ปิดแท็บข้อมูล/โครงสร้างของการเชื่อมต่อนี้และล้างผลลัพธ์คำสั่ง ให้คำสั่งและธุรกรรมที่ทำงานอยู่เสร็จสิ้นก่อน ร่าง SQL จะยังคงอยู่ และการเชื่อมต่อเดิมจะถูกตัดก่อนบันทึก",
+ mysqlDataCharset: "ชุดอักขระข้อมูล (อ่านอย่างเดียว)",
+ mysqlDataCharsetHint: "สำหรับไบต์ GBK/GB18030/BIG5 เดิมที่เก็บในคอลัมน์ข้อความ latin1 ต้องใช้เซสชันเริ่มต้นหรือระบุ charset=utf8mb4 อย่างชัดเจน นี่ไม่ใช่การตรวจจับอัตโนมัติ ข้อความตะวันตกปกติอาจถูกตีความใหม่ หากถอดรหัสไม่สำเร็จจะคงข้อความเดิมไว้",
+ mysqlDataCharsetReadOnly: "โหมดความเข้ากันได้นี้อ่านอย่างเดียวและปลดล็อกไม่ได้ ปิดใช้งานการแก้ไข การนำเข้า และคำสั่ง SET ของเซสชัน ไม่แปลงเงื่อนไข WHERE/LIKE ภาษาจีน ใช้บัญชีฐานข้อมูลที่มีสิทธิ์ SELECT เท่านั้นเพื่อป้องกันที่ฝั่งเซิร์ฟเวอร์",
+ mysqlDataCharsetExportHint: "รองรับเฉพาะการส่งออกข้อความที่ถอดรหัสแล้วเป็น CSV, JSON และ XLSX เพื่อการแสดงผล ไม่ใช่การสำรองไบต์ที่กู้คืนได้ตรงต้นฉบับ ปิดใช้งานการส่งออก/สำรอง SQL และการถ่ายโอนข้อมูล",
+ mysqlDataCharsetInvalid: "ใช้ตัวเลือก dataCharset เพียงหนึ่งค่า: GBK, GB18030 หรือ BIG5 ลบตัวเลือกนี้เพื่อใช้การทำงานเริ่มต้น",
+ mysqlDataCharsetConflict: "dataCharset ต้องใช้ค่าเริ่มต้นหรือระบุ charset=utf8mb4 เพียงหนึ่งตัวเลือก ลบการตั้งค่า charset ที่ขัดแย้งกัน โหมดนี้ใช้คำสั่ง SET ของเซสชันไม่ได้ ต้องตั้งค่าเซสชันมาตรฐานโดยไม่มี sessionVariables หรือโหมด proxySql",
title: "การเชื่อมต่อใหม่",
name: "ชื่อ",
namePlaceholder: "ชื่อการเชื่อมต่อ สร้างอัตโนมัติหากว่าง",
@@ -3562,6 +3571,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "ไม่พบแถวในฐานข้อมูล การดำเนินการถูกยกเลิกโดยไม่ใช้ค่าตัวอย่าง",
largeValueColumnUnavailable: "ไม่พบคอลัมน์ต้นทางสำหรับค่าขนาดใหญ่นี้",
largeValueLoadFailed: "โหลดค่าเต็มของฟิลด์ขนาดใหญ่ไม่สำเร็จ",
+ largeValuePendingDecode: "อ่านค่าทั้งหมดเพื่อถอดรหัส",
+ largeValueOriginalKeyUnavailable: "คีย์แถวต้นฉบับหายไปหรือไม่ชัดเจน โปรดโหลดผลลัพธ์ใหม่ก่อนอ่านค่าทั้งหมด",
+ largeValuePendingDecodeExport: "ข้อความบางส่วนยังต้องถอดรหัสทั้งหมด โปรดโหลดค่าเหล่านั้นก่อนหรือส่งออกจากฐานข้อมูลโดยตรง",
largeValueNeedsStableKey: "ตารางนี้ไม่มีคีย์หลักที่ใช้ได้ จึงไม่สามารถโหลดค่าฟิลด์ขนาดใหญ่เต็มรูปแบบอย่างปลอดภัย การดำเนินการถูกยกเลิก",
largeValueNeedsRowIdentifier: "ตารางนี้ไม่มีตัวระบุแถวที่เสถียรและใช้ได้ จึงไม่สามารถโหลดค่าฟิลด์ขนาดใหญ่เต็มรูปแบบอย่างปลอดภัย การดำเนินการถูกยกเลิก",
virtualRowIdentifier: "คีย์เสมือน",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index 0d30609b9f..18cbf08341 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -631,6 +631,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "Veri karakter kümesi uyumluluk modu salt okunur erişimi zorunlu kılar. Yazma ve geçici kilit açma kullanılamaz.",
+ mysqlDataCharsetUnsupported: "dataCharset yalnızca yerel MySQL profilinde desteklenir; MariaDB, TiDB veya diğer profillerde desteklenmez.",
+ mysqlDataCharsetCloseTabs: "Veri karakter kümesini değiştirmeden önce bu bağlantının veri/yapı sekmelerini kapatın ve sorgu sonuçlarını temizleyin. Önce etkin sorguları ve işlemleri tamamlayın. SQL taslakları korunur; kaydetmeden önce eski bağlantı kesilir.",
+ mysqlDataCharset: "Veri karakter kümesi (salt okunur)",
+ mysqlDataCharsetHint: "latin1 metin sütunlarında saklanan eski GBK/GB18030/BIG5 baytları içindir. Varsayılan veya açık charset=utf8mb4 oturumu gerekir. Otomatik algılama değildir: normal Batı metni yeniden yorumlanabilir; kod çözme başarısız olduğunda özgün metin korunur.",
+ mysqlDataCharsetReadOnly: "Bu uyumluluk modu salt okunurdur ve kilidi açılamaz. Düzenleme, içe aktarma ve oturum SET komutları devre dışıdır. Çince WHERE/LIKE koşulları dönüştürülmez. Sunucu düzeyinde koruma için yalnızca SELECT yetkili bir hesap kullanın.",
+ mysqlDataCharsetExportHint: "Yalnızca çözümlenmiş CSV, JSON ve XLSX gösterim dışa aktarımları desteklenir; bunlar baytların aynen geri yüklenebildiği yedekler değildir. SQL dışa aktarma/yedekleme ve veri aktarımı devre dışıdır.",
+ mysqlDataCharsetInvalid: "Tek bir dataCharset seçeneği kullanın: GBK, GB18030 veya BIG5; varsayılan davranış için kaldırın.",
+ mysqlDataCharsetConflict: "dataCharset varsayılan ayarı veya tek bir açık charset=utf8mb4 seçeneğini gerektirir. Çakışan charset ayarlarını kaldırın; bu modda oturum SET komutları kullanılamaz. sessionVariables veya proxySql modu olmadan standart oturum kurulumu gerekir.",
title: "Yeni Bağlantı",
name: "Ad",
namePlaceholder: "Bağlantı adı, boş bırakılırsa otomatik oluşturulur",
@@ -2569,6 +2578,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "Satır veritabanında bulunamadı. İşlem, önizleme değeri kullanılmadan iptal edildi.",
largeValueColumnUnavailable: "Bu büyük değerin kaynak sütunu bulunamadı.",
largeValueLoadFailed: "Büyük alanın tam değeri yüklenemedi.",
+ largeValuePendingDecode: "Kod çözmek için tam değeri okuyun",
+ largeValueOriginalKeyUnavailable: "Özgün satır anahtarları eksik veya belirsiz. Tam değeri okumadan önce sonucu yeniden yükleyin.",
+ largeValuePendingDecodeExport: "Bazı metinlerin hâlâ tamamen çözümlenmesi gerekiyor. Önce bu değerleri yükleyin veya doğrudan veritabanından dışa aktarın.",
largeValueNeedsStableKey: "Bu tablonun kullanılabilir bir birincil anahtarı yok, bu yüzden büyük alanın tam değeri güvenle yüklenemez. İşlem iptal edildi.",
largeValueLoadFailedWithMessage: "Büyük alanın tam değeri yüklenemedi: {message}",
largeValueLocalSortUnavailable: "Bu sütun büyük değer önizlemeleri içeriyor ve önizleme içeriğine göre yerel olarak sıralanamaz. Bunun yerine veritabanı sıralamasını kullanın.",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index b5332ca883..388aa4bac2 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1459,6 +1459,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "数据字符集兼容模式强制只读,无法执行写入,也不能临时解锁。",
+ mysqlDataCharsetUnsupported: "dataCharset 仅支持原生 MySQL 配置,不支持 MariaDB、TiDB 或其他数据库配置。",
+ mysqlDataCharsetCloseTabs: "修改数据字符集前,请关闭此连接的数据/结构页并清除查询结果,先结束正在执行的查询和事务。SQL 草稿可保留;保存前将断开旧连接。",
+ mysqlDataCharset: "数据字符集(只读)",
+ mysqlDataCharsetHint: "适用于 latin1 文本列中存放的 GBK/GB18030/BIG5 遗留字节。要求默认或显式 charset=utf8mb4 会话。这不是自动识别:正常西文可能被重新解释;解码失败时保留原文本。",
+ mysqlDataCharsetReadOnly: "此兼容模式强制只读,不能临时解锁。禁用编辑、导入及会话 SET 命令,不转换中文 WHERE/LIKE 条件。建议使用仅有 SELECT 权限的数据库账户实现服务端保护。",
+ mysqlDataCharsetExportHint: "仅支持解码后的 CSV、JSON、XLSX 展示型导出,不是原始字节的可逆备份。禁用 SQL 导出/备份和数据迁移。",
+ mysqlDataCharsetInvalid: "仅设置一个 dataCharset:GBK、GB18030 或 BIG5;移除该参数恢复默认行为。",
+ mysqlDataCharsetConflict: "dataCharset 要求默认或唯一的显式 charset=utf8mb4。请移除冲突的 charset 参数;此模式不支持会话 SET 命令。 同时要求标准会话初始化,不支持 sessionVariables 或 proxySql 模式。",
title: "新建连接",
name: "名称",
namePlaceholder: "连接名称,留空则自动生成",
@@ -3671,6 +3680,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "无法在数据库中定位该行,操作已取消,未使用预览值。",
largeValueColumnUnavailable: "无法定位大字段对应的源列。",
largeValueLoadFailed: "读取大字段完整值失败。",
+ largeValuePendingDecode: "读取完整值后解码",
+ largeValueOriginalKeyUnavailable: "原始行键缺失或不明确。请重新加载结果后再读取完整值。",
+ largeValuePendingDecodeExport: "部分文本仍需读取完整值后解码。请先加载这些值,或直接从数据库导出。",
largeValueNeedsStableKey: "该表没有可用的主键,无法安全读取大字段完整值,操作已取消。",
largeValueNeedsRowIdentifier: "该表没有可用的稳定行标识,无法安全读取大字段完整值,操作已取消。",
virtualRowIdentifier: "虚拟唯一键",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 8a676c8ea9..fd7010535a 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -1294,6 +1294,15 @@ export default withEnglishFallback({
},
connection: {
+ mysqlDataCharsetWriteBlocked: "資料字元集相容模式強制唯讀,無法執行寫入,也不能暫時解鎖。",
+ mysqlDataCharsetUnsupported: "dataCharset 僅支援原生 MySQL 設定,不支援 MariaDB、TiDB 或其他資料庫設定。",
+ mysqlDataCharsetCloseTabs: "修改資料字元集前,請關閉此連線的資料/結構頁並清除查詢結果,先結束執行中的查詢及交易。SQL 草稿可保留;儲存前將中斷舊連線。",
+ mysqlDataCharset: "資料字元集(唯讀)",
+ mysqlDataCharsetHint: "適用於 latin1 文字欄位中存放的 GBK/GB18030/BIG5 舊式位元組。需要預設或明確的 charset=utf8mb4 工作階段。這不是自動偵測:正常西文可能被重新解讀;解碼失敗時保留原文。",
+ mysqlDataCharsetReadOnly: "此相容模式強制唯讀,無法暫時解鎖。停用編輯、匯入及工作階段 SET 命令,不轉換中文 WHERE/LIKE 條件。建議使用僅有 SELECT 權限的資料庫帳戶實現伺服器端保護。",
+ mysqlDataCharsetExportHint: "僅支援解碼後的 CSV、JSON、XLSX 展示型匯出,並非原始位元組的可逆備份。停用 SQL 匯出/備份及資料移轉。",
+ mysqlDataCharsetInvalid: "僅設定一個 dataCharset:GBK、GB18030 或 BIG5;移除此參數以恢復預設行為。",
+ mysqlDataCharsetConflict: "dataCharset 需要預設或唯一明確的 charset=utf8mb4。請移除衝突的 charset 參數;此模式不支援工作階段 SET 命令。 同時需要標準工作階段初始化,不支援 sessionVariables 或 proxySql 模式。",
title: "建立連線",
name: "名稱",
namePlaceholder: "連線名稱,留空則自動產生",
@@ -3151,6 +3160,9 @@ export default withEnglishFallback({
largeValueRowUnavailable: "無法在資料庫中定位該列,操作已取消,未使用預覽值。",
largeValueColumnUnavailable: "無法定位大欄位對應的來源欄。",
largeValueLoadFailed: "讀取大欄位完整值失敗。",
+ largeValuePendingDecode: "讀取完整值後解碼",
+ largeValueOriginalKeyUnavailable: "原始資料列鍵遺失或不明確。請重新載入結果後再讀取完整值。",
+ largeValuePendingDecodeExport: "部分文字仍需讀取完整值後解碼。請先載入這些值,或直接從資料庫匯出。",
largeValueNeedsStableKey: "該資料表沒有可用的主鍵,無法安全讀取大欄位完整值,操作已取消。",
largeValueLoadFailedWithMessage: "讀取大欄位完整值失敗:{message}",
largeValueLocalSortUnavailable: "該欄包含大欄位預覽,無法依預覽內容進行目前頁排序,請使用資料庫排序。",
diff --git a/apps/desktop/src/lib/connection/__tests__/mysqlDataCharset.spec.ts b/apps/desktop/src/lib/connection/__tests__/mysqlDataCharset.spec.ts
new file mode 100644
index 0000000000..6fa27facad
--- /dev/null
+++ b/apps/desktop/src/lib/connection/__tests__/mysqlDataCharset.spec.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from "vitest";
+import { mysqlDataCharset, mysqlDataCharsetEnabled, mysqlDataCharsetValidation, setMysqlDataCharset, mysqlDataCharsetAllowsExport, mysqlDataCharsetChanged, mysqlDataCharsetChangeBlocked } from "../mysqlDataCharset";
+import type { QueryTab } from "@/types/database";
+
+describe("MySQL data charset", () => {
+ it("only retires a session for a semantic codec change", () => {
+ expect(mysqlDataCharsetChanged({ db_type: "mysql", url_params: "dataCharset=gbk" }, { db_type: "mysql", url_params: "dataCharset=GBK&timeout=20" })).toBe(false);
+ expect(mysqlDataCharsetChanged({ db_type: "firebird", url_params: "dataCharset=gbk" }, { db_type: "firebird", url_params: "dataCharset=BIG5" })).toBe(false);
+ expect(mysqlDataCharsetChanged({ db_type: "mysql", url_params: "dataCharset=GBK" }, { db_type: "mysql" })).toBe(true);
+ });
+ it("preserves drafts by refusing a codec change while any old result or editable view remains", () => {
+ const draft = { connectionId: "legacy", mode: "query", sql: "unsaved SQL", isExecuting: false } as QueryTab;
+ expect(mysqlDataCharsetChangeBlocked([draft], "legacy")).toBe(false);
+ for (const state of [{ mode: "data" }, { mode: "structure" }, { isExecuting: true }, { isExplaining: true }, { txnSessionId: "txn" }, { autoCommitOpenTransaction: true }, { resultCacheState: "disk" }, { resultSessionId: "cursor" }, { result: { rows: [] } }]) {
+ expect(mysqlDataCharsetChangeBlocked([{ ...draft, ...state } as QueryTab], "legacy")).toBe(true);
+ expect(mysqlDataCharsetChangeBlocked([{ ...draft, ...state } as QueryTab], "other")).toBe(false);
+ }
+ });
+ it("round trips edits and removes only its own option for default", () => {
+ const saved = setMysqlDataCharset("?charset=utf8mb4&timeout=10", "gbk");
+ expect(mysqlDataCharset(saved)).toBe("GBK");
+ expect(setMysqlDataCharset(saved, "default")).toBe("charset=utf8mb4&timeout=10");
+ expect(setMysqlDataCharset("DATACHARSET=gbk&dataCharset=big5&timeout=10", "GB18030")).toBe("timeout=10&dataCharset=GB18030");
+ });
+ it.each(["GBK", "gb18030", "bIg5"])("accepts explicit %s without changing session settings", (codec) => {
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: `dataCharset=${codec}` })).toBeUndefined();
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: `charset=UTF8MB4&dataCharset=${codec}` })).toBeUndefined();
+ });
+ it.each(["dataCharset=unknown", "dataCharset=", "dataCharset", "dataCharset=%20GBK%20", "dataCharset=GBK+", "dataCharset=GBK&dataCharset=BIG5", "DATACHARSET=GBK&dataCharset=GBK"])("rejects ambiguous or unsupported options: %s", (url_params) => {
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params })).toBe("connection.mysqlDataCharsetInvalid");
+ });
+ it.each(["latin1", "gbk", "utf8", ""])("rejects conflicting explicit charset=%s", (charset) => {
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: `dataCharset=GBK&charset=${charset}` })).toBe("connection.mysqlDataCharsetConflict");
+ });
+ it("leaves non-MySQL and disabled configurations unchanged", () => {
+ for (const driver_profile of ["mariadb", "tidb", "dolt"]) {
+ const config = { db_type: "mysql" as const, driver_profile, url_params: "dataCharset=GBK" };
+ expect(mysqlDataCharsetEnabled(config)).toBe(false);
+ expect(mysqlDataCharsetValidation(config)).toBe("connection.mysqlDataCharsetUnsupported");
+ }
+ for (const driver_profile of [undefined, "", "mysql", " MySQL "]) expect(mysqlDataCharsetEnabled({ db_type: "mysql", driver_profile, url_params: "dataCharset=GBK" })).toBe(true);
+ for (const db_type of ["postgres", "jdbc", "firebird", "doris"] as const) {
+ expect(mysqlDataCharsetEnabled({ db_type, url_params: "dataCharset=GBK" })).toBe(false);
+ expect(mysqlDataCharsetValidation({ db_type, url_params: "dataCharset=OTHER&charset=latin1" })).toBeUndefined();
+ }
+ expect(mysqlDataCharsetEnabled({ db_type: "mysql" })).toBe(false);
+ expect(mysqlDataCharsetEnabled({ db_type: "mysql", url_params: "dataCharset=" })).toBe(true);
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: "charset=latin1" })).toBeUndefined();
+ });
+ it("decodes encoded keys/values and rejects session overrides", () => {
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: "%64ataCharset=%47BK&charset=%75tf8mb4" })).toBeUndefined();
+ expect(mysqlDataCharsetEnabled({ db_type: "mysql", url_params: "%64ataCharset=GBK" })).toBe(true);
+ expect(mysqlDataCharsetEnabled({ db_type: "mysql", url_params: "%20dataCharset%20=GBK" })).toBe(true);
+ expect(setMysqlDataCharset("%20dataCharset%20=GBK&timeout=10", "default")).toBe("timeout=10");
+ for (const suffix of ["charset=utf8mb4&charset=utf8mb4", "sessionVariables=sql_mode=ANSI", "setupMode=bare", "setup_mode=proxy", "proxySql", "proxySql=", "proxySql=true", "proxySql=%20true%20", "proxySql=yes", "proxySql=1", "proxySql=on"]) {
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: `dataCharset=GBK&${suffix}` })).toBe("connection.mysqlDataCharsetConflict");
+ }
+ expect(mysqlDataCharsetValidation({ db_type: "mysql", url_params: "dataCharset=GBK&setupMode=standard&sessionVariables=&proxySql=false" })).toBeUndefined();
+ });
+ it("limits presentation export formats while default behavior stays unchanged", () => {
+ for (const format of ["csv", "json", "xlsx"]) expect(mysqlDataCharsetAllowsExport(true, format)).toBe(true);
+ for (const format of ["sql", "txt", "markdown", "html"]) {
+ expect(mysqlDataCharsetAllowsExport(true, format)).toBe(false);
+ expect(mysqlDataCharsetAllowsExport(false, format)).toBe(true);
+ }
+ });
+});
diff --git a/apps/desktop/src/lib/connection/__tests__/mysqlDataCharsetWiring.spec.ts b/apps/desktop/src/lib/connection/__tests__/mysqlDataCharsetWiring.spec.ts
new file mode 100644
index 0000000000..8a96bf5721
--- /dev/null
+++ b/apps/desktop/src/lib/connection/__tests__/mysqlDataCharsetWiring.spec.ts
@@ -0,0 +1,63 @@
+import { readFileSync } from "node:fs";
+import { describe, expect, it } from "vitest";
+import { translateBackendError } from "@/i18n/backend-errors";
+import en from "@/i18n/locales/en";
+import zhCN from "@/i18n/locales/zh-CN";
+import zhTW from "@/i18n/locales/zh-TW";
+import ja from "@/i18n/locales/ja";
+import es from "@/i18n/locales/es";
+import itLocale from "@/i18n/locales/it";
+import ptBR from "@/i18n/locales/pt-BR";
+import az from "@/i18n/locales/az";
+import id from "@/i18n/locales/id";
+import ko from "@/i18n/locales/ko";
+import ru from "@/i18n/locales/ru";
+import th from "@/i18n/locales/th";
+import tr from "@/i18n/locales/tr";
+
+const source = (path: string) => readFileSync(new URL(`../../../${path}`, import.meta.url), "utf8");
+
+describe("MySQL legacy compatibility UI contracts", () => {
+ it("binds the native MySQL selector to persisted URL params and leaves Firebird separate", () => {
+ const dialog = source("components/connection/ConnectionDialog.vue");
+ expect(dialog).toContain('v-if="supportsMysqlDataCharset(form)"');
+ expect(dialog).toContain('v-model="mysqlDataCharsetValue"');
+ expect(dialog).toContain("setMysqlDataCharset(form.value.url_params, value)");
+ expect(dialog).toContain("mysqlDataCharsetValidation(config)");
+ expect(dialog).toContain('v-model="firebirdDataCharset"');
+ expect(dialog).toContain("connection.firebirdDataCharsetHint");
+ });
+ it("threads effective readonly into editing, exports and the status badge", () => {
+ const grid = source("components/grid/DataGrid.vue");
+ expect(grid).toContain("const effectiveEditable = computed(() => !!props.editable && !compatibilityReadOnly.value)");
+ expect(grid).toContain("editable: computed(() => effectiveEditable.value)");
+ expect(grid).toContain("mysqlDataCharsetReadOnly: compatibilityReadOnly");
+ expect(grid).toContain("connection.mysqlDataCharsetExportHint");
+ expect(source("components/connection/ReadOnlySessionControl.vue")).toContain("if (compatibilityReadOnly.value) return;");
+ });
+ it("explains constraints in every locale and translates core policy errors", () => {
+ const keys = ["mysqlDataCharset", "mysqlDataCharsetHint", "mysqlDataCharsetReadOnly", "mysqlDataCharsetExportHint", "mysqlDataCharsetInvalid", "mysqlDataCharsetConflict", "mysqlDataCharsetCloseTabs", "mysqlDataCharsetUnsupported"] as const;
+ for (const locale of [en, zhCN, zhTW, ja, es, itLocale, ptBR, az, id, ko, ru, th, tr]) {
+ for (const key of keys) expect(locale.connection[key]).toBeTruthy();
+ for (const key of ["largeValuePendingDecode", "largeValueOriginalKeyUnavailable", "largeValuePendingDecodeExport"] as const) expect(locale.grid[key]).toBeTruthy();
+ }
+ expect(translateBackendError((key) => key, "MYSQL_DATA_CHARSET_READ_ONLY: no writes")).toBe("connection.mysqlDataCharsetReadOnly");
+ expect(translateBackendError((key) => key, "MYSQL_DATA_CHARSET_EXPORT_UNSUPPORTED: sql")).toBe("connection.mysqlDataCharsetExportHint");
+ });
+ it("uses the same pending-aware formatter for canvas and DOM grid cells", () => {
+ const grid = source("components/grid/DataGrid.vue");
+ expect(grid).toContain("formatCell: (_value, columnIndex, row) => formatGridItemCell(row, columnIndex, false)");
+ expect(grid).toContain("gridCellDisplayValue(formatGridItemCell(item, col.actualColIdx)");
+ });
+ it("blocks backup and both ends of transfer, including locally loaded query results", () => {
+ const backup = source("components/export/DatabaseExportDialog.vue");
+ expect(backup).toContain("if (mysqlDataCharsetEnabled(store.getConfig(connectionId.value))) return false;");
+ const transfer = source("components/transfer/DataTransferDialog.vue");
+ expect(transfer).toContain("mysqlDataCharsetEnabled(store.getConfig(sourceConnectionId.value)) || mysqlDataCharsetEnabled(store.getConfig(targetConnectionId.value))");
+ const resultTransfer = source("components/transfer/QueryResultTransferDialog.vue");
+ expect(resultTransfer).toContain("mysqlDataCharsetEnabled(connections.getConfig(props.sourceConnectionId)) || mysqlDataCharsetEnabled(targetConfig.value)");
+ expect(resultTransfer).toContain("if (compatibilityBlocked.value) return;");
+ expect(source("components/objects/ObjectBrowser.vue")).toContain('format === "sql" && mysqlDataCharsetEnabled(props.connection)');
+ expect(source("composables/useSidebarTreeExportRuntime.ts")).toContain('format === "sql" && targets.some((target) => mysqlDataCharsetEnabled(connectionStore.getConfig(target.connectionId)))');
+ });
+});
diff --git a/apps/desktop/src/lib/connection/mysqlDataCharset.ts b/apps/desktop/src/lib/connection/mysqlDataCharset.ts
new file mode 100644
index 0000000000..8a33a2ad31
--- /dev/null
+++ b/apps/desktop/src/lib/connection/mysqlDataCharset.ts
@@ -0,0 +1,65 @@
+import type { ConnectionConfig, QueryTab } from "@/types/database";
+
+export type MysqlDataCharsetConnection = Pick<Partial<ConnectionConfig>, "db_type" | "driver_profile" | "url_params">;
+export const MYSQL_DATA_CHARSETS = ["GBK", "GB18030", "BIG5"] as const;
+
+export function supportsMysqlDataCharset(connection?: MysqlDataCharsetConnection | null): boolean {
+ const profile = connection?.driver_profile?.trim().toLowerCase();
+ return connection?.db_type === "mysql" && (!profile || profile === "mysql");
+}
+
+function parameters(params?: string): URLSearchParams {
+ return new URLSearchParams((params ?? "").trim().replace(/^\?/, ""));
+}
+
+function values(params: URLSearchParams, name: string): string[] {
+ return [...params].filter(([key]) => key.trim().toLowerCase() === name.toLowerCase()).map(([, value]) => value);
+}
+
+export function mysqlDataCharset(params?: string): string {
+ return values(parameters(params), "dataCharset")[0]?.toUpperCase() || "default";
+}
+
+export function setMysqlDataCharset(params: string | undefined, value: string): string {
+ const parsed = parameters(params);
+ const keys = [...parsed.keys()]; // Snapshot before deleting: live iteration skips adjacent duplicate keys.
+ for (const key of keys) if (key.trim().toLowerCase() === "datacharset") parsed.delete(key);
+ if (value !== "default" && value.trim()) parsed.set("dataCharset", value.trim().toUpperCase());
+ return parsed.toString();
+}
+
+// Fail closed for unsupported values too; connection validation rejects
+// them, but stale unlock state must never turn an invalid opt-in into write access.
+export function mysqlDataCharsetEnabled(connection?: MysqlDataCharsetConnection | null): boolean {
+ return supportsMysqlDataCharset(connection) && values(parameters(connection?.url_params), "dataCharset").length > 0;
+}
+
+export function mysqlDataCharsetValidation(connection: MysqlDataCharsetConnection): string | undefined {
+ if (connection.db_type !== "mysql") return;
+ const parsed = parameters(connection.url_params);
+ const codecs = values(parsed, "dataCharset");
+ if (codecs.length === 0) return;
+ if (!supportsMysqlDataCharset(connection)) return "connection.mysqlDataCharsetUnsupported";
+ if (codecs.length > 1 || !MYSQL_DATA_CHARSETS.some((codec) => codec === codecs[0].toUpperCase())) return "connection.mysqlDataCharsetInvalid";
+ const charsets = values(parsed, "charset");
+ if (charsets.length > 1 || charsets.some((charset) => charset.toLowerCase() !== "utf8mb4")) return "connection.mysqlDataCharsetConflict";
+ if (values(parsed, "sessionVariables").some((value) => value !== "")) return "connection.mysqlDataCharsetConflict";
+ if ([...values(parsed, "setupMode"), ...values(parsed, "setup_mode")].some((value) => value.toLowerCase() !== "standard")) return "connection.mysqlDataCharsetConflict";
+ if (values(parsed, "proxySql").some((value) => ["", "true", "1", "yes", "on"].includes(value.trim().toLowerCase()))) return "connection.mysqlDataCharsetConflict";
+}
+
+export function mysqlDataCharsetAllowsExport(enabled: boolean, format: string): boolean {
+ return !enabled || ["csv", "json", "xlsx"].includes(format);
+}
+
+export function mysqlDataCharsetChanged(previous: MysqlDataCharsetConnection, next: MysqlDataCharsetConnection): boolean {
+ const codec = (connection: MysqlDataCharsetConnection) => (supportsMysqlDataCharset(connection) ? mysqlDataCharset(connection.url_params) : "default");
+ return codec(previous) !== codec(next);
+}
+
+export function mysqlDataCharsetChangeBlocked(tabs: readonly QueryTab[], connectionId: string): boolean {
+ return tabs.some(
+ (tab) =>
+ tab.connectionId === connectionId && (tab.mode !== "query" || tab.isExecuting || tab.isExplaining || !!tab.txnSessionId || tab.autoCommitOpenTransaction === true || !!tab.result || !!tab.results?.length || !!tab.resultRuns?.length || !!tab.resultSessionId || tab.resultCacheState === "disk"),
+ );
+}
diff --git a/apps/desktop/src/lib/dataGrid/__tests__/dataGridDetail.spec.ts b/apps/desktop/src/lib/dataGrid/__tests__/dataGridDetail.spec.ts
index e5166f33ae..39a092ac8a 100644
--- a/apps/desktop/src/lib/dataGrid/__tests__/dataGridDetail.spec.ts
+++ b/apps/desktop/src/lib/dataGrid/__tests__/dataGridDetail.spec.ts
@@ -178,6 +178,26 @@ describe("Cassandra collection cell detail presentation", () => {
});
describe("Mongo collection cell detail presentation", () => {
+ it("renders a pending-decode placeholder without replacing authoritative data", () => {
+ const detail = buildDataGridCellDetail({
+ rowIndex: 0,
+ rowId: 1,
+ row: ['{"carrier":"prefix"}'],
+ columns: ["body"],
+ columnIndex: 0,
+ displayValue: String,
+ isEditable: false,
+ isValuePreviewTruncated: true,
+ pendingDecodePlaceholder: "Read the full value to decode",
+ })!;
+ expect(detail.value).toBe('{"carrier":"prefix"}');
+ expect(detail.rawValue).toBe('{"carrier":"prefix"}');
+ expect(detail.rawValuePreview).toBe("Read the full value to decode");
+ expect(detail.displayValuePreview).toBe("Read the full value to decode");
+ expect(detail.formattedJson).toBe("");
+ expect(detail.imagePreviewUrl).toBeNull();
+ expect(detail.isSourceTruncated).toBe(true);
+ });
it.each([null, "NULL", MONGO_DOCUMENT_GRID_NULL])("presents BSON value %j without leaking grid encoding", (bsonValue) => {
const value = mongoDocumentGridValue(bsonValue) as string;
const text = mongoDocumentGridDisplayText(value) ?? displayCellValue(value);
diff --git a/apps/desktop/src/lib/dataGrid/__tests__/resultKeyLocator.spec.ts b/apps/desktop/src/lib/dataGrid/__tests__/resultKeyLocator.spec.ts
new file mode 100644
index 0000000000..171df98a3e
--- /dev/null
+++ b/apps/desktop/src/lib/dataGrid/__tests__/resultKeyLocator.spec.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it } from "vitest";
+import { createResultKeyLocator } from "@/lib/dataGrid/resultKeyLocator";
+import { appendIndexedResultCells, remapIndexedResultCells } from "@/lib/dataGrid/dataGridLargeValues";
+import { stripPaginationRowNumber, trimQueryPageProbe } from "@/lib/query/queryPaginationResult";
+import { buildTabResultSnapshot, decodeTabResultSnapshot, encodeTabResultSnapshot } from "@/lib/tabs/tabResultCache";
+import type { QueryResult, QueryTab } from "@/types/database";
+
+function sample(): QueryResult {
+ return {
+ columns: ["key", "part", "body"],
+ column_types: ["VARCHAR", "INT", "TEXT"],
+ rows: [
+ ["缤纷", 1, "prefix A"],
+ ["缤纷", 1, "prefix B"],
+ ],
+ affected_rows: 0,
+ execution_time_ms: 1,
+ raw_key_cells: [
+ { row_index: 0, column_index: 0, value: "çÍ·×" },
+ { row_index: 0, column_index: 1, value: 1 },
+ { row_index: 1, column_index: 0, value: "缤纷" },
+ { row_index: 1, column_index: 1, value: 1 },
+ ],
+ large_value_cells: [{ row_index: 0, column_index: 2, original_bytes: 10000, pending_decode: true }],
+ };
+}
+
+describe("original result key locators", () => {
+ it("keeps original tuples distinct despite display collisions", () => {
+ const locator = createResultKeyLocator(sample(), [0, 1], true, "unavailable");
+ expect(locator.values(0)).toEqual(["çÍ·×", 1]);
+ expect(locator.identity(0)).not.toBe(locator.identity(1));
+ });
+
+ it("preserves null and primitive types without delimiter collisions", () => {
+ const result = sample();
+ result.raw_key_cells = [
+ { row_index: 0, column_index: 0, value: null },
+ { row_index: 0, column_index: 1, value: 1 },
+ { row_index: 1, column_index: 0, value: "null" },
+ { row_index: 1, column_index: 1, value: "1" },
+ ];
+ const locator = createResultKeyLocator(result, [0, 1], true, "unavailable");
+ expect(locator.values(0)).toEqual([null, 1]);
+ expect(locator.identity(0)).not.toBe(locator.identity(1));
+ });
+
+ it("retains ordinary display-key behavior when compatibility mode is disabled", () => {
+ const result = sample();
+ result.raw_key_cells = undefined;
+ expect(createResultKeyLocator(result, [0, 1], false, "unavailable").values(0)).toEqual(["缤纷", 1]);
+ expect(() => createResultKeyLocator(result, [0, 1], true, "unavailable").values(0)).toThrow("unavailable");
+ });
+
+ it.each([[], [-1], [3], [0, 0]].map((indexes) => ({ indexes })))("rejects incomplete or ambiguous key indexes $indexes", ({ indexes }) => {
+ expect(() => createResultKeyLocator(sample(), indexes, true, "unavailable").values(0)).toThrow("unavailable");
+ });
+
+ it("rebases appended metadata and drops lookahead keys before result matching", () => {
+ const first = trimQueryPageProbe(sample(), 1);
+ expect(first.raw_key_cells).toHaveLength(2);
+ const appended = appendIndexedResultCells(first.raw_key_cells, sample().raw_key_cells, 1, 1);
+ expect(appended?.map((cell) => cell.row_index)).toEqual([0, 0, 1, 1]);
+ const remapped = remapIndexedResultCells(appended, [1, 0]);
+ expect(remapped?.map((cell) => cell.row_index)).toEqual([1, 1, 0, 0]);
+ });
+
+ it("strips pagination-helper metadata without moving real keys", () => {
+ const result = sample();
+ result.columns.push("__page");
+ result.rows.forEach((row) => row.push(99));
+ result.raw_key_cells!.push({ row_index: 0, column_index: 3, value: 99 });
+ const stripped = stripPaginationRowNumber(result, "__page");
+ expect(stripped.raw_key_cells).toHaveLength(4);
+ expect(createResultKeyLocator(stripped, [0, 1], true, "unavailable").values(0)).toEqual(["çÍ·×", 1]);
+ });
+
+ it("preserves pending state and original keys through actual snapshot construction and disk roundtrip", () => {
+ const result = sample();
+ const run = { id: "run", title: "Run", sequence: 1, sql: "SELECT * FROM example", createdAt: 1, result, results: [result], resultLocalSortOriginalRawKeyCells: result.raw_key_cells, resultLocalSortOriginalLargeValueCells: result.large_value_cells };
+ const tab = { result, results: [result], resultRuns: [run], resultLocalSortOriginalRawKeyCells: result.raw_key_cells, resultLocalSortOriginalLargeValueCells: result.large_value_cells } as QueryTab;
+ const snapshot = buildTabResultSnapshot(tab)!;
+ const restored = decodeTabResultSnapshot(encodeTabResultSnapshot(snapshot));
+ expect(snapshot.result!.raw_key_cells).not.toBe(result.raw_key_cells);
+ expect(restored.resultLocalSortOriginalRawKeyCells).toEqual(result.raw_key_cells);
+ expect(restored.resultLocalSortOriginalLargeValueCells).toEqual(result.large_value_cells);
+ expect(restored.resultRuns![0]!.resultLocalSortOriginalRawKeyCells).toEqual(result.raw_key_cells);
+ for (const restoredResult of [restored.result!, restored.results![0]!, restored.resultRuns![0]!.result!, restored.resultRuns![0]!.results![0]!]) {
+ expect(restoredResult.raw_key_cells).toEqual(result.raw_key_cells);
+ expect(restoredResult.large_value_cells).toEqual(result.large_value_cells);
+ expect(createResultKeyLocator(restoredResult, [0, 1], true, "unavailable").values(0)).toEqual(["çÍ·×", 1]);
+ }
+ });
+});
diff --git a/apps/desktop/src/lib/dataGrid/dataGridDetail.ts b/apps/desktop/src/lib/dataGrid/dataGridDetail.ts
index c9c81481b2..7cc9610f65 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridDetail.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridDetail.ts
@@ -59,6 +59,8 @@ export interface BuildDataGridCellDetailOptions {
databaseType?: DatabaseType;
includeBinaryImagePreview?: boolean;
isValuePreviewTruncated?: boolean;
+ /** Rendering only; never replaces the source value used by copy/export. */
+ pendingDecodePlaceholder?: string;
}
export interface BuildDataGridRowDetailOptions {
@@ -75,6 +77,7 @@ export interface BuildDataGridRowDetailOptions {
isNullValue?: (value: CellValue) => boolean;
isEditableColumn?: (columnIndex: number) => boolean;
isValuePreviewTruncated?: (columnIndex: number) => boolean;
+ pendingDecodePlaceholder?: (columnIndex: number) => string | undefined;
}
export interface BuildDataGridColumnDetailRow {
@@ -83,6 +86,7 @@ export interface BuildDataGridColumnDetailRow {
row: readonly CellValue[];
isEditable?: boolean;
isValuePreviewTruncated?: boolean;
+ pendingDecodePlaceholder?: string;
}
export interface BuildDataGridColumnDetailOptions {
@@ -105,9 +109,9 @@ export function buildDataGridCellDetail(options: BuildDataGridCellDetailOptions)
const rawValue = options.rawValue?.(value, options.columnIndex) ?? displayCellValue(value);
const isNull = options.isNullValue?.(value) ?? value === null;
const displayValue = options.displayValue(value, options.columnIndex);
- const formattedJson = typeof value === "string" ? detailFormattedJson(value, options.databaseType) : "";
- const rawValuePreview = previewText(rawValue);
- const displayValuePreview = previewText(displayValue);
+ const formattedJson = options.pendingDecodePlaceholder === undefined && typeof value === "string" ? detailFormattedJson(value, options.databaseType) : "";
+ const rawValuePreview = options.pendingDecodePlaceholder ?? previewText(rawValue);
+ const displayValuePreview = options.pendingDecodePlaceholder ?? previewText(displayValue);
const type = detailColumnType(options.typeByColumn, options.resultColumnTypes, column, options.columnIndex);
return {
@@ -124,10 +128,13 @@ export function buildDataGridCellDetail(options: BuildDataGridCellDetailOptions)
displayValuePreview,
isSourceTruncated: options.isValuePreviewTruncated === true,
isValuePreviewTruncated: options.isValuePreviewTruncated === true || rawValuePreview.length < rawValue.length || displayValuePreview.length < displayValue.length,
- imagePreviewUrl: cellImagePreviewUrl(value, type, {
- binary: options.includeBinaryImagePreview !== false,
- databaseType: options.databaseType,
- }),
+ imagePreviewUrl:
+ options.pendingDecodePlaceholder === undefined
+ ? cellImagePreviewUrl(value, type, {
+ binary: options.includeBinaryImagePreview !== false,
+ databaseType: options.databaseType,
+ })
+ : null,
length: isNull ? 0 : rawValue.length,
isNull,
formattedJson,
@@ -156,6 +163,7 @@ export function buildDataGridColumnDetail(options: BuildDataGridColumnDetailOpti
isEditable: row.isEditable ?? false,
includeBinaryImagePreview: false,
isValuePreviewTruncated: row.isValuePreviewTruncated,
+ pendingDecodePlaceholder: row.pendingDecodePlaceholder,
}),
)
.filter((field): field is DataGridCellDetail => field !== null);
@@ -187,6 +195,7 @@ export function buildDataGridRowDetail(options: BuildDataGridRowDetailOptions):
isEditable: options.isEditableColumn?.(columnIndex) ?? false,
includeBinaryImagePreview: false,
isValuePreviewTruncated: options.isValuePreviewTruncated?.(columnIndex),
+ pendingDecodePlaceholder: options.pendingDecodePlaceholder?.(columnIndex),
}),
)
.filter((field): field is DataGridCellDetail => field !== null);
diff --git a/apps/desktop/src/lib/dataGrid/dataGridLargeValues.ts b/apps/desktop/src/lib/dataGrid/dataGridLargeValues.ts
index 7d7db48bd6..8c82767ac7 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridLargeValues.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridLargeValues.ts
@@ -271,12 +271,20 @@ export function createResultScopedPendingRequests<T>() {
}
export function appendLargeValueCells(previous: QueryResult["large_value_cells"], segment: QueryResult["large_value_cells"], rowOffset: number, appendedRowCount: number): QueryResult["large_value_cells"] {
+ return appendIndexedResultCells(previous, segment, rowOffset, appendedRowCount);
+}
+
+export function appendIndexedResultCells<T extends { row_index: number }>(previous: T[] | undefined, segment: T[] | undefined, rowOffset: number, appendedRowCount: number): T[] | undefined {
const appended = (segment ?? []).filter((cell) => cell.row_index < appendedRowCount).map((cell) => ({ ...cell, row_index: cell.row_index + rowOffset }));
const combined = [...(previous ?? []), ...appended];
return combined.length > 0 ? combined : undefined;
}
export function remapLargeValueCells(cells: QueryResult["large_value_cells"], rowIndexes: number[]): QueryResult["large_value_cells"] {
+ return remapIndexedResultCells(cells, rowIndexes);
+}
+
+export function remapIndexedResultCells<T extends { row_index: number }>(cells: T[] | undefined, rowIndexes: number[]): T[] | undefined {
if (!cells?.length) return undefined;
const targetBySource = new Map(rowIndexes.map((sourceIndex, targetIndex) => [sourceIndex, targetIndex]));
const remapped = cells
diff --git a/apps/desktop/src/lib/dataGrid/legacyLargeValueExport.ts b/apps/desktop/src/lib/dataGrid/legacyLargeValueExport.ts
index d7851c6402..71ec86071d 100644
--- a/apps/desktop/src/lib/dataGrid/legacyLargeValueExport.ts
+++ b/apps/desktop/src/lib/dataGrid/legacyLargeValueExport.ts
@@ -1,9 +1,10 @@
+import { createResultKeyLocator } from "./resultKeyLocator";
import * as api from "@/lib/backend/api";
import type { CellValue } from "./cellValue";
import { buildDataGridContextFilterCondition } from "./dataGridSql";
import { buildTableSelectSql } from "@/lib/table/tableSelectSql";
import { SnapshotCompletionError } from "@/lib/export/snapshotCompletion";
-import type { ColumnInfo, DatabaseType } from "@/types/database";
+import type { ColumnInfo, DatabaseType, QueryResult } from "@/types/database";
export interface LegacyLargeValueContext {
databaseType: DatabaseType | undefined;
@@ -12,6 +13,8 @@ export interface LegacyLargeValueContext {
tableMeta: { catalog?: string; database?: string; schema?: string; tableName: string; tableType?: string; columns: ColumnInfo[]; primaryKeys: string[] } | undefined;
sourceColumns: string[];
rows: CellValue[][];
+ rawKeyCells?: QueryResult["raw_key_cells"];
+ requiresOriginalKeys?: boolean;
identifierQuote: string | undefined;
serverVersion: string | undefined;
includeDatabaseName: boolean;
@@ -63,9 +66,18 @@ export function chunkLegacyLargeValueRequests(requests: LegacyLargeValueCellRequ
return chunks;
}
+function contextKeyLocator(context: LegacyLargeValueContext, indexes: number[], options: ReaderOptions) {
+ return createResultKeyLocator({ columns: context.sourceColumns, rows: context.rows, raw_key_cells: context.rawKeyCells, affected_rows: 0, execution_time_ms: 0 }, indexes, context.requiresOriginalKeys === true, options.translate("grid.largeValueOriginalKeyUnavailable"));
+}
+
export async function legacyLargeValueRowPredicate(context: LegacyLargeValueContext, sourceIndex: number, primaryKeyIndexes: number[], options: ReaderOptions): Promise<string> {
const row = context.rows[sourceIndex];
if (!row) throw new Error(options.translate("grid.largeValueRowUnavailable"));
+ const keyValues = contextKeyLocator(context, primaryKeyIndexes, options).values(sourceIndex);
+ return legacyLargeValueKeyPredicate(context, keyValues, options);
+}
+
+async function legacyLargeValueKeyPredicate(context: LegacyLargeValueContext, keyValues: CellValue[], options: ReaderOptions): Promise<string> {
const table = context.tableMeta!;
const conditions = await Promise.all(
table.primaryKeys.map((columnName, index) =>
@@ -75,7 +87,7 @@ export async function legacyLargeValueRowPredicate(context: LegacyLargeValueCont
columnName,
columnInfo: table.columns.find((column) => column.name.toLocaleLowerCase() === columnName.toLocaleLowerCase()),
mode: "equals",
- value: row[primaryKeyIndexes[index]!] ?? null,
+ value: keyValues[index]!,
}),
),
);
@@ -87,7 +99,10 @@ export async function fetchLegacyLargeValueRequestChunk(context: LegacyLargeValu
const table = context.tableMeta!;
const sourceColumn = context.sourceColumns[columnIndex];
if (!sourceColumn) throw new Error(options.translate("grid.largeValueColumnUnavailable"));
- const predicates = await Promise.all(requests.map((request) => legacyLargeValueRowPredicate(context, request.sourceIndex, primaryKeyIndexes, options)));
+ // Reuse one index for the batch instead of rescanning all captured keys for
+ // every row's predicate and again for result matching.
+ const sourceLocator = contextKeyLocator(context, primaryKeyIndexes, options);
+ const predicates = await Promise.all(requests.map((request) => legacyLargeValueKeyPredicate(context, sourceLocator.values(request.sourceIndex), options)));
const selectedColumns = [...new Set([...table.primaryKeys, sourceColumn])];
const sql = await buildTableSelectSql({
databaseType: context.databaseType,
@@ -107,10 +122,12 @@ export async function fetchLegacyLargeValueRequestChunk(context: LegacyLargeValu
includeRowId: context.includeRowId,
});
beforeRead?.();
- const results = await api.executeMulti(context.connectionId!, context.executionDatabase, sql, undefined, options.uuid(), { maxRows: requests.length, fetchSize: requests.length, timeoutSecs: context.timeoutSecs }).catch((error) => {
- if (beforeRead) throw new SnapshotCompletionError("unknown", error instanceof Error ? error.message : String(error));
- throw error;
- });
+ const results = await api
+ .executeMulti(context.connectionId!, context.executionDatabase, sql, undefined, options.uuid(), { maxRows: requests.length, fetchSize: requests.length, ...(context.requiresOriginalKeys ? { resultKeyColumns: table.primaryKeys } : {}), timeoutSecs: context.timeoutSecs })
+ .catch((error) => {
+ if (beforeRead) throw new SnapshotCompletionError("unknown", error instanceof Error ? error.message : String(error));
+ throw error;
+ });
const failures = results.filter((result) => result.execution_error);
if (beforeRead && failures.length) {
const unknown = failures.find((result) => result.error?.operationOutcome !== "not_started");
@@ -120,7 +137,7 @@ export async function fetchLegacyLargeValueRequestChunk(context: LegacyLargeValu
const result = results[0];
if (!result || result.execution_error) throw new Error(result?.error ? options.translateBackendError(result.error) : String(result?.rows?.[0]?.[0] ?? options.translate("grid.largeValueLoadFailed")));
const resultIndexes = selectedColumns.map((column) => {
- if (!beforeRead) return result.columns.findIndex((name) => name.toLocaleLowerCase() === column.toLocaleLowerCase());
+ if (!beforeRead && !context.requiresOriginalKeys) return result.columns.findIndex((name) => name.toLocaleLowerCase() === column.toLocaleLowerCase());
const exact = result.columns.flatMap((name, index) => (name === column ? [index] : []));
if (exact.length) return exact.length === 1 ? exact[0]! : -1;
const folded = result.columns.flatMap((name, index) => (name.toLocaleLowerCase() === column.toLocaleLowerCase() ? [index] : []));
@@ -129,16 +146,16 @@ export async function fetchLegacyLargeValueRequestChunk(context: LegacyLargeValu
if (resultIndexes.some((index) => index < 0)) throw new Error(options.translate("grid.largeValueColumnUnavailable"));
const keyIndexes = resultIndexes.slice(0, table.primaryKeys.length);
const valueIndex = resultIndexes[selectedColumns.indexOf(sourceColumn)]!;
- if (beforeRead && result.large_value_cells?.some((cell) => cell.column_index === valueIndex || keyIndexes.includes(cell.column_index))) throw new Error(options.translate("grid.largeValueLoadFailed"));
+ if ((beforeRead || context.requiresOriginalKeys) && result.large_value_cells?.some((cell) => cell.column_index === valueIndex || keyIndexes.includes(cell.column_index))) throw new Error(options.translate("grid.largeValueLoadFailed"));
+ const resultLocator = createResultKeyLocator(result, keyIndexes, context.requiresOriginalKeys === true, options.translate("grid.largeValueOriginalKeyUnavailable"));
const values = new Map<string, CellValue>();
- for (const row of result.rows) {
- const identity = legacyLargeValueIdentityKey(row, keyIndexes);
- if (beforeRead && values.has(identity)) throw new Error(options.translate("grid.largeValueRowUnavailable"));
+ for (const [rowIndex, row] of result.rows.entries()) {
+ const identity = resultLocator.identity(rowIndex);
+ if ((beforeRead || context.requiresOriginalKeys) && values.has(identity)) throw new Error(options.translate("grid.largeValueRowUnavailable"));
values.set(identity, row[valueIndex] ?? null);
}
for (const request of requests) {
- const row = context.rows[request.sourceIndex];
- const identity = row ? legacyLargeValueIdentityKey(row, primaryKeyIndexes) : "";
+ const identity = sourceLocator.identity(request.sourceIndex);
if (!values.has(identity)) throw new Error(options.translate("grid.largeValueRowUnavailable"));
const rowValues = resolved.get(request.rowId) ?? new Map<number, CellValue>();
rowValues.set(columnIndex, values.get(identity) ?? null);
@@ -155,7 +172,11 @@ export async function resolveCapturedLegacyLargeValueCells(context: LegacyLargeV
};
try {
check();
- const keyIndexes = context.tableMeta?.primaryKeys.map((name) => context.sourceColumns.findIndex((column) => column.toLocaleLowerCase() === name.toLocaleLowerCase())) ?? [];
+ const keyIndexes =
+ context.tableMeta?.primaryKeys.map((name) => {
+ const indexes = context.sourceColumns.flatMap((column, index) => (column.toLocaleLowerCase() === name.toLocaleLowerCase() ? [index] : []));
+ return context.requiresOriginalKeys && indexes.length !== 1 ? -1 : (indexes[0] ?? -1);
+ }) ?? [];
if (!["mysql", "postgres", "oracle", "db2"].includes(context.databaseType ?? "") || !context.tableMeta?.tableName || !keyIndexes.length || keyIndexes.some((index) => index < 0)) throw new Error(options.translate("grid.largeValueNeedsRowIdentifier"));
const byColumn = new Map<number, LegacyLargeValueCellRequest[]>();
for (const request of requests) {
diff --git a/apps/desktop/src/lib/dataGrid/resultKeyLocator.ts b/apps/desktop/src/lib/dataGrid/resultKeyLocator.ts
new file mode 100644
index 0000000000..6b7ca5b4ed
--- /dev/null
+++ b/apps/desktop/src/lib/dataGrid/resultKeyLocator.ts
@@ -0,0 +1,51 @@
+import type { CellValue } from "@/lib/dataGrid/cellValue";
+import type { QueryResult } from "@/types/database";
+
+/** Internal read identity is based on original keys, never interpreted display text. */
+export function createResultKeyLocator(result: QueryResult, indexes: readonly number[], requireRaw: boolean, unavailableMessage: string) {
+ const keys = new Map<string, CellValue>();
+ const duplicates = new Set<string>();
+ for (const cell of result.raw_key_cells ?? []) {
+ const key = `${cell.row_index}:${cell.column_index}`;
+ if (keys.has(key)) duplicates.add(key);
+ keys.set(key, cell.value);
+ }
+ function values(rowIndex: number): CellValue[] {
+ const row = result.rows[rowIndex];
+ if (!row || indexes.length === 0 || new Set(indexes).size !== indexes.length) throw new Error(unavailableMessage);
+ return indexes.map((index) => {
+ if (index < 0 || index >= row.length) throw new Error(unavailableMessage);
+ if (!requireRaw) return row[index] ?? null;
+ const key = `${rowIndex}:${index}`;
+ if (!keys.has(key) || duplicates.has(key)) throw new Error(unavailableMessage);
+ return keys.get(key)!;
+ });
+ }
+ return {
+ values,
+ // JSON tuples preserve boundaries and types, even when displayed keys collide.
+ identity: (rowIndex: number) => JSON.stringify(values(rowIndex)),
+ };
+}
+
+/** Restore source order after sorting without reviving already hydrated previews. */
+export function originalResultRowOrder(result: QueryResult, originalRows: QueryResult["rows"], originalKeys: QueryResult["raw_key_cells"]): number[] | undefined {
+ if (!originalKeys?.length || result.rows.length !== originalRows.length) return undefined;
+ const indexes = [...new Set(originalKeys.map((cell) => cell.column_index))].sort((a, b) => a - b);
+ const current = createResultKeyLocator(result, indexes, true, "unavailable");
+ const original = createResultKeyLocator({ ...result, rows: originalRows, raw_key_cells: originalKeys }, indexes, true, "unavailable");
+ try {
+ const byIdentity = new Map<string, number>();
+ for (let index = 0; index < result.rows.length; index++) {
+ const identity = current.identity(index);
+ if (byIdentity.has(identity)) return undefined;
+ byIdentity.set(identity, index);
+ }
+ const order = originalRows.map((_, index) => byIdentity.get(original.identity(index)));
+ if (order.some((index) => index === undefined) || new Set(order).size !== originalRows.length) return undefined;
+ return order as number[];
+ } catch {
+ // Incomplete/ambiguous keys cannot have been used for successful hydration.
+ return undefined;
+ }
+}
diff --git a/apps/desktop/src/lib/database/__tests__/readOnlyWriteAccess.spec.ts b/apps/desktop/src/lib/database/__tests__/readOnlyWriteAccess.spec.ts
index 479be4295d..aec26e166d 100644
--- a/apps/desktop/src/lib/database/__tests__/readOnlyWriteAccess.spec.ts
+++ b/apps/desktop/src/lib/database/__tests__/readOnlyWriteAccess.spec.ts
@@ -2,6 +2,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { createPinia, setActivePinia } from "pinia";
import { useReadOnlyUnlockStore } from "@/stores/readOnlyUnlockStore";
import { connectionIsEffectivelyReadOnly, ensureReadOnlyWriteAccess, formatWriteUnlockRemaining, sqlLooksLikeMutation } from "../readOnlyWriteAccess";
+import zhCN from "@/i18n/locales/zh-CN";
+
+const { toast } = vi.hoisted(() => ({ toast: vi.fn() }));
+vi.mock("@/composables/useToast", () => ({ useToast: () => ({ toast }) }));
+vi.mock("@/i18n", () => ({ default: { global: { t: (key: string) => (key === "connection.mysqlDataCharsetWriteBlocked" ? zhCN.connection.mysqlDataCharsetWriteBlocked : key) } } }));
const unlockConnectionWrites = vi.fn();
const lockConnectionWrites = vi.fn();
@@ -28,6 +33,7 @@ describe("read-only write unlock", () => {
lockConnectionWrites.mockReset().mockResolvedValue(undefined);
connectionWriteUnlockState.mockReset().mockResolvedValue(0);
vi.useRealTimers();
+ toast.mockClear();
});
it("formats remaining time as m:ss", () => {
@@ -36,6 +42,40 @@ describe("read-only write unlock", () => {
expect(formatWriteUnlockRemaining(0)).toBe("0:00");
});
+ it("never unlocks compatibility mode, even with a stale active window", async () => {
+ const store = useReadOnlyUnlockStore();
+ const connection = { id: "legacy", db_type: "mysql" as const, read_only: false, url_params: "dataCharset=GBK" };
+ store.rememberWindow("legacy", 60_000);
+ expect(connectionIsEffectivelyReadOnly(connection)).toBe(true);
+ await expect(ensureReadOnlyWriteAccess({ connection, sql: "UPDATE t SET a=1" })).resolves.toBe(false);
+ await expect(ensureReadOnlyWriteAccess({ connection, treatAsMutation: true })).resolves.toBe(false);
+ await expect(ensureReadOnlyWriteAccess({ connection, sql: "SELECT 1" })).resolves.toBe(true);
+ expect(toast).toHaveBeenCalledTimes(2);
+ expect(toast).toHaveBeenCalledWith("数据字符集兼容模式强制只读,无法执行写入,也不能临时解锁。", 5000);
+ expect(store.pending).toBeUndefined();
+ expect(unlockConnectionWrites).not.toHaveBeenCalled();
+ expect(connection.read_only).toBe(false);
+ expect(connection.url_params).toBe("dataCharset=GBK");
+ expect(connectionIsEffectivelyReadOnly({ ...connection, url_params: "" })).toBe(false);
+ expect(connectionIsEffectivelyReadOnly({ ...connection, db_type: "firebird" })).toBe(false);
+ });
+
+ it("allows compatibility reads silently and notifies once per explicit mutation denial", async () => {
+ const connection = { id: "legacy", db_type: "mysql" as const, url_params: "dataCharset=GBK" };
+ await expect(ensureReadOnlyWriteAccess({ connection, sql: "SELECT 1" })).resolves.toBe(true);
+ expect(toast).not.toHaveBeenCalled();
+ await expect(ensureReadOnlyWriteAccess({ connection, sql: "SELECT 1", treatAsMutation: true })).resolves.toBe(false);
+ expect(toast).toHaveBeenCalledOnce();
+ expect(useReadOnlyUnlockStore().pending).toBeUndefined();
+ expect(unlockConnectionWrites).not.toHaveBeenCalled();
+ expect(connectionWriteUnlockState).not.toHaveBeenCalled();
+ });
+
+ it.each(["az", "en", "es", "id", "it", "ja", "ko", "pt-BR", "ru", "th", "tr", "zh-CN", "zh-TW"])("provides the blocked-write notification in %s", async (locale) => {
+ const messages = await import(`../../../i18n/locales/${locale}.ts`);
+ expect(messages.default.connection.mysqlDataCharsetWriteBlocked).toBeTruthy();
+ });
+
it("classifies SQL and Redis writes without treating reads as mutations", () => {
expect(sqlLooksLikeMutation("SELECT 1", "mysql")).toBe(false);
expect(sqlLooksLikeMutation("INSERT INTO t VALUES (1)", "mysql")).toBe(true);
@@ -72,6 +112,7 @@ describe("read-only write unlock", () => {
const store = await waitForPending("prod");
store.cancel();
await expect(cancelled).resolves.toBe(false);
+ expect(toast).not.toHaveBeenCalled();
expect(unlockConnectionWrites).not.toHaveBeenCalled();
expect(connectionIsEffectivelyReadOnly(connection)).toBe(true);
@@ -94,6 +135,7 @@ describe("read-only write unlock", () => {
await expect(ensureReadOnlyWriteAccess({ connection: { id: "r", read_only: true, db_type: "mysql" }, sql: "SELECT 1" })).resolves.toBe(true);
expect(store.pending).toBeUndefined();
expect(connectionWriteUnlockState).not.toHaveBeenCalled();
+ expect(toast).not.toHaveBeenCalled();
});
it("does not prompt for Elasticsearch searches on a read-only connection", async () => {
diff --git a/apps/desktop/src/lib/database/readOnlyWriteAccess.ts b/apps/desktop/src/lib/database/readOnlyWriteAccess.ts
index 18a7cd7b4a..e5063f9e89 100644
--- a/apps/desktop/src/lib/database/readOnlyWriteAccess.ts
+++ b/apps/desktop/src/lib/database/readOnlyWriteAccess.ts
@@ -4,6 +4,8 @@ import { classifyRedisCommandSafety } from "@/lib/redis/redisCommandSafety";
import { isRedisCommentLine } from "@/lib/redis/redisCommandTokenizer";
import { classifySqlRisk, isSqlRiskMutation } from "@/lib/sql/sqlRisk";
import type { DatabaseType } from "@/types/database";
+import { mysqlDataCharsetEnabled, type MysqlDataCharsetConnection } from "@/lib/connection/mysqlDataCharset";
+import { useToast } from "@/composables/useToast";
export type { WriteUnlockDurationSecs };
@@ -30,7 +32,8 @@ export function isWriteUnlockActive(connectionId: string | undefined | null): bo
return unlockStoreOrNull()?.isUnlocked(connectionId) === true;
}
-export function connectionIsEffectivelyReadOnly(connection?: { id?: string; read_only?: boolean } | null): boolean {
+export function connectionIsEffectivelyReadOnly(connection?: ({ id?: string; read_only?: boolean } & MysqlDataCharsetConnection) | null): boolean {
+ if (mysqlDataCharsetEnabled(connection)) return true;
if (!connection?.read_only) return false;
return !isWriteUnlockActive(connection.id);
}
@@ -47,7 +50,7 @@ export function sqlLooksLikeMutation(sql: string | undefined, databaseType?: Dat
}
export interface ReadOnlyWriteAccessOptions {
- connection?: { id?: string; name?: string; read_only?: boolean; db_type?: DatabaseType } | null;
+ connection?: ({ id?: string; name?: string; read_only?: boolean; db_type?: DatabaseType } & MysqlDataCharsetConnection) | null;
sql?: string;
source?: string;
treatAsMutation?: boolean;
@@ -55,6 +58,12 @@ export interface ReadOnlyWriteAccessOptions {
export async function ensureReadOnlyWriteAccess(options: ReadOnlyWriteAccessOptions): Promise<boolean> {
const connection = options.connection;
+ if (mysqlDataCharsetEnabled(connection)) {
+ if (options.treatAsMutation !== true && !sqlLooksLikeMutation(options.sql, connection?.db_type)) return true;
+ const { default: i18n } = await import("@/i18n");
+ useToast().toast(i18n.global.t("connection.mysqlDataCharsetWriteBlocked"), 5000);
+ return false;
+ }
if (!connection?.read_only) return true;
if (!connection.id) return false;
const store = unlockStoreOrNull();
diff --git a/apps/desktop/src/lib/query/queryPaginationResult.ts b/apps/desktop/src/lib/query/queryPaginationResult.ts
index 140ecfbc49..2273000c89 100644
--- a/apps/desktop/src/lib/query/queryPaginationResult.ts
+++ b/apps/desktop/src/lib/query/queryPaginationResult.ts
@@ -11,6 +11,7 @@ export function trimQueryPageProbe<T extends QueryResult>(result: T, pageLimit:
rows: result.rows.slice(0, pageLimit),
spatial_values: result.spatial_values?.slice(0, pageLimit),
large_value_cells: result.large_value_cells?.filter((cell) => cell.row_index < pageLimit),
+ raw_key_cells: result.raw_key_cells?.filter((cell) => cell.row_index < pageLimit),
// Keep discarded preview refs owned by the result until its normal cleanup.
large_value_refs: result.large_value_refs,
};
@@ -29,6 +30,7 @@ export function stripPaginationRowNumber(result: QueryResult, column: string | u
spatial_values: result.spatial_values?.map((row) => row.slice(0, index)),
spatial_columns: result.spatial_columns?.filter((column) => column.column_index < index),
large_value_cells: result.large_value_cells?.filter((cell) => cell.column_index < index),
+ raw_key_cells: result.raw_key_cells?.filter((cell) => cell.column_index < index),
hidden_column_indexes: result.hidden_column_indexes?.filter((columnIndex) => columnIndex < index),
};
}
diff --git a/apps/desktop/src/lib/tabs/tabPresentation.ts b/apps/desktop/src/lib/tabs/tabPresentation.ts
index 811bcdfdbe..b0e34c7967 100644
--- a/apps/desktop/src/lib/tabs/tabPresentation.ts
+++ b/apps/desktop/src/lib/tabs/tabPresentation.ts
@@ -1,4 +1,5 @@
import { useConnectionStore } from "@/stores/connectionStore";
+import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { useSettingsStore } from "@/stores/settingsStore";
import { hexToRgba } from "@/lib/common/color";
import { isLegacyWebView } from "@/lib/ui/legacyWebView";
@@ -76,7 +77,8 @@ export function tabConnectionColor(connectionId: string): string {
export function isConnectionReadonly(connectionId: string): boolean {
const connectionStore = useConnectionStore();
- return connectionStore.getConfig(connectionId)?.read_only ?? false;
+ const connection = connectionStore.getConfig(connectionId);
+ return mysqlDataCharsetEnabled(connection) || connection?.read_only === true;
}
function jdbcTargetLabel(connection: ConnectionConfig): string {
diff --git a/apps/desktop/src/lib/tabs/tabResultCache.ts b/apps/desktop/src/lib/tabs/tabResultCache.ts
index abab0948b2..aa5e0b0009 100644
--- a/apps/desktop/src/lib/tabs/tabResultCache.ts
+++ b/apps/desktop/src/lib/tabs/tabResultCache.ts
@@ -28,6 +28,7 @@ export interface TabResultSnapshot {
*/
resultLocalSortOriginalRows?: QueryResult["rows"];
resultLocalSortOriginalLargeValueCells?: QueryResult["large_value_cells"];
+ resultLocalSortOriginalRawKeyCells?: QueryResult["raw_key_cells"];
resultLocalSortOriginalMongoDocuments?: QueryResult["mongo_documents"];
resultLocalSortOriginalMongoCopyDocuments?: QueryResult["mongo_copy_documents"];
resultRuns?: QueryTab["resultRuns"];
@@ -63,6 +64,7 @@ interface ColumnarQueryResult {
spatial_columns?: QueryResult["spatial_columns"];
spatial_values?: QueryResult["spatial_values"];
large_value_cells?: QueryResult["large_value_cells"];
+ raw_key_cells?: QueryResult["raw_key_cells"];
execution_error?: true;
statement_index?: number;
column_types?: string[];
@@ -368,6 +370,7 @@ function stripSessionIds(result: QueryResult | undefined): QueryResult | undefin
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
large_value_cells: result.large_value_cells?.map((cell) => ({ ...cell })),
+ raw_key_cells: result.raw_key_cells?.map((cell) => ({ ...cell })),
rows: result.rows.map((row) => [...row]),
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
@@ -407,6 +410,7 @@ function stripResultRunSessionIds(resultRuns: QueryTab["resultRuns"]): QueryTab[
results: stripResultSessionIds(run.results),
resultLocalSortOriginalRows: run.resultLocalSortOriginalRows?.map((row) => [...row]),
resultLocalSortOriginalLargeValueCells: run.resultLocalSortOriginalLargeValueCells?.map((cell) => ({ ...cell })),
+ resultLocalSortOriginalRawKeyCells: run.resultLocalSortOriginalRawKeyCells?.map((cell) => ({ ...cell })),
resultLocalSortOriginalMongoDocuments: run.resultLocalSortOriginalMongoDocuments ? clonePlain(run.resultLocalSortOriginalMongoDocuments) : undefined,
resultLocalSortOriginalMongoCopyDocuments: run.resultLocalSortOriginalMongoCopyDocuments ? clonePlain(run.resultLocalSortOriginalMongoCopyDocuments) : undefined,
resultSessionId: undefined,
@@ -437,6 +441,7 @@ function toColumnarResult(result: QueryResult | undefined): ColumnarQueryResult
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
large_value_cells: result.large_value_cells?.map((cell) => ({ ...cell })),
+ raw_key_cells: result.raw_key_cells?.map((cell) => ({ ...cell })),
rowCount,
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
@@ -478,6 +483,7 @@ function fromColumnarResult(result: ColumnarQueryResult | undefined): QueryResul
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
large_value_cells: result.large_value_cells?.map((cell) => ({ ...cell })),
+ raw_key_cells: result.raw_key_cells?.map((cell) => ({ ...cell })),
rows,
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
@@ -818,6 +824,8 @@ export function buildTabResultSnapshot(tab: QueryTab): TabResultSnapshot | undef
activeResultIndex: tab.activeResultIndex,
resultEditorFingerprint: tab.resultEditorFingerprint,
resultLocalSortOriginalRows: tab.resultLocalSortOriginalRows?.map((row) => [...row]),
+ resultLocalSortOriginalLargeValueCells: tab.resultLocalSortOriginalLargeValueCells?.map((cell) => ({ ...cell })),
+ resultLocalSortOriginalRawKeyCells: tab.resultLocalSortOriginalRawKeyCells?.map((cell) => ({ ...cell })),
resultLocalSortOriginalMongoDocuments: tab.resultLocalSortOriginalMongoDocuments ? clonePlain(tab.resultLocalSortOriginalMongoDocuments) : undefined,
resultLocalSortOriginalMongoCopyDocuments: tab.resultLocalSortOriginalMongoCopyDocuments ? clonePlain(tab.resultLocalSortOriginalMongoCopyDocuments) : undefined,
resultRuns: stripResultRunSessionIds(tab.resultRuns),
diff --git a/apps/desktop/src/stores/__tests__/connectionStore.updateConnectionDatabaseTabs.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.updateConnectionDatabaseTabs.spec.ts
index 6c1bdcd407..e24ac3efde 100644
--- a/apps/desktop/src/stores/__tests__/connectionStore.updateConnectionDatabaseTabs.spec.ts
+++ b/apps/desktop/src/stores/__tests__/connectionStore.updateConnectionDatabaseTabs.spec.ts
@@ -50,6 +50,47 @@ describe("connectionStore updateConnection re-syncs open query tabs' database",
setActivePinia(createPinia());
});
+ it("disconnects a changed MySQL codec before publishing config and preserves SQL drafts", async () => {
+ const { connectionStore, queryStore } = await createStores();
+ const api = await import("@/lib/backend/api");
+ const connection = postgresConnection({ db_type: "mysql", url_params: "dataCharset=GBK" });
+ connectionStore.connections = [connection];
+ const tabId = queryStore.createTab(connection.id, "testdb", "draft");
+ queryStore.updateSql(tabId, "SELECT 'unsaved';");
+ vi.mocked(api.disconnectDb).mockImplementation(async () => {
+ expect(connectionStore.getConfig(connection.id)?.url_params).toBe("dataCharset=GBK");
+ });
+ await connectionStore.updateConnection({ ...connection, url_params: "" });
+ expect(api.disconnectDb).toHaveBeenCalled();
+ expect(connectionStore.getConfig(connection.id)?.url_params || "").toBe("");
+ expect(queryStore.tabs.find((tab) => tab.id === tabId)?.sql).toBe("SELECT 'unsaved';");
+ });
+
+ it("does not publish writable settings after codec disconnect fails", async () => {
+ const { connectionStore } = await createStores();
+ const api = await import("@/lib/backend/api");
+ const connection = postgresConnection({ db_type: "mysql", url_params: "dataCharset=GBK" });
+ connectionStore.connections = [connection];
+ vi.mocked(api.disconnectDb).mockRejectedValue(new Error("disconnect failed"));
+ await expect(connectionStore.updateConnection({ ...connection, url_params: "" })).rejects.toThrow("disconnect failed");
+ expect(connectionStore.getConfig(connection.id)?.url_params).toBe("dataCharset=GBK");
+ expect(api.saveConnections).not.toHaveBeenCalled();
+ });
+
+ it("rejects codec changes with old results without discarding them", async () => {
+ const { connectionStore, queryStore } = await createStores();
+ const api = await import("@/lib/backend/api");
+ const connection = postgresConnection({ db_type: "mysql", url_params: "dataCharset=GBK" });
+ connectionStore.connections = [connection];
+ const tabId = queryStore.createTab(connection.id, "testdb", "old result");
+ const tab = queryStore.tabs.find((item) => item.id === tabId)!;
+ tab.result = { columns: ["text"], rows: [["缤纷彩虹"]], affected_rows: 0, execution_time_ms: 0 };
+ await expect(connectionStore.updateConnection({ ...connection, url_params: "" })).rejects.toThrow();
+ expect(tab.result.rows).toEqual([["缤纷彩虹"]]);
+ expect(api.disconnectDb).not.toHaveBeenCalled();
+ expect(api.saveConnections).not.toHaveBeenCalled();
+ });
+
it("re-points a tab still on the connection's old default database, but leaves a tab the user pointed elsewhere alone", async () => {
const { connectionStore, queryStore } = await createStores();
const connection = postgresConnection();
diff --git a/apps/desktop/src/stores/__tests__/queryStore.resultViewGeneration.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.resultViewGeneration.spec.ts
index 0b8a29267f..3b117f48fe 100644
--- a/apps/desktop/src/stores/__tests__/queryStore.resultViewGeneration.spec.ts
+++ b/apps/desktop/src/stores/__tests__/queryStore.resultViewGeneration.spec.ts
@@ -78,6 +78,44 @@ describe("queryStore resultViewGeneration", { timeout: 30_000 }, () => {
expect(tab.result.rows.map((row) => row[0])).toEqual(["1786326962000000000", "100000", "92492", "92489", "9249"]);
});
+ it("keeps original key locators and pending previews aligned through sorting and clearing the sort", async () => {
+ const { useQueryStore } = await import("@/stores/queryStore");
+ const store = useQueryStore();
+ const tabId = store.createTab("mysql-1", "app", "original-keys", "query");
+ const tab = store.tabs.find((item) => item.id === tabId)!;
+ tab.result = {
+ ...sampleResult(2),
+ rows: [
+ [2, "same"],
+ [1, "same"],
+ ],
+ raw_key_cells: [
+ { row_index: 0, column_index: 1, value: "original B" },
+ { row_index: 1, column_index: 1, value: "original A" },
+ ],
+ large_value_cells: [{ row_index: 0, column_index: 1, original_bytes: 20000, pending_decode: true }],
+ };
+ store.sortTabResultLocally(tabId, "id", 0, "asc");
+ expect(tab.result.raw_key_cells).toEqual([
+ { row_index: 1, column_index: 1, value: "original B" },
+ { row_index: 0, column_index: 1, value: "original A" },
+ ]);
+ expect(tab.result.large_value_cells).toEqual([{ row_index: 1, column_index: 1, original_bytes: 20000, pending_decode: true }]);
+ // Disk snapshots clone the original ordering separately. A later explicit
+ // full read must survive clearing the sort without restoring pending state.
+ tab.resultLocalSortOriginalRows = tab.resultLocalSortOriginalRows!.map((row) => [...row]);
+ tab.result.rows[1]![1] = "resolved B";
+ tab.result.large_value_cells = [];
+ store.sortTabResultLocally(tabId, "id", 0, null);
+ expect(tab.result.raw_key_cells).toEqual([
+ { row_index: 0, column_index: 1, value: "original B" },
+ { row_index: 1, column_index: 1, value: "original A" },
+ ]);
+ expect(tab.result.large_value_cells).toBeUndefined();
+ expect(tab.result.rows[0]![1]).toBe("resolved B");
+ expect(tab.resultLocalSortOriginalRawKeyCells).toBeUndefined();
+ });
+
it("inherits the generation when a result is restored from disk", async () => {
const cached = sampleResult(2);
vi.doMock("@/lib/tabs/tabResultCache", async (importOriginal) => {
diff --git a/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
index 37b61e19e4..be2333ec48 100644
--- a/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
+++ b/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
@@ -14,6 +14,23 @@ function make(rows: number, spatial?: QueryResult["spatial_columns"]): QueryResu
}
describe("appendQueryResultSegment spatial merge", () => {
+ it("rebases original key and pending preview metadata and excludes capped rows", () => {
+ const previous = { ...make(1), raw_key_cells: [{ row_index: 0, column_index: 0, value: "raw A" }] };
+ const segment = {
+ ...make(2),
+ raw_key_cells: [
+ { row_index: 0, column_index: 0, value: "raw B" },
+ { row_index: 1, column_index: 0, value: "discard" },
+ ],
+ large_value_cells: [{ row_index: 0, column_index: 0, original_bytes: 20000, pending_decode: true }],
+ };
+ const merged = appendQueryResultSegment(previous, segment, 2);
+ expect(merged.raw_key_cells).toEqual([
+ { row_index: 0, column_index: 0, value: "raw A" },
+ { row_index: 1, column_index: 0, value: "raw B" },
+ ]);
+ expect(merged.large_value_cells).toEqual([{ row_index: 1, column_index: 0, original_bytes: 20000, pending_decode: true }]);
+ });
it("sums client request wait across loaded pages", () => {
const previous = { ...make(1), client_request_wait_ms: 45 };
const segment = { ...make(1), client_request_wait_ms: 30 };
diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts
index 20bfe993ad..c67b28f5ca 100644
--- a/apps/desktop/src/stores/connectionStore.ts
+++ b/apps/desktop/src/stores/connectionStore.ts
@@ -205,6 +205,7 @@ import { filterNacosNamespacesForSidebar, normalizeNacosNamespacesForDisplay } f
import { buildPackageMemberNodes, markPackageNodesExpandable, packageMemberGroupOwnerId } from "@/lib/sidebar/packageMembers";
import { configuredDatabaseProductName, connectionConfigFingerprint, normalizeDatabaseConnectionInfo } from "@/lib/connection/connectionDatabaseInfo";
import { withoutSshLocalPorts } from "@/lib/connection/sshLocalPort";
+import { mysqlDataCharsetChanged, mysqlDataCharsetChangeBlocked } from "@/lib/connection/mysqlDataCharset";
import { driverProfileObjectTreeProfileForConnection } from "@/lib/database/driverProfileExtensions";
import { createMetadataLoadTrace, logMetadataLoadTrace, MetadataLoadCoordinator, type MetadataLoadTraceLogger } from "@/lib/metadata/metadataLoadCoordinator";
import type { MetadataScopeInput } from "@/lib/metadata/metadataLoadScope";
@@ -4693,6 +4694,14 @@ export const useConnectionStore = defineStore("connection", () => {
// Edit forms do not own server-derived hints. Retain the previous hint only
// while its protected URL still refers to the same saved JDBC target.
config = { ...config, jdbc_dialect: keepsSavedJdbcTarget ? previousConfig.jdbc_dialect : undefined };
+ if (mysqlDataCharsetChanged(previousConfig, config)) {
+ const { useQueryStore } = await import("@/stores/queryStore");
+ if (mysqlDataCharsetChangeBlocked(useQueryStore().tabs, config.id)) throw new Error(i18n.global.t("connection.mysqlDataCharsetCloseTabs"));
+ // Retire the old decoding session before publishing a potentially writable
+ // config. Preserve SQL drafts and do not silently discard grid edits.
+ await disconnect(config.id, { skipTabHandling: true, markClosedByUser: false });
+ if (mysqlDataCharsetChangeBlocked(useQueryStore().tabs, config.id)) throw new Error(i18n.global.t("connection.mysqlDataCharsetCloseTabs"));
+ }
const previousDatabase = previousConfig.database ?? "";
const runtimeConfigChanged = connectionConfigFingerprint(previousConfig) !== connectionConfigFingerprint(config);
const shouldReconnectPlugin = runtimeConfigChanged && previousConfig.db_type === "plugin" && config.db_type === "plugin" && connectedIds.value.has(config.id);
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index 158ae9c3f5..c6c5327f04 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -121,9 +121,10 @@ import { queryResultNameFromPreamble, queryResultSourceLabel, queryResultSourceN
import { sqlServerCountUsesLocalTempTable } from "@/lib/query/queryResultCountSession";
import { stripPaginationRowNumber, trimQueryPageProbe } from "@/lib/query/queryPaginationResult";
import { prepareBatchQueryPagination, type BatchQueryPaginationPlan } from "@/lib/query/batchQueryPagination";
+import { originalResultRowOrder } from "@/lib/dataGrid/resultKeyLocator";
import { mysqlTablePageBaseSql } from "@/lib/table/tableDataPageProbe";
import { beginDataGridNativeSelectionBlock, finishDataGridNativeSelectionBlock } from "@/lib/dataGrid/dataGridNativeSelection";
-import { appendLargeValueCells, canUseTableDataLargeValuePreview, remapLargeValueCells, supportsTableDataLargeValuePreview, tableDataLargeValuePreviewOptions, TABLE_DATA_RESULT_MAX_BYTES } from "@/lib/dataGrid/dataGridLargeValues";
+import { appendIndexedResultCells, remapIndexedResultCells, appendLargeValueCells, canUseTableDataLargeValuePreview, remapLargeValueCells, supportsTableDataLargeValuePreview, tableDataLargeValuePreviewOptions, TABLE_DATA_RESULT_MAX_BYTES } from "@/lib/dataGrid/dataGridLargeValues";
import { simpleDataGridOrderByReferencesMissingColumn, sortDataGridRowIndexes, type DataGridSortDirection } from "@/lib/dataGrid/dataGridSort";
import { normalizeResultPageSize } from "@/lib/dataGrid/paginationPageSize";
import { agentProtocolQueryResultMaxRows, capQueryResultTotal, effectiveQueryResultMaxRows, limitQueryPagination, queryResultLimitReached } from "@/lib/dataGrid/queryResultRowLimit";
@@ -406,6 +407,7 @@ function markQueryResultRowsRaw(result: QueryResult): QueryResult {
markRaw(result.rows);
if (result.neo4j_node_cells) markRaw(result.neo4j_node_cells);
if (result.large_value_cells) markRaw(result.large_value_cells);
+ if (result.raw_key_cells) markRaw(result.raw_key_cells);
if (result.mongo_documents) markRaw(result.mongo_documents);
if (result.mongo_copy_documents) markRaw(result.mongo_copy_documents);
return result;
@@ -466,6 +468,7 @@ export function appendQueryResultSegment(previous: QueryResult, segment: QueryRe
spatial_columns: spatial_columns.length > 0 ? spatial_columns : undefined,
spatial_values: appendParallelValues(previous.spatial_values, segment.spatial_values),
large_value_cells: appendLargeValueCells(previous.large_value_cells, segment.large_value_cells, previous.rows.length, appendedRowCount),
+ raw_key_cells: appendIndexedResultCells(previous.raw_key_cells, segment.raw_key_cells, previous.rows.length, appendedRowCount),
large_value_context: segment.large_value_context ?? previous.large_value_context,
large_value_refs: [
...new Set([...(previous.large_value_refs ?? []), ...(segment.large_value_refs ?? []), ...(previous.large_value_cells ?? []).flatMap((cell) => (cell.value_ref ? [cell.value_ref] : [])), ...(segment.large_value_cells ?? []).flatMap((cell) => (cell.value_ref ? [cell.value_ref] : []))]),
@@ -493,6 +496,7 @@ function markQueryResultRunsRowsRaw(resultRuns: NonNullable<QueryTab["resultRuns
if (run.results) markQueryResultsRowsRaw(run.results);
if (run.resultLocalSortOriginalRows) markRaw(run.resultLocalSortOriginalRows);
if (run.resultLocalSortOriginalLargeValueCells) markRaw(run.resultLocalSortOriginalLargeValueCells);
+ if (run.resultLocalSortOriginalRawKeyCells) markRaw(run.resultLocalSortOriginalRawKeyCells);
if (run.resultLocalSortOriginalMongoDocuments) markRaw(run.resultLocalSortOriginalMongoDocuments);
if (run.resultLocalSortOriginalMongoCopyDocuments) markRaw(run.resultLocalSortOriginalMongoCopyDocuments);
}
@@ -515,6 +519,7 @@ function releaseResultObjectPayload(result: QueryResult): void {
result.neo4j_node_cells = undefined;
result.mongo_copy_documents = undefined;
result.large_value_cells = undefined;
+ result.raw_key_cells = undefined;
result.elasticsearch_raw_body = undefined;
result.redis_console_output = undefined;
result.messages = undefined;
@@ -1980,6 +1985,7 @@ export const useQueryStore = defineStore("query", () => {
tab.resultEditorFingerprint = undefined;
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
tab.resultSortMode = undefined;
@@ -2018,6 +2024,7 @@ export const useQueryStore = defineStore("query", () => {
tab.resultSortMode = undefined;
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
tab.orderByInput = undefined;
@@ -2065,6 +2072,7 @@ export const useQueryStore = defineStore("query", () => {
run.results = undefined;
run.resultLocalSortOriginalRows = undefined;
run.resultLocalSortOriginalLargeValueCells = undefined;
+ run.resultLocalSortOriginalRawKeyCells = undefined;
run.resultLocalSortOriginalMongoDocuments = undefined;
run.resultLocalSortOriginalMongoCopyDocuments = undefined;
run.resultSessionId = undefined;
@@ -2103,6 +2111,7 @@ export const useQueryStore = defineStore("query", () => {
tab.resultSortMode = run.resultSortMode;
tab.resultLocalSortOriginalRows = run.resultLocalSortOriginalRows;
tab.resultLocalSortOriginalLargeValueCells = run.resultLocalSortOriginalLargeValueCells;
+ tab.resultLocalSortOriginalRawKeyCells = run.resultLocalSortOriginalRawKeyCells;
tab.resultLocalSortOriginalMongoDocuments = run.resultLocalSortOriginalMongoDocuments;
tab.resultLocalSortOriginalMongoCopyDocuments = run.resultLocalSortOriginalMongoCopyDocuments;
tab.orderByInput = run.orderByInput;
@@ -2499,6 +2508,7 @@ export const useQueryStore = defineStore("query", () => {
resultSortMode: tab.resultSortMode,
resultLocalSortOriginalRows: tab.resultLocalSortOriginalRows,
resultLocalSortOriginalLargeValueCells: tab.resultLocalSortOriginalLargeValueCells,
+ resultLocalSortOriginalRawKeyCells: tab.resultLocalSortOriginalRawKeyCells,
resultLocalSortOriginalMongoDocuments: tab.resultLocalSortOriginalMongoDocuments,
resultLocalSortOriginalMongoCopyDocuments: tab.resultLocalSortOriginalMongoCopyDocuments,
orderByInput: tab.orderByInput,
@@ -2623,6 +2633,7 @@ export const useQueryStore = defineStore("query", () => {
resultSortMode: tab.resultSortMode,
resultLocalSortOriginalRows: tab.resultLocalSortOriginalRows,
resultLocalSortOriginalLargeValueCells: tab.resultLocalSortOriginalLargeValueCells,
+ resultLocalSortOriginalRawKeyCells: tab.resultLocalSortOriginalRawKeyCells,
resultLocalSortOriginalMongoDocuments: tab.resultLocalSortOriginalMongoDocuments,
resultLocalSortOriginalMongoCopyDocuments: tab.resultLocalSortOriginalMongoCopyDocuments,
orderByInput: tab.orderByInput,
@@ -2705,10 +2716,19 @@ export const useQueryStore = defineStore("query", () => {
if (!tab.resultLocalSortOriginalRows) {
tab.resultLocalSortOriginalRows = tab.result.rows.slice();
tab.resultLocalSortOriginalLargeValueCells = tab.result.large_value_cells?.map((cell) => ({ ...cell }));
+ tab.resultLocalSortOriginalRawKeyCells = tab.result.raw_key_cells?.map((cell) => ({ ...cell }));
tab.resultLocalSortOriginalMongoDocuments = tab.result.mongo_documents?.slice();
tab.resultLocalSortOriginalMongoCopyDocuments = tab.result.mongo_copy_documents?.slice();
}
+ // Full-value reads may have resolved previews since the previous sort (or
+ // after a disk restore, whose original-order rows are separate objects).
+ // Reconcile by original keys so clearing a sort cannot resurrect placeholders.
+ const originalOrder = originalResultRowOrder(tab.result, tab.resultLocalSortOriginalRows, tab.resultLocalSortOriginalRawKeyCells);
+ if (originalOrder) {
+ tab.resultLocalSortOriginalRows = originalOrder.map((index) => tab.result!.rows[index]!);
+ tab.resultLocalSortOriginalLargeValueCells = remapLargeValueCells(tab.result.large_value_cells, originalOrder);
+ }
const originalRows = tab.resultLocalSortOriginalRows;
const columnType = (tab.result.column_types?.[columnIndex]?.trim() || undefined) ?? (tab.tableMeta?.columns?.find((c) => c.name.toLowerCase() === column.toLowerCase())?.data_type?.trim() || undefined) ?? (tab.resultColumnTypeLabels?.[columnIndex]?.trim() || undefined);
const rowIndexes = direction ? sortDataGridRowIndexes(originalRows, columnIndex, direction, columnType) : originalRows.map((_, index) => index);
@@ -2718,7 +2738,8 @@ export const useQueryStore = defineStore("query", () => {
const originalMongoCopyDocuments = tab.resultLocalSortOriginalMongoCopyDocuments;
const mongo_copy_documents = originalMongoCopyDocuments ? rowIndexes.map((index) => originalMongoCopyDocuments[index]) : undefined;
const large_value_cells = remapLargeValueCells(tab.resultLocalSortOriginalLargeValueCells, rowIndexes);
- assignDisplayedResult(tab, { ...tab.result, rows, large_value_cells, mongo_documents, mongo_copy_documents });
+ const raw_key_cells = remapIndexedResultCells(tab.resultLocalSortOriginalRawKeyCells, rowIndexes);
+ assignDisplayedResult(tab, { ...tab.result, rows, large_value_cells, raw_key_cells, mongo_documents, mongo_copy_documents });
// Reordering rows invalidates source-index view snapshots.
publishResultGeneration(tab, "local-sort");
@@ -2730,6 +2751,7 @@ export const useQueryStore = defineStore("query", () => {
if (!direction) {
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
}
@@ -5518,6 +5540,7 @@ export const useQueryStore = defineStore("query", () => {
resultSortMode: original.mode === "data" && original.resultSortMode === "database" ? original.resultSortMode : undefined,
resultLocalSortOriginalRows: undefined,
resultLocalSortOriginalLargeValueCells: undefined,
+ resultLocalSortOriginalRawKeyCells: undefined,
resultLocalSortOriginalMongoDocuments: undefined,
resultLocalSortOriginalMongoCopyDocuments: undefined,
orderByInput: original.mode === "data" ? original.orderByInput : undefined,
@@ -6860,6 +6883,7 @@ export const useQueryStore = defineStore("query", () => {
tab.resultSortedSql = undefined;
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
}
@@ -8244,6 +8268,7 @@ export const useQueryStore = defineStore("query", () => {
tab.lastExecutedSql = sql;
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
if (captureResultRun && tab.result && !tab.activeResultRunId) {
@@ -10668,6 +10693,7 @@ export const useQueryStore = defineStore("query", () => {
}
tab.resultLocalSortOriginalRows = undefined;
tab.resultLocalSortOriginalLargeValueCells = undefined;
+ tab.resultLocalSortOriginalRawKeyCells = undefined;
tab.resultLocalSortOriginalMongoDocuments = undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = undefined;
tab.resultSortColumn = undefined;
@@ -10799,6 +10825,7 @@ export const useQueryStore = defineStore("query", () => {
tab.result = snapshot.result ? markQueryResultRowsRaw(snapshot.result) : results?.[activeIndex] ? markQueryResultRowsRaw(results[activeIndex]) : undefined;
tab.resultLocalSortOriginalRows = snapshot.resultLocalSortOriginalRows ? markRaw(snapshot.resultLocalSortOriginalRows) : undefined;
tab.resultLocalSortOriginalLargeValueCells = snapshot.resultLocalSortOriginalLargeValueCells?.map((cell) => ({ ...cell }));
+ tab.resultLocalSortOriginalRawKeyCells = snapshot.resultLocalSortOriginalRawKeyCells?.map((cell) => ({ ...cell }));
tab.resultLocalSortOriginalMongoDocuments = snapshot.resultLocalSortOriginalMongoDocuments ? markRaw(snapshot.resultLocalSortOriginalMongoDocuments) : undefined;
tab.resultLocalSortOriginalMongoCopyDocuments = snapshot.resultLocalSortOriginalMongoCopyDocuments ? markRaw(snapshot.resultLocalSortOriginalMongoCopyDocuments) : undefined;
// 快照编解码会重建负载,落盘前的各 run 估算值不再对应恢复后的对象,
diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts
index 4e73bdee21..75d0ce0727 100644
--- a/apps/desktop/src/types/database.ts
+++ b/apps/desktop/src/types/database.ts
@@ -1851,7 +1851,10 @@ export interface QueryResult {
/** With value_ref, zero can mean an unknown byte size, not an empty value. */
original_bytes: number;
value_ref?: string;
+ pending_decode?: boolean;
}>;
+ /** Authoritative original keys for internal reads; never derive these from interpreted display text. */
+ raw_key_cells?: Array<{ row_index: number; column_index: number; value: string | number | boolean | null }>;
/** Frontend-only original result connection, independent of the currently active tab. */
large_value_context?: { connectionId: string; database: string; clientSessionId?: string; txnSessionId?: string; catalog?: string };
/** Retained result refs also cover cells already hydrated into complete local values. */
@@ -2004,6 +2007,7 @@ export interface QueryResultRun {
resultSortMode?: "database" | "local";
resultLocalSortOriginalRows?: QueryResult["rows"];
resultLocalSortOriginalLargeValueCells?: QueryResult["large_value_cells"];
+ resultLocalSortOriginalRawKeyCells?: QueryResult["raw_key_cells"];
resultLocalSortOriginalMongoDocuments?: QueryResult["mongo_documents"];
resultLocalSortOriginalMongoCopyDocuments?: QueryResult["mongo_copy_documents"];
orderByInput?: string;
@@ -2608,6 +2612,7 @@ export interface QueryTab {
resultSortMode?: "database" | "local";
resultLocalSortOriginalRows?: QueryResult["rows"];
resultLocalSortOriginalLargeValueCells?: QueryResult["large_value_cells"];
+ resultLocalSortOriginalRawKeyCells?: QueryResult["raw_key_cells"];
resultLocalSortOriginalMongoDocuments?: QueryResult["mongo_documents"];
resultLocalSortOriginalMongoCopyDocuments?: QueryResult["mongo_copy_documents"];
orderByInput?: string;
diff --git a/crates/dbx-cli/src/main.rs b/crates/dbx-cli/src/main.rs
index 1b67b51e64..c6cd7fb838 100644
--- a/crates/dbx-cli/src/main.rs
+++ b/crates/dbx-cli/src/main.rs
@@ -1119,6 +1119,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: Vec::new(),
affected_rows: 2,
@@ -1222,6 +1223,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: Vec::new(),
affected_rows: 1,
@@ -1283,6 +1285,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![vec![serde_json::from_str(value).unwrap()]],
affected_rows: 0,
diff --git a/crates/dbx-core/src/ai/agent_tools.rs b/crates/dbx-core/src/ai/agent_tools.rs
index ea3794c1c9..18e26e0fd6 100644
--- a/crates/dbx-core/src/ai/agent_tools.rs
+++ b/crates/dbx-core/src/ai/agent_tools.rs
@@ -2579,6 +2579,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows,
affected_rows,
diff --git a/crates/dbx-core/src/connection/mod.rs b/crates/dbx-core/src/connection/mod.rs
index f3a8b771cd..2493f89218 100644
--- a/crates/dbx-core/src/connection/mod.rs
+++ b/crates/dbx-core/src/connection/mod.rs
@@ -325,6 +325,8 @@ pub enum TxnConnection {
}
pub struct TransactionSession {
+ /// Immutable interpretation from the pool that owns the pinned connection.
+ pub mysql_data_charset: Option<db::mysql::MySqlDataCharset>,
pub sqlserver: Option<crate::query::sqlserver_manual_transaction::SessionMetadata>,
pub connection: Arc<Mutex<TxnConnection>>,
pub pool_key: String,
@@ -8177,7 +8179,7 @@ fn is_manual_transaction_pool_key(pool_key: &str) -> bool {
/// `conn` from matching a `conn-2` pool. Used by
/// [`AppState::is_connection_open`] and [`config_for_pool_key`];
/// `drain_connection_pools` filters on the same convention.
-fn pool_key_belongs_to_connection(pool_key: &str, connection_id: &str) -> bool {
+pub(crate) fn pool_key_belongs_to_connection(pool_key: &str, connection_id: &str) -> bool {
pool_key.strip_prefix(connection_id).is_some_and(|rest| rest.is_empty() || rest.starts_with(':'))
}
@@ -8709,6 +8711,12 @@ fn native_postgres_url_config(config: &ConnectionConfig) -> Option<ConnectionCon
}
fn validate_connection_url_params(config: &ConnectionConfig) -> Result<(), String> {
+ db::mysql::data_charset_for_config(config)?;
+ if matches!(config.db_type, DatabaseType::Doris | DatabaseType::StarRocks | DatabaseType::ManticoreSearch)
+ && db::mysql::data_charset_from_params(config.url_params.as_deref().unwrap_or(""))?.is_some()
+ {
+ return Err("dataCharset interpretation is supported only by the native MySQL connection type".into());
+ }
let normalized = native_postgres_url_config(config);
normalized.as_ref().unwrap_or(config).validate_native_url_params()
}
@@ -9550,6 +9558,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("M")]],
affected_rows: 0,
@@ -11939,6 +11948,38 @@ sleep 30
);
}
+ #[test]
+ fn mysql_data_charset_rejects_compatible_native_products_before_connect() {
+ for db_type in [DatabaseType::Doris, DatabaseType::StarRocks, DatabaseType::ManticoreSearch] {
+ let mut config = mysql_config(None);
+ config.db_type = db_type;
+ for params in [
+ "dataCharset=GBK",
+ "charset=utf8mb4& dataCharset=GBK",
+ " dataCharset=GBK ",
+ "%64ataCharset=GBK",
+ "dataCharset+=GBK",
+ "dataCharset%20=GBK",
+ "%64ataCharset=%47BK",
+ "%64ataCharset=",
+ "%64ataCharset=invalid",
+ "%64ataCharset",
+ ] {
+ config.url_params = Some(params.into());
+ assert!(validate_connection_url_params(&config).is_err(), "{db_type:?}: {params}");
+ }
+ config.url_params = None;
+ validate_connection_url_params(&config).unwrap();
+ }
+ let mut config = mysql_config(None);
+ config.url_params = Some("%64ataCharset=%47BK".into());
+ validate_connection_url_params(&config).unwrap();
+ // Firebird owns its own unrelated option; this gate must not parse it.
+ config.db_type = DatabaseType::Firebird;
+ config.url_params = Some("dataCharset=WIN1252".into());
+ validate_connection_url_params(&config).unwrap();
+ }
+
#[test]
fn postgres_url_validation_rejects_invalid_stringtype_before_connect() {
let mut config = mysql_config(Some("postgres"));
diff --git a/crates/dbx-core/src/data/database_export.rs b/crates/dbx-core/src/data/database_export.rs
index 3cf7c68f2a..a043d12ab6 100644
--- a/crates/dbx-core/src/data/database_export.rs
+++ b/crates/dbx-core/src/data/database_export.rs
@@ -2882,6 +2882,12 @@ pub async fn begin_database_backup_snapshot_core_for_export(
database: &str,
export_id: Option<&str>,
) -> Result<DatabaseBackupSnapshot, String> {
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ connection_id,
+ crate::query::mysql_data_charset_policy::EXPORT_UNSUPPORTED,
+ )
+ .await?;
let db_type = state
.configs
.read()
@@ -3698,6 +3704,12 @@ pub async fn export_database_sql_core(
request: &DatabaseExportRequest,
on_progress: impl Fn(ExportProgress) + Sync,
) -> Result<(), String> {
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ &request.connection_id,
+ crate::query::mysql_data_charset_policy::EXPORT_UNSUPPORTED,
+ )
+ .await?;
let db_type = state
.configs
.read()
diff --git a/crates/dbx-core/src/data/query_result_export.rs b/crates/dbx-core/src/data/query_result_export.rs
index 76292b682e..1c1dfc1097 100644
--- a/crates/dbx-core/src/data/query_result_export.rs
+++ b/crates/dbx-core/src/data/query_result_export.rs
@@ -1069,6 +1069,24 @@ async fn export_query_result_with_cleanup(
on_progress: impl Fn(TableExportProgress),
report_completion: bool,
) -> crate::table_export::ExportCompletion {
+ let policy_check: Result<(), String> = async {
+ crate::query::mysql_data_charset_policy::check_export(state, &request.connection_id, &request.format).await?;
+ if crate::query::mysql_data_charset_policy::enabled_for_connection(state, &request.connection_id).await? {
+ crate::query::check_read_only_for_connection_multi(
+ state,
+ &request.connection_id,
+ &[request.sql.as_str(), request.query_base_sql.as_str()],
+ )
+ .await?;
+ crate::query::check_read_only_for_connection_multi(state, &request.connection_id, &request.setup_sql)
+ .await?;
+ }
+ Ok(())
+ }
+ .await;
+ if let Err(error) = policy_check {
+ return crate::table_export::ExportCompletion { result: Err(error), cleanup: Ok(()) };
+ }
let mut session_id: Option<String> = None;
let mut duckdb_snapshot = None;
let result = export_query_result_core_inner(
@@ -1936,7 +1954,7 @@ async fn try_export_mysql_query_result_stream(
let progress_clock = Arc::new(StreamProgressClock::new());
let progress_clock_for_stream = progress_clock.clone();
- let stream_future = crate::db::mysql::stream_query_result_on_conn(
+ let stream_future = crate::db::mysql::stream_query_result_on_conn_with_data_charset(
&mut conn,
&request.sql,
bare,
@@ -1944,6 +1962,7 @@ async fn try_export_mysql_query_result_stream(
mysql_dialect,
&export_cancelled,
format.eq_ignore_ascii_case("sql"),
+ pool.data_charset(),
|item| {
if export_cancelled.load(Ordering::SeqCst)
|| cancel_token.as_ref().is_some_and(|token| token.is_cancelled())
diff --git a/crates/dbx-core/src/data/sql_file_import.rs b/crates/dbx-core/src/data/sql_file_import.rs
index 136f430d27..16163ff9fd 100644
--- a/crates/dbx-core/src/data/sql_file_import.rs
+++ b/crates/dbx-core/src/data/sql_file_import.rs
@@ -737,6 +737,12 @@ pub async fn execute_sql_file_content(
started_at: Instant,
mut emit: impl FnMut(SqlFileProgress),
) -> Result<(), String> {
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ &request.connection_id,
+ crate::query::mysql_data_charset_policy::READ_ONLY,
+ )
+ .await?;
if request.resolve_includes {
let error = "SQL includes require local .sql file execution, not inline content".to_string();
emit(sql_file_error_progress(&request.execution_id, started_at, error.clone()));
@@ -886,6 +892,12 @@ async fn execute_sql_file_paths_with_options(
zip_package: bool,
mut emit: impl FnMut(SqlFileProgress),
) -> Result<(), String> {
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ &request.connection_id,
+ crate::query::mysql_data_charset_policy::READ_ONLY,
+ )
+ .await?;
let prepared;
let mut expanded_request;
let expanded_paths;
diff --git a/crates/dbx-core/src/data/table_export.rs b/crates/dbx-core/src/data/table_export.rs
index 7484bb126f..2fc64ef0c5 100644
--- a/crates/dbx-core/src/data/table_export.rs
+++ b/crates/dbx-core/src/data/table_export.rs
@@ -735,6 +735,7 @@ async fn fetch_table_export_batch(
}
if *table_read_completed {
return Ok(QueryResult {
+ raw_key_cells: Vec::new(),
columns: col_names.to_vec(),
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -1608,6 +1609,11 @@ async fn export_table_data_with_cleanup(
on_progress: impl Fn(TableExportProgress),
report_completion: bool,
) -> ExportCompletion {
+ if let Err(error) =
+ crate::query::mysql_data_charset_policy::check_export(state, &request.connection_id, &request.format).await
+ {
+ return ExportCompletion { result: Err(error), cleanup: Ok(()) };
+ }
let cancelled = Arc::new(AtomicBool::new(false));
let cancel_token = CancellationToken::new();
let cancel_watcher =
diff --git a/crates/dbx-core/src/data/table_import.rs b/crates/dbx-core/src/data/table_import.rs
index 334d2b1ce2..5e4ae28dab 100644
--- a/crates/dbx-core/src/data/table_import.rs
+++ b/crates/dbx-core/src/data/table_import.rs
@@ -7483,6 +7483,12 @@ pub async fn import_table_file_core<F>(
where
F: FnMut(TableImportProgress),
{
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ &request.connection_id,
+ crate::query::mysql_data_charset_policy::READ_ONLY,
+ )
+ .await?;
let started_at = Instant::now();
let mut db_write_ms = 0u128;
let mut statement_count = 0usize;
diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs
index 920796ff83..e39c70776e 100644
--- a/crates/dbx-core/src/data/transfer.rs
+++ b/crates/dbx-core/src/data/transfer.rs
@@ -9871,6 +9871,18 @@ pub fn should_transfer_schema_objects(
/// outcome. Executes in dependency order (sequence → view → function →
/// procedure → trigger → event). Errors are collected per object and the
/// transfer continues.
+pub async fn check_data_charset_transfer(state: &AppState, request: &TransferRequest) -> Result<(), String> {
+ for connection_id in [&request.source_connection_id, &request.target_connection_id] {
+ crate::query::mysql_data_charset_policy::reject_operation(
+ state,
+ connection_id,
+ crate::query::mysql_data_charset_policy::TRANSFER_UNSUPPORTED,
+ )
+ .await?;
+ }
+ Ok(())
+}
+
pub async fn transfer_schema_objects<F>(
state: &AppState,
request: &TransferRequest,
@@ -9881,6 +9893,7 @@ pub async fn transfer_schema_objects<F>(
where
F: FnMut(TransferProgress),
{
+ check_data_charset_transfer(state, request).await?;
if request.has_package_selection() {
let source_db_type = get_db_type(state, &request.source_connection_id).await?;
let target_db_type = get_db_type(state, &request.target_connection_id).await?;
@@ -9940,6 +9953,7 @@ pub(crate) async fn transfer_schema_objects_with_routine_context<F>(
where
F: FnMut(TransferProgress),
{
+ check_data_charset_transfer(state, request).await?;
if matches!(request.content, TransferContent::DataOnly) && !request.has_package_selection() {
return Ok(TransferObjectOutcome::default());
}
@@ -12511,6 +12525,7 @@ pub async fn rename_tables_to_backup<F>(
where
F: FnMut(TransferProgress),
{
+ check_data_charset_transfer(state, request).await?;
let source_pool_key = ensure_transfer_pool(
state,
&request.source_connection_id,
@@ -14236,6 +14251,7 @@ pub async fn drop_backup_tables(
backup_names: &HashMap<String, String>,
drop_order: &[String],
) -> Result<(), String> {
+ check_data_charset_transfer(state, request).await?;
let mut ordered: Vec<&String> = drop_order.iter().filter(|table| backup_names.contains_key(*table)).collect();
let mut leftovers: Vec<&String> = backup_names.keys().filter(|table| !drop_order.contains(*table)).collect();
leftovers.sort();
@@ -14350,6 +14366,7 @@ where
F: FnMut(TransferProgress),
C: FnMut(Option<u64>),
{
+ check_data_charset_transfer(state, request).await?;
validate_transfer_database_pair(request, source_db_type, target_db_type)?;
let state = state.clone();
if mysql_xugu::is_pair(source_db_type, target_db_type) {
@@ -15710,6 +15727,7 @@ CREATE TABLE "Other"."prefix""Source"."NAME" ("ID" INT);"#;
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: 0,
diff --git a/crates/dbx-core/src/data/transfer/overwrite_clear.rs b/crates/dbx-core/src/data/transfer/overwrite_clear.rs
index b933f8f492..7b93e06d2c 100644
--- a/crates/dbx-core/src/data/transfer/overwrite_clear.rs
+++ b/crates/dbx-core/src/data/transfer/overwrite_clear.rs
@@ -28,6 +28,7 @@ pub async fn clear_foreign_key_linked_overwrite_targets(
target_db_type: DatabaseType,
target_pool_key: &str,
) -> Result<HashSet<String>, String> {
+ super::check_data_charset_transfer(state, request).await?;
if !overwrite_clear_prepass_enabled(request, tables.len(), &target_db_type) {
return Ok(HashSet::new());
}
diff --git a/crates/dbx-core/src/data/transfer_runner.rs b/crates/dbx-core/src/data/transfer_runner.rs
index a863da65f5..45ddcf9bf2 100644
--- a/crates/dbx-core/src/data/transfer_runner.rs
+++ b/crates/dbx-core/src/data/transfer_runner.rs
@@ -102,6 +102,9 @@ where
let app = ProgressEmitter::new(progress_callback);
let (routine_context, package_transfer) = match async {
+ // Reject interpreted source/target data before preflight I/O or claiming
+ // package approvals. Keep the later check after those awaited steps too.
+ super::transfer::check_data_charset_transfer(&state, &request).await?;
super::transfer::validate_transfer_database_pair(&request, &source_db_type, &target_db_type)?;
if super::transfer::mysql_xugu::is_pair(&source_db_type, &target_db_type) {
super::transfer::mysql_xugu::preflight(&state, &request, &source_pool_key, &target_pool_key).await?;
@@ -145,6 +148,28 @@ where
};
super::transfer::with_transfer_operation_timeout(operation_timeout_secs, async {
+ if let Err(error) = super::transfer::check_data_charset_transfer(&state, &request).await {
+ emit_terminal_progress(
+ &app,
+ history.as_ref(),
+ TransferProgress {
+ oracle_package_approval: None,
+ oracle_package_preflight: None,
+ oracle_routine_operation: None,
+ transfer_id: transfer_id.clone(),
+ table: String::new(),
+ table_index: 0,
+ total_tables,
+ rows_transferred: 0,
+ total_rows: None,
+ status: TransferStatus::Error,
+ error: Some(error),
+ terminal: true,
+ },
+ )
+ .await;
+ return;
+ }
// Sort tables by FK dependency so referenced tables are transferred first,
// and keep the foreign key metadata fetched along the way — MySQL-family
// targets reuse it per table below instead of re-querying it.
@@ -840,6 +865,50 @@ mod tests {
}
}
+ #[tokio::test]
+ async fn data_charset_transfer_stops_before_preflight_or_connection_capture() {
+ let directory = tempfile::tempdir().unwrap();
+ let storage = crate::persistence::test_storage::open(&directory.path().join("storage.db")).await.unwrap();
+ let state = Arc::new(AppState::new_with_plugin_dir(storage, directory.path().join("plugins")));
+ let config: ConnectionConfig = serde_json::from_value(json!({
+ "id": "legacy", "name": "legacy", "db_type": "mysql", "host": "127.0.0.1",
+ "port": 1, "username": "", "password": "", "url_params": "dataCharset=GBK"
+ }))
+ .unwrap();
+ state.configs.write().await.insert("legacy".into(), config);
+ for (source, target, source_type, target_type) in [
+ ("legacy", "unconfigured", DatabaseType::Mysql, DatabaseType::Xugu),
+ ("unconfigured", "legacy", DatabaseType::Mysql, DatabaseType::Mysql),
+ ] {
+ let request: TransferRequest = serde_json::from_value(json!({
+ "transferId": uuid::Uuid::new_v4().to_string(), "sourceConnectionId": source,
+ "sourceDatabase": "db", "sourceSchema": "db", "targetConnectionId": target,
+ "targetDatabase": "db", "targetSchema": "db", "tables": ["must-not-read"],
+ "createTable": false, "content": "dataOnly", "batchSize": 100
+ }))
+ .unwrap();
+ let terminal = run_transfer(
+ state.clone(),
+ request,
+ source_type,
+ target_type,
+ "no-source-pool".into(),
+ "no-target-pool".into(),
+ None,
+ None,
+ |_| panic!("compatibility rejection must precede progress"),
+ )
+ .await;
+ assert!(terminal.terminal);
+ assert!(matches!(terminal.status, TransferStatus::Error));
+ assert!(terminal.error.unwrap().starts_with(crate::query::mysql_data_charset_policy::TRANSFER_UNSUPPORTED));
+ assert!(terminal.oracle_package_approval.is_none());
+ assert!(terminal.oracle_package_preflight.is_none());
+ assert!(terminal.oracle_routine_operation.is_none());
+ }
+ assert!(state.connection_pools_snapshot().await.is_empty());
+ }
+
#[tokio::test]
async fn unsupported_package_requests_stop_before_connection_capture_or_any_table_work() {
let directory = tempfile::tempdir().unwrap();
diff --git a/crates/dbx-core/src/query/mod.rs b/crates/dbx-core/src/query/mod.rs
index f56aa24de9..7c5dd979af 100644
--- a/crates/dbx-core/src/query/mod.rs
+++ b/crates/dbx-core/src/query/mod.rs
@@ -3,6 +3,9 @@ pub use dbx_drivers::query_messages;
pub mod document_ops;
pub mod hbase_ops;
pub mod mongo_ops;
+pub mod mysql_data_charset_policy;
+#[cfg(test)]
+mod mysql_data_charset_tests;
pub mod object_cache;
pub mod pl_debug;
pub mod plugin_data;
@@ -394,16 +397,32 @@ impl ExecuteMultiResult {
}
fn success_with_index_and_large_values(
+ result: db::QueryResult,
+ statement_index: usize,
+ large_value_cells: Vec<db::LargeValueCell>,
+ table_data_preview: bool,
+ ) -> Self {
+ Self::success_with_index_and_large_values_and_charset(
+ result,
+ statement_index,
+ large_value_cells,
+ table_data_preview,
+ None,
+ )
+ }
+
+ fn success_with_index_and_large_values_and_charset(
mut result: db::QueryResult,
statement_index: usize,
mut large_value_cells: Vec<db::LargeValueCell>,
table_data_preview: bool,
+ data_charset: Option<db::mysql::MySqlDataCharset>,
) -> Self {
large_value_cells =
merge_large_value_cells(large_value_cells, std::mem::take(&mut result.deferred_large_value_cells));
let server_cells = if table_data_preview {
remap_large_value_cells_around_server_markers(&result, &mut large_value_cells);
- extract_server_large_value_markers(&mut result)
+ extract_server_large_value_markers_with_charset(&mut result, data_charset)
} else {
Vec::new()
};
@@ -430,11 +449,19 @@ impl ExecuteMultiResult {
Self::success_with_index_and_large_values(result, statement_index, Vec::new(), table_data_preview)
}
- fn success_with_optional_server_large_values(mut result: db::QueryResult, table_data_preview: bool) -> Self {
+ fn success_with_optional_server_large_values(result: db::QueryResult, table_data_preview: bool) -> Self {
+ Self::success_with_optional_server_large_values_and_charset(result, table_data_preview, None)
+ }
+
+ fn success_with_optional_server_large_values_and_charset(
+ mut result: db::QueryResult,
+ table_data_preview: bool,
+ data_charset: Option<db::mysql::MySqlDataCharset>,
+ ) -> Self {
let mut deferred_cells = std::mem::take(&mut result.deferred_large_value_cells);
let large_value_cells = if table_data_preview {
remap_large_value_cells_around_server_markers(&result, &mut deferred_cells);
- extract_server_large_value_markers(&mut result)
+ extract_server_large_value_markers_with_charset(&mut result, data_charset)
} else {
Vec::new()
};
@@ -624,7 +651,15 @@ fn server_large_value_markers(result: &db::QueryResult) -> Vec<ServerLargeValueM
markers
}
+#[cfg(test)]
fn extract_server_large_value_markers(result: &mut db::QueryResult) -> Vec<db::LargeValueCell> {
+ extract_server_large_value_markers_with_charset(result, None)
+}
+
+fn extract_server_large_value_markers_with_charset(
+ result: &mut db::QueryResult,
+ data_charset: Option<db::mysql::MySqlDataCharset>,
+) -> Vec<db::LargeValueCell> {
let markers = server_large_value_markers(result);
if markers.is_empty() {
return Vec::new();
@@ -658,15 +693,41 @@ fn extract_server_large_value_markers(result: &mut db::QueryResult) -> Vec<db::L
.and_then(server_large_value_marker)
.map(|value| (value.kind, value.preview_size, value.original_bytes));
let source_result_index = marker.result_index.saturating_sub(1);
- if marker_value.is_some_and(|value| {
+ // The driver preserves this exact marker-adjacent text carrier.
+ // LEFT's extra character proves server truncation; never decode a
+ // prefix whose unreceived suffix may invalidate the whole value.
+ let pending_decode = data_charset.is_some()
+ && marker.preview_kind == Some(ServerLargeValuePreviewKind::Text)
+ && marker.source_type.is_none()
+ && marker_value.is_some_and(|value| {
+ value.0 == ServerLargeValuePreviewKind::Text
+ && row
+ .get(source_result_index)
+ .and_then(serde_json::Value::as_str)
+ .is_some_and(|text| text.chars().count() > value.1)
+ });
+ let truncated = marker_value.is_some_and(|value| {
row.get_mut(source_result_index)
.is_some_and(|source| truncate_server_large_value_preview(source, value.0, value.1))
+ });
+ if pending_decode {
+ // An empty payload cannot accidentally masquerade as a decoded
+ // prefix. Consumers must materialize the marked cell to copy it.
+ row[source_result_index] = serde_json::Value::String(String::new());
+ } else if let Some(codec) = data_charset.filter(|_| {
+ marker.preview_kind == Some(ServerLargeValuePreviewKind::Text) && marker.source_type.is_none()
}) {
+ if let Some(serde_json::Value::String(text)) = row.get_mut(source_result_index) {
+ *text = codec.interpret_text(text);
+ }
+ }
+ if truncated {
large_value_cells.push(db::LargeValueCell {
row_index,
column_index: marker.source_index,
original_bytes: marker_value.and_then(|value| value.2).unwrap_or(SERVER_LARGE_VALUE_UNKNOWN_BYTES),
value_ref,
+ pending_decode: pending_decode.then_some(true),
});
}
}
@@ -674,6 +735,13 @@ fn extract_server_large_value_markers(result: &mut db::QueryResult) -> Vec<db::L
let removed: std::collections::HashSet<usize> = markers.iter().map(|marker| marker.result_index).collect();
let retained_index = |index: usize| index - removed.iter().filter(|removed_index| **removed_index < index).count();
+ result.raw_key_cells.retain_mut(|cell| {
+ if removed.contains(&cell.column_index) {
+ return false;
+ }
+ cell.column_index = retained_index(cell.column_index);
+ true
+ });
result.spatial_columns.retain_mut(|column| {
if removed.contains(&column.column_index) {
return false;
@@ -811,6 +879,9 @@ fn error_from_query_result(result: &db::QueryResult) -> Option<crate::backend_er
/// Uses config_for_pool_key to correctly resolve configs when pool_key includes
/// a database suffix (e.g., "prod:app" → config stored under "prod").
pub async fn check_read_only_for_connection(state: &AppState, pool_key: &str, sql: &str) -> Result<(), String> {
+ if mysql_data_charset_policy::enabled_for_connection(state, pool_key).await? {
+ return mysql_data_charset_policy::check_sql(sql, pool_key);
+ }
let connection = {
let configs = state.configs.read().await;
crate::connection::config_for_pool_key(pool_key, &configs)
@@ -831,6 +902,12 @@ pub async fn check_read_only_for_connection_multi(
pool_key: &str,
statements: &[impl AsRef<str>],
) -> Result<(), String> {
+ if mysql_data_charset_policy::enabled_for_connection(state, pool_key).await? {
+ for sql in statements {
+ mysql_data_charset_policy::check_sql(sql.as_ref(), pool_key)?;
+ }
+ return Ok(());
+ }
let connection = {
let configs = state.configs.read().await;
crate::connection::config_for_pool_key(pool_key, &configs)
@@ -851,6 +928,11 @@ pub async fn check_read_only_for_connection_multi(
/// This uses connection_id directly (not pool_key), so it is safe to call at command entry points
/// before any pool key is constructed.
pub async fn connection_readonly_name(state: &AppState, connection_id: &str) -> Option<String> {
+ // Invalid compatibility configuration also fails closed at this Option-only
+ // legacy action boundary; connection setup reports the validation details.
+ if mysql_data_charset_policy::enabled_for_connection(state, connection_id).await.unwrap_or(true) {
+ return Some(format!("{connection_id} (MySQL dataCharset read-only)"));
+ }
let name = {
let configs = state.configs.read().await;
configs.get(connection_id).filter(|c| c.read_only).map(|c| c.name.clone())?
@@ -861,6 +943,19 @@ pub async fn connection_readonly_name(state: &AppState, connection_id: &str) ->
Some(name)
}
+/// Shared by Desktop and Web; compatibility-readonly is never temporarily unlockable.
+pub async fn unlock_connection_writes_core(
+ state: &AppState,
+ connection_id: &str,
+ duration_secs: u64,
+) -> Result<u64, String> {
+ if !state.configs.read().await.contains_key(connection_id) {
+ return Err("Connection not found".into());
+ }
+ mysql_data_charset_policy::reject_operation(state, connection_id, mysql_data_charset_policy::READ_ONLY).await?;
+ state.write_unlock_windows.unlock(connection_id, duration_secs).await
+}
+
async fn connection_is_mongodb(state: &AppState, connection_id: &str) -> bool {
let configs = state.configs.read().await;
configs.get(connection_id).is_some_and(|config| config.db_type == DatabaseType::MongoDb)
@@ -1301,6 +1396,7 @@ pub fn truncate_result_with_max_rows(mut result: db::QueryResult, max_rows: Opti
let row_limit = query_result_row_limit(max_rows);
if result.rows.len() > row_limit {
result.rows.truncate(row_limit);
+ result.raw_key_cells.retain(|cell| cell.row_index < row_limit);
result.truncated = true;
}
result
@@ -1900,7 +1996,7 @@ async fn do_execute_typed(
let statement_result = wait_for_result_opt(
execution_cancel_token,
query_timeout,
- db::mysql::execute_query_on_conn_with_limits(
+ db::mysql::execute_query_on_conn_with_limits_with_data_charset(
&mut conn,
sql,
bare,
@@ -1909,6 +2005,7 @@ async fn do_execute_typed(
&options.result_key_columns,
mysql_dialect,
options.execution_id.as_deref(),
+ p.data_charset(),
),
)
.await
@@ -4028,7 +4125,12 @@ async fn execute_multi_core_with_options_for_client_and_progress_typed_inner(
Ok((result, transaction)) => (Ok(result), transaction),
Err(error) => (Err(error), None),
};
- return single_statement_multi_result(result, table_data_preview, transaction);
+ return single_statement_multi_result_with_charset(
+ result,
+ table_data_preview,
+ transaction,
+ mysql_pool.as_ref().and_then(|(pool, _)| pool.data_charset()),
+ );
}
if let Some((pool, mode)) = mysql_pool {
@@ -4216,9 +4318,22 @@ fn single_statement_multi_result(
result: Result<db::QueryResult, QueryExecutionError>,
table_data_preview: bool,
transaction: Option<MysqlAutoCommitTransaction>,
+) -> Result<Vec<ExecuteMultiResult>, QueryExecutionError> {
+ single_statement_multi_result_with_charset(result, table_data_preview, transaction, None)
+}
+
+fn single_statement_multi_result_with_charset(
+ result: Result<db::QueryResult, QueryExecutionError>,
+ table_data_preview: bool,
+ transaction: Option<MysqlAutoCommitTransaction>,
+ data_charset: Option<db::mysql::MySqlDataCharset>,
) -> Result<Vec<ExecuteMultiResult>, QueryExecutionError> {
result.map(|result| {
- let mut result = ExecuteMultiResult::success_with_optional_server_large_values(result, table_data_preview);
+ let mut result = ExecuteMultiResult::success_with_optional_server_large_values_and_charset(
+ result,
+ table_data_preview,
+ data_charset,
+ );
if let Some(transaction) = transaction {
transaction.mark(&mut result);
}
@@ -4239,6 +4354,10 @@ fn mysql_single_statement_uses_batch_route(
}
trait MysqlBatchStatementExecutor {
+ fn data_charset(&self) -> Option<db::mysql::MySqlDataCharset> {
+ None
+ }
+
fn table_data_preview(&self) -> bool {
false
}
@@ -4272,6 +4391,7 @@ trait MysqlBatchStatementExecutor {
}
struct MysqlBatchConnection<'a> {
+ data_charset: Option<db::mysql::MySqlDataCharset>,
conn: &'a mut mysql_async::Conn,
cancel_token: Option<CancellationToken>,
query_timeout: Option<Duration>,
@@ -4285,6 +4405,10 @@ struct MysqlBatchConnection<'a> {
}
impl MysqlBatchStatementExecutor for MysqlBatchConnection<'_> {
+ fn data_charset(&self) -> Option<db::mysql::MySqlDataCharset> {
+ self.data_charset
+ }
+
fn table_data_preview(&self) -> bool {
self.table_data_preview
}
@@ -4293,7 +4417,7 @@ impl MysqlBatchStatementExecutor for MysqlBatchConnection<'_> {
wait_for_result_opt(
self.cancel_token.clone(),
self.query_timeout,
- db::mysql::execute_query_results_on_conn_with_limits(
+ db::mysql::execute_query_results_on_conn_with_limits_with_data_charset(
&mut *self.conn,
statement,
self.bare,
@@ -4302,6 +4426,7 @@ impl MysqlBatchStatementExecutor for MysqlBatchConnection<'_> {
self.result_key_columns,
self.dialect,
self.diagnostic_trace_id,
+ self.data_charset,
),
)
.await
@@ -4470,11 +4595,12 @@ where
);
}
results.extend(statement_results.into_iter().map(|result| {
- ExecuteMultiResult::success_with_index_and_large_values(
+ ExecuteMultiResult::success_with_index_and_large_values_and_charset(
result.result,
statement_index,
result.large_value_cells,
table_data_preview,
+ executor.data_charset(),
)
}));
}
@@ -4744,6 +4870,7 @@ async fn execute_multi_mysql(
};
let mut executor = MysqlBatchConnection {
+ data_charset: pool.data_charset(),
conn: &mut conn,
cancel_token: cancel_token.clone(),
query_timeout,
@@ -4864,6 +4991,7 @@ fn error_query_result(message: String) -> db::QueryResult {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::Value::String(message)]],
affected_rows: 0,
@@ -4885,6 +5013,7 @@ fn empty_query_result(execution_time_ms: u128) -> db::QueryResult {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -5300,6 +5429,7 @@ async fn execute_statements_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: total_affected,
@@ -5906,6 +6036,7 @@ async fn exec_tx_pg_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: total_affected,
@@ -6004,6 +6135,7 @@ async fn exec_tx_mysql_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: total_affected,
@@ -6202,6 +6334,7 @@ async fn exec_tx_sqlite_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: total_affected,
@@ -6337,6 +6470,7 @@ async fn exec_tx_explicit_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: total_affected,
@@ -6526,6 +6660,10 @@ async fn begin_transaction_session(
_ => return Err("Manual transaction is not supported for this database type".to_string()),
}
}; // connections lock released here
+ let mysql_data_charset = match &pool_handle {
+ TxnPoolHandle::Mysql(pool) => pool.data_charset(),
+ _ => None,
+ };
let (txn_conn, pool_key) = match pool_handle {
TxnPoolHandle::Postgres(pg_pool) => {
@@ -6660,6 +6798,7 @@ async fn begin_transaction_session(
let txn_session_id = uuid::Uuid::new_v4().to_string();
let session = TransactionSession {
+ mysql_data_charset,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(txn_conn)),
pool_key: pool_key.clone(),
@@ -6796,10 +6935,10 @@ pub async fn execute_in_manual_transaction_with_options(
// Resolve statements and validate before taking the per-session connection
// lock. The session stays visible in the map so close/disconnect cleanup can
// remove it and roll back once the current DB operation releases the lock.
- let (pool_key, connection_id) = {
+ let (pool_key, connection_id, mysql_data_charset) = {
let sessions = state.transaction_sessions.read().await;
let session = sessions.get(txn_session_id).ok_or(MANUAL_TRANSACTION_SESSION_NOT_FOUND_ERROR)?;
- (session.pool_key.clone(), session.connection_id.clone())
+ (session.pool_key.clone(), session.connection_id.clone(), session.mysql_data_charset)
};
let db_type = connection_database_type(state, &connection_id).await;
@@ -6948,6 +7087,7 @@ pub async fn execute_in_manual_transaction_with_options(
conn.as_mut().ok_or_else(|| MANUAL_TRANSACTION_SESSION_NOT_FOUND_ERROR.to_string())?,
statement,
row_limit,
+ mysql_data_charset,
)
.await
}
@@ -7003,9 +7143,10 @@ pub async fn execute_in_manual_transaction_with_options(
};
match result {
Ok(query_result) => {
- let mut executed = ExecuteMultiResult::success_with_optional_server_large_values(
+ let mut executed = ExecuteMultiResult::success_with_optional_server_large_values_and_charset(
query_result,
options.table_data_preview,
+ mysql_data_charset,
);
if classification.get(i).copied().unwrap_or(false) {
executed = executed.with_manual_transaction_proven_read_only();
@@ -7107,6 +7248,11 @@ pub(crate) async fn stream_rows_in_manual_transaction_with_cancel<F>(
where
F: FnMut(Vec<Vec<serde_json::Value>>) -> Result<(), String> + Send,
{
+ let pool_key = {
+ let sessions = state.transaction_sessions.read().await;
+ sessions.get(txn_session_id).ok_or(MANUAL_TRANSACTION_SESSION_NOT_FOUND_ERROR)?.pool_key.clone()
+ };
+ check_read_only_for_connection(state, &pool_key, sql).await?;
let expired_connection = {
let mut sessions = state.transaction_sessions.write().await;
let Some(session) = sessions.get_mut(txn_session_id) else {
@@ -7130,11 +7276,18 @@ where
return Err(MANUAL_TRANSACTION_IDLE_ROLLBACK_ERROR.to_string());
}
- let (connection, pool_key, connection_id) = {
+ let (connection, pool_key, connection_id, mysql_data_charset) = {
let sessions = state.transaction_sessions.read().await;
sessions
.get(txn_session_id)
- .map(|session| (Arc::clone(&session.connection), session.pool_key.clone(), session.connection_id.clone()))
+ .map(|session| {
+ (
+ Arc::clone(&session.connection),
+ session.pool_key.clone(),
+ session.connection_id.clone(),
+ session.mysql_data_charset,
+ )
+ })
.ok_or(MANUAL_TRANSACTION_SESSION_NOT_FOUND_ERROR)?
};
let operation_budget = {
@@ -7200,7 +7353,15 @@ where
match row_result {
Ok(row) => {
batch.push(
- (0..row.len()).map(|index| db::mysql::mysql_value_to_json(&row, index)).collect(),
+ (0..row.len())
+ .map(|index| {
+ db::mysql::mysql_value_to_json_with_data_charset(
+ &row,
+ index,
+ mysql_data_charset,
+ )
+ })
+ .collect(),
);
total_rows += 1;
if batch.len() >= batch_size {
@@ -7597,7 +7758,23 @@ async fn execute_manual_txn_mysql_statement(
conn: &mut mysql_async::Conn,
sql: &str,
row_limit: usize,
+ data_charset: Option<db::mysql::MySqlDataCharset>,
) -> Result<db::QueryResult, String> {
+ if data_charset.is_some() {
+ return db::mysql::execute_query_on_conn_with_limits_with_data_charset(
+ conn,
+ sql,
+ false,
+ Some(row_limit),
+ None,
+ &[],
+ db::mysql::MySqlQueryDialect::default(),
+ None,
+ data_charset,
+ )
+ .await
+ .map(|result| result.result);
+ }
if db::mysql::is_result_set_query(sql, db::mysql::MySqlQueryDialect::default()) {
let start = std::time::Instant::now();
let mut result = conn.query_iter(sql).await.map_err(|e| format!("Query failed: {e}"))?;
@@ -7615,6 +7792,7 @@ async fn execute_manual_txn_mysql_statement(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows,
@@ -7641,7 +7819,11 @@ async fn execute_manual_txn_mysql_statement(
break;
}
let row = row.map_err(|e| format!("Query failed: {e}"))?;
- data.push((0..row.len()).map(|i| db::mysql::mysql_value_to_json(&row, i)).collect());
+ data.push(
+ (0..row.len())
+ .map(|i| db::mysql::mysql_value_to_json_with_data_charset(&row, i, data_charset))
+ .collect(),
+ );
}
Ok(db::QueryResult {
columns,
@@ -7649,6 +7831,7 @@ async fn execute_manual_txn_mysql_statement(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: data,
affected_rows: 0,
@@ -7671,6 +7854,7 @@ async fn execute_manual_txn_mysql_statement(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows,
@@ -7734,6 +7918,7 @@ pub async fn commit_manual_transaction(state: &AppState, txn_session_id: &str) -
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -7769,6 +7954,7 @@ pub async fn rollback_manual_transaction(state: &AppState, txn_session_id: &str)
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -7949,6 +8135,7 @@ mod tests {
state.transaction_sessions.write().await.insert(
"snapshot".to_string(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(TxnConnection::Postgres(Box::new(connection)))),
pool_key: "conn-1".to_string(),
@@ -8948,8 +9135,9 @@ for line in sys.stdin:
assert!(validate_query_execution_mode(Some(DatabaseType::Postgres), "SELECT 1; SELECT 2", &options).is_err());
}
- fn idle_test_session(idle_timeout: Duration) -> TransactionSession {
+ pub(super) fn idle_test_session(idle_timeout: Duration) -> TransactionSession {
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(TxnConnection::Mysql(None))),
pool_key: "conn-1".to_string(),
@@ -8997,7 +9185,7 @@ for line in sys.stdin:
let _ = std::fs::remove_dir_all(dir);
}
- fn test_connection_config(db_type: DatabaseType) -> ConnectionConfig {
+ pub(super) fn test_connection_config(db_type: DatabaseType) -> ConnectionConfig {
ConnectionConfig {
oracle_oci_nls_lang: None,
oracle_oci_tns_admin: None,
@@ -10296,6 +10484,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!(2)]],
affected_rows: 0,
@@ -10573,6 +10762,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!(value)]],
affected_rows: 0,
@@ -10787,7 +10977,13 @@ for line in sys.stdin:
let result = ExecuteMultiResult::success_with_index_and_large_values(
empty_query_result(1),
0,
- vec![db::LargeValueCell { row_index: 2, column_index: 3, original_bytes: 65_536, value_ref: None }],
+ vec![db::LargeValueCell {
+ row_index: 2,
+ column_index: 3,
+ original_bytes: 65_536,
+ pending_decode: None,
+ value_ref: None,
+ }],
false,
);
@@ -10801,28 +10997,82 @@ for line in sys.stdin:
#[test]
fn large_value_cell_merge_replaces_driver_entries_and_appends_server_entries() {
let driver_cells = vec![
- db::LargeValueCell { row_index: 1, column_index: 2, original_bytes: 10, value_ref: None },
- db::LargeValueCell { row_index: 3, column_index: 4, original_bytes: 20, value_ref: None },
+ db::LargeValueCell {
+ row_index: 1,
+ column_index: 2,
+ original_bytes: 10,
+ pending_decode: None,
+ value_ref: None,
+ },
+ db::LargeValueCell {
+ row_index: 3,
+ column_index: 4,
+ original_bytes: 20,
+ pending_decode: None,
+ value_ref: None,
+ },
];
let server_cells = vec![
- db::LargeValueCell { row_index: 1, column_index: 2, original_bytes: 100, value_ref: None },
- db::LargeValueCell { row_index: 5, column_index: 6, original_bytes: 200, value_ref: None },
+ db::LargeValueCell {
+ row_index: 1,
+ column_index: 2,
+ original_bytes: 100,
+ pending_decode: None,
+ value_ref: None,
+ },
+ db::LargeValueCell {
+ row_index: 5,
+ column_index: 6,
+ original_bytes: 200,
+ pending_decode: None,
+ value_ref: None,
+ },
];
assert_eq!(
merge_large_value_cells(driver_cells, server_cells),
vec![
- db::LargeValueCell { row_index: 1, column_index: 2, original_bytes: 100, value_ref: None },
- db::LargeValueCell { row_index: 3, column_index: 4, original_bytes: 20, value_ref: None },
- db::LargeValueCell { row_index: 5, column_index: 6, original_bytes: 200, value_ref: None },
+ db::LargeValueCell {
+ row_index: 1,
+ column_index: 2,
+ original_bytes: 100,
+ pending_decode: None,
+ value_ref: None
+ },
+ db::LargeValueCell {
+ row_index: 3,
+ column_index: 4,
+ original_bytes: 20,
+ pending_decode: None,
+ value_ref: None
+ },
+ db::LargeValueCell {
+ row_index: 5,
+ column_index: 6,
+ original_bytes: 200,
+ pending_decode: None,
+ value_ref: None
+ },
]
);
}
#[test]
fn large_value_cell_merge_preserves_single_source_inputs() {
- let driver_cell = db::LargeValueCell { row_index: 1, column_index: 2, original_bytes: 10, value_ref: None };
- let server_cell = db::LargeValueCell { row_index: 3, column_index: 4, original_bytes: 20, value_ref: None };
+ let driver_cell = db::LargeValueCell {
+ row_index: 1,
+ column_index: 2,
+ original_bytes: 10,
+ pending_decode: None,
+ value_ref: None,
+ };
+ let server_cell = db::LargeValueCell {
+ row_index: 3,
+ column_index: 4,
+ original_bytes: 20,
+ pending_decode: None,
+ value_ref: None,
+ };
assert_eq!(merge_large_value_cells(vec![driver_cell.clone()], Vec::new()), vec![driver_cell]);
assert_eq!(merge_large_value_cells(Vec::new(), vec![server_cell.clone()]), vec![server_cell]);
@@ -10832,10 +11082,22 @@ for line in sys.stdin:
fn large_value_cell_merge_handles_large_disjoint_inputs() {
const CELL_COUNT: usize = 100_000;
let driver_cells = (0..CELL_COUNT)
- .map(|row_index| db::LargeValueCell { row_index, column_index: 0, original_bytes: 10, value_ref: None })
+ .map(|row_index| db::LargeValueCell {
+ row_index,
+ column_index: 0,
+ original_bytes: 10,
+ pending_decode: None,
+ value_ref: None,
+ })
.collect();
let server_cells = (0..CELL_COUNT)
- .map(|row_index| db::LargeValueCell { row_index, column_index: 1, original_bytes: 20, value_ref: None })
+ .map(|row_index| db::LargeValueCell {
+ row_index,
+ column_index: 1,
+ original_bytes: 20,
+ pending_decode: None,
+ value_ref: None,
+ })
.collect();
let merged = merge_large_value_cells(driver_cells, server_cells);
@@ -11238,6 +11500,7 @@ for line in sys.stdin:
row_index: 0,
column_index: 0,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: Some("original-ref".to_string()),
}]
);
@@ -11467,6 +11730,7 @@ for line in sys.stdin:
row_index: 0,
column_index: 1,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: None
}]
);
@@ -11603,6 +11867,7 @@ done
state.transaction_sessions.write().await.insert(
"txn-test".to_string(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(TxnConnection::ExternalDriver {
session,
@@ -11844,6 +12109,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -11872,6 +12138,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -12924,6 +13191,7 @@ for line in sys.stdin:
state.transaction_sessions.write().await.insert(
txn_session_id.clone(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(TxnConnection::Agent {
client: Arc::new(crate::db::agent_driver::PooledAgentClient::new(client)),
@@ -12987,6 +13255,7 @@ for line in sys.stdin:
mysql_state.transaction_sessions.write().await.insert(
mysql_txn_id.clone(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: Arc::new(tokio::sync::Mutex::new(TxnConnection::Mysql(None))),
pool_key: "mysql-conn".to_string(),
@@ -13502,6 +13771,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!(2_041_797_190_226_354_178_i64),
@@ -13537,6 +13807,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true, true, true, true],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![
vec![
@@ -13573,6 +13844,7 @@ for line in sys.stdin:
row_index: 0,
column_index: 1,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: None
}]
);
@@ -13598,6 +13870,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true, true, true, true],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![
vec![
@@ -13632,7 +13905,13 @@ for line in sys.stdin:
assert_eq!(result.rows[1][2], serde_json::Value::Null);
assert_eq!(
cells,
- vec![db::LargeValueCell { row_index: 0, column_index: 2, original_bytes: 5231, value_ref: None }]
+ vec![db::LargeValueCell {
+ row_index: 0,
+ column_index: 2,
+ original_bytes: 5231,
+ pending_decode: None,
+ value_ref: None
+ }]
);
}
@@ -13659,6 +13938,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true; 5],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![
vec![
@@ -13703,12 +13983,14 @@ for line in sys.stdin:
row_index: 0,
column_index: 1,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: None
},
db::LargeValueCell {
row_index: 0,
column_index: 2,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: None
},
]
@@ -13726,6 +14008,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true, true],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: ["0x", "0X", "\\x"]
.into_iter()
@@ -13768,7 +14051,13 @@ for line in sys.stdin:
cells,
[3, 7, 11]
.into_iter()
- .map(|row_index| db::LargeValueCell { row_index, column_index: 0, original_bytes: 5, value_ref: None })
+ .map(|row_index| db::LargeValueCell {
+ row_index,
+ column_index: 0,
+ original_bytes: 5,
+ pending_decode: None,
+ value_ref: None
+ })
.collect::<Vec<_>>()
);
}
@@ -13870,7 +14159,13 @@ for line in sys.stdin:
.into_iter()
.enumerate()
.filter_map(|(row_index, size)| size.filter(|size| *size > preview_size).map(|original_bytes| {
- db::LargeValueCell { row_index, column_index: 1, original_bytes, value_ref: None }
+ db::LargeValueCell {
+ row_index,
+ column_index: 1,
+ original_bytes,
+ pending_decode: None,
+ value_ref: None,
+ }
}))
.collect::<Vec<_>>()
);
@@ -13889,6 +14184,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true; 3],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![
vec![serde_json::json!(1), serde_json::json!("<CLOB>"), serde_json::json!("D:1")],
@@ -13917,6 +14213,7 @@ for line in sys.stdin:
row_index: 0,
column_index: 1,
original_bytes: SERVER_LARGE_VALUE_UNKNOWN_BYTES,
+ pending_decode: None,
value_ref: None
}]
);
@@ -13931,6 +14228,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true, true],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![
vec![serde_json::json!("[0.1,0.2,0.3]"), serde_json::json!("V:9")],
@@ -13969,6 +14267,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![true; 4],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows: 0,
diff --git a/crates/dbx-core/src/query/mongo_ops.rs b/crates/dbx-core/src/query/mongo_ops.rs
index b47e60d3d2..bab2951530 100644
--- a/crates/dbx-core/src/query/mongo_ops.rs
+++ b/crates/dbx-core/src/query/mongo_ops.rs
@@ -1453,6 +1453,7 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<serde_json::Value>>, affecte
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows,
affected_rows,
diff --git a/crates/dbx-core/src/query/mysql_data_charset_policy.rs b/crates/dbx-core/src/query/mysql_data_charset_policy.rs
new file mode 100644
index 0000000000..181f87eb6d
--- /dev/null
+++ b/crates/dbx-core/src/query/mysql_data_charset_policy.rs
@@ -0,0 +1,86 @@
+//! Application-level protection for explicitly interpreted MySQL text.
+//! SQL classification is not an authorization sandbox; use SELECT-only grants.
+use crate::{
+ connection::AppState,
+ models::connection::{ConnectionConfig, DatabaseType},
+};
+
+pub const READ_ONLY: &str = "MYSQL_DATA_CHARSET_READ_ONLY";
+pub const EXPORT_UNSUPPORTED: &str = "MYSQL_DATA_CHARSET_EXPORT_UNSUPPORTED";
+pub const TRANSFER_UNSUPPORTED: &str = "MYSQL_DATA_CHARSET_TRANSFER_UNSUPPORTED";
+pub const SESSION_CHANGE_UNSUPPORTED: &str = "MYSQL_DATA_CHARSET_SESSION_CHANGE_UNSUPPORTED";
+
+pub fn enabled(config: &ConnectionConfig) -> Result<bool, String> {
+ crate::db::mysql::data_charset_for_config(config).map(|charset| charset.is_some())
+}
+
+pub async fn enabled_for_connection(state: &AppState, key: &str) -> Result<bool, String> {
+ let connection_id = {
+ let configs = state.configs.read().await;
+ match crate::connection::config_for_pool_key(key, &configs) {
+ Some(config) => {
+ if enabled(config)? {
+ return Ok(true);
+ }
+ config.id.clone()
+ }
+ None => key.to_owned(),
+ }
+ };
+ // Saving a new configuration must not unlock an old, still-running decoded
+ // connection. Keep the stricter policy until every old pool/session closes.
+ if state
+ .with_connection_pools(|pools| {
+ pools.iter().any(|(pool_key, pool)| {
+ crate::connection::pool_key_belongs_to_connection(pool_key, &connection_id)
+ && matches!(pool, crate::connection::PoolKind::Mysql(pool, _) if pool.data_charset().is_some())
+ })
+ })
+ .await
+ {
+ return Ok(true);
+ }
+ Ok(state.transaction_sessions.read().await.values().any(|session| {
+ (session.connection_id == connection_id || session.pool_key == key) && session.mysql_data_charset.is_some()
+ }))
+}
+
+pub async fn reject_operation(state: &AppState, key: &str, error: &str) -> Result<(), String> {
+ if enabled_for_connection(state, key).await? {
+ return Err(format!(
+ "{error}: MySQL dataCharset interpretation is read-only; disable it and reconnect for this operation."
+ ));
+ }
+ Ok(())
+}
+
+pub async fn check_export(state: &AppState, key: &str, format: &str) -> Result<(), String> {
+ if !matches!(format.to_ascii_lowercase().as_str(), "csv" | "json" | "xlsx") {
+ reject_operation(state, key, EXPORT_UNSUPPORTED).await?;
+ }
+ Ok(())
+}
+
+pub fn check_sql(sql: &str, name: &str) -> Result<(), String> {
+ for statement in crate::sql::split_sql_statements_for_database(sql, DatabaseType::Mysql) {
+ let stripped = crate::query_execution_sql::strip_sql_comments_and_literals(&statement);
+ // All manual SET statements are disallowed: aliases, session variables and
+ // prepared session changes must not invalidate the UTF8 carrier invariant.
+ if stripped
+ .trim_start()
+ .split(|c: char| !c.is_ascii_alphanumeric() && c != '_')
+ .next()
+ .is_some_and(|word| word.eq_ignore_ascii_case("set"))
+ {
+ return Err(format!(
+ "{SESSION_CHANGE_UNSUPPORTED}: session changes are unavailable with MySQL dataCharset."
+ ));
+ }
+ crate::query_execution_sql::check_read_only(&statement, name, DatabaseType::Mysql)
+ .map_err(|error| format!("{READ_ONLY}: {error}"))?;
+ }
+ // Check the original text as well as split statements: executable MySQL
+ // comments must not disappear during statement splitting.
+ crate::query_execution_sql::check_read_only(sql, name, DatabaseType::Mysql)
+ .map_err(|error| format!("{READ_ONLY}: {error}"))
+}
diff --git a/crates/dbx-core/src/query/mysql_data_charset_tests.rs b/crates/dbx-core/src/query/mysql_data_charset_tests.rs
new file mode 100644
index 0000000000..256ba50b5e
--- /dev/null
+++ b/crates/dbx-core/src/query/mysql_data_charset_tests.rs
@@ -0,0 +1,394 @@
+use super::{mysql_data_charset_policy as policy, tests::test_connection_config, *};
+
+#[test]
+fn mysql_data_charset_server_preview_is_pending_and_original_keys_are_rebased() {
+ use dbx_types::types::OriginalKeyCell;
+ let mut result = empty_query_result(0);
+ result.columns = vec!["text".into(), "__DBX_LARGE_VALUE_BYTES_T_0".into(), "key".into()];
+ result.rows = vec![
+ vec![serde_json::json!("çÍ·×"), serde_json::json!("T:3:96000"), serde_json::json!("中文")],
+ vec![serde_json::json!("ÖÐÎÄ"), serde_json::json!("T:8:4"), serde_json::json!("中文")],
+ vec![serde_json::json!("ÖÐÎÄ\u{81}"), serde_json::json!("T:8:5"), serde_json::json!("other")],
+ ];
+ result.raw_key_cells = vec![
+ OriginalKeyCell { row_index: 0, column_index: 2, value: serde_json::json!("ÖÐÎÄ") },
+ OriginalKeyCell { row_index: 1, column_index: 2, value: serde_json::json!("中文") },
+ OriginalKeyCell { row_index: 2, column_index: 2, value: serde_json::json!("other") },
+ ];
+ let cells = extract_server_large_value_markers_with_charset(&mut result, Some(db::mysql::MySqlDataCharset::Gbk));
+ assert_eq!(cells.len(), 1);
+ assert_eq!(cells[0].pending_decode, Some(true));
+ assert_eq!(cells[0].original_bytes, 96000);
+ assert_eq!(result.rows[0][0], "");
+ assert_eq!(result.rows[1][0], "中文");
+ assert_eq!(result.rows[2][0], "ÖÐÎÄ\u{81}", "invalid complete suffix keeps the whole original carrier");
+ assert_eq!(result.raw_key_cells[0].column_index, 1);
+ assert_ne!(result.raw_key_cells[0].value, result.raw_key_cells[1].value);
+ let truncated = truncate_result_with_max_rows(result, Some(2));
+ assert_eq!(truncated.raw_key_cells.len(), 2);
+ assert!(truncated.raw_key_cells.iter().all(|cell| cell.row_index < 2));
+}
+
+#[test]
+fn mysql_data_charset_preview_keeps_upstream_deferred_cells() {
+ let mut result = empty_query_result(0);
+ result.columns = vec!["text".into(), "__DBX_LARGE_VALUE_BYTES_T_0".into(), "deferred".into()];
+ result.rows = vec![vec![serde_json::json!("çÍ·×"), serde_json::json!("T:3:96000"), serde_json::json!("")]];
+ result.deferred_large_value_cells = vec![db::LargeValueCell {
+ row_index: 0,
+ column_index: 2,
+ original_bytes: 128000,
+ value_ref: Some("deferred-ref".into()),
+ pending_decode: None,
+ }];
+ for indexed in [false, true] {
+ let output = if indexed {
+ ExecuteMultiResult::success_with_index_and_large_values_and_charset(
+ result.clone(),
+ 0,
+ Vec::new(),
+ true,
+ Some(db::mysql::MySqlDataCharset::Gbk),
+ )
+ } else {
+ ExecuteMultiResult::success_with_optional_server_large_values_and_charset(
+ result.clone(),
+ true,
+ Some(db::mysql::MySqlDataCharset::Gbk),
+ )
+ };
+ assert_eq!(output.result.columns, ["text", "deferred"]);
+ assert!(output.result.deferred_large_value_cells.is_empty());
+ assert_eq!(output.large_value_cells.len(), 2);
+ let pending = output.large_value_cells.iter().find(|cell| cell.column_index == 0).unwrap();
+ assert_eq!(pending.pending_decode, Some(true));
+ let deferred = output.large_value_cells.iter().find(|cell| cell.column_index == 1).unwrap();
+ assert_eq!(deferred.value_ref.as_deref(), Some("deferred-ref"));
+ assert_eq!(deferred.original_bytes, 128000);
+ }
+}
+
+#[test]
+fn mysql_data_charset_pending_is_not_applied_to_json_binary_or_default_results() {
+ for (alias, marker, codec, expected) in [
+ ("T", "T:3:20", None, "çÍ·..."),
+ ("J", "T:3:20", Some(db::mysql::MySqlDataCharset::Gbk), "çÍ·..."),
+ ("B", "B:3:20", Some(db::mysql::MySqlDataCharset::Gbk), "0xaabbcc..."),
+ ] {
+ let mut result = empty_query_result(0);
+ result.columns = vec!["value".into(), format!("__DBX_LARGE_VALUE_BYTES_{alias}_0")];
+ result.rows =
+ vec![vec![serde_json::json!(if alias == "B" { "0xaabbccdd" } else { "çÍ·×" }), serde_json::json!(marker)]];
+ let cells = extract_server_large_value_markers_with_charset(&mut result, codec);
+ assert_eq!(cells.len(), 1);
+ assert_eq!(cells[0].pending_decode, None);
+ assert_eq!(result.rows[0][0], expected);
+ }
+}
+
+async fn fixture() -> (tempfile::TempDir, Arc<AppState>) {
+ let directory = tempfile::tempdir().unwrap();
+ let storage = crate::persistence::test_storage::open(&directory.path().join("storage.db")).await.unwrap();
+ let state = Arc::new(AppState::new(storage));
+ let mut config = test_connection_config(DatabaseType::Mysql);
+ config.url_params = Some("dataCharset=GBK".into());
+ state.configs.write().await.insert(config.id.clone(), config);
+ (directory, state)
+}
+
+#[test]
+fn compatibility_sql_rejects_session_changes_and_known_writes() {
+ for sql in [
+ "SET NAMES latin1",
+ "SET @@session.character_set_results = 'gbk'",
+ "/*!40101 SET NAMES latin1 */",
+ "SELECT 1; SET NAMES gbk",
+ "SELECT 1 /*!50000 INTO OUTFILE '/tmp/data' */",
+ "PREPARE s FROM 'SET NAMES latin1'",
+ "EXECUTE s",
+ "UPDATE t SET v = '中文'",
+ "INSERT INTO t VALUES ('中文')",
+ "DELETE FROM t",
+ "ALTER TABLE t ADD COLUMN v TEXT",
+ "DROP TABLE t",
+ "CALL mutate()",
+ "WITH c AS (SELECT 1) UPDATE t SET v = 'new'",
+ "SELECT 1; DELETE FROM t",
+ "SELECT * FROM t INTO OUTFILE '/tmp/data'",
+ ] {
+ assert!(policy::check_sql(sql, "test").is_err(), "must reject {sql}");
+ }
+ for sql in [
+ "SELECT 'SET NAMES latin1'",
+ "SELECT '/*! SET NAMES latin1 */'",
+ "/* SET NAMES latin1 */ SELECT 1",
+ "SELECT 1; SELECT 2",
+ "SHOW CREATE TABLE t",
+ "WITH c AS (SELECT 1) SELECT * FROM c",
+ ] {
+ assert!(policy::check_sql(sql, "test").is_ok(), "must allow {sql}");
+ }
+}
+
+#[tokio::test]
+async fn compatibility_policy_precedes_unlock_and_preserves_stored_readonly() {
+ let (_directory, state) = fixture().await;
+ assert!(unlock_connection_writes_core(&state, "conn-1", 60).await.unwrap_err().starts_with(policy::READ_ONLY));
+ assert_eq!(state.write_unlock_windows.remaining_ms("conn-1").await, 0);
+ state.write_unlock_windows.unlock("conn-1", 60).await.unwrap();
+ assert!(check_read_only_for_connection(&state, "conn-1:db", "UPDATE t SET v=1").await.is_err());
+ assert!(check_read_only_for_connection_multi(&state, "conn-1:db", &["SELECT 1", "DELETE FROM t"]).await.is_err());
+ assert!(connection_readonly_name(&state, "conn-1").await.is_some());
+ assert!(policy::reject_operation(&state, "conn-1", policy::READ_ONLY).await.is_err());
+ assert!(check_read_only_for_connection(&state, "conn-1", "SELECT 1").await.is_ok());
+ assert!(!state.configs.read().await["conn-1"].read_only);
+
+ state.configs.write().await.get_mut("conn-1").unwrap().url_params = None;
+ assert!(unlock_connection_writes_core(&state, "conn-1", 60).await.unwrap() > 0);
+ assert!(check_read_only_for_connection(&state, "conn-1", "UPDATE t SET v=1").await.is_ok());
+ assert!(policy::reject_operation(&state, "conn-1", policy::READ_ONLY).await.is_ok());
+ state.configs.write().await.get_mut("conn-1").unwrap().read_only = true;
+ assert!(check_read_only_for_connection(&state, "conn-1", "UPDATE t SET v=1").await.is_ok());
+ state.write_unlock_windows.lock("conn-1").await;
+ assert!(check_read_only_for_connection(&state, "conn-1", "UPDATE t SET v=1").await.is_err());
+ assert!(state.configs.read().await["conn-1"].read_only);
+}
+
+#[tokio::test]
+async fn compatibility_policy_keeps_pinned_session_protected_after_config_change() {
+ let (_directory, state) = fixture().await;
+ let mut session = super::tests::idle_test_session(Duration::from_secs(300));
+ session.connection_id = "conn-1".into();
+ session.pool_key = "conn-1:db".into();
+ session.mysql_data_charset = Some(db::mysql::MySqlDataCharset::Gbk);
+ state.transaction_sessions.write().await.insert("legacy-txn".into(), session);
+ state.configs.write().await.get_mut("conn-1").unwrap().url_params = None;
+ state.write_unlock_windows.unlock("conn-1", 60).await.unwrap();
+ assert!(check_read_only_for_connection(&state, "conn-1:db", "DELETE FROM t").await.is_err());
+ assert!(policy::check_export(&state, "conn-1", "sql").await.is_err());
+ assert!(policy::reject_operation(&state, "conn-1", policy::READ_ONLY).await.is_err());
+ // The empty fake handle would fail differently if dispatch reached the driver.
+ let error =
+ execute_in_manual_transaction(&state, "legacy-txn", "UPDATE t SET v=1", "db", None, None).await.unwrap_err();
+ assert!(error.starts_with(policy::READ_ONLY), "{error}");
+ let config = state.configs.write().await.remove("conn-1").unwrap();
+ assert!(check_read_only_for_connection(&state, "conn-1:db", "DELETE FROM t").await.is_err());
+ state.configs.write().await.insert(config.id.clone(), config);
+ state.transaction_sessions.write().await.remove("legacy-txn");
+ assert!(check_read_only_for_connection(&state, "conn-1", "DELETE FROM t").await.is_ok());
+}
+
+#[tokio::test]
+async fn compatibility_policy_is_mysql_only_and_invalid_options_fail_closed() {
+ let (_directory, state) = fixture().await;
+ state.configs.write().await.get_mut("conn-1").unwrap().db_type = DatabaseType::Postgres;
+ assert!(check_read_only_for_connection(&state, "conn-1", "DELETE FROM t").await.is_ok());
+ let mut configs = state.configs.write().await;
+ let config = configs.get_mut("conn-1").unwrap();
+ config.db_type = DatabaseType::Mysql;
+ config.url_params = Some("dataCharset=unsupported".into());
+ drop(configs);
+ assert!(check_read_only_for_connection(&state, "conn-1", "SELECT 1").await.is_err());
+ assert!(connection_readonly_name(&state, "conn-1").await.is_some());
+}
+
+#[tokio::test]
+async fn compatibility_exports_fail_before_touching_destination_or_pool() {
+ let (directory, state) = fixture().await;
+ let destination = directory.path().join("preserve.sql");
+ std::fs::write(&destination, b"preserve existing output").unwrap();
+ for format in ["sql", "txt", "markdown"] {
+ let table: crate::table_export::TableExportRequest = serde_json::from_value(serde_json::json!({
+ "exportId":"legacy-export", "connectionId":"conn-1", "database":"db", "schema":null,
+ "tableName":"t", "filePath":destination, "format":format
+ }))
+ .unwrap();
+ let error =
+ crate::table_export::export_table_data_core(&state, &table, |_| panic!("must reject before progress"))
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::EXPORT_UNSUPPORTED), "{error}");
+ let completion = crate::table_export::export_table_data_core_with_completion(&state, &table, |_| {
+ panic!("must reject before progress")
+ })
+ .await;
+ assert!(completion.result.unwrap_err().starts_with(policy::EXPORT_UNSUPPORTED));
+ assert!(completion.cleanup.is_ok());
+ let query: crate::query_result_export::QueryResultExportRequest = serde_json::from_value(serde_json::json!({
+ "exportId":"legacy-query-export", "connectionId":"conn-1", "database":"db", "sql":"SELECT 1",
+ "queryBaseSql":"SELECT 1", "databaseType":"mysql", "filePath":destination, "format":format,
+ "pageSize":100
+ }))
+ .unwrap();
+ let error = crate::query_result_export::export_query_result_core(&state, &query, None, |_| {
+ panic!("must reject before progress")
+ })
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::EXPORT_UNSUPPORTED), "{error}");
+ let completion =
+ crate::query_result_export::export_query_result_core_with_completion(&state, &query, None, |_| {
+ panic!("must reject before progress")
+ })
+ .await;
+ assert!(completion.result.unwrap_err().starts_with(policy::EXPORT_UNSUPPORTED));
+ assert!(completion.cleanup.is_ok());
+ }
+ let backup: crate::database_export::DatabaseExportRequest = serde_json::from_value(serde_json::json!({
+ "exportId":"legacy-backup", "connectionId":"conn-1", "database":"db", "schema":"db",
+ "filePath":destination, "includeStructure":true, "includeData":true, "includeObjects":true, "batchSize":100
+ }))
+ .unwrap();
+ assert!(crate::database_export::export_database_sql_core(&state, &backup, |_| panic!(
+ "must reject before progress"
+ ))
+ .await
+ .unwrap_err()
+ .starts_with(policy::EXPORT_UNSUPPORTED));
+ assert!(crate::database_export::begin_database_backup_snapshot_core(&state, "conn-1", "db")
+ .await
+ .unwrap_err()
+ .starts_with(policy::EXPORT_UNSUPPORTED));
+ for format in ["csv", "JSON", "xlsx"] {
+ policy::check_export(&state, "conn-1", format).await.unwrap();
+ }
+ assert_eq!(std::fs::read(&destination).unwrap(), b"preserve existing output");
+ assert!(state.connection_pools_snapshot().await.is_empty());
+}
+
+#[tokio::test]
+async fn compatibility_imports_and_direct_write_executor_fail_before_io() {
+ let (directory, state) = fixture().await;
+ let request: crate::sql::SqlFileRequest = serde_json::from_value(serde_json::json!({
+ "executionId":"legacy-import", "connectionId":"conn-1", "database":"db",
+ "filePath":directory.path().join("does-not-exist.sql"), "continueOnError":false
+ }))
+ .unwrap();
+ let error = crate::sql_file_import::execute_sql_file_content(
+ &state,
+ &request,
+ "DELETE FROM t",
+ CancellationToken::new(),
+ std::time::Instant::now(),
+ |_| panic!("no import progress"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::READ_ONLY), "{error}");
+ let error = crate::sql_file_import::execute_sql_file_path(
+ &state,
+ &request,
+ std::path::Path::new(&request.file_path),
+ CancellationToken::new(),
+ std::time::Instant::now(),
+ |_| panic!("no import progress"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::READ_ONLY), "{error}");
+ let error =
+ crate::transfer::execute_on_pool(&state, "conn-1:db", "ALTER TABLE t ADD COLUMN v TEXT").await.unwrap_err();
+ assert!(error.starts_with(policy::READ_ONLY), "{error}");
+ let table: crate::table_import::TableImportRequest = serde_json::from_value(serde_json::json!({
+ "importId":"legacy-table-import", "connectionId":"conn-1", "database":"db", "schema":"db",
+ "table":"t", "filePath":directory.path().join("does-not-exist.csv"), "mappings":[], "mode":"append", "batchSize":100
+ })).unwrap();
+ let error = crate::table_import::import_table_file_core(
+ &state,
+ &table,
+ &DatabaseType::Mysql,
+ "conn-1:db",
+ |_| Box::pin(async { false }),
+ |_| panic!("no table import progress"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::READ_ONLY), "{error}");
+ assert!(state.connection_pools_snapshot().await.is_empty());
+}
+
+#[tokio::test]
+async fn compatibility_transfer_rejects_source_and_target_before_dispatch() {
+ let (_directory, state) = fixture().await;
+ let mut ordinary = test_connection_config(DatabaseType::Mysql);
+ ordinary.id = "ordinary".into();
+ state.configs.write().await.insert(ordinary.id.clone(), ordinary);
+ for (source, target) in [("conn-1", "ordinary"), ("ordinary", "conn-1")] {
+ let request: crate::transfer::TransferRequest = serde_json::from_value(serde_json::json!({
+ "transferId":"legacy-transfer", "sourceConnectionId":source, "sourceDatabase":"db", "sourceSchema":"db",
+ "targetConnectionId":target, "targetDatabase":"db", "targetSchema":"db",
+ "tables":["t"], "createTable":true, "batchSize":100
+ }))
+ .unwrap();
+ assert!(crate::transfer::check_data_charset_transfer(&state, &request)
+ .await
+ .unwrap_err()
+ .starts_with(policy::TRANSFER_UNSUPPORTED));
+ let error = crate::transfer::transfer_schema_objects(&state, &request, source, target, |_| {
+ panic!("no transfer progress")
+ })
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::TRANSFER_UNSUPPORTED), "{error}");
+ let error = crate::transfer::transfer_table_with_result(
+ &state,
+ &request,
+ "t",
+ 0,
+ &DatabaseType::Mysql,
+ &DatabaseType::Mysql,
+ source,
+ target,
+ &HashMap::new(),
+ &mut Vec::new(),
+ None,
+ false,
+ |_| panic!("no transfer progress"),
+ |_| panic!("no source read"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::TRANSFER_UNSUPPORTED), "{error}");
+ }
+ assert!(state.connection_pools_snapshot().await.is_empty());
+}
+
+#[tokio::test]
+async fn compatibility_schema_transfer_rejects_before_data_only_shortcut_or_package_approval() {
+ let (_directory, state) = fixture().await;
+ for (source, target) in [("conn-1", "unconfigured"), ("unconfigured", "conn-1")] {
+ for content in ["dataOnly", "structureOnly", "structureAndData"] {
+ for packages in [false, true] {
+ let request: crate::transfer::TransferRequest = serde_json::from_value(serde_json::json!({
+ "transferId": "legacy-schema-transfer", "sourceConnectionId": source,
+ "sourceDatabase": "db", "sourceSchema": "db", "targetConnectionId": target,
+ "targetDatabase": "db", "targetSchema": "db", "tables": [],
+ "createTable": false, "batchSize": 100, "content": content,
+ "objects": if packages { serde_json::json!([{"objectType":"PACKAGE_BODY", "names":["pkg"]}]) } else { serde_json::json!([]) },
+ })).unwrap();
+ let error = crate::transfer::transfer_schema_objects(
+ &state,
+ &request,
+ "missing-source",
+ "missing-target",
+ |_| panic!("policy rejection must precede package approval progress"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::TRANSFER_UNSUPPORTED), "{content}, packages={packages}: {error}");
+ let error = crate::transfer::transfer_schema_objects_with_routine_context(
+ &state,
+ &request,
+ "missing-source",
+ "missing-target",
+ None,
+ |_| panic!("direct inner entry must retain the same protection"),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.starts_with(policy::TRANSFER_UNSUPPORTED), "{error}");
+ }
+ }
+ }
+ assert!(state.connection_pools_snapshot().await.is_empty());
+}
diff --git a/crates/dbx-core/src/query/sqlserver_manual_transaction.rs b/crates/dbx-core/src/query/sqlserver_manual_transaction.rs
index 01548896da..5298ccbd44 100644
--- a/crates/dbx-core/src/query/sqlserver_manual_transaction.rs
+++ b/crates/dbx-core/src/query/sqlserver_manual_transaction.rs
@@ -286,6 +286,7 @@ pub async fn begin(
let id = format!("{PREFIX}{}", uuid::Uuid::new_v4());
let metadata = SessionMetadata { lifecycle, driver, ends: state.sqlserver_transaction_ends.clone() };
let session = TransactionSession {
+ mysql_data_charset: None,
sqlserver: Some(metadata.clone()),
connection: Arc::new(tokio::sync::Mutex::new(conn)),
pool_key,
@@ -950,6 +951,7 @@ for line in sys.stdin:
state.transaction_sessions.write().await.insert(
id.clone(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: Some(SessionMetadata {
lifecycle: state.connection_lifecycle_snapshot("mock-sqlserver"),
driver: DriverInfo::default(),
diff --git a/crates/dbx-core/src/schema/agent_pg_sequences.rs b/crates/dbx-core/src/schema/agent_pg_sequences.rs
index fdd91f6319..148f1aa2a8 100644
--- a/crates/dbx-core/src/schema/agent_pg_sequences.rs
+++ b/crates/dbx-core/src/schema/agent_pg_sequences.rs
@@ -373,6 +373,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: 0,
diff --git a/crates/dbx-core/src/schema/kingbase.rs b/crates/dbx-core/src/schema/kingbase.rs
index 31257e9b72..c647af8cee 100644
--- a/crates/dbx-core/src/schema/kingbase.rs
+++ b/crates/dbx-core/src/schema/kingbase.rs
@@ -278,6 +278,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!("kdb_utils"),
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index 4e727b0513..b8f042d726 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -3386,6 +3386,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows,
affected_rows: 0,
@@ -4541,6 +4542,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!("users"),
@@ -4572,6 +4574,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!("orders"),
@@ -4602,6 +4605,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("users"), serde_json::json!("CREATE TABLE `users` (`id` bigint);\n")]],
affected_rows: 0,
@@ -4629,6 +4633,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!("active_users"),
@@ -4660,6 +4665,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
serde_json::json!("active_users"),
@@ -5755,6 +5761,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![
vec![serde_json::json!("daily_revenue"), serde_json::json!("BASE TABLE")],
@@ -5794,6 +5801,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![
vec![
@@ -6049,6 +6057,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("Customer table")]],
affected_rows: 0,
@@ -6070,6 +6079,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!(" ")]],
affected_rows: 0,
@@ -6099,6 +6109,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("18446744073709551615")]],
affected_rows: 0,
@@ -6145,6 +6156,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![
vec![serde_json::json!("ORDERS"), serde_json::json!("Orders table")],
@@ -6320,6 +6332,7 @@ for line in sys.stdin:
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![
vec![
@@ -6699,6 +6712,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: 0,
@@ -6878,6 +6892,7 @@ done
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![
vec![
diff --git a/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs b/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
index f01490659b..f596ffceee 100644
--- a/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
+++ b/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
@@ -681,6 +681,7 @@ fn execute_change_transaction(
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: Vec::new(),
affected_rows: 0,
diff --git a/crates/dbx-core/tests/lob_cancel_wait.rs b/crates/dbx-core/tests/lob_cancel_wait.rs
index 7487930a81..cdebd2d745 100644
--- a/crates/dbx-core/tests/lob_cancel_wait.rs
+++ b/crates/dbx-core/tests/lob_cancel_wait.rs
@@ -101,6 +101,7 @@ async fn public_lob_request_cancels_while_waiting_for_transaction_connection() {
fixture.state.transaction_sessions.write().await.insert(
"txn".into(),
TransactionSession {
+ mysql_data_charset: None,
sqlserver: None,
connection: connection.clone(),
pool_key: "lob".into(),
diff --git a/crates/dbx-core/tests/mysql_data_charset_live.rs b/crates/dbx-core/tests/mysql_data_charset_live.rs
new file mode 100644
index 0000000000..9bce2e6e52
--- /dev/null
+++ b/crates/dbx-core/tests/mysql_data_charset_live.rs
@@ -0,0 +1,363 @@
+//! Read-only integration over the accepted issue #12458 fixture.
+//!
+//! Set DBX_LIVE_MYSQL_DATA_CHARSET_URL to a SELECT-only MySQL URL whose database
+//! contains legacy_text(id, legacy_text, normal_utf8, raw_blob). This test never
+//! creates or mutates database objects; other codec samples are SELECT literals.
+//! cargo test -p dbx-core --no-default-features --features sqlite-bundled \
+//! --test mysql_data_charset_live -- --ignored --nocapture
+use dbx_core::connection::AppState;
+use dbx_core::models::connection::ConnectionConfig;
+use dbx_core::query::{
+ begin_manual_transaction, execute_in_manual_transaction, execute_in_manual_transaction_with_options,
+ execute_multi_core_with_options_for_client, execute_sql_statement, rollback_manual_transaction,
+ stream_rows_in_manual_transaction, ManualTransactionExecutionOptions, QueryExecutionOptions,
+};
+use dbx_core::query_result_export::{export_query_result_core, QueryResultExportRequest};
+use dbx_core::table_export::{export_table_data_core, TableExportRequest};
+use serde_json::{json, Value};
+use std::path::Path;
+use std::sync::Arc;
+
+fn config(opts: &mysql_async::Opts, id: &str, codec: Option<&str>) -> ConnectionConfig {
+ serde_json::from_value(json!({
+ "id":id, "name":id, "db_type":"mysql", "host":opts.ip_or_hostname(), "port":opts.tcp_port(),
+ "username":opts.user().unwrap_or(""), "password":opts.pass().unwrap_or(""), "database":opts.db_name(),
+ "url_params":codec.map(|codec| format!("dataCharset={codec}")), "keepalive_interval_secs":0,
+ "connect_timeout_secs":5, "query_timeout_secs":30
+ }))
+ .unwrap()
+}
+
+fn assert_export(path: &Path, format: &str, expected: &str, rows: usize) {
+ match format {
+ "csv" => {
+ let text = std::fs::read_to_string(path).unwrap();
+ assert!(text.contains(expected), "CSV must contain interpreted text");
+ assert_eq!(text.lines().count(), rows + 1);
+ let mut reader = csv::Reader::from_path(path).unwrap();
+ let column = reader.headers().unwrap().iter().position(|header| header == "legacy_text").unwrap();
+ let values = reader.records().map(Result::unwrap).collect::<Vec<_>>();
+ assert_eq!(&values[0][column], expected, "CSV must contain the complete value, not a prefix");
+ }
+ "json" => {
+ let value: Value = serde_json::from_slice(&std::fs::read(path).unwrap()).unwrap();
+ assert_eq!(value.as_array().unwrap().len(), rows);
+ assert_eq!(value[0]["legacy_text"], expected);
+ }
+ "xlsx" => {
+ let data = dbx_core::table_import::parse_xlsx_file(path.to_str().unwrap(), 100).unwrap();
+ assert_eq!(data.total_rows, rows);
+ let index = data.columns.iter().position(|column| column == "legacy_text").unwrap();
+ assert_eq!(data.rows[0][index], expected);
+ }
+ _ => unreachable!(),
+ }
+}
+
+#[tokio::test]
+#[ignore = "requires SELECT-only issue12458 legacy_long_keys and legacy_key_collisions fixtures"]
+async fn mysql_data_charset_core_pending_previews_and_original_key_collisions() {
+ let url = std::env::var("DBX_LIVE_MYSQL_DATA_CHARSET_URL").expect("set SELECT-only fixture URL");
+ let opts = mysql_async::Opts::from_url(&url).unwrap();
+ let database = opts.db_name().unwrap();
+ let directory = tempfile::tempdir().unwrap();
+ let storage = dbx_core::persistence::test_storage::open(&directory.path().join("state.db")).await.unwrap();
+ let state = Arc::new(AppState::new(storage));
+ for (id, codec) in [("default", None), ("GBK", Some("GBK"))] {
+ state.configs.write().await.insert(id.into(), config(&opts, id, codec));
+ }
+ let stored_sql =
+ "SELECT legacy_key,part,HEX(legacy_text),HEX(raw_blob) FROM legacy_long_keys ORDER BY legacy_key,part";
+ let before = execute_sql_statement(&state, "default", database, stored_sql, None, None).await.unwrap().rows;
+ let preview_sql = "SELECT LEFT(legacy_text,4) AS legacy_text, CONCAT('T:3:',LENGTH(legacy_text)) AS __DBX_LARGE_VALUE_BYTES_T_0, legacy_key, part FROM legacy_long_keys WHERE legacy_key=CONVERT(_binary 0xD6D0CEC4 USING latin1) ORDER BY part";
+ for batch in [false, true] {
+ let sql = if batch { format!("{preview_sql};{preview_sql}") } else { preview_sql.into() };
+ let results = execute_multi_core_with_options_for_client(
+ &state,
+ "GBK",
+ database,
+ &sql,
+ None,
+ None,
+ QueryExecutionOptions {
+ table_data_preview: true,
+ result_key_columns: vec!["legacy_key".into(), "part".into()],
+ ..Default::default()
+ },
+ )
+ .await
+ .unwrap();
+ for result in results {
+ assert!(!result.execution_error);
+ assert_eq!(result.result.rows.len(), 2);
+ assert_eq!(result.large_value_cells.len(), 2);
+ assert!(result.large_value_cells.iter().all(|cell| cell.pending_decode == Some(true)));
+ assert_eq!(result.large_value_cells[0].original_bytes, 96000);
+ assert_eq!(result.large_value_cells[1].original_bytes, 96001);
+ assert_eq!(result.result.rows[0][0], "");
+ assert_eq!(result.result.rows[0][1], "中文");
+ assert_eq!(result.result.raw_key_cells.len(), 4);
+ let key =
+ result.result.raw_key_cells.iter().find(|cell| cell.row_index == 0 && cell.column_index == 1).unwrap();
+ assert_eq!(key.value, "ÖÐÎÄ", "raw key must survive marker-column removal");
+ }
+ }
+ let default_preview = execute_multi_core_with_options_for_client(
+ &state,
+ "default",
+ database,
+ preview_sql,
+ None,
+ None,
+ QueryExecutionOptions { table_data_preview: true, ..Default::default() },
+ )
+ .await
+ .unwrap();
+ assert_eq!(default_preview[0].result.rows[0][0], "çÍ·...");
+ assert!(default_preview[0].large_value_cells.iter().all(|cell| cell.pending_decode.is_none()));
+ assert!(default_preview[0].result.raw_key_cells.is_empty());
+
+ let full_sql = "SELECT legacy_key, part, legacy_text FROM legacy_long_keys WHERE legacy_key=CONVERT(_binary 0xD6D0CEC4 USING latin1) ORDER BY part";
+ let full = execute_sql_statement(&state, "GBK", database, full_sql, None, None).await.unwrap();
+ assert_eq!(full.rows[0][2], "缤纷彩虹".repeat(12000));
+ assert_eq!(
+ full.rows[1][2],
+ format!("{}\u{81}", "çͷײʺç".repeat(12000)),
+ "unseen invalid suffix must preserve the whole carrier"
+ );
+ assert_eq!(full.raw_key_cells.len(), 4);
+ let collision = execute_sql_statement(
+ &state,
+ "GBK",
+ database,
+ "SELECT legacy_key,legacy_text FROM legacy_key_collisions ORDER BY legacy_key",
+ None,
+ None,
+ )
+ .await
+ .unwrap();
+ assert_eq!(collision.rows.len(), 2);
+ assert!(collision.rows.iter().all(|row| row[0] == "中文"));
+ assert_eq!(collision.raw_key_cells.len(), 2);
+ assert_ne!(collision.raw_key_cells[0].value, collision.raw_key_cells[1].value);
+ assert_ne!(collision.rows[0][1], collision.rows[1][1]);
+
+ let transaction = begin_manual_transaction(&state, "GBK", database, None, None).await.unwrap();
+ let preview = execute_in_manual_transaction_with_options(
+ &state,
+ &transaction,
+ preview_sql,
+ database,
+ None,
+ ManualTransactionExecutionOptions { table_data_preview: true, ..Default::default() },
+ )
+ .await
+ .unwrap();
+ assert_eq!(preview[0].large_value_cells.len(), 2);
+ assert!(preview[0].large_value_cells.iter().all(|cell| cell.pending_decode == Some(true)));
+ assert_eq!(preview[0].result.raw_key_cells.len(), 4);
+ let txn_full = execute_in_manual_transaction(&state, &transaction, full_sql, database, None, None).await.unwrap();
+ assert_eq!(txn_full[0].rows, full.rows);
+ assert_eq!(txn_full[0].raw_key_cells, full.raw_key_cells);
+ for (row_index, part) in [(0, 1), (1, 2)] {
+ let sql = format!("SELECT legacy_text FROM legacy_long_keys WHERE legacy_key=CONVERT(_binary 0xD6D0CEC4 USING latin1) AND part={part}");
+ let expected = full.rows[row_index][2].as_str().unwrap();
+ for format in ["csv", "json", "xlsx"] {
+ for in_transaction in [false, true] {
+ let destination = directory.path().join(format!("long-{part}-{in_transaction}.{format}"));
+ let request: QueryResultExportRequest = serde_json::from_value(json!({
+ "exportId":format!("long-{part}-{format}-{in_transaction}"), "connectionId":"GBK",
+ "database":database, "sql":sql, "queryBaseSql":sql, "databaseType":"mysql",
+ "filePath":destination, "format":format, "pageSize":1,
+ "clientSessionId":format!("long-export-{part}-{format}-{in_transaction}"),
+ "txnSessionId":in_transaction.then_some(transaction.as_str())
+ }))
+ .unwrap();
+ export_query_result_core(&state, &request, None, |_| {}).await.unwrap();
+ assert_export(&destination, format, expected, 1);
+ }
+ }
+ }
+ rollback_manual_transaction(&state, &transaction).await.unwrap();
+
+ for (codec, hex, expected) in [
+ ("GBK", "e7cdb7d7b2cabae7", "缤纷彩虹"),
+ ("GB18030", "d6d0cec49439fc36", "中文😀"),
+ ("BIG5", "c163c5e9a4a4a4e5", "繁體中文"),
+ ] {
+ if codec != "GBK" {
+ state.configs.write().await.insert(codec.into(), config(&opts, codec, Some(codec)));
+ }
+ for (limit, pending) in [(3, true), (100, false)] {
+ let sql = format!("SELECT LEFT(CONVERT(_binary 0x{hex} USING latin1),{}) AS v, 'T:{limit}:8' AS __DBX_LARGE_VALUE_BYTES_T_0", limit + 1);
+ let result = execute_multi_core_with_options_for_client(
+ &state,
+ codec,
+ database,
+ &sql,
+ None,
+ None,
+ QueryExecutionOptions { table_data_preview: true, ..Default::default() },
+ )
+ .await
+ .unwrap();
+ if pending {
+ assert_eq!(result[0].large_value_cells[0].pending_decode, Some(true));
+ } else {
+ assert!(result[0].large_value_cells.is_empty());
+ assert_eq!(result[0].result.rows[0][0], expected);
+ }
+ }
+ }
+ let after = execute_sql_statement(&state, "default", database, stored_sql, None, None).await.unwrap().rows;
+ assert_eq!(before, after);
+ for id in ["default", "GBK", "GB18030", "BIG5"] {
+ state.remove_connection_pools(id).await;
+ }
+ println!("server LEFT pending/complete, 3 codecs, invalid suffix, composite/raw colliding keys, single/batch/manual, default and HEX passed");
+}
+
+#[tokio::test]
+#[ignore = "requires DBX_LIVE_MYSQL_DATA_CHARSET_URL and the read-only issue12458 legacy_text fixture"]
+async fn mysql_data_charset_core_query_transactions_and_display_exports() {
+ let url = std::env::var("DBX_LIVE_MYSQL_DATA_CHARSET_URL").expect("set SELECT-only fixture URL");
+ let opts = mysql_async::Opts::from_url(&url).expect("valid fixture URL");
+ let database = opts.db_name().expect("fixture URL database");
+ let directory = tempfile::tempdir().unwrap();
+ let storage = dbx_core::persistence::test_storage::open(&directory.path().join("state.db")).await.unwrap();
+ let state = Arc::new(AppState::new(storage));
+ state.configs.write().await.insert("default".into(), config(&opts, "default", None));
+ let stored_sql = "SELECT id, HEX(legacy_text), HEX(normal_utf8), HEX(raw_blob) FROM legacy_text ORDER BY id";
+ let before = execute_sql_statement(&state, "default", database, stored_sql, None, None).await.unwrap().rows;
+ assert_eq!(before.len(), 4, "use the accepted four-row fixture");
+ let default_before = execute_sql_statement(
+ &state,
+ "default",
+ database,
+ "SELECT legacy_text, normal_utf8 FROM legacy_text WHERE id=1",
+ None,
+ None,
+ )
+ .await
+ .unwrap()
+ .rows;
+ assert_ne!(default_before[0][0], "缤纷彩虹");
+ assert_eq!(default_before[0][1], "缤纷彩虹");
+
+ for (codec, hex, expected) in [
+ ("GBK", "e7cdb7d7b2cabae7", "缤纷彩虹"),
+ ("GB18030", "d6d0cec49439fc36", "中文😀"),
+ ("BIG5", "c163c5e9a4a4a4e5", "繁體中文"),
+ ] {
+ state.configs.write().await.insert(codec.into(), config(&opts, codec, Some(codec)));
+ let sql = format!("SELECT CONVERT(_binary 0x{hex} USING latin1) AS legacy_text, '中文' AS normal_text, _binary 0x{hex} AS raw_blob, NULL AS nullable, 'ASCII' AS ascii_text");
+ let result = execute_sql_statement(&state, codec, database, &sql, None, None).await.unwrap();
+ assert_eq!(result.rows[0][0], expected, "single raw-connection core path {codec}");
+ assert_eq!(result.rows[0][1], "中文");
+ assert_eq!(result.rows[0][2], format!("0x{hex}"));
+ assert!(result.rows[0][3].is_null());
+ assert_eq!(result.rows[0][4], "ASCII");
+ let batch = execute_multi_core_with_options_for_client(
+ &state,
+ codec,
+ database,
+ &format!("{sql}; {sql}"),
+ None,
+ None,
+ QueryExecutionOptions { client_session_id: Some(format!("legacy-tab-{codec}")), ..Default::default() },
+ )
+ .await
+ .unwrap();
+ assert_eq!(batch.len(), 2);
+ assert!(batch.iter().all(|part| !part.execution_error && part.result.rows[0][0] == expected));
+
+ let long_sql = format!("SELECT REPEAT(CONVERT(_binary 0x{hex} USING latin1),10000) AS legacy_text");
+ let full = execute_sql_statement(&state, codec, database, &long_sql, None, None).await.unwrap();
+ assert_eq!(full.rows[0][0], expected.repeat(10000), "complete-value read {codec}");
+
+ let transaction = begin_manual_transaction(&state, codec, database, None, None).await.unwrap();
+ let transaction_result =
+ execute_in_manual_transaction(&state, &transaction, &sql, database, None, None).await.unwrap();
+ assert_eq!(transaction_result[0].rows, result.rows, "manual direct converter {codec}");
+ let mut streamed = Vec::new();
+ stream_rows_in_manual_transaction(&state, &transaction, &sql, 1, |rows| {
+ streamed.extend(rows);
+ Ok(())
+ })
+ .await
+ .unwrap();
+ assert_eq!(streamed, result.rows, "manual transaction stream converter {codec}");
+
+ for format in ["csv", "json", "xlsx"] {
+ for in_transaction in [false, true] {
+ let destination = directory.path().join(format!("{codec}-{in_transaction}.{format}"));
+ let request: QueryResultExportRequest = serde_json::from_value(json!({
+ "exportId":format!("export-{codec}-{format}-{in_transaction}"), "connectionId":codec,
+ "database":database, "sql":sql, "queryBaseSql":sql, "databaseType":"mysql",
+ "filePath":destination, "format":format, "pageSize":1,
+ "clientSessionId":format!("export-tab-{codec}-{format}-{in_transaction}"),
+ "txnSessionId":in_transaction.then_some(transaction.as_str())
+ }))
+ .unwrap();
+ export_query_result_core(&state, &request, None, |_| {}).await.unwrap();
+ assert_export(&destination, format, expected, 1);
+ }
+ }
+ rollback_manual_transaction(&state, &transaction).await.unwrap();
+ let session = execute_sql_statement(
+ &state,
+ codec,
+ database,
+ "SELECT @@character_set_client, @@character_set_connection, @@character_set_results",
+ None,
+ None,
+ )
+ .await
+ .unwrap();
+ assert_eq!(session.rows[0], vec![json!("utf8mb4"); 3]);
+ println!("{codec}: single/batch/full/manual/stream and CSV/JSON/XLSX passed");
+ }
+
+ let browse = execute_sql_statement(
+ &state,
+ "GBK",
+ database,
+ "SELECT id, legacy_text, normal_utf8, raw_blob FROM legacy_text ORDER BY id",
+ None,
+ None,
+ )
+ .await
+ .unwrap();
+ assert_eq!(browse.rows.len(), 4);
+ assert_eq!(browse.rows[0][1], "缤纷彩虹");
+ assert_eq!(browse.rows[1][1], "恶毒三角");
+ for format in ["csv", "json", "xlsx"] {
+ let destination = directory.path().join(format!("table.{format}"));
+ let request: TableExportRequest = serde_json::from_value(json!({
+ "exportId":format!("table-{format}"), "connectionId":"GBK", "database":database, "schema":database,
+ "tableName":"legacy_text", "filePath":destination, "format":format, "orderBy":"id", "batchSize":2
+ }))
+ .unwrap();
+ export_table_data_core(&state, &request, |_| {}).await.unwrap();
+ assert_export(&destination, format, "缤纷彩虹", 4);
+ }
+
+ let after = execute_sql_statement(&state, "default", database, stored_sql, None, None).await.unwrap().rows;
+ assert_eq!(before, after, "SELECT-only validation must leave all original stored bytes unchanged");
+ let default_after = execute_sql_statement(
+ &state,
+ "default",
+ database,
+ "SELECT legacy_text, normal_utf8 FROM legacy_text WHERE id=1",
+ None,
+ None,
+ )
+ .await
+ .unwrap()
+ .rows;
+ assert_eq!(default_before, default_after, "opt-in must not affect the ordinary pool");
+ for id in ["default", "GBK", "GB18030", "BIG5"] {
+ state.remove_connection_pools(id).await;
+ }
+ println!("table CSV/JSON/XLSX and fixture HEX/default controls passed; no database writes performed");
+}
diff --git a/crates/dbx-driver-elasticsearch/src/lib.rs b/crates/dbx-driver-elasticsearch/src/lib.rs
index 908c63de72..12636a881a 100644
--- a/crates/dbx-driver-elasticsearch/src/lib.rs
+++ b/crates/dbx-driver-elasticsearch/src/lib.rs
@@ -2378,6 +2378,7 @@ fn parse_elasticsearch_response_with_sql_parser(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: row_count,
@@ -2407,6 +2408,7 @@ fn parse_elasticsearch_response_with_sql_parser(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: row_count,
@@ -2582,6 +2584,7 @@ fn raw_json_response_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::Value::Number(status.into()), serde_json::Value::String(body_text.into())]],
affected_rows: 0,
@@ -2652,6 +2655,7 @@ fn parse_elasticsearch_rest_response_with_sql_parser(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows,
@@ -3161,6 +3165,7 @@ pub fn parse_tabular_sql_response(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result_rows,
affected_rows: total_key
diff --git a/crates/dbx-driver-mysql/Cargo.toml b/crates/dbx-driver-mysql/Cargo.toml
index 2cb2643574..a6eaadaeaa 100644
--- a/crates/dbx-driver-mysql/Cargo.toml
+++ b/crates/dbx-driver-mysql/Cargo.toml
@@ -16,6 +16,7 @@ dbx-sql-dialect = { path = "../dbx-sql-dialect" }
dbx-types = { path = "../dbx-types", default-features = false }
chrono = { version = "0.4", features = ["serde"] }
futures = "0.3"
+encoding_rs = "0.8"
log = "0.4"
mysql_async = { version = "0.37", default-features = false, features = ["default-rustls", "client_ed25519", "chrono", "rust_decimal"] }
percent-encoding = "2"
diff --git a/crates/dbx-driver-mysql/src/lib.rs b/crates/dbx-driver-mysql/src/lib.rs
index 09d7f19648..0578a73fd6 100644
--- a/crates/dbx-driver-mysql/src/lib.rs
+++ b/crates/dbx-driver-mysql/src/lib.rs
@@ -11,6 +11,7 @@ pub mod doris;
pub mod manticoresearch;
pub mod mysql;
pub mod mysql_compatible;
+mod mysql_data_charset;
pub mod ob_oracle;
pub mod oceanbase_mysql;
pub mod starrocks;
diff --git a/crates/dbx-driver-mysql/src/mysql.rs b/crates/dbx-driver-mysql/src/mysql.rs
index 0c2dda60bf..67219673b9 100644
--- a/crates/dbx-driver-mysql/src/mysql.rs
+++ b/crates/dbx-driver-mysql/src/mysql.rs
@@ -28,11 +28,15 @@ use crate::types::{
is_opaque_aggregate_state_type, ColumnInfo, ColumnMetadataCapabilities, CompletionAssistantCandidate,
CompletionAssistantCandidateKind, CompletionAssistantMatchMode, CompletionAssistantObjectKind,
CompletionAssistantRequest, CompletionAssistantResponse, DatabaseInfo, ForeignKeyInfo, IndexInfo, LargeValueCell,
- ObjectInfo, ObjectStatistics, QueryMessage, QueryResult, SpatialColumnBuilder, TableInfo, TriggerInfo,
+ ObjectInfo, ObjectStatistics, OriginalKeyCell, QueryMessage, QueryResult, SpatialColumnBuilder, TableInfo,
+ TriggerInfo,
};
use dbx_types::metadata_filter::{table_name_filter_matches, TableNameFilter};
use super::file_validator::validate_file_path;
+pub use crate::mysql_data_charset::{
+ data_charset_for_config, data_charset_from_params, data_charset_from_url, MySqlDataCharset,
+};
use crate::mysql_event_sql::MysqlEventInfo;
/// DBX-owned MySQL pool handle. The driver does not expose its configured
@@ -42,6 +46,7 @@ use crate::mysql_event_sql::MysqlEventInfo;
pub struct MySqlPool {
inner: mysql_async::Pool,
max_connections: usize,
+ data_charset: Option<MySqlDataCharset>,
checkout_verifications: std::sync::Arc<MySqlCheckoutVerifications>,
/// Budget for checking a connection out of this pool.
///
@@ -70,6 +75,7 @@ impl MySqlPool {
Self {
inner: mysql_async::Pool::new(opts),
max_connections: max_connections.max(1),
+ data_charset: None,
checkout_verifications: Default::default(),
checkout_timeout: checkout_timeout.max(Duration::from_secs(1)),
}
@@ -88,6 +94,10 @@ impl MySqlPool {
self.max_connections == 1
}
+ pub fn data_charset(&self) -> Option<MySqlDataCharset> {
+ self.data_charset
+ }
+
pub async fn disconnect(self) -> Result<(), mysql_async::Error> {
self.inner.disconnect().await
}
@@ -112,6 +122,9 @@ impl Deref for MySqlPool {
#[doc(hidden)]
pub trait MySqlPoolAccess {
+ fn data_charset(&self) -> Option<MySqlDataCharset> {
+ None
+ }
fn driver_pool(&self) -> &mysql_async::Pool;
fn checkout_max_connections(&self) -> Option<usize>;
/// Liveness evidence for pooled connections; `None` pings every checkout.
@@ -214,6 +227,9 @@ pub async fn get_event_info<P: MySqlPoolAccess + ?Sized>(
}
impl MySqlPoolAccess for MySqlPool {
+ fn data_charset(&self) -> Option<MySqlDataCharset> {
+ self.data_charset
+ }
fn driver_pool(&self) -> &mysql_async::Pool {
&self.inner
}
@@ -583,15 +599,16 @@ fn mysql_value_to_json_with_effective_type(
row: &mysql_async::Row,
index: usize,
effective_type: Option<&str>,
+ data_charset: Option<MySqlDataCharset>,
) -> serde_json::Value {
if effective_type.is_some_and(is_opaque_aggregate_state_type) {
return match row.as_ref(index) {
None | Some(mysql_async::Value::NULL) => serde_json::Value::Null,
Some(mysql_async::Value::Bytes(bytes)) => super::binary_value_to_json(bytes),
- _ => mysql_value_to_json(row, index),
+ _ => mysql_value_to_json_with_data_charset(row, index, data_charset),
};
}
- mysql_value_to_json(row, index)
+ mysql_value_to_json_with_data_charset(row, index, data_charset)
}
fn ensure_doris_opaque_cells_fit_budget(
@@ -988,6 +1005,14 @@ pub fn mysql_column_type_name(column: &mysql_async::Column) -> String {
}
pub fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_json::Value {
+ mysql_value_to_json_with_data_charset(row, idx, None)
+}
+
+pub fn mysql_value_to_json_with_data_charset(
+ row: &mysql_async::Row,
+ idx: usize,
+ data_charset: Option<MySqlDataCharset>,
+) -> serde_json::Value {
let Some(column) = row.columns_ref().get(idx) else {
return serde_json::Value::Null;
};
@@ -1005,6 +1030,29 @@ pub fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_json::Va
.unwrap_or(serde_json::Value::Null);
}
+ if let Some(data_charset) = data_charset {
+ if is_mysql_legacy_text_column(column) {
+ if let mysql_async::Value::Bytes(bytes) = value {
+ // Interpret the untouched carrier, before the old UTF8 heuristic.
+ return match std::str::from_utf8(bytes) {
+ Ok(text) => {
+ serde_json::Value::String(if mysql_is_server_text_preview_source(row.columns_ref(), idx) {
+ // Core must inspect the original character count before
+ // deciding whether this LEFT result is complete. Even
+ // the old UTF8 repair heuristic would destroy evidence.
+ text.to_owned()
+ } else {
+ data_charset.interpret_text(text)
+ })
+ }
+ // An invalid UTF8 result violates this mode's wire contract.
+ // Keep its bytes inspectable; never fabricate replacement text.
+ Err(_) => super::binary_value_to_json(bytes),
+ };
+ }
+ }
+ }
+
match column.column_type() {
ColumnType::MYSQL_TYPE_JSON => {
if let Some(v) = row_get::<String, _>(row, idx) {
@@ -1090,6 +1138,22 @@ pub fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_json::Va
.unwrap_or(serde_json::Value::Null)
}
+fn is_mysql_legacy_text_column(column: &mysql_async::Column) -> bool {
+ !is_mysql_binary_charset(column)
+ && matches!(
+ column.column_type(),
+ ColumnType::MYSQL_TYPE_STRING
+ | ColumnType::MYSQL_TYPE_VAR_STRING
+ | ColumnType::MYSQL_TYPE_VARCHAR
+ | ColumnType::MYSQL_TYPE_BLOB
+ | ColumnType::MYSQL_TYPE_LONG_BLOB
+ | ColumnType::MYSQL_TYPE_MEDIUM_BLOB
+ | ColumnType::MYSQL_TYPE_TINY_BLOB
+ | ColumnType::MYSQL_TYPE_ENUM
+ | ColumnType::MYSQL_TYPE_SET
+ )
+}
+
fn bytes_to_upper_hex(bytes: &[u8]) -> String {
const HEX: &[u8; 16] = b"0123456789ABCDEF";
let mut output = String::with_capacity(bytes.len() * 2);
@@ -1122,14 +1186,15 @@ fn mysql_value_to_json_for_export(
row: &mysql_async::Row,
idx: usize,
spatial_as_wkb: bool,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<serde_json::Value, String> {
if !spatial_as_wkb
|| !row.columns_ref().get(idx).is_some_and(|column| column.column_type() == ColumnType::MYSQL_TYPE_GEOMETRY)
{
- return Ok(mysql_value_to_json(row, idx));
+ return Ok(mysql_value_to_json_with_data_charset(row, idx, data_charset));
}
let Some(bytes) = row_get::<Vec<u8>, _>(row, idx) else {
- return Ok(mysql_value_to_json(row, idx));
+ return Ok(mysql_value_to_json_with_data_charset(row, idx, data_charset));
};
mysql_geometry_to_export_marker(&bytes)
.map(serde_json::Value::String)
@@ -1198,6 +1263,7 @@ fn mysql_bounded_value_preview(
index: usize,
preview_bytes: usize,
protected_indexes: &HashSet<usize>,
+ data_charset: Option<MySqlDataCharset>,
) -> Option<(serde_json::Value, usize)> {
if protected_indexes.contains(&index) {
return None;
@@ -1214,6 +1280,24 @@ fn mysql_bounded_value_preview(
}
let binary = is_mysql_binary_charset(column) || is_mysql_binary_string_column(column);
+ if !binary && is_mysql_legacy_text_column(column) {
+ if let Some(data_charset) = data_charset {
+ let mut text = match std::str::from_utf8(bytes) {
+ Ok(text) => data_charset.interpret(text, preview_bytes),
+ Err(_) => {
+ // Keep the invalid wire bytes inspectable under the same
+ // representation as complete-value retrieval.
+ let hex_bytes = preview_bytes.saturating_sub(2) / 2;
+ let serde_json::Value::String(text) = super::binary_value_to_json(&bytes[..hex_bytes]) else {
+ return None;
+ };
+ text
+ }
+ };
+ text.push_str("...");
+ return Some((serde_json::Value::String(text), bytes.len()));
+ }
+ }
let end = if binary {
preview_bytes.min(bytes.len())
} else {
@@ -1239,8 +1323,21 @@ fn mysql_result_protected_column_indexes(
columns: &[mysql_async::Column],
protected_columns: &[String],
) -> HashSet<usize> {
+ let mut indexes = mysql_result_key_column_indexes(columns, protected_columns);
+ for (index, column) in columns.iter().enumerate() {
+ if column.name_str().to_ascii_uppercase().starts_with(crate::sql_dialect::DBX_LARGE_VALUE_BYTES_COLUMN_PREFIX) {
+ indexes.insert(index);
+ if index > 0 {
+ indexes.insert(index - 1);
+ }
+ }
+ }
+ indexes
+}
+
+fn mysql_result_key_column_indexes(columns: &[mysql_async::Column], protected_columns: &[String]) -> HashSet<usize> {
let protected: HashSet<String> = protected_columns.iter().map(|column| column.to_ascii_lowercase()).collect();
- let mut indexes = columns
+ columns
.iter()
.enumerate()
.filter_map(|(index, column)| {
@@ -1248,22 +1345,119 @@ fn mysql_result_protected_column_indexes(
|| protected.contains(&column.name_str().to_ascii_lowercase()))
.then_some(index)
})
- .collect::<HashSet<_>>();
- for (index, column) in columns.iter().enumerate() {
- if column.name_str().to_ascii_uppercase().starts_with(crate::sql_dialect::DBX_LARGE_VALUE_BYTES_COLUMN_PREFIX) {
- indexes.insert(index);
- if index > 0 {
- indexes.insert(index - 1);
+ .collect()
+}
+
+fn mysql_is_server_text_preview_source(columns: &[mysql_async::Column], index: usize) -> bool {
+ let Some(marker) = columns.get(index + 1) else { return false };
+ let name = marker.name_str().to_ascii_uppercase();
+ let Some(suffix) = name.strip_prefix(crate::sql_dialect::DBX_LARGE_VALUE_BYTES_COLUMN_PREFIX) else {
+ return false;
+ };
+ suffix.strip_prefix("T_").is_some_and(|index| index.parse::<usize>().is_ok())
+}
+
+fn mysql_original_key_cells(
+ row: &mysql_async::Row,
+ row_index: usize,
+ key_indexes: &HashSet<usize>,
+ data_charset: Option<MySqlDataCharset>,
+) -> Vec<OriginalKeyCell> {
+ if data_charset.is_none() {
+ return Vec::new();
+ }
+ (0..row.len())
+ .filter(|index| key_indexes.contains(index))
+ .filter_map(|column_index| {
+ // Never advertise a potentially truncated projection as a complete key.
+ if mysql_is_server_text_preview_source(row.columns_ref(), column_index) {
+ return None;
}
- }
+ let column = row.columns_ref().get(column_index)?;
+ let value = if is_mysql_legacy_text_column(column) {
+ match row.as_ref(column_index)? {
+ mysql_async::Value::Bytes(bytes) => {
+ serde_json::Value::String(std::str::from_utf8(bytes).ok()?.to_owned())
+ }
+ _ => mysql_value_to_json(row, column_index),
+ }
+ } else {
+ mysql_value_to_json(row, column_index)
+ };
+ Some(OriginalKeyCell { row_index, column_index, value })
+ })
+ .collect()
+}
+
+fn mysql_legacy_key_bytes_fit_budget(
+ row: &mysql_async::Row,
+ row_index: usize,
+ key_indexes: &HashSet<usize>,
+ data_charset: Option<MySqlDataCharset>,
+ max_result_bytes: Option<usize>,
+) -> Result<bool, String> {
+ let Some(limit) = max_result_bytes.filter(|_| data_charset.is_some()) else { return Ok(true) };
+ // Before cloning raw keys, bound the extra allocation by the existing
+ // result budget. The complete row is already owned by mysql_async.
+ let bytes = key_indexes.iter().fold(0usize, |total, index| {
+ let len = match row.as_ref(*index) {
+ Some(mysql_async::Value::Bytes(bytes)) => bytes.len(),
+ _ => 0,
+ };
+ total.saturating_add(len)
+ });
+ mysql_legacy_row_fits_limit(bytes <= limit, row_index)
+}
+
+fn mysql_legacy_row_fits_limit(fits: bool, row_index: usize) -> Result<bool, String> {
+ if !fits && row_index == 0 {
+ return Err("MySQL legacy text row and original key metadata exceed the result byte budget; increase the result budget or select fewer columns".into());
+ }
+ Ok(fits)
+}
+
+#[derive(Default)]
+struct MysqlSerializedByteCount(usize);
+
+impl std::io::Write for MysqlSerializedByteCount {
+ fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
+ self.0 =
+ self.0.checked_add(bytes.len()).ok_or_else(|| std::io::Error::other("MySQL result byte count overflow"))?;
+ Ok(bytes.len())
+ }
+
+ fn flush(&mut self) -> std::io::Result<()> {
+ Ok(())
}
- indexes
+}
+
+fn mysql_accept_original_key_row_budget(
+ values: &[serde_json::Value],
+ srids: &[Option<u32>],
+ large_values: &[LargeValueCell],
+ raw_keys: &[OriginalKeyCell],
+ row_index: usize,
+ max_result_bytes: Option<usize>,
+ used_bytes: &mut usize,
+) -> Result<bool, String> {
+ let Some(limit) = max_result_bytes.filter(|_| !raw_keys.is_empty()) else { return Ok(true) };
+ // Count, rather than allocate, a second serialized copy of potentially
+ // large keys. Both displayed values and locator metadata share the budget.
+ let mut count = MysqlSerializedByteCount::default();
+ serde_json::to_writer(&mut count, &(values, srids, large_values, raw_keys)).map_err(|error| error.to_string())?;
+ let next = used_bytes.saturating_add(count.0);
+ if !mysql_legacy_row_fits_limit(next <= limit, row_index)? {
+ return Ok(false);
+ }
+ *used_bytes = next;
+ Ok(true)
}
fn mysql_row_to_json_with_srids(
row: &mysql_async::Row,
spatial_columns: &mut SpatialColumnBuilder,
effective_types: &[String],
+ data_charset: Option<MySqlDataCharset>,
) -> (Vec<serde_json::Value>, Vec<Option<u32>>) {
let mut srids = vec![None; row.len()];
let values = (0..row.len())
@@ -1273,7 +1467,12 @@ fn mysql_row_to_json_with_srids(
.get(idx)
.is_some_and(|column| column.column_type() == ColumnType::MYSQL_TYPE_GEOMETRY);
if !is_geometry {
- return mysql_value_to_json_with_effective_type(row, idx, effective_types.get(idx).map(String::as_str));
+ return mysql_value_to_json_with_effective_type(
+ row,
+ idx,
+ effective_types.get(idx).map(String::as_str),
+ data_charset,
+ );
}
let Some(bytes) = row_get::<Vec<u8>, _>(row, idx) else {
spatial_columns.observe(idx, None);
@@ -1302,6 +1501,7 @@ fn mysql_row_to_json_with_srids_and_previews(
preview_bytes: Option<usize>,
protected_indexes: &HashSet<usize>,
effective_types: &[String],
+ data_charset: Option<MySqlDataCharset>,
) -> (Vec<serde_json::Value>, Vec<Option<u32>>, Vec<LargeValueCell>) {
let mut srids = vec![None; row.len()];
let mut large_value_cells = Vec::new();
@@ -1334,12 +1534,14 @@ fn mysql_row_to_json_with_srids_and_previews(
row,
index,
effective_types.get(index).map(String::as_str),
+ data_charset,
);
}
- if let Some((preview, original_bytes)) =
- preview_bytes.and_then(|limit| mysql_bounded_value_preview(row, index, limit, protected_indexes))
+ if let Some((preview, original_bytes)) = preview_bytes
+ .and_then(|limit| mysql_bounded_value_preview(row, index, limit, protected_indexes, data_charset))
{
large_value_cells.push(LargeValueCell {
+ pending_decode: None,
row_index,
column_index: index,
original_bytes,
@@ -1347,7 +1549,12 @@ fn mysql_row_to_json_with_srids_and_previews(
});
return preview;
}
- mysql_value_to_json_with_effective_type(row, index, effective_types.get(index).map(String::as_str))
+ mysql_value_to_json_with_effective_type(
+ row,
+ index,
+ effective_types.get(index).map(String::as_str),
+ data_charset,
+ )
})
.collect();
(values, srids, large_value_cells)
@@ -2113,6 +2320,7 @@ fn create_pool(
tcp_keepalive_mode: MySqlTcpKeepaliveMode,
) -> Result<MySqlPool, String> {
let tls_url = mysql_tls_url(url)?;
+ let data_charset = data_charset_from_url(url)?;
let local_infile_paths = mysql_local_infile_paths(&tls_url.url);
let opts =
mysql_async::Opts::from_url(&mysql_async_url(&tls_url.url)).map_err(|e| format!("Invalid MySQL URL: {e}"))?;
@@ -2154,7 +2362,9 @@ fn create_pool(
// to paths explicitly supplied by the user instead of enabling arbitrary reads.
builder = builder.local_infile_handler(Some(mysql_async::WhiteListFsHandler::new(local_infile_paths)));
}
- Ok(MySqlPool::new_with_checkout_timeout(builder, max_connections, checkout_timeout))
+ let mut pool = MySqlPool::new_with_checkout_timeout(builder, max_connections, checkout_timeout);
+ pool.data_charset = data_charset;
+ Ok(pool)
}
fn mysql_async_tcp_host(host: &str) -> &str {
@@ -2971,6 +3181,7 @@ fn is_dbx_handled_mysql_url_param(key: &str) -> bool {
matches!(
key.to_ascii_lowercase().as_str(),
"charset"
+ | "datacharset"
| "catalog"
| "time_zone"
| "time-zone"
@@ -3018,6 +3229,7 @@ fn mysql_async_url(url: &str) -> Cow<'_, str> {
};
let original_count = query.split('&').filter(|segment| !segment.trim().is_empty()).count();
+ let data_charset_enabled = data_charset_from_url(url).ok().flatten().is_some();
let mut filtered: Vec<String> = Vec::new();
let mut changed = false;
let mut has_catalog = false;
@@ -3052,7 +3264,12 @@ fn mysql_async_url(url: &str) -> Cow<'_, str> {
changed = true;
continue;
}
- if is_dbx_handled_mysql_url_param(key) {
+ if is_dbx_handled_mysql_url_param(key)
+ || (data_charset_enabled
+ && is_dbx_handled_mysql_url_param(
+ percent_decode_str(&key.replace('+', " ")).decode_utf8_lossy().trim(),
+ ))
+ {
changed = true;
continue;
}
@@ -5552,7 +5769,6 @@ async fn collect_mysql_server_messages(conn: &mut mysql_async::Conn, warnings: u
async fn execute_result_set_with_text_protocol_on_conn(
conn: &mut mysql_async::Conn,
sql: &str,
- row_limit: usize,
max_rows: Option<usize>,
max_result_bytes: Option<usize>,
result_key_columns: &[String],
@@ -5560,7 +5776,9 @@ async fn execute_result_set_with_text_protocol_on_conn(
start: Instant,
progress_clock: Option<&crate::execution::StreamProgressClock>,
opaque_types: &DorisOpaqueColumnTypes,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<MySqlQueryResult, String> {
+ let row_limit = query_result_row_limit(max_rows);
let diagnostics_enabled = diagnostic_trace_id.is_some() && log::log_enabled!(log::Level::Info);
let dispatch_started_at = diagnostics_enabled.then(Instant::now);
let mut result = conn.query_iter(sql).await.map_err(|e| e.to_string())?;
@@ -5572,6 +5790,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
drop(result);
let messages = collect_mysql_server_messages(conn, warnings, &info).await;
return Ok(MySqlQueryResult::exact(QueryResult {
+ raw_key_cells: Vec::new(),
columns: vec![],
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -5596,6 +5815,9 @@ async fn execute_result_set_with_text_protocol_on_conn(
let preview_bytes =
max_result_bytes.map(|max_bytes| mysql_result_cell_preview_bytes(max_bytes, row_limit, result.columns_ref()));
let protected_indexes = mysql_result_protected_column_indexes(result.columns_ref(), result_key_columns);
+ let key_indexes = mysql_result_key_column_indexes(result.columns_ref(), result_key_columns);
+ let mut raw_key_cells = Vec::new();
+ let mut used_result_bytes = 0usize;
if max_result_bytes.is_none() && should_collect_text_result_set(sql, row_limit, max_rows) {
let rows: Vec<mysql_async::Row> = result.collect_and_drop().await.map_err(|e| e.to_string())?;
@@ -5609,8 +5831,11 @@ async fn execute_result_set_with_text_protocol_on_conn(
let result_rows = rows
.iter()
.take(row_limit)
- .map(|row| {
- let (values, srids) = mysql_row_to_json_with_srids(row, &mut spatial_columns, &column_types);
+ .enumerate()
+ .map(|(row_index, row)| {
+ raw_key_cells.extend(mysql_original_key_cells(row, row_index, &key_indexes, data_charset));
+ let (values, srids) =
+ mysql_row_to_json_with_srids(row, &mut spatial_columns, &column_types, data_charset);
spatial_values.push(srids);
values
})
@@ -5618,6 +5843,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
return Ok(MySqlQueryResult::exact(QueryResult {
+ raw_key_cells,
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -5666,6 +5892,11 @@ async fn execute_result_set_with_text_protocol_on_conn(
break;
}
let row_index = result_rows.len();
+ if !mysql_legacy_key_bytes_fit_budget(&row, row_index, &key_indexes, data_charset, max_result_bytes)? {
+ truncated = true;
+ break;
+ }
+ let row_raw_keys = mysql_original_key_cells(&row, row_index, &key_indexes, data_charset);
let convert_started_at = diagnostics_enabled.then(Instant::now);
let (values, srids, mut row_large_values) = mysql_row_to_json_with_srids_and_previews(
&row,
@@ -5674,7 +5905,21 @@ async fn execute_result_set_with_text_protocol_on_conn(
preview_bytes,
&protected_indexes,
&column_types,
+ data_charset,
);
+ if !mysql_accept_original_key_row_budget(
+ &values,
+ &srids,
+ &row_large_values,
+ &row_raw_keys,
+ row_index,
+ max_result_bytes,
+ &mut used_result_bytes,
+ )? {
+ truncated = true;
+ break;
+ }
+ raw_key_cells.extend(row_raw_keys);
result_rows.push(values);
spatial_values.push(srids);
large_value_cells.append(&mut row_large_values);
@@ -5716,6 +5961,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
Ok(MySqlQueryResult {
result: QueryResult {
+ raw_key_cells,
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -5747,6 +5993,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
diagnostic_trace_id: Option<&str>,
start: Instant,
opaque_types: &DorisOpaqueColumnTypes,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<Vec<MySqlQueryResult>, String> {
// Per-set warnings/info read after each `collect()` are only accurate when
// the connection negotiated CLIENT_DEPRECATE_EOF: with legacy EOF packets
@@ -5778,6 +6025,9 @@ async fn execute_result_sets_with_text_protocol_on_conn(
let preview_bytes = max_result_bytes
.map(|max_bytes| mysql_result_cell_preview_bytes(max_bytes, row_limit, result.columns_ref()));
let protected_indexes = mysql_result_protected_column_indexes(result.columns_ref(), result_key_columns);
+ let key_indexes = mysql_result_key_column_indexes(result.columns_ref(), result_key_columns);
+ let mut raw_key_cells = Vec::new();
+ let mut used_result_bytes = 0usize;
let rows = if max_result_bytes.is_none() && should_collect_text_result_set(sql, row_limit, max_rows) {
let read_started_at = diagnostics_enabled.then(Instant::now);
@@ -5790,8 +6040,11 @@ async fn execute_result_sets_with_text_protocol_on_conn(
let converted_rows = rows
.iter()
.take(row_limit)
- .map(|row| {
- let (values, srids) = mysql_row_to_json_with_srids(row, &mut spatial_columns, &column_types);
+ .enumerate()
+ .map(|(row_index, row)| {
+ raw_key_cells.extend(mysql_original_key_cells(row, row_index, &key_indexes, data_charset));
+ let (values, srids) =
+ mysql_row_to_json_with_srids(row, &mut spatial_columns, &column_types, data_charset);
spatial_values.push(srids);
values
})
@@ -5816,9 +6069,20 @@ async fn execute_result_sets_with_text_protocol_on_conn(
}
let Some(row) = next_row else { break };
let row = row.map_err(|e| e.to_string())?;
- if rows.len() < row_limit {
+ if rows.len() < row_limit && !truncated {
ensure_doris_opaque_cells_fit_budget(&row, &column_types, max_result_bytes)?;
let row_index = rows.len();
+ if !mysql_legacy_key_bytes_fit_budget(
+ &row,
+ row_index,
+ &key_indexes,
+ data_charset,
+ max_result_bytes,
+ )? {
+ truncated = true;
+ continue;
+ }
+ let row_raw_keys = mysql_original_key_cells(&row, row_index, &key_indexes, data_charset);
let convert_started_at = diagnostics_enabled.then(Instant::now);
let (values, srids, mut row_large_values) = mysql_row_to_json_with_srids_and_previews(
&row,
@@ -5827,7 +6091,21 @@ async fn execute_result_sets_with_text_protocol_on_conn(
preview_bytes,
&protected_indexes,
&column_types,
+ data_charset,
);
+ if !mysql_accept_original_key_row_budget(
+ &values,
+ &srids,
+ &row_large_values,
+ &row_raw_keys,
+ row_index,
+ max_result_bytes,
+ &mut used_result_bytes,
+ )? {
+ truncated = true;
+ continue;
+ }
+ raw_key_cells.extend(row_raw_keys);
rows.push(values);
spatial_values.push(srids);
large_value_cells.append(&mut row_large_values);
@@ -5851,6 +6129,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
results.push(MySqlQueryResult {
result: QueryResult {
+ raw_key_cells,
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -5880,6 +6159,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
drop(result);
let messages = collect_mysql_server_messages(conn, warnings, &info).await;
results.push(MySqlQueryResult::exact(QueryResult {
+ raw_key_cells: Vec::new(),
columns: vec![],
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -5977,6 +6257,7 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
start: Instant,
progress_clock: Option<&crate::execution::StreamProgressClock>,
opaque_types: &DorisOpaqueColumnTypes,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<MySqlQueryResult, String> {
let diagnostics_enabled = diagnostic_trace_id.is_some() && log::log_enabled!(log::Level::Info);
let dispatch_started_at = diagnostics_enabled.then(Instant::now);
@@ -5988,6 +6269,9 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
let preview_bytes =
max_result_bytes.map(|max_bytes| mysql_result_cell_preview_bytes(max_bytes, row_limit, result.columns_ref()));
let protected_indexes = mysql_result_protected_column_indexes(result.columns_ref(), result_key_columns);
+ let key_indexes = mysql_result_key_column_indexes(result.columns_ref(), result_key_columns);
+ let mut raw_key_cells = Vec::new();
+ let mut used_result_bytes = 0usize;
let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new();
let mut spatial_values: Vec<Vec<Option<u32>>> = Vec::new();
@@ -6018,6 +6302,11 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
break;
}
let row_index = result_rows.len();
+ if !mysql_legacy_key_bytes_fit_budget(&row, row_index, &key_indexes, data_charset, max_result_bytes)? {
+ truncated = true;
+ break;
+ }
+ let row_raw_keys = mysql_original_key_cells(&row, row_index, &key_indexes, data_charset);
let convert_started_at = diagnostics_enabled.then(Instant::now);
let (values, srids, mut row_large_values) = mysql_row_to_json_with_srids_and_previews(
&row,
@@ -6026,7 +6315,21 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
preview_bytes,
&protected_indexes,
&column_types,
+ data_charset,
);
+ if !mysql_accept_original_key_row_budget(
+ &values,
+ &srids,
+ &row_large_values,
+ &row_raw_keys,
+ row_index,
+ max_result_bytes,
+ &mut used_result_bytes,
+ )? {
+ truncated = true;
+ break;
+ }
+ raw_key_cells.extend(row_raw_keys);
result_rows.push(values);
spatial_values.push(srids);
large_value_cells.append(&mut row_large_values);
@@ -6068,6 +6371,7 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
Ok(MySqlQueryResult {
result: QueryResult {
+ raw_key_cells,
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -6125,7 +6429,19 @@ where
P: MySqlPoolAccess + ?Sized,
{
let mut conn = get_conn_with_health_check(pool).await?;
- execute_query_on_conn_with_max_rows(&mut conn, sql, bare, max_rows, dialect).await
+ execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ sql,
+ bare,
+ max_rows,
+ None,
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .map(|result| result.result)
}
/// Progress-aware variant of [`execute_query_with_max_rows`] for long transfers.
@@ -6152,9 +6468,10 @@ where
let mut conn = get_conn_with_health_check(pool).await?;
let timeout_error = format!("Query timed out after {} seconds", timeout.map_or(0, |timeout| timeout.as_secs()));
let clock_for_query = progress_clock.clone();
+ let data_charset = pool.data_charset();
crate::execution::await_stream_with_progress_timeout(
async move {
- execute_query_on_conn_with_limits_progress(
+ execute_query_on_conn_with_limits_progress_with_data_charset(
&mut conn,
sql,
bare,
@@ -6164,6 +6481,7 @@ where
dialect,
None,
Some(&clock_for_query),
+ data_charset,
)
.await
.map(|result| result.result)
@@ -6186,12 +6504,22 @@ pub async fn stream_query_rows(
mut on_row: impl FnMut(&[serde_json::Value]) -> Result<(), String>,
) -> Result<u64, String> {
let mut conn = get_conn_with_health_check(pool).await?;
- stream_query_result_on_conn(&mut conn, sql, bare, max_rows, dialect, cancelled, false, |item| {
- if let MySqlQueryStreamItem::Row(row) = item {
- on_row(&row)?;
- }
- Ok(())
- })
+ stream_query_result_on_conn_with_data_charset(
+ &mut conn,
+ sql,
+ bare,
+ max_rows,
+ dialect,
+ cancelled,
+ false,
+ pool.data_charset(),
+ |item| {
+ if let MySqlQueryStreamItem::Row(row) = item {
+ on_row(&row)?;
+ }
+ Ok(())
+ },
+ )
.await
}
@@ -6203,21 +6531,74 @@ pub async fn stream_query_result_on_conn(
dialect: MySqlQueryDialect,
cancelled: &AtomicBool,
spatial_as_wkb: bool,
+ on_item: impl FnMut(MySqlQueryStreamItem) -> Result<(), String>,
+) -> Result<u64, String> {
+ stream_query_result_on_conn_with_data_charset(
+ conn,
+ sql,
+ bare,
+ max_rows,
+ dialect,
+ cancelled,
+ spatial_as_wkb,
+ None,
+ on_item,
+ )
+ .await
+}
+
+pub async fn stream_query_result_on_conn_with_data_charset(
+ conn: &mut mysql_async::Conn,
+ sql: &str,
+ bare: bool,
+ max_rows: Option<usize>,
+ dialect: MySqlQueryDialect,
+ cancelled: &AtomicBool,
+ spatial_as_wkb: bool,
+ data_charset: Option<MySqlDataCharset>,
mut on_item: impl FnMut(MySqlQueryStreamItem) -> Result<(), String>,
) -> Result<u64, String> {
let row_limit = max_rows.unwrap_or(usize::MAX);
let opaque_types = resolve_doris_opaque_column_types(conn, sql, dialect).await;
if bare || prefers_text_protocol_query(sql, dialect) {
- stream_query_result_text(conn, sql, row_limit, cancelled, spatial_as_wkb, &opaque_types, &mut on_item).await
+ stream_query_result_text(
+ conn,
+ sql,
+ row_limit,
+ cancelled,
+ spatial_as_wkb,
+ &opaque_types,
+ &mut on_item,
+ data_charset,
+ )
+ .await
} else {
- match stream_query_result_prepared(conn, sql, row_limit, cancelled, spatial_as_wkb, &opaque_types, &mut on_item)
- .await
+ match stream_query_result_prepared(
+ conn,
+ sql,
+ row_limit,
+ cancelled,
+ spatial_as_wkb,
+ &opaque_types,
+ &mut on_item,
+ data_charset,
+ )
+ .await
{
Ok(rows) => Ok(rows),
Err(err) if mysql_error_should_retry_with_text_protocol(&err) => {
- stream_query_result_text(conn, sql, row_limit, cancelled, spatial_as_wkb, &opaque_types, &mut on_item)
- .await
+ stream_query_result_text(
+ conn,
+ sql,
+ row_limit,
+ cancelled,
+ spatial_as_wkb,
+ &opaque_types,
+ &mut on_item,
+ data_charset,
+ )
+ .await
}
Err(err) => Err(err),
}
@@ -6232,6 +6613,7 @@ async fn stream_query_result_text(
spatial_as_wkb: bool,
opaque_types: &DorisOpaqueColumnTypes,
on_item: &mut impl FnMut(MySqlQueryStreamItem) -> Result<(), String>,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<u64, String> {
let mut result = conn.query_iter(sql).await.map_err(|e| e.to_string())?;
if !advance_to_result_set_with_columns(&mut result).await? {
@@ -6259,9 +6641,14 @@ async fn stream_query_result_text(
let values: Vec<serde_json::Value> = (0..row.len())
.map(|i| {
if column_types.get(i).is_some_and(|column_type| is_opaque_aggregate_state_type(column_type)) {
- Ok(mysql_value_to_json_with_effective_type(&row, i, column_types.get(i).map(String::as_str)))
+ Ok(mysql_value_to_json_with_effective_type(
+ &row,
+ i,
+ column_types.get(i).map(String::as_str),
+ data_charset,
+ ))
} else {
- mysql_value_to_json_for_export(&row, i, spatial_as_wkb)
+ mysql_value_to_json_for_export(&row, i, spatial_as_wkb, data_charset)
}
})
.collect::<Result<_, _>>()?;
@@ -6280,6 +6667,7 @@ async fn stream_query_result_prepared(
spatial_as_wkb: bool,
opaque_types: &DorisOpaqueColumnTypes,
on_item: &mut impl FnMut(MySqlQueryStreamItem) -> Result<(), String>,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<u64, String> {
let mut result = conn.exec_iter(sql, ()).await.map_err(|e| e.to_string())?;
let columns: Vec<String> = result.columns_ref().iter().map(|c| c.name_str().to_string()).collect();
@@ -6307,9 +6695,14 @@ async fn stream_query_result_prepared(
let values: Vec<serde_json::Value> = (0..row.len())
.map(|i| {
if column_types.get(i).is_some_and(|column_type| is_opaque_aggregate_state_type(column_type)) {
- Ok(mysql_value_to_json_with_effective_type(&row, i, column_types.get(i).map(String::as_str)))
+ Ok(mysql_value_to_json_with_effective_type(
+ &row,
+ i,
+ column_types.get(i).map(String::as_str),
+ data_charset,
+ ))
} else {
- mysql_value_to_json_for_export(&row, i, spatial_as_wkb)
+ mysql_value_to_json_for_export(&row, i, spatial_as_wkb, data_charset)
}
})
.collect::<Result<_, _>>()?;
@@ -6406,6 +6799,17 @@ pub async fn execute_transaction_statement_on_conn(
conn: &mut mysql_async::Conn,
sql: &str,
max_rows: Option<usize>,
+) -> Result<MySqlTransactionExecution, MySqlTransactionError> {
+ execute_transaction_statement_on_conn_with_data_charset(conn, sql, max_rows, None).await
+}
+
+/// Context-aware fixed-session read conversion; preserves the same no-replay
+/// protocol and final server-status contract as the default wrapper.
+pub async fn execute_transaction_statement_on_conn_with_data_charset(
+ conn: &mut mysql_async::Conn,
+ sql: &str,
+ max_rows: Option<usize>,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<MySqlTransactionExecution, MySqlTransactionError> {
let started_at = Instant::now();
let row_limit = query_result_row_limit(max_rows);
@@ -6420,6 +6824,7 @@ pub async fn execute_transaction_statement_on_conn(
query.drop_result().await.map_err(transaction_error_from_mysql_error)?;
let messages = collect_mysql_server_messages(conn, warnings, &info).await;
QueryResult {
+ raw_key_cells: Vec::new(),
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -6439,12 +6844,16 @@ pub async fn execute_transaction_statement_on_conn(
}
} else {
let mut spatial_columns = mysql_spatial_column_builder(query.columns_ref());
+ let key_indexes = mysql_result_key_column_indexes(query.columns_ref(), &[]);
+ let mut raw_key_cells = Vec::new();
let mut rows = Vec::with_capacity(row_limit.min(128));
let mut spatial_values = Vec::new();
let mut truncated = false;
while let Some(row) = query.next().await.map_err(transaction_error_from_mysql_error)? {
if rows.len() < row_limit {
- let (values, srids) = mysql_row_to_json_with_srids(&row, &mut spatial_columns, &column_types);
+ raw_key_cells.extend(mysql_original_key_cells(&row, rows.len(), &key_indexes, data_charset));
+ let (values, srids) =
+ mysql_row_to_json_with_srids(&row, &mut spatial_columns, &column_types, data_charset);
spatial_values.push(srids);
rows.push(values);
} else {
@@ -6457,6 +6866,7 @@ pub async fn execute_transaction_statement_on_conn(
query.drop_result().await.map_err(transaction_error_from_mysql_error)?;
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
QueryResult {
+ raw_key_cells,
columns,
column_types,
deferred_large_value_cells: Vec::new(),
@@ -6489,7 +6899,32 @@ pub async fn execute_query_on_conn_with_limits(
dialect: MySqlQueryDialect,
diagnostic_trace_id: Option<&str>,
) -> Result<MySqlQueryResult, String> {
- execute_query_on_conn_with_limits_progress(
+ execute_query_on_conn_with_limits_with_data_charset(
+ conn,
+ sql,
+ bare,
+ max_rows,
+ max_result_bytes,
+ result_key_columns,
+ dialect,
+ diagnostic_trace_id,
+ None,
+ )
+ .await
+}
+
+pub async fn execute_query_on_conn_with_limits_with_data_charset(
+ conn: &mut mysql_async::Conn,
+ sql: &str,
+ bare: bool,
+ max_rows: Option<usize>,
+ max_result_bytes: Option<usize>,
+ result_key_columns: &[String],
+ dialect: MySqlQueryDialect,
+ diagnostic_trace_id: Option<&str>,
+ data_charset: Option<MySqlDataCharset>,
+) -> Result<MySqlQueryResult, String> {
+ execute_query_on_conn_with_limits_progress_with_data_charset(
conn,
sql,
bare,
@@ -6499,6 +6934,7 @@ pub async fn execute_query_on_conn_with_limits(
dialect,
diagnostic_trace_id,
None,
+ data_charset,
)
.await
}
@@ -6520,7 +6956,33 @@ pub async fn execute_query_on_conn_with_limits_progress(
diagnostic_trace_id: Option<&str>,
progress_clock: Option<&crate::execution::StreamProgressClock>,
) -> Result<MySqlQueryResult, String> {
- let opaque_types = resolve_doris_opaque_column_types(conn, sql, dialect).await;
+ execute_query_on_conn_with_limits_progress_with_data_charset(
+ conn,
+ sql,
+ bare,
+ max_rows,
+ max_result_bytes,
+ result_key_columns,
+ dialect,
+ diagnostic_trace_id,
+ progress_clock,
+ None,
+ )
+ .await
+}
+
+pub async fn execute_query_on_conn_with_limits_progress_with_data_charset(
+ conn: &mut mysql_async::Conn,
+ sql: &str,
+ bare: bool,
+ max_rows: Option<usize>,
+ max_result_bytes: Option<usize>,
+ result_key_columns: &[String],
+ dialect: MySqlQueryDialect,
+ diagnostic_trace_id: Option<&str>,
+ progress_clock: Option<&crate::execution::StreamProgressClock>,
+ data_charset: Option<MySqlDataCharset>,
+) -> Result<MySqlQueryResult, String> {
execute_query_on_conn_with_limits_progress_resolved(
conn,
sql,
@@ -6531,7 +6993,7 @@ pub async fn execute_query_on_conn_with_limits_progress(
dialect,
diagnostic_trace_id,
progress_clock,
- &opaque_types,
+ data_charset,
)
.await
}
@@ -6546,8 +7008,9 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
dialect: MySqlQueryDialect,
diagnostic_trace_id: Option<&str>,
progress_clock: Option<&crate::execution::StreamProgressClock>,
- opaque_types: &DorisOpaqueColumnTypes,
+ data_charset: Option<MySqlDataCharset>,
) -> Result<MySqlQueryResult, String> {
+ let opaque_types = resolve_doris_opaque_column_types(conn, sql, dialect).await;
let start = Instant::now();
let row_limit = query_result_row_limit(max_rows);
@@ -6556,14 +7019,14 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
execute_result_set_with_text_protocol_on_conn(
conn,
sql,
- row_limit,
max_rows,
max_result_bytes,
result_key_columns,
diagnostic_trace_id,
start,
progress_clock,
- opaque_types,
+ &opaque_types,
+ data_charset,
)
.await
} else {
@@ -6576,7 +7039,8 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
diagnostic_trace_id,
start,
progress_clock,
- opaque_types,
+ &opaque_types,
+ data_charset,
)
.await
{
@@ -6585,14 +7049,14 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
execute_result_set_with_text_protocol_on_conn(
conn,
sql,
- row_limit,
max_rows,
max_result_bytes,
result_key_columns,
diagnostic_trace_id,
start,
progress_clock,
- opaque_types,
+ &opaque_types,
+ data_charset,
)
.await
}
@@ -6611,6 +7075,7 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
match mysql_add_column_if_not_exists_fallback(conn, &query_sql, &err).await {
Some(MySqlAddColumnFallback::AlreadyExists) => {
return Ok(MySqlQueryResult::exact(QueryResult {
+ raw_key_cells: Vec::new(),
columns: vec![],
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -6651,6 +7116,7 @@ async fn execute_query_on_conn_with_limits_progress_resolved(
drop_result.map_err(|e| e.to_string())?;
Ok(MySqlQueryResult::exact(QueryResult {
+ raw_key_cells: Vec::new(),
columns: vec![],
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -6693,8 +7159,33 @@ pub async fn execute_query_results_on_conn_with_limits(
dialect: MySqlQueryDialect,
diagnostic_trace_id: Option<&str>,
) -> Result<Vec<MySqlQueryResult>, String> {
- let opaque_types = resolve_doris_opaque_column_types(conn, sql, dialect).await;
+ execute_query_results_on_conn_with_limits_with_data_charset(
+ conn,
+ sql,
+ bare,
+ max_rows,
+ max_result_bytes,
+ result_key_columns,
+ dialect,
+ diagnostic_trace_id,
+ None,
+ )
+ .await
+}
+
+pub async fn execute_query_results_on_conn_with_limits_with_data_charset(
+ conn: &mut mysql_async::Conn,
+ sql: &str,
+ bare: bool,
+ max_rows: Option<usize>,
+ max_result_bytes: Option<usize>,
+ result_key_columns: &[String],
+ dialect: MySqlQueryDialect,
+ diagnostic_trace_id: Option<&str>,
+ data_charset: Option<MySqlDataCharset>,
+) -> Result<Vec<MySqlQueryResult>, String> {
if is_result_set_query(sql, dialect) && (bare || prefers_text_protocol_query(sql, dialect)) {
+ let opaque_types = resolve_doris_opaque_column_types(conn, sql, dialect).await;
let start = Instant::now();
execute_result_sets_with_text_protocol_on_conn(
conn,
@@ -6706,6 +7197,7 @@ pub async fn execute_query_results_on_conn_with_limits(
diagnostic_trace_id,
start,
&opaque_types,
+ data_charset,
)
.await
} else {
@@ -6719,7 +7211,7 @@ pub async fn execute_query_results_on_conn_with_limits(
dialect,
diagnostic_trace_id,
None,
- &opaque_types,
+ data_charset,
)
.await
.map(|result| vec![result])
@@ -6786,6 +7278,7 @@ pub async fn execute_non_result_batch_on_conn(
if capture_per_set_messages { mysql_info_message(&info).into_iter().collect() } else { Vec::new() };
let elapsed_ms = start.elapsed().as_millis();
let current_result = QueryResult {
+ raw_key_cells: Vec::new(),
columns: vec![],
column_types: Vec::new(),
deferred_large_value_cells: Vec::new(),
@@ -7420,6 +7913,239 @@ mod tests {
new_row(values, columns.into())
}
+ #[test]
+ fn data_charset_converters_share_original_carrier_and_preserve_nontext() {
+ let carrier = "çͷײʺç";
+ let codec = Some(MySqlDataCharset::Gbk);
+ for kind in [
+ ColumnType::MYSQL_TYPE_VAR_STRING,
+ ColumnType::MYSQL_TYPE_STRING,
+ ColumnType::MYSQL_TYPE_BLOB,
+ ColumnType::MYSQL_TYPE_LONG_BLOB,
+ ColumnType::MYSQL_TYPE_MEDIUM_BLOB,
+ ColumnType::MYSQL_TYPE_TINY_BLOB,
+ ] {
+ let column = mysql_test_column(kind, 45, ColumnFlags::empty(), u32::MAX);
+ let row = mysql_test_row_with_columns(vec![Value::Bytes(carrier.as_bytes().to_vec())], vec![column]);
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, 0, codec), serde_json::json!("缤纷彩虹"));
+ assert_eq!(mysql_value_to_json_for_export(&row, 0, false, codec).unwrap(), serde_json::json!("缤纷彩虹"));
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, 0, None), mysql_value_to_json(&row, 0));
+ let mut spatial = mysql_spatial_column_builder(row.columns_ref());
+ assert_eq!(
+ mysql_row_to_json_with_srids(&row, &mut spatial, &[], codec).0[0],
+ serde_json::json!("缤纷彩虹")
+ );
+ }
+ let row = mysql_test_row_with_columns(
+ vec![
+ Value::Bytes(carrier.as_bytes().to_vec()),
+ Value::NULL,
+ Value::Bytes("正常中文".as_bytes().to_vec()),
+ Value::Int(42),
+ ],
+ vec![
+ mysql_test_column(ColumnType::MYSQL_TYPE_BLOB, 63, ColumnFlags::BINARY_FLAG, 100),
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::empty(), 100),
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::empty(), 100),
+ mysql_test_column(ColumnType::MYSQL_TYPE_LONG, 63, ColumnFlags::empty(), 100),
+ ],
+ );
+ for index in 0..row.len() {
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, index, codec), mysql_value_to_json(&row, index));
+ }
+ // Existing UTF8 repair must not run before explicit GBK decoding.
+ let row = mysql_test_row_with_columns(
+ vec![Value::Bytes("ä¸\u{AD}".as_bytes().to_vec())],
+ vec![mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::empty(), 100)],
+ );
+ assert_eq!(mysql_value_to_json(&row, 0), serde_json::json!("中"));
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, 0, codec), serde_json::json!("ä¸\u{AD}"));
+ }
+
+ #[test]
+ fn data_charset_preview_is_bounded_and_preserves_wire_size() {
+ let carrier = "çͷײʺç".repeat(10_000);
+ let column = mysql_test_column(ColumnType::MYSQL_TYPE_LONG_BLOB, 45, ColumnFlags::empty(), u32::MAX);
+ let row = mysql_test_row_with_columns(vec![Value::Bytes(carrier.as_bytes().to_vec())], vec![column]);
+ let mut spatial = mysql_spatial_column_builder(row.columns_ref());
+ let (values, _, cells) = mysql_row_to_json_with_srids_and_previews(
+ &row,
+ &mut spatial,
+ 3,
+ Some(5),
+ &HashSet::new(),
+ &[],
+ Some(MySqlDataCharset::Gbk),
+ );
+ assert_eq!(values[0], serde_json::json!("缤..."));
+ assert_eq!(
+ cells,
+ vec![LargeValueCell {
+ row_index: 3,
+ column_index: 0,
+ original_bytes: carrier.len(),
+ value_ref: None,
+ pending_decode: None
+ }]
+ );
+ }
+
+ #[test]
+ fn data_charset_option_is_removed_before_mysql_async_parsing() {
+ let url = "mysql://root@localhost/test?dataCharset=GBK&charset=utf8mb4";
+ assert_eq!(mysql_async_url(url), "mysql://root@localhost/test");
+ assert_eq!(data_charset_from_url(url).unwrap(), Some(MySqlDataCharset::Gbk));
+ let encoded = "mysql://root@localhost/test?%64ataCharset=%47BK&%63harset=utf8mb4";
+ assert_eq!(mysql_async_url(encoded), "mysql://root@localhost/test");
+ assert_eq!(data_charset_from_url(encoded).unwrap(), Some(MySqlDataCharset::Gbk));
+ }
+
+ #[test]
+ fn data_charset_original_keys_preserve_carriers_and_decoded_collisions() {
+ let columns = vec![
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::PRI_KEY_FLAG, 100).with_name(b"key"),
+ mysql_test_column(ColumnType::MYSQL_TYPE_LONG, 63, ColumnFlags::PRI_KEY_FLAG, 10).with_name(b"part"),
+ ];
+ let indexes = mysql_result_key_column_indexes(&columns, &[]);
+ let codec = Some(MySqlDataCharset::Gbk);
+ let row = |key: &str| {
+ mysql_test_row_with_columns(vec![Value::Bytes(key.as_bytes().to_vec()), Value::Int(7)], columns.clone())
+ };
+ let carrier = row("ÖÐÎÄ");
+ let unicode = row("中文");
+ assert_eq!(
+ mysql_value_to_json_with_data_charset(&carrier, 0, codec),
+ mysql_value_to_json_with_data_charset(&unicode, 0, codec)
+ );
+ let original = mysql_original_key_cells(&carrier, 0, &indexes, codec);
+ assert_eq!(
+ original,
+ vec![
+ OriginalKeyCell { row_index: 0, column_index: 0, value: serde_json::json!("ÖÐÎÄ") },
+ OriginalKeyCell { row_index: 0, column_index: 1, value: mysql_value_to_json(&carrier, 1) },
+ ]
+ );
+ assert_ne!(original[0].value, mysql_original_key_cells(&unicode, 1, &indexes, codec)[0].value);
+ let heuristic = row("ä¸\u{AD}");
+ assert_eq!(mysql_value_to_json(&heuristic, 0), serde_json::json!("中"));
+ assert_eq!(mysql_original_key_cells(&heuristic, 2, &indexes, codec)[0].value, serde_json::json!("ä¸\u{AD}"));
+ assert!(mysql_original_key_cells(&carrier, 0, &indexes, None).is_empty());
+ let alias =
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::empty(), 100).with_name(b"alias_key");
+ assert_eq!(mysql_result_key_column_indexes(&[alias], &["alias_key".into()]), HashSet::from([0]));
+ }
+
+ #[test]
+ fn data_charset_original_decimal_keys_remain_lossless_on_the_wire() {
+ for (column_type, values) in [
+ (ColumnType::MYSQL_TYPE_DECIMAL, ["12345678901234567890.12345678", "12345678901234567890.12345679"]),
+ (
+ ColumnType::MYSQL_TYPE_NEWDECIMAL,
+ [
+ "123456789012345678901234567890.123456789012345678901234567890",
+ "123456789012345678901234567890.123456789012345678901234567891",
+ ],
+ ),
+ ] {
+ let column = mysql_test_column(column_type, 63, ColumnFlags::PRI_KEY_FLAG, 65).with_name(b"key");
+ let indexes = mysql_result_key_column_indexes(std::slice::from_ref(&column), &[]);
+ let mut wire_values = Vec::new();
+ for value in values {
+ let row =
+ mysql_test_row_with_columns(vec![Value::Bytes(value.as_bytes().to_vec())], vec![column.clone()]);
+ let keys = mysql_original_key_cells(&row, 0, &indexes, Some(MySqlDataCharset::Gbk));
+ assert_eq!(keys[0].value, serde_json::json!(value));
+ let wire = serde_json::to_string(&keys).unwrap();
+ let restored: Vec<OriginalKeyCell> = serde_json::from_str(&wire).unwrap();
+ assert_eq!(restored[0].value.as_str(), Some(value));
+ assert_eq!(
+ mysql_value_to_json_with_data_charset(&row, 0, Some(MySqlDataCharset::Gbk)),
+ restored[0].value
+ );
+ wire_values.push(restored[0].value.clone());
+ }
+ assert_ne!(wire_values[0], wire_values[1], "adjacent exact decimal keys must not collapse");
+ }
+ }
+
+ #[test]
+ fn data_charset_server_marker_source_stays_uninterpreted_until_core_validation() {
+ let row = mysql_test_row_with_columns(
+ vec![Value::Bytes("ÖÐ".as_bytes().to_vec()), Value::Bytes(b"T:1:1000".to_vec())],
+ vec![
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::PRI_KEY_FLAG, 100)
+ .with_name(b"payload"),
+ mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::empty(), 100)
+ .with_name(b"__DBX_LARGE_VALUE_BYTES_T_0"),
+ ],
+ );
+ let codec = Some(MySqlDataCharset::Gbk);
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, 0, codec), serde_json::json!("ÖÐ"));
+ assert_eq!(MySqlDataCharset::Gbk.interpret_text("ÖÐ"), "中");
+ let protected = mysql_result_protected_column_indexes(row.columns_ref(), &[]);
+ let mut spatial = mysql_spatial_column_builder(row.columns_ref());
+ let (values, _, cells) =
+ mysql_row_to_json_with_srids_and_previews(&row, &mut spatial, 0, Some(1), &protected, &[], codec);
+ assert_eq!(values[0], serde_json::json!("ÖÐ"));
+ assert!(cells.is_empty(), "core owns server-marker pending metadata");
+ assert!(
+ mysql_original_key_cells(&row, 0, &HashSet::from([0]), codec).is_empty(),
+ "a truncated expression is not an authoritative key"
+ );
+ }
+
+ #[test]
+ fn data_charset_original_key_sidecar_shares_row_budget_atomically() {
+ let values = vec![serde_json::json!("中")];
+ let keys = vec![OriginalKeyCell { row_index: 0, column_index: 0, value: serde_json::json!("ÖÐ") }];
+ let mut used = 0;
+ assert!(mysql_accept_original_key_row_budget(&values, &[], &[], &keys, 0, Some(200), &mut used).unwrap());
+ let one_row = used;
+ assert!(one_row > serde_json::to_vec(&values).unwrap().len());
+ assert!(!mysql_accept_original_key_row_budget(&values, &[], &[], &keys, 1, Some(one_row), &mut used).unwrap());
+ assert_eq!(used, one_row, "reject the row and its metadata atomically");
+ assert!(mysql_accept_original_key_row_budget(&values, &[], &[], &keys, 0, Some(1), &mut 0)
+ .unwrap_err()
+ .contains("byte budget"));
+ assert!(mysql_accept_original_key_row_budget(&values, &[], &[], &keys, 0, None, &mut 0).unwrap());
+ assert!(mysql_accept_original_key_row_budget(&values, &[], &[], &[], 0, Some(1), &mut 0).unwrap());
+ let row = mysql_test_row_with_columns(
+ vec![Value::Bytes(vec![b'x'; 1000])],
+ vec![mysql_test_column(ColumnType::MYSQL_TYPE_VAR_STRING, 45, ColumnFlags::PRI_KEY_FLAG, 1000)],
+ );
+ assert!(mysql_legacy_key_bytes_fit_budget(
+ &row,
+ 0,
+ &HashSet::from([0]),
+ Some(MySqlDataCharset::Gbk),
+ Some(100)
+ )
+ .is_err());
+ assert!(!mysql_legacy_key_bytes_fit_budget(
+ &row,
+ 1,
+ &HashSet::from([0]),
+ Some(MySqlDataCharset::Gbk),
+ Some(100)
+ )
+ .unwrap());
+ assert!(mysql_legacy_key_bytes_fit_budget(&row, 0, &HashSet::from([0]), None, Some(100)).unwrap());
+ }
+
+ #[test]
+ fn data_charset_invalid_wire_utf8_never_becomes_replacement_text() {
+ let bytes = vec![0xff; 100];
+ let row = mysql_test_row_with_columns(
+ vec![Value::Bytes(bytes.clone())],
+ vec![mysql_test_column(ColumnType::MYSQL_TYPE_LONG_BLOB, 45, ColumnFlags::empty(), u32::MAX)],
+ );
+ let codec = Some(MySqlDataCharset::Gbk);
+ assert_eq!(mysql_value_to_json_with_data_charset(&row, 0, codec), crate::binary_value_to_json(&bytes));
+ let (preview, size) = mysql_bounded_value_preview(&row, 0, 5, &HashSet::new(), codec).unwrap();
+ assert_eq!(preview, serde_json::json!("0xff..."));
+ assert_eq!(size, 100);
+ }
+
#[tokio::test]
#[ignore = "requires a disposable MySQL reachable via DBX_LIVE_MYSQL_TRANSFER_{HOST,PORT,USER,PASSWORD}"]
async fn live_mysql_progress_read_survives_a_total_duration_beyond_the_timeout() {
@@ -9121,7 +9847,7 @@ mod tests {
let column = Column::new(ColumnType::MYSQL_TYPE_STRING).with_name(b"v2").with_character_set(33);
let row = mysql_test_row_with_columns(vec![Value::Bytes(vec![0x00, 0xff, 0x01])], vec![column.clone()]);
assert_eq!(
- mysql_value_to_json_with_effective_type(&row, 0, Some("agg_state<sum(int)>")),
+ mysql_value_to_json_with_effective_type(&row, 0, Some("agg_state<sum(int)>"), None),
serde_json::json!("0x00ff01")
);
assert!(ensure_doris_opaque_cells_fit_budget(&row, &["agg_state<sum(int)>".to_string()], Some(7))
@@ -9136,14 +9862,14 @@ mod tests {
let null_row = mysql_test_row_with_columns(vec![Value::NULL], vec![column]);
assert_eq!(
- mysql_value_to_json_with_effective_type(&null_row, 0, Some("agg_state<sum(int)>")),
+ mysql_value_to_json_with_effective_type(&null_row, 0, Some("agg_state<sum(int)>"), None),
serde_json::Value::Null
);
let unexpected =
mysql_test_row_with_columns(vec![Value::Int(42)], vec![Column::new(ColumnType::MYSQL_TYPE_LONG)]);
assert_eq!(
- mysql_value_to_json_with_effective_type(&unexpected, 0, Some("agg_state<sum(int)>")),
+ mysql_value_to_json_with_effective_type(&unexpected, 0, Some("agg_state<sum(int)>"), None),
serde_json::json!(42)
);
}
@@ -9270,14 +9996,20 @@ mod tests {
let mut spatial_columns = mysql_spatial_column_builder(row.columns_ref());
let (values, _srids, cells) =
- mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 7, Some(1024), &protected, &[]);
+ mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 7, Some(1024), &protected, &[], None);
assert_eq!(values[0], serde_json::json!("k".repeat(2048)));
assert_eq!(values[1].as_str().map(str::len), Some(1027));
assert!(values[1].as_str().is_some_and(|value| value.ends_with("...")));
assert_eq!(
cells,
- vec![LargeValueCell { row_index: 7, column_index: 1, original_bytes: 32 * 1024, value_ref: None }]
+ vec![LargeValueCell {
+ row_index: 7,
+ column_index: 1,
+ original_bytes: 32 * 1024,
+ value_ref: None,
+ pending_decode: None
+ }]
);
}
@@ -9300,12 +10032,18 @@ mod tests {
let mut spatial_columns = mysql_spatial_column_builder(row.columns_ref());
let (values, _srids, cells) =
- mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 0, Some(512), &protected, &[]);
+ mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 0, Some(512), &protected, &[], None);
assert_eq!(values[0], serde_json::json!("k".repeat(2048)));
assert_eq!(
cells,
- vec![LargeValueCell { row_index: 0, column_index: 1, original_bytes: 4096, value_ref: None }]
+ vec![LargeValueCell {
+ row_index: 0,
+ column_index: 1,
+ original_bytes: 4096,
+ value_ref: None,
+ pending_decode: None
+ }]
);
}
@@ -9340,7 +10078,7 @@ mod tests {
let mut spatial_columns = mysql_spatial_column_builder(row.columns_ref());
let (values, _srids, cells) =
- mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 0, Some(256), &protected, &[]);
+ mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 0, Some(256), &protected, &[], None);
assert_eq!(values[0].as_str().map(str::len), Some(500));
assert!(values[1].as_str().is_some_and(|value| value.ends_with("...")));
@@ -9348,7 +10086,13 @@ mod tests {
assert_eq!(values[3], serde_json::json!("B:419:25143"));
assert_eq!(
cells,
- vec![LargeValueCell { row_index: 0, column_index: 1, original_bytes: 10_000, value_ref: None }]
+ vec![LargeValueCell {
+ row_index: 0,
+ column_index: 1,
+ original_bytes: 10_000,
+ value_ref: None,
+ pending_decode: None
+ }]
);
}
@@ -9362,8 +10106,15 @@ mod tests {
let row = mysql_test_row_with_columns(vec![Value::Bytes(vec![0xAB; 4096])], vec![payload_column]);
let mut spatial_columns = mysql_spatial_column_builder(row.columns_ref());
- let (values, _srids, cells) =
- mysql_row_to_json_with_srids_and_previews(&row, &mut spatial_columns, 0, Some(512), &HashSet::new(), &[]);
+ let (values, _srids, cells) = mysql_row_to_json_with_srids_and_previews(
+ &row,
+ &mut spatial_columns,
+ 0,
+ Some(512),
+ &HashSet::new(),
+ &[],
+ None,
+ );
let preview = values[0].as_str().unwrap();
assert!(preview.starts_with("0xabab"));
diff --git a/crates/dbx-driver-mysql/src/mysql_data_charset.rs b/crates/dbx-driver-mysql/src/mysql_data_charset.rs
new file mode 100644
index 0000000000..e6c65fb616
--- /dev/null
+++ b/crates/dbx-driver-mysql/src/mysql_data_charset.rs
@@ -0,0 +1,335 @@
+//! Explicit interpretation of MySQL latin1 byte-container text. Never an encoder.
+use crate::models::connection::{ConnectionConfig, DatabaseType};
+use encoding_rs::{DecoderResult, Encoding, BIG5, GB18030, GBK};
+use percent_encoding::percent_decode_str;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum MySqlDataCharset {
+ Gbk,
+ Gb18030,
+ Big5,
+}
+
+pub fn data_charset_for_config(config: &ConnectionConfig) -> Result<Option<MySqlDataCharset>, String> {
+ if config.db_type != DatabaseType::Mysql {
+ return Ok(None);
+ }
+ let selected = data_charset_from_params(config.url_params.as_deref().unwrap_or(""))?;
+ let profile = config.driver_profile.as_deref().unwrap_or("").trim();
+ if selected.is_some() && !profile.is_empty() && !profile.eq_ignore_ascii_case("mysql") {
+ return Err(
+ "MySQL dataCharset is only supported by the native MySQL product, not MySQL-compatible profiles".into()
+ );
+ }
+ Ok(selected)
+}
+
+pub fn data_charset_from_url(url: &str) -> Result<Option<MySqlDataCharset>, String> {
+ data_charset_from_params(url.split_once('?').map_or("", |(_, params)| params))
+}
+
+fn decode_form_component(value: &str) -> String {
+ percent_decode_str(&value.replace('+', " ")).decode_utf8_lossy().into_owned()
+}
+
+/// Parse raw connection URL parameters using the same form semantics as the
+/// driver URL path. Product-level gates must use this before opening a pool.
+pub fn data_charset_from_params(params: &str) -> Result<Option<MySqlDataCharset>, String> {
+ // Match URLSearchParams form decoding. Inspect every occurrence rather than
+ // applying first/last-wins semantics to security-relevant session options.
+ let params = params.trim().trim_start_matches('?');
+ let options: Vec<_> = params
+ .split('&')
+ .map(|segment| {
+ let (key, value) = segment.split_once('=').unwrap_or((segment, ""));
+ (decode_form_component(key).trim().to_owned(), decode_form_component(value), segment.contains('='))
+ })
+ .collect();
+ if !options.iter().any(|(key, _, _)| key.eq_ignore_ascii_case("dataCharset")) {
+ return Ok(None);
+ }
+
+ let mut selected = None;
+ let mut seen = false;
+ let mut charset_seen = false;
+ let mut incompatible = false;
+ for (key, value, has_equals) in options {
+ if key.eq_ignore_ascii_case("dataCharset") {
+ if seen {
+ return Err("Duplicate MySQL dataCharset option".into());
+ }
+ seen = true;
+ selected = Some(match value.to_ascii_uppercase().as_str() {
+ "GBK" => MySqlDataCharset::Gbk,
+ "GB18030" => MySqlDataCharset::Gb18030,
+ "BIG5" => MySqlDataCharset::Big5,
+ _ => return Err("MySQL dataCharset must be GBK, GB18030 or BIG5".into()),
+ });
+ } else if key.eq_ignore_ascii_case("charset") {
+ if charset_seen {
+ return Err("Duplicate MySQL charset option with dataCharset".into());
+ }
+ charset_seen = true;
+ incompatible |= !value.eq_ignore_ascii_case("utf8mb4");
+ } else if key.eq_ignore_ascii_case("sessionVariables") {
+ incompatible |= !value.is_empty();
+ } else if key.eq_ignore_ascii_case("setupMode") || key.eq_ignore_ascii_case("setup_mode") {
+ incompatible |= !value.eq_ignore_ascii_case("standard");
+ } else if key.eq_ignore_ascii_case("proxySql") {
+ // The existing setup parser treats a bare flag as true and trims
+ // boolean values; the validation must not miss either spelling.
+ incompatible |= !has_equals
+ || value.trim().is_empty()
+ || matches!(value.trim().to_ascii_lowercase().as_str(), "true" | "1" | "yes" | "on");
+ }
+ }
+ if incompatible {
+ return Err("MySQL dataCharset requires the default/utf8mb4 charset and standard session setup without sessionVariables".into());
+ }
+ Ok(selected)
+}
+
+// MySQL's latin1 is CP1252, including the five undefined C1 control slots.
+// Other C1 code points are not carriers: accepting them would not be reversible.
+fn carrier_byte(c: char) -> Option<u8> {
+ const SPECIAL: [char; 32] = [
+ '€', '\u{81}', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u{8d}', 'Ž', '\u{8f}', '\u{90}', '‘',
+ '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u{9d}', 'ž', 'Ÿ',
+ ];
+ match c as u32 {
+ 0..=0x7f | 0xa0..=0xff => Some(c as u8),
+ _ => SPECIAL.iter().position(|&candidate| candidate == c).map(|i| i as u8 + 0x80),
+ }
+}
+
+fn prefix(text: &str, limit: usize) -> &str {
+ let mut end = limit.min(text.len());
+ while !text.is_char_boundary(end) {
+ end -= 1;
+ }
+ &text[..end]
+}
+
+impl MySqlDataCharset {
+ /// Interpret a complete, untouched UTF8 carrier after core has established
+ /// that a server-side preview was not truncated.
+ pub fn interpret_text(self, original: &str) -> String {
+ self.interpret(original, usize::MAX)
+ }
+
+ fn encoding(self) -> &'static Encoding {
+ match self {
+ Self::Gbk => GBK,
+ Self::Gb18030 => GB18030,
+ Self::Big5 => BIG5,
+ }
+ }
+
+ /// Validate the entire value, retaining at most `limit` UTF8 bytes. Scanning
+ /// the suffix is necessary: a late invalid byte must preserve the original
+ /// carrier in previews just as it does in complete values. Auxiliary memory
+ /// is constant apart from the explicitly bounded result.
+ pub(crate) fn interpret(self, original: &str, limit: usize) -> String {
+ self.decode(original, limit).unwrap_or_else(|| prefix(original, limit).to_owned())
+ }
+
+ fn decode(self, original: &str, limit: usize) -> Option<String> {
+ let mut decoder = self.encoding().new_decoder_without_bom_handling();
+ let mut chars = original.chars();
+ let mut output = String::with_capacity(limit.min(original.len()));
+ let mut prefix_full = false;
+ let mut gbk_lead = false;
+ loop {
+ let mut input = [0u8; 1024];
+ let mut count = 0;
+ for byte in &mut input {
+ let Some(c) = chars.next() else { break };
+ *byte = carrier_byte(c)?;
+ // encoding_rs intentionally shares the WHATWG GBK/GB18030
+ // decoder. GBK opt-in must not accept GB18030 four-byte forms.
+ if self == Self::Gbk {
+ if gbk_lead {
+ if byte.is_ascii_digit() {
+ return None;
+ }
+ gbk_lead = false;
+ } else {
+ gbk_lead = (0x81..=0xfe).contains(byte);
+ }
+ }
+ count += 1;
+ }
+ let last = count < input.len();
+ let mut consumed = 0;
+ loop {
+ let mut buffer = [0u8; 4096];
+ let (result, read, written) =
+ decoder.decode_to_utf8_without_replacement(&input[consumed..count], &mut buffer, last);
+ consumed += read;
+ let text = std::str::from_utf8(&buffer[..written]).ok()?;
+ if !prefix_full {
+ let part = prefix(text, limit.saturating_sub(output.len()));
+ output.push_str(part);
+ prefix_full = part.len() < text.len() || output.len() == limit;
+ }
+ match result {
+ DecoderResult::Malformed(_, _) => return None,
+ DecoderResult::InputEmpty => break,
+ DecoderResult::OutputFull => {}
+ }
+ }
+ if last {
+ return Some(output);
+ }
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn data_charset_is_scoped_to_the_mysql_product_not_protocol_profiles() {
+ let mut config: ConnectionConfig = serde_json::from_value(serde_json::json!({
+ "id":"codec-test", "name":"codec-test", "db_type":"mysql", "host":"localhost",
+ "port":3306, "username":"test", "password":"", "database":null,
+ "url_params":"dataCharset=GBK"
+ }))
+ .unwrap();
+ for profile in [None, Some(""), Some(" "), Some("mysql"), Some(" MySQL ")] {
+ config.driver_profile = profile.map(str::to_owned);
+ assert_eq!(data_charset_for_config(&config).unwrap(), Some(MySqlDataCharset::Gbk));
+ }
+ for profile in ["mariadb", "tidb", "doris", "custom"] {
+ config.driver_profile = Some(profile.into());
+ assert!(data_charset_for_config(&config).unwrap_err().contains("native MySQL product"));
+ config.url_params = None;
+ assert_eq!(data_charset_for_config(&config).unwrap(), None);
+ config.url_params = Some("dataCharset=GBK".into());
+ }
+ // Firebird already owns a separate dataCharset option; never parse it
+ // using this MySQL-specific policy.
+ config.db_type = DatabaseType::Firebird;
+ config.url_params = Some("dataCharset=not-a-mysql-option".into());
+ assert_eq!(data_charset_for_config(&config).unwrap(), None);
+ }
+
+ #[test]
+ fn explicit_options_validate_without_changing_default() {
+ assert_eq!(data_charset_from_params("charset=latin1").unwrap(), None);
+ for (name, expected) in
+ [("gbk", MySqlDataCharset::Gbk), ("Gb18030", MySqlDataCharset::Gb18030), ("BIG5", MySqlDataCharset::Big5)]
+ {
+ assert_eq!(
+ data_charset_from_params(&format!("dataCharset={name}&charset=UTF8MB4")).unwrap(),
+ Some(expected)
+ );
+ }
+ for params in [
+ "dataCharset=",
+ "dataCharset=utf8",
+ "dataCharset=GBK&datacharset=GBK",
+ "dataCharset=GBK&charset=latin1",
+ "dataCharset=GBK&charset=utf8",
+ "dataCharset=GBK&charset=utf8mb4&charset=gbk",
+ "dataCharset=GBK&sessionVariables=character_set_results=latin1",
+ "dataCharset=GBK&setupMode=bare",
+ "dataCharset=GBK&proxySql=true",
+ ] {
+ assert!(data_charset_from_params(params).is_err(), "{params}");
+ }
+ }
+
+ #[test]
+ fn data_charset_form_decoding_and_session_options_match_url_semantics() {
+ for params in [
+ "%64ataCharset=%47BK",
+ "?dataCharset=gbk&%63harset=UTF8MB4",
+ "dataCharset=GBK&sessionVariables=",
+ "dataCharset=GBK&proxySql=false",
+ "dataCharset=GBK&setupMode=standard",
+ ] {
+ assert_eq!(data_charset_from_params(params).unwrap(), Some(MySqlDataCharset::Gbk), "{params}");
+ }
+ for params in [
+ "dataCharset",
+ "dataCharset=",
+ "dataCharset=%20GBK%20",
+ "dataCharset=GBK+",
+ "dataCharset=GBK#fragment",
+ "dataCharset=GBK&%64ataCharset=GBK",
+ "dataCharset=GBK&charset=utf8mb4&CHARSET=utf8mb4",
+ "dataCharset=GBK&%73essionVariables=character_set_results%3Dlatin1",
+ "dataCharset=GBK&sessionVariables=+",
+ "dataCharset=GBK&proxySql",
+ "dataCharset=GBK&proxySql=",
+ "dataCharset=GBK&proxySql=+",
+ "dataCharset=GBK&proxySql=%20",
+ "dataCharset=GBK&proxySql=%20true%20",
+ "dataCharset=GBK&%70roxySql",
+ "dataCharset=GBK&setup%4dode=compatible",
+ "dataCharset=GBK&charset=%20utf8mb4%20",
+ "dataCharset=GBK&+sessionVariables=character_set_results%3Dlatin1",
+ ] {
+ assert!(data_charset_from_params(params).is_err(), "{params}");
+ }
+ // Existing unrelated options retain their previous validation/behavior.
+ assert_eq!(data_charset_from_params("charset=latin1&charset=gbk&proxySql").unwrap(), None);
+ }
+
+ #[test]
+ fn strict_carrier_and_decoder_preserve_failures() {
+ for (codec, original, expected) in [
+ (MySqlDataCharset::Gbk, "çͷײʺç", "缤纷彩虹"),
+ (MySqlDataCharset::Gbk, "¶ñ¶¾Èý½Ç", "恶毒三角"),
+ (MySqlDataCharset::Gb18030, "ÖÐÎÄ”9ü6", "中文😀"),
+ (MySqlDataCharset::Big5, "ÁcÅ餤¤å", "繁體中文"),
+ ] {
+ assert_eq!(codec.interpret(original, usize::MAX), expected);
+ for limit in 0..expected.len() + 2 {
+ assert_eq!(codec.interpret(original, limit), prefix(expected, limit));
+ }
+ }
+ for codec in [MySqlDataCharset::Gbk, MySqlDataCharset::Gb18030, MySqlDataCharset::Big5] {
+ for original in ["", "ASCII 123", "正常中文😀", "ÿ", "\u{80}", "leading ASCII \u{81}", "çͷײʺç中"]
+ {
+ assert_eq!(codec.interpret(original, usize::MAX), original);
+ }
+ }
+ assert_eq!(MySqlDataCharset::Gbk.interpret("”9ü6", usize::MAX), "”9ü6");
+ // Western text can be a valid carrier; interpretation is never detection.
+ assert_eq!(MySqlDataCharset::Gbk.interpret("ÖÐ", usize::MAX), "中");
+ }
+
+ #[test]
+ fn carrier_control_slots_are_exact() {
+ let specials = "€\u{81}‚ƒ„…†‡ˆ‰Š‹Œ\u{8d}Ž\u{8f}\u{90}‘’“”•–—˜™š›œ\u{9d}žŸ";
+ for (offset, c) in specials.chars().enumerate() {
+ assert_eq!(carrier_byte(c), Some(0x80 + offset as u8));
+ }
+ for byte in 0u8..=255 {
+ if !(0x80..=0x9f).contains(&byte) {
+ assert_eq!(carrier_byte(char::from(byte)), Some(byte));
+ }
+ }
+ for c in ['\u{80}', '\u{82}', '\u{9f}', '中', '😀'] {
+ assert_eq!(carrier_byte(c), None);
+ }
+ }
+
+ #[test]
+ fn bounded_preview_checks_suffix_and_multibyte_chunk_boundary() {
+ let original = format!("{}ÖÐ", "a".repeat(1023));
+ assert_eq!(MySqlDataCharset::Gbk.interpret(&original, usize::MAX), format!("{}中", "a".repeat(1023)));
+ let large = "çͷײʺç".repeat(100_000);
+ assert_eq!(MySqlDataCharset::Gbk.interpret(&large, 5), "缤");
+ let invalid_tail = format!("{large}ÿ");
+ assert_eq!(MySqlDataCharset::Gbk.interpret(&invalid_tail, 5), prefix(&invalid_tail, 5));
+ let unicode_tail = format!("{large}中");
+ assert_eq!(MySqlDataCharset::Gbk.interpret(&unicode_tail, 5), prefix(&unicode_tail, 5));
+ // EOF after an exact input-buffer multiple must flush the pending lead.
+ let unfinished = format!("{}\u{81}", "a".repeat(1023));
+ assert_eq!(MySqlDataCharset::Gbk.interpret(&unfinished, usize::MAX), unfinished);
+ }
+}
diff --git a/crates/dbx-driver-mysql/tests/mysql_data_charset_live.rs b/crates/dbx-driver-mysql/tests/mysql_data_charset_live.rs
new file mode 100644
index 0000000000..5748d8886b
--- /dev/null
+++ b/crates/dbx-driver-mysql/tests/mysql_data_charset_live.rs
@@ -0,0 +1,210 @@
+//! SELECT-only MySQL regression. Run with DBX_LIVE_MYSQL_DATA_CHARSET_URL set
+//! to a MySQL URL (prefer a SELECT-only account), then `cargo test -p
+//! dbx-driver-mysql --test mysql_data_charset_live -- --ignored --nocapture`.
+use dbx_driver_mysql::mysql::{self, MySqlQueryDialect, MySqlQueryStreamItem};
+use mysql_async::prelude::Queryable;
+use std::sync::atomic::AtomicBool;
+use std::time::Duration;
+
+#[tokio::test]
+#[ignore = "requires DBX_LIVE_MYSQL_DATA_CHARSET_URL and additive issue12458 long-key fixtures; SELECT only"]
+async fn mysql_data_charset_original_keys_and_server_previews() {
+ let url = std::env::var("DBX_LIVE_MYSQL_DATA_CHARSET_URL").expect("set DBX_LIVE_MYSQL_DATA_CHARSET_URL");
+ let separator = if url.contains('?') { '&' } else { '?' };
+ let pool = mysql::connect(&format!("{url}{separator}dataCharset=GBK"), Duration::from_secs(10)).await.unwrap();
+ let mut conn = mysql::get_conn_with_health_check(&pool).await.unwrap();
+ let dialect = MySqlQueryDialect::default();
+ let sql = "SELECT legacy_key, part, LEFT(legacy_text,2) AS legacy_text, CONCAT('T:1:',LENGTH(legacy_text)) AS __DBX_LARGE_VALUE_BYTES_T_2 FROM legacy_long_keys WHERE legacy_key=CONVERT(_binary 0xD6D0CEC4 USING latin1) ORDER BY part";
+ for bare in [false, true] {
+ let result = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ sql,
+ bare,
+ Some(10),
+ Some(32 * 1024),
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ assert_eq!(result.result.rows.len(), 2);
+ assert_eq!(result.result.rows[0][0], "中文");
+ assert_eq!(result.result.rows[0][2], "çÍ", "server preview carrier must reach core untouched");
+ assert_eq!(result.result.raw_key_cells.len(), 4, "both original compound key cells per row");
+ for row in 0..2 {
+ let key = result
+ .result
+ .raw_key_cells
+ .iter()
+ .find(|cell| cell.row_index == row && cell.column_index == 0)
+ .unwrap();
+ assert_eq!(key.value, "ÖÐÎÄ");
+ assert!(result.result.raw_key_cells.iter().any(|cell| cell.row_index == row && cell.column_index == 1));
+ }
+ let collisions = "SELECT legacy_key, LEFT(legacy_text,2) AS legacy_text, CONCAT('T:1:',LENGTH(legacy_text)) AS __DBX_LARGE_VALUE_BYTES_T_1 FROM legacy_key_collisions ORDER BY HEX(legacy_key)";
+ let collision_result = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ collisions,
+ bare,
+ Some(10),
+ Some(32 * 1024),
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ assert_eq!(collision_result.result.rows[0][0], collision_result.result.rows[1][0]);
+ assert_eq!(collision_result.result.raw_key_cells.len(), 2);
+ assert_ne!(collision_result.result.raw_key_cells[0].value, collision_result.result.raw_key_cells[1].value);
+ let query = "SELECT legacy_key, part FROM legacy_long_keys ORDER BY legacy_key, part";
+ let bounded = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ query,
+ bare,
+ Some(10),
+ Some(230),
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ assert!(bounded.result.truncated);
+ assert!(!bounded.result.rows.is_empty());
+ assert_eq!(bounded.result.raw_key_cells.len(), bounded.result.rows.len() * 2);
+ assert!(bounded.result.raw_key_cells.iter().all(|cell| cell.row_index < bounded.result.rows.len()));
+ let error = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ query,
+ bare,
+ Some(10),
+ Some(1),
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap_err();
+ assert!(error.contains("byte budget"));
+ }
+ drop(conn);
+ pool.disconnect().await.unwrap();
+}
+
+#[tokio::test]
+#[ignore = "requires DBX_LIVE_MYSQL_DATA_CHARSET_URL; executes only SELECT statements"]
+async fn mysql_data_charset_real_engine_read_paths() {
+ let url = std::env::var("DBX_LIVE_MYSQL_DATA_CHARSET_URL").expect("set DBX_LIVE_MYSQL_DATA_CHARSET_URL");
+ let dialect = MySqlQueryDialect::default();
+ for (codec, hex, expected) in [
+ ("GBK", "e7cdb7d7b2cabae7", "缤纷彩虹"),
+ ("GB18030", "d6d0cec49439fc36", "中文😀"),
+ ("BIG5", "c163c5e9a4a4a4e5", "繁體中文"),
+ ] {
+ let separator = if url.contains('?') { '&' } else { '?' };
+ let configured = format!("{url}{separator}dataCharset={codec}");
+ let pool = mysql::connect(&configured, Duration::from_secs(10)).await.unwrap();
+ let sql = format!("SELECT CONVERT(_binary 0x{hex} USING latin1) AS legacy_text, CONVERT(_binary 0xe4b8ade69687 USING utf8mb4) AS normal_text, _binary 0x{hex} AS raw_blob, NULL AS null_value, 'ASCII' AS ascii_value");
+ for bare in [false, true] {
+ let result = mysql::execute_query_with_max_rows(&pool, &sql, bare, None, dialect).await.unwrap();
+ assert_eq!(result.rows[0][0], expected, "{codec} bare={bare}");
+ assert_eq!(result.rows[0][1], "中文");
+ assert_eq!(result.rows[0][2], format!("0x{hex}"));
+ assert!(result.rows[0][3].is_null());
+ assert_eq!(result.rows[0][4], "ASCII");
+ let mut conn = mysql::get_conn_with_health_check(&pool).await.unwrap();
+ let mut streamed = Vec::new();
+ mysql::stream_query_result_on_conn_with_data_charset(
+ &mut conn,
+ &sql,
+ bare,
+ None,
+ dialect,
+ &AtomicBool::new(false),
+ false,
+ pool.data_charset(),
+ |item| {
+ if let MySqlQueryStreamItem::Row(row) = item {
+ streamed.push(row);
+ }
+ Ok(())
+ },
+ )
+ .await
+ .unwrap();
+ assert_eq!(streamed, result.rows, "stream {codec} bare={bare}");
+ let long_sql = format!("SELECT REPEAT(CONVERT(_binary 0x{hex} USING latin1), 10000) AS long_text");
+ let full = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ &long_sql,
+ bare,
+ Some(1),
+ None,
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ assert_eq!(full.result.rows[0][0], expected.repeat(10000));
+ let preview = mysql::execute_query_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ &long_sql,
+ bare,
+ Some(1),
+ Some(1024),
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ let text = preview.result.rows[0][0].as_str().unwrap();
+ assert!(text.ends_with("..."));
+ assert!(text.len() <= 1027);
+ assert!(full.result.rows[0][0].as_str().unwrap().starts_with(text.strip_suffix("...").unwrap()));
+ assert_eq!(preview.large_value_cells.len(), 1);
+ let carrier_size: u64 = conn
+ .query_first(format!(
+ "SELECT OCTET_LENGTH(CONVERT(CONVERT(_binary 0x{hex} USING latin1) USING utf8mb4)) * 10000"
+ ))
+ .await
+ .unwrap()
+ .unwrap();
+ assert_eq!(preview.large_value_cells[0].original_bytes, carrier_size as usize);
+ }
+ let mut conn = mysql::get_conn_with_health_check(&pool).await.unwrap();
+ let session: (String, String, String) = conn
+ .query_first("SELECT @@character_set_client, @@character_set_connection, @@character_set_results")
+ .await
+ .unwrap()
+ .unwrap();
+ assert_eq!(session, ("utf8mb4".into(), "utf8mb4".into(), "utf8mb4".into()));
+ let multi = format!("{sql}; {sql}");
+ let results = mysql::execute_query_results_on_conn_with_limits_with_data_charset(
+ &mut conn,
+ &multi,
+ true,
+ None,
+ None,
+ &[],
+ dialect,
+ None,
+ pool.data_charset(),
+ )
+ .await
+ .unwrap();
+ assert_eq!(results.len(), 2);
+ assert!(results.iter().all(|result| result.result.rows[0][0] == expected));
+ drop(conn);
+ pool.disconnect().await.unwrap();
+ }
+}
diff --git a/crates/dbx-driver-postgres/src/postgres.rs b/crates/dbx-driver-postgres/src/postgres.rs
index c14b6f0a59..efeae06b57 100644
--- a/crates/dbx-driver-postgres/src/postgres.rs
+++ b/crates/dbx-driver-postgres/src/postgres.rs
@@ -2184,6 +2184,7 @@ async fn execute_select_prepared(
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns,
+ raw_key_cells: Vec::new(),
spatial_values,
rows: result_rows,
affected_rows: 0,
@@ -2294,6 +2295,7 @@ async fn execute_select_text(
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns,
+ raw_key_cells: Vec::new(),
spatial_values,
rows: result_rows,
affected_rows: 0,
@@ -8972,6 +8974,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: affected,
@@ -9813,6 +9816,7 @@ async fn execute_query_with_max_rows_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: affected,
@@ -16540,6 +16544,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![vec![
serde_json::json!("amount"),
diff --git a/crates/dbx-driver-sqlserver/src/sqlserver.rs b/crates/dbx-driver-sqlserver/src/sqlserver.rs
index 1c4d965b5c..89ce48fc03 100644
--- a/crates/dbx-driver-sqlserver/src/sqlserver.rs
+++ b/crates/dbx-driver-sqlserver/src/sqlserver.rs
@@ -890,6 +890,7 @@ fn server_messages_query_result(messages: Vec<String>, start: Instant) -> Option
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -1014,6 +1015,7 @@ fn collect_first_result_finish(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns,
+ raw_key_cells: Vec::new(),
spatial_values,
rows,
affected_rows: 0,
@@ -1951,6 +1953,7 @@ fn push_sqlserver_result_set(results: &mut Vec<QueryResult>, result: Option<SqlS
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result.rows,
affected_rows: 0,
@@ -2012,6 +2015,7 @@ fn push_sqlserver_ordered_events(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows,
@@ -3903,6 +3907,7 @@ async fn execute_query_with_max_rows_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: result.rows_affected().iter().sum::<u64>(),
@@ -3971,6 +3976,7 @@ async fn execute_batch_with_max_rows_metadata_inner(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: result.rows_affected().iter().sum::<u64>(),
@@ -4072,6 +4078,7 @@ pub async fn execute_simple_batch_with_max_rows_metadata(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -4697,6 +4704,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -4724,6 +4732,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -4746,6 +4755,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!(1)]],
affected_rows: 0,
@@ -6006,6 +6016,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("app_user"), serde_json::json!("8")]],
affected_rows: 0,
@@ -6570,6 +6581,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!(42), serde_json::json!(101)]],
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/clickhouse_driver.rs b/crates/dbx-drivers/src/db/clickhouse_driver.rs
index 6a9effbb3b..a0c97aec20 100644
--- a/crates/dbx-drivers/src/db/clickhouse_driver.rs
+++ b/crates/dbx-drivers/src/db/clickhouse_driver.rs
@@ -607,6 +607,7 @@ fn limited_query_result(result: ChJsonResult, execution_time_ms: u128, max_rows:
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: 0,
@@ -874,6 +875,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs b/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
index eb43471bff..c4416876f6 100644
--- a/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
+++ b/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
@@ -484,6 +484,7 @@ fn query_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result.rows,
affected_rows,
diff --git a/crates/dbx-drivers/src/db/couchdb_driver.rs b/crates/dbx-drivers/src/db/couchdb_driver.rs
index bd675969cf..3af84fa5f0 100644
--- a/crates/dbx-drivers/src/db/couchdb_driver.rs
+++ b/crates/dbx-drivers/src/db/couchdb_driver.rs
@@ -608,6 +608,7 @@ fn couchdb_table_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: row_count,
@@ -629,6 +630,7 @@ fn couchdb_raw_json_response_result(status: u16, body_text: impl Into<String>, s
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![Value::Number(status.into()), Value::String(body_text.into())]],
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/dynamodb_driver.rs b/crates/dbx-drivers/src/db/dynamodb_driver.rs
index 9fce6f953b..30843f115f 100644
--- a/crates/dbx-drivers/src/db/dynamodb_driver.rs
+++ b/crates/dbx-drivers/src/db/dynamodb_driver.rs
@@ -647,6 +647,7 @@ fn documents_query_result(documents: Vec<Value>, truncated: bool, started: Insta
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows,
affected_rows: 0,
@@ -668,6 +669,7 @@ fn affected_query_result(affected_rows: u64, started: Instant) -> QueryResult {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows,
diff --git a/crates/dbx-drivers/src/db/influxdb3_driver.rs b/crates/dbx-drivers/src/db/influxdb3_driver.rs
index 27f7030f27..8e91a22b27 100644
--- a/crates/dbx-drivers/src/db/influxdb3_driver.rs
+++ b/crates/dbx-drivers/src/db/influxdb3_driver.rs
@@ -361,6 +361,7 @@ fn build_query_result(rows: Vec<serde_json::Value>, start: Instant) -> QueryResu
deferred_large_value_cells: Vec::new(),
column_sortables: columns.iter().map(|_| false).collect(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
columns,
column_types: vec![],
diff --git a/crates/dbx-drivers/src/db/influxdb_driver.rs b/crates/dbx-drivers/src/db/influxdb_driver.rs
index c94b79738f..047363e9c6 100644
--- a/crates/dbx-drivers/src/db/influxdb_driver.rs
+++ b/crates/dbx-drivers/src/db/influxdb_driver.rs
@@ -649,6 +649,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
columns,
column_types: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
affected_rows: rows.len() as u64,
rows,
@@ -668,6 +669,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -868,6 +870,7 @@ fn parse_flux_csv(text: &str, start: Instant) -> Result<QueryResult, String> {
deferred_large_value_cells: Vec::new(),
column_sortables: columns.iter().map(|_| false).collect(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
columns,
column_types: vec![],
diff --git a/crates/dbx-drivers/src/db/meilisearch_driver.rs b/crates/dbx-drivers/src/db/meilisearch_driver.rs
index a8ca9d4238..6e42c237ec 100644
--- a/crates/dbx-drivers/src/db/meilisearch_driver.rs
+++ b/crates/dbx-drivers/src/db/meilisearch_driver.rs
@@ -1908,6 +1908,7 @@ fn raw_response_result(status: u16, body: String, start: Instant, truncated: boo
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![vec![Value::Number(status.into()), Value::String(body)]],
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/rqlite_driver.rs b/crates/dbx-drivers/src/db/rqlite_driver.rs
index def2ace5e2..dd61bacba1 100644
--- a/crates/dbx-drivers/src/db/rqlite_driver.rs
+++ b/crates/dbx-drivers/src/db/rqlite_driver.rs
@@ -324,6 +324,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows,
@@ -380,6 +381,7 @@ fn query_result_from_rqlite_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result.values,
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/salesforce_driver.rs b/crates/dbx-drivers/src/db/salesforce_driver.rs
index 301ee86aba..7fd831dad4 100644
--- a/crates/dbx-drivers/src/db/salesforce_driver.rs
+++ b/crates/dbx-drivers/src/db/salesforce_driver.rs
@@ -679,6 +679,7 @@ fn parse_soql_response(value: Value, elapsed_ms: u128, max_rows: usize) -> Query
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows,
affected_rows: total_size,
@@ -1180,6 +1181,7 @@ impl SfClient {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![false],
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![vec![Value::String(new_id)]],
affected_rows: 1,
@@ -1217,6 +1219,7 @@ fn salesforce_affected_query_result(affected_rows: u64, started: Instant) -> Que
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows,
diff --git a/crates/dbx-drivers/src/db/solr_driver.rs b/crates/dbx-drivers/src/db/solr_driver.rs
index ac21342371..6decdff169 100644
--- a/crates/dbx-drivers/src/db/solr_driver.rs
+++ b/crates/dbx-drivers/src/db/solr_driver.rs
@@ -985,6 +985,7 @@ fn solr_table_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows: row_count,
@@ -1006,6 +1007,7 @@ fn solr_raw_json_response_result(status: u16, body_text: impl Into<String>, star
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![Value::Number(status.into()), Value::String(body_text.into())]],
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/sqlite.rs b/crates/dbx-drivers/src/db/sqlite.rs
index 665c4ffaa2..fd98237e41 100644
--- a/crates/dbx-drivers/src/db/sqlite.rs
+++ b/crates/dbx-drivers/src/db/sqlite.rs
@@ -2959,6 +2959,7 @@ fn execute_query_blocking(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result_rows,
affected_rows: 0,
@@ -2979,6 +2980,7 @@ fn execute_query_blocking(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: conn.changes(),
diff --git a/crates/dbx-drivers/src/db/sqlite_worker.rs b/crates/dbx-drivers/src/db/sqlite_worker.rs
index 900a7a69b5..65278bcf6b 100644
--- a/crates/dbx-drivers/src/db/sqlite_worker.rs
+++ b/crates/dbx-drivers/src/db/sqlite_worker.rs
@@ -178,6 +178,7 @@ impl SqliteWorkerSession<'_> {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: rows.unwrap_or_default(),
affected_rows: affected_rows.unwrap_or(0),
diff --git a/crates/dbx-drivers/src/db/turso_driver.rs b/crates/dbx-drivers/src/db/turso_driver.rs
index 5b589c08d7..e7285ec09d 100644
--- a/crates/dbx-drivers/src/db/turso_driver.rs
+++ b/crates/dbx-drivers/src/db/turso_driver.rs
@@ -392,6 +392,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -417,6 +418,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows,
@@ -439,6 +441,7 @@ pub async fn execute_query_with_max_rows(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: affected,
@@ -623,6 +626,7 @@ fn query_result_from_turso_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: result.values,
affected_rows: 0,
diff --git a/crates/dbx-drivers/src/db/vector_driver.rs b/crates/dbx-drivers/src/db/vector_driver.rs
index b735ebb403..944cc4c03c 100644
--- a/crates/dbx-drivers/src/db/vector_driver.rs
+++ b/crates/dbx-drivers/src/db/vector_driver.rs
@@ -981,6 +981,7 @@ fn json_to_query_result(
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![
Value::Number(status.into()),
@@ -1021,6 +1022,7 @@ fn values_to_query_result(items: Vec<Value>, start: Instant) -> QueryResult {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
affected_rows: rows.len() as u64,
rows,
diff --git a/crates/dbx-drivers/src/db/victoriametrics_driver.rs b/crates/dbx-drivers/src/db/victoriametrics_driver.rs
index e90aa4f5da..96879e5ff7 100644
--- a/crates/dbx-drivers/src/db/victoriametrics_driver.rs
+++ b/crates/dbx-drivers/src/db/victoriametrics_driver.rs
@@ -358,6 +358,7 @@ fn series_result_to_query_result(series: Vec<SeriesResult>, start: Instant) -> Q
server_execute_time_us: None,
query_timings_ms: None,
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
truncated: false,
session_id: None,
@@ -398,6 +399,7 @@ fn simple_result(rows: Vec<Vec<Value>>, value_type: &str, start: Instant) -> Que
server_execute_time_us: None,
query_timings_ms: None,
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
truncated: false,
session_id: None,
diff --git a/crates/dbx-mcp/Cargo.toml b/crates/dbx-mcp/Cargo.toml
index 7ff5c864b3..15cfcf4292 100644
--- a/crates/dbx-mcp/Cargo.toml
+++ b/crates/dbx-mcp/Cargo.toml
@@ -49,6 +49,7 @@ url = "2"
security-framework = { version = "3.7", optional = true }
[dev-dependencies]
+dbx-core = { path = "../dbx-core", default-features = false, features = ["test-support"] }
rmcp = { version = "3.5.1", features = ["transport-streamable-http-client-reqwest"] }
rustls-pemfile = "2.2"
tempfile = "3"
diff --git a/crates/dbx-mcp/src/backend.rs b/crates/dbx-mcp/src/backend.rs
index 64c9f3e503..742020ee29 100644
--- a/crates/dbx-mcp/src/backend.rs
+++ b/crates/dbx-mcp/src/backend.rs
@@ -1496,6 +1496,7 @@ impl DbxBackend for LocalBackend {
connection.id.clone(),
database.to_string(),
client_session_id.to_string(),
+ pool.data_charset(),
),
owner_config,
resource_permit,
@@ -2970,6 +2971,7 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<Value>>, affected_rows: u64)
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows,
affected_rows,
@@ -4843,19 +4845,12 @@ mod tests {
let server_csr = dir.path().join("server.csr");
let server_pem = dir.path().join("server.pem");
let run = |args: &[&str]| {
- let status = std::process::Command::new("openssl")
- .args(args)
- .stdout(std::process::Stdio::null())
- .stderr(std::process::Stdio::null())
- .status()
- .unwrap();
let output = std::process::Command::new("openssl").args(args).output().unwrap();
assert!(
output.status.success(),
"openssl failed: {args:?} stderr={}",
String::from_utf8_lossy(&output.stderr)
);
- let _ = status;
};
// Self-signed CA.
run(&[
@@ -4891,7 +4886,12 @@ mod tests {
// Server cert signed by the CA, with SAN for 127.0.0.1. The x509 -req
// subcommand takes extensions via -extfile, not -addext.
let ext_path = dir.path().join("server.ext");
- std::fs::write(&ext_path, "subjectAltName=IP:127.0.0.1\nbasicConstraints=critical,CA:FALSE\n").unwrap();
+ // Native TLS on macOS requires an explicit TLS server purpose.
+ std::fs::write(
+ &ext_path,
+ "subjectAltName=IP:127.0.0.1\nbasicConstraints=critical,CA:FALSE\nextendedKeyUsage=serverAuth\n",
+ )
+ .unwrap();
run(&[
"x509",
"-req",
diff --git a/crates/dbx-mcp/src/http.rs b/crates/dbx-mcp/src/http.rs
index c85c7b2909..de85648cb4 100644
--- a/crates/dbx-mcp/src/http.rs
+++ b/crates/dbx-mcp/src/http.rs
@@ -246,6 +246,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows: 0,
diff --git a/crates/dbx-mcp/src/server.rs b/crates/dbx-mcp/src/server.rs
index a8cd937b72..dccc2fb40b 100644
--- a/crates/dbx-mcp/src/server.rs
+++ b/crates/dbx-mcp/src/server.rs
@@ -6246,6 +6246,7 @@ fn empty_query_result() -> dbx_core::db::QueryResult {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows: 0,
@@ -6594,9 +6595,14 @@ fn mcp_permissions(
connection: &dbx_core::models::connection::ConnectionConfig,
policy: &McpGlobalPolicy,
) -> dbx_core::agent_tools::AgentSqlPermissions {
+ // Invalid compatibility configuration must not advertise write permission.
+ let compatibility_read_only = dbx_core::query::mysql_data_charset_policy::enabled(connection).unwrap_or(true);
dbx_core::agent_tools::AgentSqlPermissions {
- allow_writes: !policy.read_only && !connection.read_only,
- allow_dangerous: !policy.read_only && !connection.read_only && policy.allow_dangerous_sql,
+ allow_writes: !policy.read_only && !connection.read_only && !compatibility_read_only,
+ allow_dangerous: !policy.read_only
+ && !connection.read_only
+ && !compatibility_read_only
+ && policy.allow_dangerous_sql,
confirmed_write_sql: mcp_confirmed_write_sql_from_env(),
}
}
@@ -7066,6 +7072,12 @@ fn validate_sql_policy(
sql: &str,
allow_database_switch: bool,
) -> Result<dbx_core::agent_tools::AgentSqlPermissions, CallToolResult> {
+ if dbx_core::query::mysql_data_charset_policy::enabled(connection)
+ .map_err(|error| tool_error("MYSQL_DATA_CHARSET_CONFIG_INVALID", error))?
+ {
+ dbx_core::query::mysql_data_charset_policy::check_sql(sql, &connection.name)
+ .map_err(|error| tool_error("MYSQL_DATA_CHARSET_SQL_BLOCKED", error))?;
+ }
if !allow_database_switch && mcp_sql_has_forbidden_database_switch(sql, connection.db_type) {
return Err(tool_error(
"SQL_BLOCKED",
@@ -7586,6 +7598,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows: 0,
@@ -8316,6 +8329,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -11447,6 +11461,25 @@ mod tests {
ConnectionSelector { connection_id: Some(id.to_string()), connection_name: None }
}
+ #[test]
+ fn data_charset_policy_blocks_writes_and_session_changes_despite_mcp_permissions() {
+ let mut conn = connection("mysql", "mysql", "mysql", "app");
+ conn.url_params = Some("dataCharset=GBK".to_string());
+ let policy = McpGlobalPolicy { read_only: false, allow_dangerous_sql: true, ..Default::default() };
+ assert!(!conn.read_only);
+ let permissions = mcp_permissions(&conn, &policy);
+ assert!(!permissions.allow_writes);
+ assert!(!permissions.allow_dangerous);
+ assert!(validate_sql_policy(&conn, &policy, "app", "SELECT 1", true).is_ok());
+ for sql in ["UPDATE t SET value=1", "SET NAMES latin1", "SET @v=1", "SELECT 1; UPDATE t SET value=1"] {
+ let error = validate_sql_policy(&conn, &policy, "app", sql, true).unwrap_err();
+ assert!(result_text(&error).contains("MYSQL_DATA_CHARSET"));
+ }
+ conn.url_params = None;
+ assert!(mcp_permissions(&conn, &policy).allow_writes);
+ assert!(validate_sql_policy(&conn, &policy, "app", "UPDATE t SET value=1", true).is_ok());
+ }
+
#[tokio::test]
async fn opted_in_session_exposes_transaction_tools_and_structured_state() {
let policy = McpGlobalPolicy { read_only: false, allow_dangerous_sql: true, ..Default::default() };
@@ -13016,6 +13049,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 0,
@@ -13050,6 +13084,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![],
affected_rows: 2,
@@ -13085,6 +13120,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::Value::String(value)]],
affected_rows: 1,
diff --git a/crates/dbx-mcp/src/transaction.rs b/crates/dbx-mcp/src/transaction.rs
index 758727239e..d73fbd1ae6 100644
--- a/crates/dbx-mcp/src/transaction.rs
+++ b/crates/dbx-mcp/src/transaction.rs
@@ -60,7 +60,12 @@ pub struct TransactionIoSuccess {
#[derive(Debug)]
pub enum TransactionIoError {
- Server { code: u16, message: String },
+ /// Rejected locally before sending SQL; the physical session is unchanged.
+ Policy(String),
+ Server {
+ code: u16,
+ message: String,
+ },
Transport(String),
}
@@ -80,6 +85,7 @@ pub struct MysqlTransactionIo {
connection_id: String,
database: String,
client_session_id: String,
+ data_charset: Option<dbx_core::db::mysql::MySqlDataCharset>,
}
impl MysqlTransactionIo {
@@ -89,8 +95,9 @@ impl MysqlTransactionIo {
connection_id: String,
database: String,
client_session_id: String,
+ data_charset: Option<dbx_core::db::mysql::MySqlDataCharset>,
) -> Self {
- Self { conn: Some(conn), state, connection_id, database, client_session_id }
+ Self { conn: Some(conn), state, connection_id, database, client_session_id, data_charset }
}
fn conn(&mut self) -> Result<&mut mysql_async::Conn, TransactionIoError> {
@@ -105,9 +112,17 @@ impl TransactionIo for MysqlTransactionIo {
sql: &str,
max_rows: Option<usize>,
) -> Result<TransactionIoSuccess, TransactionIoError> {
- let execution = dbx_core::db::mysql::execute_transaction_statement_on_conn(self.conn()?, sql, max_rows)
- .await
- .map_err(map_mysql_transaction_error)?;
+ check_mysql_data_charset_transaction_sql(self.data_charset, sql, &self.connection_id)
+ .map_err(TransactionIoError::Policy)?;
+ let data_charset = self.data_charset;
+ let execution = dbx_core::db::mysql::execute_transaction_statement_on_conn_with_data_charset(
+ self.conn()?,
+ sql,
+ max_rows,
+ data_charset,
+ )
+ .await
+ .map_err(map_mysql_transaction_error)?;
Ok(TransactionIoSuccess { result: execution.result, in_transaction: execution.in_transaction })
}
@@ -126,6 +141,20 @@ impl TransactionIo for MysqlTransactionIo {
}
}
+fn check_mysql_data_charset_transaction_sql(
+ data_charset: Option<dbx_core::db::mysql::MySqlDataCharset>,
+ sql: &str,
+ connection_id: &str,
+) -> Result<(), String> {
+ // These exact statements are emitted by the owner lifecycle. User queries
+ // are separately prohibited from issuing transaction control by the server.
+ // Do not admit arbitrary START/COMMIT/ROLLBACK prefixes or session changes.
+ if data_charset.is_some() && !matches!(sql, "START TRANSACTION" | "COMMIT" | "ROLLBACK") {
+ dbx_core::query::mysql_data_charset_policy::check_sql(sql, connection_id)?;
+ }
+ Ok(())
+}
+
fn map_mysql_transaction_error(error: dbx_core::db::mysql::MySqlTransactionError) -> TransactionIoError {
match error {
dbx_core::db::mysql::MySqlTransactionError::Server { code, message, .. } => {
@@ -577,6 +606,10 @@ async fn handle_command(
}));
false
}
+ Ok(Err(TransactionIoError::Policy(message))) => {
+ let _ = command.response.send(Err(failure("TRANSACTION_SQL_BLOCKED", message, None, current)));
+ false
+ }
Ok(Err(TransactionIoError::Server { code, message })) => {
if is_commit {
set_unknown(inner);
@@ -668,6 +701,18 @@ fn failure(
#[cfg(test)]
mod tests {
+ #[test]
+ fn data_charset_fixed_session_policy_preserves_only_exact_lifecycle_commands() {
+ use dbx_core::db::mysql::MySqlDataCharset;
+ for sql in ["SELECT 1", "START TRANSACTION", "COMMIT", "ROLLBACK"] {
+ assert!(super::check_mysql_data_charset_transaction_sql(Some(MySqlDataCharset::Gbk), sql, "test").is_ok());
+ }
+ for sql in ["UPDATE t SET value=1", "SET NAMES latin1", "SET @v=1", "COMMIT; UPDATE t SET value=1"] {
+ assert!(super::check_mysql_data_charset_transaction_sql(Some(MySqlDataCharset::Gbk), sql, "test").is_err());
+ assert!(super::check_mysql_data_charset_transaction_sql(None, sql, "test").is_ok());
+ }
+ }
+
use std::{
collections::VecDeque,
sync::{
@@ -689,6 +734,7 @@ mod tests {
#[derive(Clone)]
enum Step {
Success { in_transaction: bool },
+ PolicyError,
ServerError { code: u16, message: &'static str },
TransportError(&'static str),
Ping { in_transaction: bool },
@@ -738,6 +784,7 @@ mod tests {
self.max_active_calls.fetch_max(active, Ordering::SeqCst);
let result = match step {
Step::Success { in_transaction } => Ok(TransactionIoSuccess { result: empty_result(), in_transaction }),
+ Step::PolicyError => Err(TransactionIoError::Policy("MYSQL_DATA_CHARSET_READ_ONLY".into())),
Step::ServerError { code, message } => {
Err(TransactionIoError::Server { code, message: message.to_string() })
}
@@ -787,6 +834,7 @@ mod tests {
fn step_name(step: &Step) -> &'static str {
match step {
Step::Success { .. } => "success",
+ Step::PolicyError => "policy error",
Step::ServerError { .. } => "server error",
Step::TransportError(_) => "transport error",
Step::Ping { .. } => "ping",
@@ -802,6 +850,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: Vec::new(),
affected_rows: 0,
@@ -824,6 +873,25 @@ mod tests {
}
}
+ #[tokio::test]
+ async fn data_charset_policy_denial_preserves_owner_state_without_ping_or_disconnect() {
+ let (io, probe) = ScriptedIo::new([
+ Step::Success { in_transaction: true },
+ Step::PolicyError,
+ Step::Success { in_transaction: false },
+ ]);
+ let owner = TransactionOwner::spawn(io, config());
+ owner.acquire().await.unwrap().begin().await.unwrap();
+ let error = owner.acquire().await.unwrap().query("UPDATE t SET v=1", None).await.unwrap_err();
+ assert_eq!(error.code, "TRANSACTION_SQL_BLOCKED");
+ assert_eq!(error.mysql_code, None);
+ assert_eq!(error.state, TransactionState::Active);
+ assert_eq!(probe.ping_calls.load(Ordering::SeqCst), 0);
+ assert_eq!(probe.disconnects.load(Ordering::SeqCst), 0);
+ owner.acquire().await.unwrap().rollback().await.unwrap();
+ owner.close().await.unwrap();
+ }
+
#[tokio::test]
async fn begin_ack_and_commit_ack_drive_visible_state_and_outcome() {
let (io, _) =
diff --git a/crates/dbx-mcp/tests/local.rs b/crates/dbx-mcp/tests/local.rs
index 8b422ce80f..10d31130fe 100644
--- a/crates/dbx-mcp/tests/local.rs
+++ b/crates/dbx-mcp/tests/local.rs
@@ -93,7 +93,7 @@ async fn local_backend_reads_dbx_storage_without_desktop_process() {
async fn duplicate_connection_preserves_secrets_ssh_and_sidebar_group() {
let directory = tempdir().expect("temporary data directory");
let db_path = directory.path().join("dbx.db");
- let storage = Storage::open(&db_path).await.expect("open storage");
+ let storage = dbx_core::persistence::test_storage::open(&db_path).await.expect("open isolated storage");
storage
.save_mcp_global_policy(&dbx_core::storage::McpGlobalPolicy {
read_only: false,
@@ -255,7 +255,7 @@ async fn duplicate_connection_preserves_secrets_ssh_and_sidebar_group() {
client.cancel().await.expect("close client");
server_task.abort();
- let reopened = Storage::open(&db_path).await.expect("reopen storage");
+ let reopened = dbx_core::persistence::test_storage::open(&db_path).await.expect("reopen isolated storage");
let connections = reopened.load_connections().await.expect("reload connections");
assert_eq!(connections.len(), 4, "failed duplicates must not add connections");
let copied = connections
diff --git a/crates/dbx-mcp/tests/mongodb_databases.rs b/crates/dbx-mcp/tests/mongodb_databases.rs
index 5fea81701e..7f99eba829 100644
--- a/crates/dbx-mcp/tests/mongodb_databases.rs
+++ b/crates/dbx-mcp/tests/mongodb_databases.rs
@@ -2,7 +2,8 @@ use std::{sync::Arc, time::Duration};
use dbx_core::{
models::connection::ConnectionConfig,
- storage::{McpConnectionPolicy, McpDatabaseScope, McpGlobalPolicy, Storage},
+ persistence::test_storage,
+ storage::{McpConnectionPolicy, McpDatabaseScope, McpGlobalPolicy},
};
use dbx_mcp::{DbxMcpServer, LocalBackend, McpScope};
use rmcp::{
@@ -44,7 +45,7 @@ async fn list_databases(
) -> CallToolResult {
let directory = tempdir().expect("temporary data directory");
let db_path = directory.path().join("dbx.db");
- let storage = Storage::open(&db_path).await.expect("open storage");
+ let storage = test_storage::open(&db_path).await.expect("open isolated storage");
storage.save_connections(&[connection]).await.expect("save connection");
storage
.save_mcp_global_policy(&McpGlobalPolicy {
@@ -171,7 +172,7 @@ for line in sys.stdin:
)
.expect("write Agent fixture");
let storage_path = directory.path().join("dbx.db");
- let storage = Storage::open(&storage_path).await.expect("open storage");
+ let storage = test_storage::open(&storage_path).await.expect("open isolated storage");
let mut connection = mongo_connection();
connection.driver_profile = Some("mongodb-legacy".to_string());
connection.keepalive_interval_secs = 0;
diff --git a/crates/dbx-mcp/tests/mysql_data_charset_live.rs b/crates/dbx-mcp/tests/mysql_data_charset_live.rs
new file mode 100644
index 0000000000..c8fa0172c2
--- /dev/null
+++ b/crates/dbx-mcp/tests/mysql_data_charset_live.rs
@@ -0,0 +1,87 @@
+//! SELECT-only fixture regression for the production fixed-session MCP owner.
+//! DBX_LIVE_MYSQL_DATA_CHARSET_URL points at the additive issue12458 fixtures.
+//! Use the authorized local, direct plaintext MySQL fixture URL, with a database
+//! containing legacy_long_keys and SELECT grants; TLS/tunnel/URL options are not
+//! copied into this test's connection configs. DBX storage and its managed key
+//! are isolated in a temporary directory; no OS keychain is required.
+//! Rejected writes must produce a local policy error, not a MySQL grant error.
+use dbx_core::{models::connection::ConnectionConfig, persistence::secret_codec::SecretKeyPolicy, storage::Storage};
+use dbx_mcp::{transaction::TransactionState, DbxBackend, LocalBackend};
+use serde_json::json;
+
+#[tokio::test]
+#[ignore = "requires DBX_LIVE_MYSQL_DATA_CHARSET_URL and issue12458 legacy_long_keys fixture"]
+async fn mysql_data_charset_fixed_owner_reads_and_enforces_immutable_policy() {
+ let url = std::env::var("DBX_LIVE_MYSQL_DATA_CHARSET_URL").expect("set SELECT-only fixture URL");
+ let opts = mysql_async::Opts::from_url(&url).unwrap();
+ let database = opts.db_name().unwrap();
+ let directory = tempfile::tempdir().unwrap();
+ let db_path = directory.path().join("dbx.db");
+ let storage = Storage::open_with_secret_key_policy(&db_path, SecretKeyPolicy::ManagedDataDir).await.unwrap();
+ let mut connections = Vec::new();
+ for (id, charset) in [("legacy", Some("dataCharset=GBK")), ("default", None)] {
+ let connection: ConnectionConfig = serde_json::from_value(json!({
+ "id":id, "name":id, "db_type":"mysql", "host":opts.ip_or_hostname(), "port":opts.tcp_port(),
+ "username":opts.user().unwrap_or(""), "password":opts.pass().unwrap_or(""), "database":database,
+ "url_params":charset, "read_only":false, "keepalive_interval_secs":0,
+ "connect_timeout_secs":5, "query_timeout_secs":30
+ }))
+ .unwrap();
+ storage.add_connection_for_mcp(connection.clone()).await.unwrap();
+ connections.push(connection);
+ }
+ drop(storage);
+ let backend = LocalBackend::open(&db_path).await.unwrap();
+ let legacy = backend.open_transaction_owner(&connections[0], database, "legacy-session").await.unwrap();
+ let default = backend.open_transaction_owner(&connections[1], database, "default-session").await.unwrap();
+ let query = "SELECT legacy_key,part FROM legacy_long_keys WHERE legacy_key=CONVERT(_binary 0xD6D0CEC4 USING latin1) ORDER BY part";
+ let stored =
+ "SELECT HEX(legacy_key),part,HEX(legacy_text),HEX(raw_blob) FROM legacy_long_keys ORDER BY legacy_key,part";
+ let before = default.acquire().await.unwrap().query(stored, None).await.unwrap().result.rows;
+ let original = default.acquire().await.unwrap().query(query, None).await.unwrap();
+ assert_eq!(original.result.rows[0][0], "ÖÐÎÄ");
+ assert!(original.result.raw_key_cells.is_empty());
+ // The disabled mode still permits session SQL without changing database data.
+ default.acquire().await.unwrap().query("SET @dbx_data_charset_probe=1", None).await.unwrap();
+ legacy.acquire().await.unwrap().begin().await.unwrap();
+ let decoded = legacy.acquire().await.unwrap().query(query, None).await.unwrap();
+ assert_eq!(decoded.state, TransactionState::Active);
+ assert_eq!(decoded.result.rows[0][0], "中文");
+ assert_eq!(decoded.result.raw_key_cells[0].value, "ÖÐÎÄ");
+ assert_eq!(decoded.result.raw_key_cells.len(), decoded.result.rows.len() * 2);
+
+ // A live owner retains the pool codec even if the stored config changes.
+ backend.state().configs.write().await.get_mut("legacy").unwrap().url_params = None;
+ for sql in [
+ "UPDATE legacy_long_keys SET legacy_text=legacy_text WHERE 1=0",
+ "SET NAMES latin1",
+ "SET @dbx_data_charset_probe=1",
+ ] {
+ let denied = legacy.acquire().await.unwrap().query(sql, None).await.unwrap_err();
+ assert_eq!(denied.code, "TRANSACTION_SQL_BLOCKED");
+ assert!(denied.message.contains("MYSQL_DATA_CHARSET"));
+ assert_eq!(denied.mysql_code, None, "must reject before the database can enforce grants");
+ assert_eq!(denied.state, TransactionState::Active, "local rejection preserves the physical transaction");
+ }
+ let batch = legacy
+ .acquire()
+ .await
+ .unwrap()
+ .batch(
+ vec![query.into(), "UPDATE legacy_long_keys SET legacy_text=legacy_text WHERE 1=0".into(), query.into()],
+ None,
+ true,
+ )
+ .await;
+ assert_eq!(batch.len(), 3);
+ assert_eq!(batch[0].as_ref().unwrap().result.rows[0][0], "中文");
+ assert_eq!(batch[1].as_ref().unwrap_err().code, "TRANSACTION_SQL_BLOCKED");
+ assert_eq!(batch[2].as_ref().unwrap().result.rows[0][0], "中文");
+ legacy.acquire().await.unwrap().commit().await.unwrap();
+ legacy.acquire().await.unwrap().begin().await.unwrap();
+ legacy.acquire().await.unwrap().rollback().await.unwrap();
+ let after = default.acquire().await.unwrap().query(stored, None).await.unwrap().result.rows;
+ assert_eq!(before, after);
+ legacy.close().await.unwrap();
+ default.close().await.unwrap();
+}
diff --git a/crates/dbx-types/src/types.rs b/crates/dbx-types/src/types.rs
index c547711890..38652f304b 100644
--- a/crates/dbx-types/src/types.rs
+++ b/crates/dbx-types/src/types.rs
@@ -600,6 +600,35 @@ pub struct LargeValueCell {
/// Opaque original-result locator. Absent for legacy preview/re-query drivers.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub value_ref: Option<String>,
+ /// A server-truncated carrier cannot be strictly decoded until explicitly
+ /// fetching the complete value. The preview is not presentation data.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub pending_decode: Option<bool>,
+}
+
+/// Original, complete key cells retained before presentation-only decoding.
+/// These are internal read locators, never inverse-encoded displayed values.
+#[derive(Debug, Clone, Deserialize, PartialEq)]
+pub struct OriginalKeyCell {
+ pub row_index: usize,
+ pub column_index: usize,
+ pub value: serde_json::Value,
+}
+
+impl Serialize for OriginalKeyCell {
+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+ where
+ S: serde::Serializer,
+ {
+ use serde::ser::SerializeStruct;
+ let mut state = serializer.serialize_struct("OriginalKeyCell", 3)?;
+ state.serialize_field("row_index", &self.row_index)?;
+ state.serialize_field("column_index", &self.column_index)?;
+ // Original locators already use the driver's lossless representation
+ // (MySQL DECIMAL/BIGINT are strings), not the display column's type.
+ state.serialize_field("value", &JsSafeCell(&self.value, None))?;
+ state.end()
+ }
}
#[derive(Debug, Clone, Deserialize)]
@@ -629,6 +658,10 @@ pub struct QueryResult {
pub spatial_values: Vec<Vec<Option<u32>>>,
#[serde(default, deserialize_with = "deserialize_vec_or_default")]
pub rows: Vec<Vec<serde_json::Value>>,
+ /// Sparse original key values for internal full-value reads. Empty means
+ /// no authoritative locator metadata, not permission to guess decoded keys.
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ pub raw_key_cells: Vec<OriginalKeyCell>,
pub affected_rows: u64,
pub execution_time_ms: u128,
/// OceanBase SQL Audit EXECUTE_TIME in microseconds. Absent when the
@@ -677,6 +710,7 @@ impl Serialize for QueryResult {
let field_count = 9
+ usize::from(!self.spatial_columns.is_empty())
+ usize::from(!self.spatial_values.is_empty())
+ + usize::from(!self.raw_key_cells.is_empty())
+ usize::from(self.elasticsearch_raw_body.is_some())
+ usize::from(self.server_execute_time_us.is_some())
+ usize::from(self.query_timings_ms.is_some())
@@ -692,6 +726,9 @@ impl Serialize for QueryResult {
state.serialize_field("spatial_values", &self.spatial_values)?;
}
state.serialize_field("rows", &JsSafeRows(&self.rows, &self.column_types))?;
+ if !self.raw_key_cells.is_empty() {
+ state.serialize_field("raw_key_cells", &self.raw_key_cells)?;
+ }
state.serialize_field("affected_rows", &self.affected_rows)?;
state.serialize_field("execution_time_ms", &self.execution_time_ms)?;
if let Some(server_execute_time_us) = &self.server_execute_time_us {
@@ -2034,6 +2071,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: Vec::new(),
spatial_columns: Vec::new(),
+ raw_key_cells: Vec::new(),
spatial_values: Vec::new(),
rows: vec![vec![
serde_json::json!(1391198305898897409i64),
@@ -2056,6 +2094,24 @@ mod tests {
}
}
+ #[test]
+ fn raw_key_cells_are_optional_and_preserve_javascript_integer_fidelity() {
+ let mut result = bigint_result_sample();
+ assert!(serde_json::to_value(&result).unwrap().get("raw_key_cells").is_none());
+ result.raw_key_cells = vec![super::OriginalKeyCell {
+ row_index: 0,
+ column_index: 0,
+ value: serde_json::json!(1391198305898897409i64),
+ }];
+ let wire = serde_json::to_value(&result).unwrap();
+ assert_eq!(wire["raw_key_cells"][0]["value"], "1391198305898897409");
+ let restored: super::QueryResult = serde_json::from_value(wire).unwrap();
+ assert_eq!(restored.raw_key_cells[0].value, "1391198305898897409");
+ let mut old_wire = serde_json::to_value(bigint_result_sample()).unwrap();
+ old_wire.as_object_mut().unwrap().remove("raw_key_cells");
+ assert!(serde_json::from_value::<super::QueryResult>(old_wire).unwrap().raw_key_cells.is_empty());
+ }
+
/// #7832: integers beyond JavaScript's ±(2^53 - 1) safe range must cross
/// the transport boundary as decimal strings, while safe integers keep
/// their JSON number form so ordinary grids stay unchanged.
diff --git a/crates/dbx-web/src/routes/connection.rs b/crates/dbx-web/src/routes/connection.rs
index 832b9e25e4..03dc2c345f 100644
--- a/crates/dbx-web/src/routes/connection.rs
+++ b/crates/dbx-web/src/routes/connection.rs
@@ -633,7 +633,9 @@ pub async fn unlock_connection_writes(
)
.await?;
let remaining_ms =
- state.app.write_unlock_windows.unlock(&body.connection_id, body.duration_secs).await.map_err(AppError::from)?;
+ dbx_core::query::unlock_connection_writes_core(&state.app, &body.connection_id, body.duration_secs)
+ .await
+ .map_err(AppError::from)?;
Ok(Json(WriteUnlockStateResponse { remaining_ms }))
}
@@ -2496,10 +2498,10 @@ done
headers
}
- /// 回归:Web connect_db 不得把明文 no-save 密码写入全局 AppState.configs,
- /// 且凭据严格按登录会话隔离——会话 B 无法复用/重建出会话 A 的密码。
+ /// Encrypted SQLite must scope no-save credentials when supported; the fast
+ /// bundled lane must reject encryption without retaining the attempted secret.
#[tokio::test]
- async fn connect_db_sanitizes_global_config_and_scopes_password_by_session() {
+ async fn connect_db_scopes_password_by_session_or_rejects_unavailable_sqlite_encryption() {
let (state, dir) = test_web_state().await;
let db_path = dir.join("a.db").to_string_lossy().to_string();
std::fs::File::create(&db_path).unwrap();
@@ -2525,8 +2527,59 @@ done
.await
})
.await;
+ // Another workspace member may enable encryption on dbx-core even when
+ // this crate's feature is off. In that case retain the positive checks.
+ // Explicit SQLCipher builds always require success; never swallow their errors.
+ #[cfg(not(feature = "sqlite-sqlcipher"))]
+ if let Err(error) = &result {
+ assert_eq!(
+ error.message,
+ "Encrypted SQLite support is not compiled in this build. Rebuild with the sqlite-sqlcipher or sqlite-multiple-ciphers feature."
+ );
+ assert!(state.app.pool_handle("conn-a").await.is_none());
+ assert!(!state.app.session_credentials.has("token-a", "conn-a"));
+ assert!(!state.app.session_credentials.has("token-b", "conn-a"));
+ if let Some(stored) = state.app.configs.read().await.get("conn-a") {
+ assert!(stored.password.is_empty());
+ }
+ let _ = std::fs::remove_dir_all(dir);
+ return;
+ }
assert!(result.is_ok(), "{result:?}");
+ assert_session_password_is_scoped(&state).await;
+ let _ = std::fs::remove_dir_all(dir);
+ }
+
+ /// Saving no-save credentials requires no encrypted driver. Keep the positive
+ /// owner-isolation contract covered even in the bundled SQLite fast lane.
+ #[tokio::test]
+ async fn save_connections_sanitizes_global_config_and_scopes_password_by_session() {
+ let (state, dir) = test_web_state().await;
+ let mut config = sqlite_config("conn-a", &dir.join("a.db").to_string_lossy());
+ config.db_type = DatabaseType::Postgres;
+ config.host = "127.0.0.1".to_string();
+ config.port = 5432;
+ config.save_password = false;
+ config.password = "hunter2".to_string();
+
+ let _ = save_connections(
+ State(state.clone()),
+ cookie_headers("token-a"),
+ Json(SaveConnectionsRequest { configs: vec![config], removed_ids: Vec::new() }),
+ )
+ .await
+ .unwrap();
+
+ assert_session_password_is_scoped(&state).await;
+ let persisted = state.app.storage.load_connections().await.unwrap();
+ assert_eq!(persisted.len(), 1);
+ assert_eq!(persisted[0].id, "conn-a");
+ assert!(persisted[0].password.is_empty());
+ let _ = std::fs::remove_dir_all(dir);
+ }
+
+ async fn assert_session_password_is_scoped(state: &Arc<WebState>) {
// 全局运行态配置不含明文密码(泄露面消除)。
let stored = state.app.configs.read().await.get("conn-a").cloned().unwrap();
assert_eq!(stored.password, "");
@@ -2548,8 +2601,6 @@ done
assert_eq!(db_config.password, "");
})
.await;
-
- let _ = std::fs::remove_dir_all(dir);
}
#[tokio::test]
diff --git a/crates/dbx-web/src/routes/database_export.rs b/crates/dbx-web/src/routes/database_export.rs
index 494c2f4e34..b7930e5106 100644
--- a/crates/dbx-web/src/routes/database_export.rs
+++ b/crates/dbx-web/src/routes/database_export.rs
@@ -36,6 +36,13 @@ pub async fn start_database_export(
Json(body): Json<StartExportRequest>,
) -> Result<Json<serde_json::Value>, AppError> {
let mut req = body.request;
+ dbx_core::query::mysql_data_charset_policy::reject_operation(
+ &state.app,
+ &req.connection_id,
+ dbx_core::query::mysql_data_charset_policy::EXPORT_UNSUPPORTED,
+ )
+ .await
+ .map_err(AppError::from)?;
let export_id = req.export_id.clone();
// Web mode: write to a server-side temp file instead of the client-supplied
diff --git a/crates/dbx-web/src/routes/query.rs b/crates/dbx-web/src/routes/query.rs
index 1df34e9df2..0d32526257 100644
--- a/crates/dbx-web/src/routes/query.rs
+++ b/crates/dbx-web/src/routes/query.rs
@@ -1916,6 +1916,7 @@ mod tests {
deferred_large_value_cells: Vec::new(),
column_sortables: vec![],
spatial_columns: vec![],
+ raw_key_cells: Vec::new(),
spatial_values: vec![],
rows: vec![vec![serde_json::json!("relation customer_orders does not exist")]],
affected_rows: 0,
diff --git a/crates/dbx-web/src/routes/query_result_export.rs b/crates/dbx-web/src/routes/query_result_export.rs
index a305241939..41828080f5 100644
--- a/crates/dbx-web/src/routes/query_result_export.rs
+++ b/crates/dbx-web/src/routes/query_result_export.rs
@@ -39,6 +39,9 @@ pub async fn start_query_result_export(
Json(body): Json<StartQueryResultExportRequest>,
) -> Result<Json<serde_json::Value>, AppError> {
let mut req = body.request;
+ dbx_core::query::mysql_data_charset_policy::check_export(&state.app, &req.connection_id, &req.format)
+ .await
+ .map_err(AppError::from)?;
let export_id = req.export_id.clone();
let ext = match req.format.as_str() {
diff --git a/crates/dbx-web/src/routes/table_export.rs b/crates/dbx-web/src/routes/table_export.rs
index 5d8a2039d7..c9defbf0e8 100644
--- a/crates/dbx-web/src/routes/table_export.rs
+++ b/crates/dbx-web/src/routes/table_export.rs
@@ -36,6 +36,9 @@ pub async fn start_table_export(
Json(body): Json<StartExportRequest>,
) -> Result<Json<serde_json::Value>, AppError> {
let mut req = body.request;
+ dbx_core::query::mysql_data_charset_policy::check_export(&state.app, &req.connection_id, &req.format)
+ .await
+ .map_err(AppError::from)?;
let export_id = req.export_id.clone();
// Generate temp file path for web export output
diff --git a/crates/dbx-web/src/routes/transfer.rs b/crates/dbx-web/src/routes/transfer.rs
index fc5996e3c1..4080074202 100644
--- a/crates/dbx-web/src/routes/transfer.rs
+++ b/crates/dbx-web/src/routes/transfer.rs
@@ -88,6 +88,7 @@ pub async fn start_transfer(
) -> Result<Json<serde_json::Value>, AppError> {
let operation_timeout_secs = body.operation_timeout_secs;
let req = body.request;
+ transfer::check_data_charset_transfer(&state.app, &req).await.map_err(AppError::from)?;
transfer::validate_transfer_request(&req).map_err(AppError::from)?;
transfer::validate_transfer_operation_timeout(operation_timeout_secs).map_err(AppError::from)?;
diff --git a/packages/app-tests/dataGridContextMenu.test.ts b/packages/app-tests/dataGridContextMenu.test.ts
index ead1111198..956268984e 100644
--- a/packages/app-tests/dataGridContextMenu.test.ts
+++ b/packages/app-tests/dataGridContextMenu.test.ts
@@ -9,7 +9,10 @@ const dataGridSource = readFileSync(dataGridPath, "utf8");
test("set NULL applies a real null value only to editable selections", () => {
const handler = dataGridSource.match(/function setSelectionNull\(\) \{[^]*?\n\}/)?.[0] ?? "";
- assert.match(handler, /if \(!props\.editable \|\| !selectionHasEditableCells\(\)\) return;/);
+ assert.match(dataGridSource, /const resolvedConnectionConfig = computed\(\(\) => connectionStore\.getConfig\(props\.connectionId \?\? ""\)\);/);
+ assert.match(dataGridSource, /const compatibilityReadOnly = computed\(\(\) => mysqlDataCharsetEnabled\(resolvedConnectionConfig\.value\)\);/);
+ assert.match(dataGridSource, /const effectiveEditable = computed\(\(\) => !!props\.editable && !compatibilityReadOnly\.value\);/);
+ assert.match(handler, /if \(!effectiveEditable\.value \|\| !selectionHasEditableCells\(\)\) return;/);
assert.match(handler, /fillSelectionWithValue\(null\);/);
assert.doesNotMatch(handler, /fillSelectionWithValue\(["'](?:NULL)?["']\)/);
});
diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs
index 91417c8417..699bae245b 100644
--- a/src-tauri/src/commands/connection.rs
+++ b/src-tauri/src/commands/connection.rs
@@ -3017,10 +3017,7 @@ pub async fn unlock_connection_writes(
connection_id: String,
duration_secs: u64,
) -> Result<WriteUnlockState, String> {
- if !state.configs.read().await.contains_key(&connection_id) {
- return Err("Connection not found".to_string());
- }
- let remaining_ms = state.write_unlock_windows.unlock(&connection_id, duration_secs).await?;
+ let remaining_ms = dbx_core::query::unlock_connection_writes_core(&state, &connection_id, duration_secs).await?;
Ok(WriteUnlockState { remaining_ms })
}
diff --git a/src-tauri/src/commands/database_export.rs b/src-tauri/src/commands/database_export.rs
index 7f2e593faa..b1a29a7f3c 100644
--- a/src-tauri/src/commands/database_export.rs
+++ b/src-tauri/src/commands/database_export.rs
@@ -72,6 +72,12 @@ pub async fn export_database_sql(
state: State<'_, Arc<AppState>>,
request: DatabaseExportRequest,
) -> Result<(), String> {
+ dbx_core::query::mysql_data_charset_policy::reject_operation(
+ &state,
+ &request.connection_id,
+ dbx_core::query::mysql_data_charset_policy::EXPORT_UNSUPPORTED,
+ )
+ .await?;
let state = state.inner().clone();
let export_id = request.export_id.clone();
diff --git a/src-tauri/src/commands/mcp.rs b/src-tauri/src/commands/mcp.rs
index f4dd6518e9..6a1cdad06b 100644
--- a/src-tauri/src/commands/mcp.rs
+++ b/src-tauri/src/commands/mcp.rs
@@ -2730,9 +2730,10 @@ mod tests {
let calls = std::fs::read_to_string(log_path).unwrap();
assert!(calls.contains("npm root -g"));
assert!(calls.contains("npm prefix -g"));
+ let canonical_npm_cli = canonical_runtime_path(&npm_cli_path).unwrap();
assert!(calls
.lines()
- .any(|line| line == format!("{} install -g @dbx-app/mcp-server@latest", npm_cli_path.display())));
+ .any(|line| line == format!("{} install -g @dbx-app/mcp-server@latest", canonical_npm_cli.display())));
assert!(!calls.contains("--registry"));
assert!(calls.contains(&format!("PATH={}", canonical_runtime_path(&dir).unwrap().display())));
diff --git a/src-tauri/src/commands/query_result_export.rs b/src-tauri/src/commands/query_result_export.rs
index faf9ed84dd..1ba9b94465 100644
--- a/src-tauri/src/commands/query_result_export.rs
+++ b/src-tauri/src/commands/query_result_export.rs
@@ -323,6 +323,7 @@ pub async fn start_query_result_export(
state: State<'_, Arc<AppState>>,
mut request: QueryResultExportRequest,
) -> Result<(), String> {
+ dbx_core::query::mysql_data_charset_policy::check_export(&state, &request.connection_id, &request.format).await?;
let state = state.inner().clone();
let export_id = request.export_id.clone();
let target = StagedExportTarget::new(&request.file_path)?;
diff --git a/src-tauri/src/commands/table_export.rs b/src-tauri/src/commands/table_export.rs
index c98db4a05b..888fc1fb61 100644
--- a/src-tauri/src/commands/table_export.rs
+++ b/src-tauri/src/commands/table_export.rs
@@ -68,6 +68,7 @@ pub async fn start_table_export(
state: State<'_, Arc<AppState>>,
request: TableExportRequest,
) -> Result<(), String> {
+ dbx_core::query::mysql_data_charset_policy::check_export(&state, &request.connection_id, &request.format).await?;
let state = state.inner().clone();
let export_id = request.export_id.clone();
let file_path = request.file_path.clone();
diff --git a/src-tauri/src/commands/transfer.rs b/src-tauri/src/commands/transfer.rs
index b4299aa81a..75c68903cc 100644
--- a/src-tauri/src/commands/transfer.rs
+++ b/src-tauri/src/commands/transfer.rs
@@ -27,6 +27,7 @@ pub async fn start_transfer(
operation_timeout_secs: Option<u64>,
) -> Result<(), String> {
let state = state.inner().clone();
+ dbx_core::transfer::check_data_charset_transfer(&state, &request).await?;
dbx_core::transfer::validate_transfer_operation_timeout(operation_timeout_secs)?;
// Reject transfer early if the target connection is read-only — writing to it is inherently required
ensure_connection_writable(&state, &request.target_connection_id, "Transfer").await?;