fix(mysql): copy varbinary text values as raw strings
This commit is contained in:
1 parent
cd008b2d56
commit
14ad5ef9bf
8 files changed
+299
-35
No files matched your search
@@ -114,6 +114,7 @@ const HEX_ESCAPE_RE = /^(?:\\x[0-9a-fA-F]{2}|\s)+$/;
|
||||
const BINARY_TYPE_RE = /^(?:blob|tinyblob|mediumblob|longblob|bytea|bytes|binary|varbinary|image|raw|long\s+raw)(?:\b|\()/i;
|
||||
const FIXED_BINARY_TYPE_RE = /^binary(?:\b|\()/i;
|
||||
const BINARY_STRING_TYPE_RE = /^(?:binary|varbinary)(?:\b|\()/i;
|
||||
const VARBINARY_TYPE_RE = /^varbinary(?:\b|\()/i;
|
||||
const BLOB_TYPE_RE = /^(?:blob|tinyblob|mediumblob|longblob)(?:\b|\()/i;
|
||||
const MYSQL_FILE_IMPORT_TYPE_RE = /^(?:blob|tinyblob|mediumblob|longblob|binary|varbinary)(?:\b|\()/i;
|
||||
|
||||
@@ -220,6 +221,23 @@ export function binaryCellUtf8Text(value: unknown, columnType?: string, database
|
||||
return binaryCellUtf8TextBytes(bytes, columnType);
|
||||
}
|
||||
|
||||
// 复制到剪贴板时,把「文本型」MySQL VARBINARY 单元格还原成其原始字符串。
|
||||
// DBX 后端为保留任意 bytes,把该值统一序列化成 `0x<hex>`;前端只有在严格 UTF-8 解码、
|
||||
// 无控制字符且重新编码后与原 bytes 完全一致时,才把 payload(如 token)复制为文本。
|
||||
// 其余情况返回 null,让调用方沿用无损 hex。范围严格限定 MySQL VARBINARY,避免改变
|
||||
// MySQL BINARY/BLOB、SQL Server VARBINARY、PostgreSQL BYTEA、Oracle RAW 等现有语义。
|
||||
export function binaryCellClipboardText(value: unknown, columnType?: string, databaseType?: DatabaseType): string | null {
|
||||
if (databaseType !== "mysql" || !VARBINARY_TYPE_RE.test((columnType ?? "").trim())) return null;
|
||||
// MySQL QueryResult 的 binary canonical form 是 `0x<hex>`;不要把普通的偶数长度
|
||||
// 文本(例如 "abcd")猜测成 hex bytes。
|
||||
const bytes = typeof value === "string" ? parseBinaryCellHexValue(value) : null;
|
||||
if (!bytes) return null;
|
||||
const text = binaryCellUtf8TextBytes(bytes, columnType);
|
||||
if (text === null) return null;
|
||||
const encoded = new TextEncoder().encode(text);
|
||||
return encoded.length === bytes.length && encoded.every((byte, index) => byte === bytes[index]) ? text : null;
|
||||
}
|
||||
|
||||
// MySQL BLOB 的文本预览必须与编辑写回路径(coerceMysqlBlobTextValue,仅 mysql)走同一闸门:
|
||||
// SQLite/DuckDB/H2/Firebird 等库同样暴露 `blob` 列,若一律按文本预览会出现
|
||||
// “显示是文本、编辑器却是十六进制”的不一致,故 blob 文本预览仅在 mysql 连接开启。
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { cellImagePreviewUrl } from "@/lib/dataGrid/cellImageUrl";
|
||||
import { binaryCellClipboardText } from "@/lib/dataGrid/binaryCellDownload";
|
||||
import { clipboardCellValue, displayCellValue, type CellValue } from "@/lib/dataGrid/cellValue";
|
||||
import { formatJsonText } from "@/lib/dataGrid/cellDetailPresentation";
|
||||
import type { DatabaseType } from "@/types/database";
|
||||
@@ -186,11 +187,11 @@ function detailColumnType(typeByColumn: ReadonlyMap<string, string> | undefined,
|
||||
return resultColumnTypes?.[columnIndex]?.trim() ?? "";
|
||||
}
|
||||
|
||||
export function dataGridRowDetailJson(detail: DataGridRowDetail, originalDocument?: unknown): string {
|
||||
export function dataGridRowDetailJson(detail: DataGridRowDetail, originalDocument?: unknown, databaseType?: DatabaseType): string {
|
||||
if (originalDocument !== undefined) return JSON.stringify(jsonDetailDisplayValue(originalDocument), null, 2);
|
||||
const row: Record<string, CellValue> = {};
|
||||
detail.fields.forEach((field) => {
|
||||
row[field.column] = field.value;
|
||||
row[field.column] = binaryCellClipboardText(field.value, field.type, databaseType) ?? field.value;
|
||||
});
|
||||
return JSON.stringify(jsonDetailDisplayValue(row), null, 2);
|
||||
}
|
||||
@@ -214,23 +215,23 @@ export function jsonDetailDisplayValue(value: unknown): unknown {
|
||||
return value;
|
||||
}
|
||||
|
||||
export function dataGridRowDetailTsv(detail: DataGridRowDetail): string {
|
||||
return detail.fields.map((field) => clipboardCellValue(field.value)).join("\t");
|
||||
export function dataGridRowDetailTsv(detail: DataGridRowDetail, databaseType?: DatabaseType): string {
|
||||
return detail.fields.map((field) => clipboardCellValue(binaryCellClipboardText(field.value, field.type, databaseType) ?? field.value)).join("\t");
|
||||
}
|
||||
|
||||
export function dataGridColumnDetailJson(detail: DataGridColumnDetail): string {
|
||||
export function dataGridColumnDetailJson(detail: DataGridColumnDetail, databaseType?: DatabaseType): string {
|
||||
return JSON.stringify(
|
||||
detail.fields.map((field) => ({
|
||||
row: field.rowNumber,
|
||||
value: field.value,
|
||||
value: binaryCellClipboardText(field.value, field.type, databaseType) ?? field.value,
|
||||
})),
|
||||
null,
|
||||
2,
|
||||
);
|
||||
}
|
||||
|
||||
export function dataGridColumnDetailTsv(detail: DataGridColumnDetail): string {
|
||||
return detail.fields.map((field) => clipboardCellValue(field.value)).join("\n");
|
||||
export function dataGridColumnDetailTsv(detail: DataGridColumnDetail, databaseType?: DatabaseType): string {
|
||||
return detail.fields.map((field) => clipboardCellValue(binaryCellClipboardText(field.value, field.type, databaseType) ?? field.value)).join("\n");
|
||||
}
|
||||
|
||||
export interface BuildDeleteRowConfirmDetailsOptions<TRow> {
|
||||
|
||||
Reference in new issue
Block a user