From bd8f071d9f224215672f25d1187bfec05ac63d2f Mon Sep 17 00:00:00 2001
From: Diego Imbert <diego@windmill.dev>
Date: Fri, 27 Mar 2026 16:17:53 +0100
Subject: [PATCH] refactor: reuse columnDefToTableEditorValuesColumn for
 default value handling

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../lib/components/DatatableSchemaDiff.svelte | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/lib/components/DatatableSchemaDiff.svelte b/frontend/src/lib/components/DatatableSchemaDiff.svelte
index 1ab67330de..fc8a9e855e 100644
--- a/frontend/src/lib/components/DatatableSchemaDiff.svelte
+++ b/frontend/src/lib/components/DatatableSchemaDiff.svelte
@@ -1,9 +1,11 @@
 <script module lang="ts">
-	import type {
-		TableEditorValues,
-		TableEditorValuesColumn,
-		TableEditorForeignKey
+	import {
+		type TableEditorValues,
+		type TableEditorValuesColumn,
+		type TableEditorForeignKey,
+		columnDefToTableEditorValuesColumn
 	} from '$lib/components/apps/components/display/dbtable/tableEditor'
+	import type { ColumnMetadata } from '$lib/components/apps/components/display/dbtable/utils'
 	import {
 		diffTableEditorValues,
 		type AlterTableValues,
@@ -23,14 +25,16 @@
 				if (!table || typeof table !== 'object') continue
 				result[schemaName][tableName] = {
 					name: table.name ?? tableName,
-					columns: (table.columns ?? []).map(
-						(c: any): TableEditorValuesColumn => ({
-							name: c.name,
-							datatype: c.datatype,
-							primaryKey: c.primary_key ?? c.primaryKey,
-							defaultValue: c.default_value ?? c.defaultValue,
-							nullable: c.nullable
-						})
+					columns: (table.columns ?? []).map((c: any) =>
+						columnDefToTableEditorValuesColumn({
+							field: c.name,
+							datatype: c.datatype ?? '',
+							defaultvalue: c.default_value ?? c.defaultValue ?? '',
+							isprimarykey: c.primary_key ?? c.primaryKey ?? false,
+							isidentity: 'No',
+							isnullable: c.nullable === false ? 'NO' : 'YES',
+							isenum: false
+						} as ColumnMetadata)
 					),
 					foreignKeys: (table.foreign_keys ?? table.foreignKeys ?? []).map(
 						(fk: any): TableEditorForeignKey => ({