feat(dameng): preserve character length units
This commit is contained in:
1 parent
8020fe5886
commit
32b4acee3a
13 files changed
+382
-24
No files matched your search
@@ -1,10 +1,13 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
combineDataTypeForDatabase,
|
||||
combineDataTypeForDatabaseWithLengthUnit,
|
||||
createColumnDrafts,
|
||||
dataTypeLengthInputValue,
|
||||
dataTypeLengthUnitValue,
|
||||
DATA_TYPE_OPTIONS,
|
||||
defaultNewColumnDataType,
|
||||
getDataTypeLengthUnitOptions,
|
||||
getDefaultLengthForType,
|
||||
hasExistingColumnTypeChange,
|
||||
isDataTypeLengthDisabled,
|
||||
@@ -14,6 +17,7 @@ import {
|
||||
isSqlServerIdentityCompatibleDataType,
|
||||
mysqlEnumDataType,
|
||||
rehydrateColumnDraftsFromMetadata,
|
||||
restoreDamengLengthUnitsAfterSave,
|
||||
splitDataType,
|
||||
} from "@/lib/table/tableStructureEditorState";
|
||||
|
||||
@@ -101,6 +105,79 @@ describe("tableStructureEditorState", () => {
|
||||
expect(combineDataTypeForDatabase("mysql", "integer", "11")).toBe("integer(11)");
|
||||
});
|
||||
|
||||
it("offers BYTE and CHAR units only for supported Dameng character types", () => {
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "varchar2(255 CHAR)")).toEqual(["BYTE", "CHAR"]);
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "varchar(255)")).toEqual(["BYTE", "CHAR"]);
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "char(10 BYTE)")).toEqual(["BYTE", "CHAR"]);
|
||||
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "nchar(10)")).toEqual([]);
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "nvarchar2(10)")).toEqual([]);
|
||||
expect(getDataTypeLengthUnitOptions("dameng", "number(10,0)")).toEqual([]);
|
||||
expect(getDataTypeLengthUnitOptions("oracle", "varchar2(255 CHAR)")).toEqual([]);
|
||||
expect(getDataTypeLengthUnitOptions("mysql", "varchar(255)")).toEqual([]);
|
||||
});
|
||||
|
||||
it("separates and reconstructs Dameng character length units", () => {
|
||||
expect(dataTypeLengthInputValue("dameng", "varchar2(255 char)")).toBe("255");
|
||||
expect(dataTypeLengthUnitValue("dameng", "varchar2(255 char)")).toBe("CHAR");
|
||||
expect(dataTypeLengthInputValue("dameng", "char(10 BYTE)")).toBe("10");
|
||||
expect(dataTypeLengthUnitValue("dameng", "char(10 BYTE)")).toBe("BYTE");
|
||||
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "varchar2", "255", "CHAR")).toBe("varchar2(255 CHAR)");
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "varchar", "64", "byte")).toBe("varchar(64 BYTE)");
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "char", "", "CHAR")).toBe("char");
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "varchar2", "255", "")).toBe("varchar2(255)");
|
||||
});
|
||||
|
||||
it("does not reinterpret unsupported length parameters or dialects", () => {
|
||||
expect(dataTypeLengthInputValue("dameng", "varchar2(255 WORD)")).toBe("255 WORD");
|
||||
expect(dataTypeLengthUnitValue("dameng", "varchar2(255 WORD)")).toBe("");
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("mysql", "varchar", "255", "CHAR")).toBe("varchar(255)");
|
||||
expect(combineDataTypeForDatabaseWithLengthUnit("dameng", "nvarchar2", "20", "BYTE")).toBe("nvarchar2(20)");
|
||||
});
|
||||
|
||||
it("keeps a saved Dameng length unit when an older agent omits it during post-save refresh", () => {
|
||||
const [legacyAgentDraft] = createColumnDrafts(
|
||||
[
|
||||
{
|
||||
name: "DISPLAY_NAME",
|
||||
data_type: "VARCHAR2(255)",
|
||||
is_nullable: true,
|
||||
column_default: null,
|
||||
is_primary_key: false,
|
||||
extra: null,
|
||||
},
|
||||
],
|
||||
"dameng",
|
||||
);
|
||||
|
||||
const [restored] = restoreDamengLengthUnitsAfterSave([legacyAgentDraft!], new Map([["display_name", "VARCHAR2(255 CHAR)"]]));
|
||||
|
||||
expect(restored?.dataType).toBe("VARCHAR2(255 CHAR)");
|
||||
expect(restored?.original?.data_type).toBe("VARCHAR2(255 CHAR)");
|
||||
});
|
||||
|
||||
it("prefers live Dameng metadata when the agent returns an explicit length unit", () => {
|
||||
const [liveDraft] = createColumnDrafts(
|
||||
[
|
||||
{
|
||||
name: "DISPLAY_NAME",
|
||||
data_type: "VARCHAR2(255 BYTE)",
|
||||
is_nullable: true,
|
||||
column_default: null,
|
||||
is_primary_key: false,
|
||||
extra: null,
|
||||
},
|
||||
],
|
||||
"dameng",
|
||||
);
|
||||
|
||||
const [restored] = restoreDamengLengthUnitsAfterSave([liveDraft!], new Map([["display_name", "VARCHAR2(255 CHAR)"]]));
|
||||
|
||||
expect(restored?.dataType).toBe("VARCHAR2(255 BYTE)");
|
||||
expect(restored?.original?.data_type).toBe("VARCHAR2(255 BYTE)");
|
||||
});
|
||||
|
||||
it("does not add MySQL display lengths when choosing SQLite-family types", () => {
|
||||
for (const databaseType of ["sqlite", "rqlite", "turso"] as const) {
|
||||
expect(getDefaultLengthForType(databaseType, "integer")).toBe("");
|
||||
|
||||
@@ -842,6 +842,66 @@ export function splitDataType(raw: string): { baseType: string; params: string }
|
||||
return { baseType, params };
|
||||
}
|
||||
|
||||
export type DataTypeLengthUnit = "BYTE" | "CHAR";
|
||||
|
||||
const DAMENG_LENGTH_UNIT_TYPES = new Set(["char", "varchar", "varchar2"]);
|
||||
const DAMENG_LENGTH_UNITS: readonly DataTypeLengthUnit[] = ["BYTE", "CHAR"];
|
||||
|
||||
function normalizedDataTypeName(rawDataType: string): string {
|
||||
return splitDataType(rawDataType).baseType.trim().replace(/\s+/g, " ").toLowerCase();
|
||||
}
|
||||
|
||||
export function getDataTypeLengthUnitOptions(dbType: DatabaseType | undefined, rawDataType: string): readonly DataTypeLengthUnit[] {
|
||||
if (dbType !== "dameng") return [];
|
||||
return DAMENG_LENGTH_UNIT_TYPES.has(normalizedDataTypeName(rawDataType)) ? DAMENG_LENGTH_UNITS : [];
|
||||
}
|
||||
|
||||
function splitDataTypeLengthParams(dbType: DatabaseType | undefined, rawDataType: string): { length: string; unit: DataTypeLengthUnit | "" } {
|
||||
const { params } = splitDataType(rawDataType);
|
||||
if (!params || getDataTypeLengthUnitOptions(dbType, rawDataType).length === 0) {
|
||||
return { length: params, unit: "" };
|
||||
}
|
||||
|
||||
const match = params.match(/^(.*\S)\s+(BYTE|CHAR)$/i);
|
||||
if (!match) return { length: params, unit: "" };
|
||||
return {
|
||||
length: match[1]!.trim(),
|
||||
unit: match[2]!.toUpperCase() as DataTypeLengthUnit,
|
||||
};
|
||||
}
|
||||
|
||||
export function dataTypeLengthUnitValue(dbType: DatabaseType | undefined, rawDataType: string): DataTypeLengthUnit | "" {
|
||||
return splitDataTypeLengthParams(dbType, rawDataType).unit;
|
||||
}
|
||||
|
||||
export function combineDataTypeForDatabaseWithLengthUnit(dbType: DatabaseType | undefined, baseType: string, length: string, unit: string | undefined): string {
|
||||
const normalizedLength = length.trim();
|
||||
if (!normalizedLength) return combineDataTypeForDatabase(dbType, baseType, "");
|
||||
|
||||
const normalizedUnit = unit?.trim().toUpperCase();
|
||||
const validUnit = normalizedUnit === "BYTE" || normalizedUnit === "CHAR" ? normalizedUnit : "";
|
||||
const allowedUnits = getDataTypeLengthUnitOptions(dbType, baseType);
|
||||
const params = validUnit && allowedUnits.includes(validUnit) ? `${normalizedLength} ${validUnit}` : normalizedLength;
|
||||
return combineDataTypeForDatabase(dbType, baseType, params);
|
||||
}
|
||||
|
||||
export function restoreDamengLengthUnitsAfterSave(columns: EditableStructureColumn[], savedDataTypesByColumn: ReadonlyMap<string, string>): EditableStructureColumn[] {
|
||||
if (savedDataTypesByColumn.size === 0) return columns;
|
||||
|
||||
return columns.map((column) => {
|
||||
if (dataTypeLengthUnitValue("dameng", column.dataType)) return column;
|
||||
const savedDataType = savedDataTypesByColumn.get(column.name.trim().toLowerCase());
|
||||
if (!savedDataType || !dataTypeLengthUnitValue("dameng", savedDataType)) return column;
|
||||
if (normalizedDataTypeName(savedDataType) !== normalizedDataTypeName(column.dataType)) return column;
|
||||
|
||||
return {
|
||||
...column,
|
||||
dataType: savedDataType,
|
||||
original: column.original ? { ...column.original, data_type: savedDataType } : column.original,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
/** MySQL character/text types that accept `CHARACTER SET` and `COLLATE`. */
|
||||
const MYSQL_CHARACTER_DATA_TYPES = new Set(["char", "varchar", "tinytext", "text", "mediumtext", "longtext", "enum", "set"]);
|
||||
|
||||
@@ -898,7 +958,7 @@ export function combineDataTypeForDatabase(dbType: DatabaseType | undefined, bas
|
||||
|
||||
export function dataTypeLengthInputValue(dbType: DatabaseType | undefined, rawDataType: string): string {
|
||||
const parsed = splitDataType(rawDataType);
|
||||
return isDataTypeLengthDisabled(dbType, parsed.baseType) ? "" : parsed.params;
|
||||
return isDataTypeLengthDisabled(dbType, parsed.baseType) ? "" : splitDataTypeLengthParams(dbType, rawDataType).length;
|
||||
}
|
||||
|
||||
export function normalizeDataTypeParams(dbType: DatabaseType | undefined, baseType: string, params: string): string {
|
||||
|
||||
Reference in new issue
Block a user