feat(data-generate): prefer column default values

This commit is contained in:
t8y2 committed 2026-07-05 00:49:13 +08:00
1 parent 67a1843faf
commit 91855de832
3 files changed
+264 -14

No files matched your search

@@ -4,7 +4,7 @@ import { useI18n } from "vue-i18n";
import { useConnectionStore } from "@/stores/connectionStore"; import { useConnectionStore } from "@/stores/connectionStore";
import * as api from "@/lib/backend/api"; import * as api from "@/lib/backend/api";
import type { TableGenerateConfig } from "@/lib/dataGrid/dataGenerate"; import type { TableGenerateConfig } from "@/lib/dataGrid/dataGenerate";
import { findGeneratorKey, generateTableData, defaultGeneratorParams } from "@/lib/dataGrid/dataGenerate"; import { displayGeneratedValue, findGeneratorKey, formatGeneratedValue, generateTableData, defaultGeneratorParams } from "@/lib/dataGrid/dataGenerate";
import { quoteTableIdentifier } from "@/lib/table/tableSelectSql"; import { quoteTableIdentifier } from "@/lib/table/tableSelectSql";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime"; import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect"; import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
@@ -113,7 +113,7 @@ async function loadSchemas() {
database: db, database: db,
rowCount: 1000, rowCount: 1000,
columns: cols.map((c: ColumnInfo) => { columns: cols.map((c: ColumnInfo) => {
const isAI = c.extra === "auto_increment" || (c.column_default?.includes("nextval") ?? false); const isAI = c.extra === "auto_increment" || (c.column_default?.toLowerCase().includes("nextval") ?? false);
const gKey = findGeneratorKey(c.name, c.data_type, isAI); const gKey = findGeneratorKey(c.name, c.data_type, isAI);
return { return {
columnName: c.name, columnName: c.name,
@@ -133,6 +133,7 @@ async function loadSchemas() {
gKey, gKey,
), ),
isAutoIncrement: isAI, isAutoIncrement: isAI,
columnDefault: c.column_default,
}; };
}), }),
}; };
@@ -205,7 +206,7 @@ async function loadColumns(schema: string, table: string) {
database: props.prefillDatabase, database: props.prefillDatabase,
rowCount: 1000, rowCount: 1000,
columns: cols.map((c: ColumnInfo) => { columns: cols.map((c: ColumnInfo) => {
const isAI = c.extra === "auto_increment" || (c.column_default?.includes("nextval") ?? false); const isAI = c.extra === "auto_increment" || (c.column_default?.toLowerCase().includes("nextval") ?? false);
const gKey = findGeneratorKey(c.name, c.data_type, isAI); const gKey = findGeneratorKey(c.name, c.data_type, isAI);
return { return {
columnName: c.name, columnName: c.name,
@@ -225,6 +226,7 @@ async function loadColumns(schema: string, table: string) {
gKey, gKey,
), ),
isAutoIncrement: isAI, isAutoIncrement: isAI,
columnDefault: c.column_default,
}; };
}), }),
}; };
@@ -324,6 +326,10 @@ function onPreviewColResizeStart(ci: number, event: MouseEvent) {
} }
const currentPreview = computed(() => generatedResults.value[previewTableIndex.value] ?? { tableName: "", columns: [], rows: [], sql: "" }); const currentPreview = computed(() => generatedResults.value[previewTableIndex.value] ?? { tableName: "", columns: [], rows: [], sql: "" });
function displayPreviewCell(cell: unknown): string {
return displayGeneratedValue(cell);
}
async function fetchMaxValues(cfg: TableGenerateConfig): Promise<Record<string, number>> { async function fetchMaxValues(cfg: TableGenerateConfig): Promise<Record<string, number>> {
const starts: Record<string, number> = {}; const starts: Record<string, number> = {};
const aiCols = cfg.columns.filter((c) => { const aiCols = cfg.columns.filter((c) => {
@@ -428,13 +434,7 @@ function sqlStatementsForTable(r: { tableName: string; columns: string[]; rows:
} else { } else {
const colList = r.columns.map((c) => quoteTableIdentifier(dbType.value, c)).join(", "); const colList = r.columns.map((c) => quoteTableIdentifier(dbType.value, c)).join(", ");
for (const row of r.rows) { for (const row of r.rows) {
const vals = row const vals = row.map(formatGeneratedValue).join(", ");
.map((v) => {
if (v === null || v === undefined) return "NULL";
if (typeof v === "number") return String(v);
return `'${String(v).replace(/'/g, "''")}'`;
})
.join(", ");
stmts.push(`INSERT INTO ${quoteTableIdentifier(dbType.value, r.tableName)} (${colList}) VALUES (${vals});`); stmts.push(`INSERT INTO ${quoteTableIdentifier(dbType.value, r.tableName)} (${colList}) VALUES (${vals});`);
} }
} }
@@ -868,7 +868,7 @@ async function onFileSelected(event: Event) {
:style="{ maxWidth: (previewColWidths[ci] ?? 120) + 'px' }" :style="{ maxWidth: (previewColWidths[ci] ?? 120) + 'px' }"
:class="{ 'text-muted-foreground italic': cell === null || cell === undefined }" :class="{ 'text-muted-foreground italic': cell === null || cell === undefined }"
> >
{{ cell === null || cell === undefined ? "NULL" : String(cell) }} {{ displayPreviewCell(cell) }}
</td> </td>
</tr> </tr>
</tbody> </tbody>
+153 -3
View File
@@ -188,6 +188,12 @@ export interface GeneratorParams {
disableLinks?: boolean; disableLinks?: boolean;
} }
export interface GeneratedSqlExpression {
__dbxGeneratedSqlExpression: true;
sql: string;
display: string;
}
export interface ColumnGenerateConfig { export interface ColumnGenerateConfig {
columnName: string; columnName: string;
dataType: string; dataType: string;
@@ -198,6 +204,7 @@ export interface ColumnGenerateConfig {
generatorCategoryLabel?: string; generatorCategoryLabel?: string;
generatorParams?: GeneratorParams; generatorParams?: GeneratorParams;
isAutoIncrement?: boolean; isAutoIncrement?: boolean;
columnDefault?: string | null;
} }
export interface TableGenerateConfig { export interface TableGenerateConfig {
@@ -224,6 +231,133 @@ function randDigit(): number {
export function randDecimal(min: number, max: number, decimals: number): number { export function randDecimal(min: number, max: number, decimals: number): number {
return parseFloat((Math.random() * (max - min) + min).toFixed(decimals)); return parseFloat((Math.random() * (max - min) + min).toFixed(decimals));
} }
export function isGeneratedSqlExpression(value: unknown): value is GeneratedSqlExpression {
return !!value && typeof value === "object" && (value as GeneratedSqlExpression).__dbxGeneratedSqlExpression === true;
}
function generatedSqlExpression(sql: string, display = sql): GeneratedSqlExpression {
return { __dbxGeneratedSqlExpression: true, sql, display };
}
function trimColumnDefault(defaultValue: string | null | undefined): string | null {
const value = defaultValue?.trim();
if (!value || value.toLowerCase() === "null") return null;
return value;
}
function isWrappedByOuterParens(value: string): boolean {
if (!value.startsWith("(") || !value.endsWith(")")) return false;
let depth = 0;
let quote: "'" | '"' | null = null;
for (let i = 0; i < value.length; i++) {
const ch = value[i];
if (quote) {
if (ch === quote) {
if (quote === "'" && value[i + 1] === "'") {
i++;
} else {
quote = null;
}
}
continue;
}
if (ch === "'" || ch === '"') {
quote = ch;
continue;
}
if (ch === "(") depth++;
if (ch === ")") depth--;
if (depth === 0 && i < value.length - 1) return false;
}
return depth === 0;
}
function stripOuterParens(value: string): string {
let current = value.trim();
while (isWrappedByOuterParens(current)) {
current = current.slice(1, -1).trim();
}
return current;
}
function parseSqlStringLiteral(value: string): string | null {
const text = stripOuterParens(value);
let start = 0;
if ((text[0] === "N" || text[0] === "n" || text[0] === "E" || text[0] === "e") && text[1] === "'") {
start = 1;
}
if (text[start] !== "'") return null;
let result = "";
for (let i = start + 1; i < text.length; i++) {
const ch = text[i];
if (ch !== "'") {
result += ch;
continue;
}
if (text[i + 1] === "'") {
result += "'";
i++;
continue;
}
const tail = text.slice(i + 1).trim();
if (!tail || /^::[\w."[\]\s]+$/.test(tail)) return result;
return null;
}
return null;
}
function isStringLikeType(dataType: string): boolean {
const type = dataType.toLowerCase();
return type.includes("char") || type.includes("text") || type.includes("clob") || type.includes("enum") || type.includes("set") || type.includes("uuid") || type.includes("guid") || type.includes("json") || type.includes("xml");
}
function isTemporalType(dataType: string): boolean {
const type = dataType.toLowerCase();
return type.includes("date") || type.includes("time") || type.includes("timestamp");
}
function looksLikeSqlDefaultExpression(value: string): boolean {
const text = stripOuterParens(value);
const lower = text.toLowerCase();
if (/^(current_timestamp|current_date|current_time|localtimestamp|localtime|sysdate|systimestamp)(\(\))?$/i.test(text)) {
return true;
}
if (/\b(nextval|now|uuid|random|rand|gen_random_uuid|uuid_generate_v4)\s*\(/i.test(text)) {
return true;
}
if (/^[a-z_][\w$]*(?:\.[a-z_][\w$]*)?\s*\(/i.test(text)) {
return true;
}
return lower.includes("::") || /\b(case|select)\b/i.test(text);
}
function generatedDefaultValue(defaultValue: string | null | undefined, dataType: string): unknown | undefined {
const trimmed = trimColumnDefault(defaultValue);
if (!trimmed) return undefined;
const value = stripOuterParens(trimmed);
const quoted = parseSqlStringLiteral(value);
if (quoted !== null) return quoted;
if (/^(true|false)$/i.test(value)) return value.toLowerCase() === "true";
if (/^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i.test(value)) {
return Number(value);
}
if (isTemporalType(dataType) && /^\d{4}-\d{2}-\d{2}(?:[ T]\d{2}:\d{2}:\d{2}(?:\.\d+)?)?$/.test(value)) {
return value;
}
if (isStringLikeType(dataType) && !looksLikeSqlDefaultExpression(value)) {
return value;
}
// Keep expression defaults as raw SQL so functions like CURRENT_TIMESTAMP run in the database.
return generatedSqlExpression(value);
}
function parseLocalDate(str: string): Date { function parseLocalDate(str: string): Date {
const [y, m, d] = str.split("-").map(Number); const [y, m, d] = str.split("-").map(Number);
return new Date(y, m - 1, d); return new Date(y, m - 1, d);
@@ -1067,6 +1201,10 @@ export function defaultGeneratorParams(_columnName: string, attrs: ColumnAttrs,
const precision = attrs.numericPrecision ?? null; const precision = attrs.numericPrecision ?? null;
const scale = attrs.numericScale ?? null; const scale = attrs.numericScale ?? null;
const charLen = attrs.characterMaximumLength ?? null; const charLen = attrs.characterMaximumLength ?? null;
if (!attrs.isAutoIncrement && generatedDefaultValue(attrs.columnDefault, attrs.dataType) !== undefined) {
params.includeDefault = true;
params.defaultPercent = 100;
}
if (generatorKey === "sequence") { if (generatorKey === "sequence") {
params.startValue = 1; params.startValue = 1;
@@ -1407,10 +1545,15 @@ export function getGeneratorCategoryAndLabel(key: string): { category: string; c
return { category: "general", categoryLabel: "通用", label: key }; return { category: "general", categoryLabel: "通用", label: key };
} }
export function generateValue(columnName: string, dataType: string, generatorKey: string | undefined, rowIndex: number, params?: GeneratorParams): unknown { export function generateValue(columnName: string, dataType: string, generatorKey: string | undefined, rowIndex: number, params?: GeneratorParams, columnDefault?: string | null): unknown {
// null / default overrides // null / default overrides
if (params?.includeNull && params.nullPercent && Math.random() * 100 < params.nullPercent) return null; if (params?.includeNull && params.nullPercent && Math.random() * 100 < params.nullPercent) return null;
if (params?.includeDefault && params.defaultPercent && Math.random() * 100 < params.defaultPercent) return null; const defaultValue = generatedDefaultValue(columnDefault, dataType);
if (defaultValue !== undefined) {
const includeDefault = params?.includeDefault ?? true;
const defaultPercent = params?.defaultPercent ?? 100;
if (includeDefault && defaultPercent > 0 && Math.random() * 100 < defaultPercent) return defaultValue;
}
const key = generatorKey ?? findGeneratorKey(columnName, dataType); const key = generatorKey ?? findGeneratorKey(columnName, dataType);
if ((key === "date" || key === "datetime") && rowIndex === 0) { if ((key === "date" || key === "datetime") && rowIndex === 0) {
@@ -1580,12 +1723,19 @@ function generateByType(type: string, rowIndex: number): unknown {
} }
export function formatGeneratedValue(value: unknown): string { export function formatGeneratedValue(value: unknown): string {
if (isGeneratedSqlExpression(value)) return value.sql;
if (value === null || value === undefined) return "NULL"; if (value === null || value === undefined) return "NULL";
if (typeof value === "number") return String(value); if (typeof value === "number") return String(value);
if (typeof value === "boolean") return value ? "1" : "0"; if (typeof value === "boolean") return value ? "1" : "0";
return `'${String(value).replace(/'/g, "''")}'`; return `'${String(value).replace(/'/g, "''")}'`;
} }
export function displayGeneratedValue(value: unknown): string {
if (isGeneratedSqlExpression(value)) return value.display;
if (value === null || value === undefined) return "NULL";
return String(value);
}
export interface GenerateResult { export interface GenerateResult {
columns: string[]; columns: string[];
rows: unknown[][]; rows: unknown[][];
@@ -1597,7 +1747,7 @@ export function generateTableData(config: TableGenerateConfig, databaseType?: Da
const rows: unknown[][] = []; const rows: unknown[][] = [];
for (let i = 0; i < config.rowCount; i++) { for (let i = 0; i < config.rowCount; i++) {
const row = config.columns.map((col) => generateValue(col.columnName, col.dataType, col.generatorKey, i, col.generatorParams)); const row = config.columns.map((col) => generateValue(col.columnName, col.dataType, col.generatorKey, i, col.generatorParams, col.isAutoIncrement ? null : col.columnDefault));
rows.push(row); rows.push(row);
} }
+100
View File
@@ -0,0 +1,100 @@
import { strict as assert } from "node:assert";
import { test } from "vitest";
import { defaultGeneratorParams, displayGeneratedValue, generateTableData, generateValue } from "../../apps/desktop/src/lib/dataGrid/dataGenerate.ts";
test("enables default values for columns with schema defaults", () => {
const params = defaultGeneratorParams(
"status",
{
dataType: "varchar(16)",
columnDefault: "active",
},
"text",
);
assert.equal(params.includeDefault, true);
assert.equal(params.defaultPercent, 100);
});
test("uses string column defaults instead of random generated values", () => {
const result = generateTableData(
{
tableName: "users",
schema: "public",
database: "app",
rowCount: 2,
columns: [
{
columnName: "status",
dataType: "varchar(16)",
rowCount: 2,
generatorKey: "text",
generatorParams: { includeDefault: true, defaultPercent: 100 },
columnDefault: "active",
},
],
},
"postgres",
);
assert.deepEqual(result.rows, [["active"], ["active"]]);
assert.match(result.sql, /VALUES\n\('active'\),\n\('active'\);$/);
});
test("unwraps quoted and casted PostgreSQL default literals", () => {
const result = generateTableData(
{
tableName: "users",
schema: "public",
database: "app",
rowCount: 1,
columns: [
{
columnName: "role",
dataType: "text",
rowCount: 1,
generatorKey: "text",
generatorParams: { includeDefault: true, defaultPercent: 100 },
columnDefault: "'guest'::text",
},
],
},
"postgres",
);
assert.deepEqual(result.rows, [["guest"]]);
assert.match(result.sql, /VALUES\n\('guest'\);$/);
});
test("keeps expression defaults as raw SQL", () => {
const result = generateTableData(
{
tableName: "events",
schema: "public",
database: "app",
rowCount: 2,
columns: [
{
columnName: "created_at",
dataType: "timestamp",
rowCount: 2,
generatorKey: "datetime",
generatorParams: { includeDefault: true, defaultPercent: 100 },
columnDefault: "CURRENT_TIMESTAMP",
},
],
},
"postgres",
);
assert.equal(displayGeneratedValue(result.rows[0][0]), "CURRENT_TIMESTAMP");
assert.match(result.sql, /VALUES\n\(CURRENT_TIMESTAMP\),\n\(CURRENT_TIMESTAMP\);$/);
assert.doesNotMatch(result.sql, /'CURRENT_TIMESTAMP'/);
});
test("includeDefault without a schema default no longer emits NULL", () => {
const value = generateValue("name", "varchar(32)", "text", 0, { includeDefault: true, defaultPercent: 100 });
assert.notEqual(value, null);
assert.notEqual(value, undefined);
});