github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-01 16:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: normalize temporal column precision

Browse Source
This commit is contained in:
t8y2
2026-05-26 14:38:53 +08:00
parent 8539e492cc
commit 32a4a5b1ec
4 changed files with 185 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/src/components/structure/TableStructureEditor.vue
+12 -3
View File
@@ -38,7 +38,7 @@ import { type EditableStructureColumn, type EditableStructureIndex } from "@/lib
import { getTableStructureCapabilities } from "@/lib/tableStructureCapabilities";
import {
buildStructureTargetLabel,
combineDataType,
combineDataTypeForDatabase,
createColumnDrafts,
createIndexDrafts,
DATA_TYPE_OPTIONS,
@@ -545,7 +545,12 @@ watch(
:allow-custom="true"
trigger-class="h-6 w-full font-mono text-[11px]"
@update:model-value="
(v: string) => (column.dataType = combineDataType(v, splitDataType(column.dataType).params))
(v: string) =>
(column.dataType = combineDataTypeForDatabase(
databaseType,
v,
splitDataType(column.dataType).params,
))
"
/>
<Input
@@ -561,7 +566,11 @@ watch(
class="h-6 min-w-16 font-mono text-[11px]"
:disabled="isColumnTypeDisabled(column)"
@update:model-value="
column.dataType = combineDataType(splitDataType(column.dataType).baseType, String($event))
column.dataType = combineDataTypeForDatabase(
databaseType,
splitDataType(column.dataType).baseType,
String($event),
)
"
/>
</td>
apps/desktop/src/lib/tableStructureEditorState.ts
+54 -1
View File
@@ -1,4 +1,4 @@
import type { ColumnInfo, IndexInfo } from "../types/database.ts";
import type { ColumnInfo, DatabaseType, IndexInfo } from "../types/database.ts";
import type { EditableStructureColumn, EditableStructureIndex } from "./tableStructureEditorSql.ts";
export const DATA_TYPE_OPTIONS: Record<string, string[]> = {
@@ -282,6 +282,59 @@ export function combineDataType(baseType: string, params: string): string {
return `${type}(${p})`;
}
export function combineDataTypeForDatabase(dbType: DatabaseType | undefined, baseType: string, params: string): string {
return combineDataType(baseType, normalizeDataTypeParams(dbType, baseType, params));
}
export function normalizeDataTypeParams(dbType: DatabaseType | undefined, baseType: string, params: string): string {
const p = params.trim();
if (!p) return "";
if (!isTemporalPrecisionType(dbType, baseType)) return p;
return isValidTemporalPrecision(dbType, p) ? p : "";
}
function isTemporalPrecisionType(dbType: DatabaseType | undefined, baseType: string): boolean {
const normalized = baseType.trim().replace(/\s+/g, " ").toLowerCase();
switch (dbType) {
case "mysql":
case "doris":
case "starrocks":
case "goldendb":
case "sundb":
return ["time", "datetime", "timestamp"].includes(normalized);
case "postgres":
case "gaussdb":
case "opengauss":
case "highgo":
case "vastbase":
case "kingbase":
case "redshift":
return [
"time",
"time without time zone",
"time with time zone",
"timestamp",
"timestamp without time zone",
"timestamp with time zone",
].includes(normalized);
case "sqlserver":
return ["time", "datetime2", "datetimeoffset"].includes(normalized);
case "oracle":
case "dameng":
case "oceanbase-oracle":
return ["timestamp", "timestamp with time zone", "timestamp with local time zone"].includes(normalized);
default:
return false;
}
}
function isValidTemporalPrecision(dbType: DatabaseType | undefined, params: string): boolean {
if (!/^\d+$/.test(params)) return false;
const value = Number(params);
const max = dbType === "oracle" || dbType === "dameng" || dbType === "oceanbase-oracle" ? 9 : 6;
return Number.isInteger(value) && value >= 0 && value <= max && String(value) === params;
}
export function buildStructureTargetLabel(
connectionName: string | undefined,
database: string | undefined,