wdevs/relspecgo
5
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Releases 58 Wiki Activity

feat(merge): enhance type conflict detection for columns

Browse Source 
* Introduced extractTypeParts function to handle embedded dimensions in type strings.
* Updated columnTypeConflict to utilize new type extraction logic.
* Improved PostgreSQL type normalization and handling in various components.
This commit is contained in:
Warky
2026-05-19 19:12:27 +02:00
parent 9235ef5e08
commit 9190df81dd
6 changed files with 141 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/writers/sqlite/datatypes.go
+13 -28
View File
@@ -2,6 +2,8 @@ package sqlite
import (
"strings"
"git.warky.dev/wdevs/relspecgo/pkg/pgsql"
)
// SQLite type affinities
@@ -15,45 +17,29 @@ const (
// MapPostgreSQLType maps PostgreSQL data types to SQLite type affinities
func MapPostgreSQLType(pgType string) string {
// Normalize the type
normalized := strings.ToLower(strings.TrimSpace(pgType))
// Remove array notation if present
normalized = strings.TrimSuffix(normalized, "[]")
// Remove precision/scale if present
if idx := strings.Index(normalized, "("); idx != -1 {
normalized = normalized[:idx]
}
// Resolve synonyms to canonical form before mapping
normalized = pgsql.NormalizePGType(normalized)
// Map to SQLite type affinity
switch normalized {
// TEXT affinity
case "varchar", "character varying", "text", "char", "character",
"citext", "uuid", "timestamp", "timestamptz", "timestamp with time zone",
"timestamp without time zone", "date", "time", "timetz", "time with time zone",
"time without time zone", "json", "jsonb", "xml", "inet", "cidr", "macaddr":
case "varchar", "char", "text", "citext", "uuid",
"timestamp", "timestamptz", "date", "time", "timetz",
"json", "jsonb", "xml", "inet", "cidr", "macaddr":
return TypeText
// INTEGER affinity
case "int", "int2", "int4", "int8", "integer", "smallint", "bigint",
"serial", "smallserial", "bigserial", "boolean", "bool":
case "integer", "smallint", "bigint",
"serial", "smallserial", "bigserial", "boolean":
return TypeInteger
// REAL affinity
case "real", "float", "float4", "float8", "double precision":
case "real", "float", "double precision":
return TypeReal
// NUMERIC affinity
case "numeric", "decimal", "money":
case "numeric", "money":
return TypeNumeric
// BLOB affinity
case "bytea", "blob":
return TypeBlob
default:
// Default to TEXT for unknown types
return TypeText
}
}
@@ -65,10 +51,9 @@ func IsIntegerType(colType string) bool {
if idx := strings.Index(normalized, "("); idx != -1 {
normalized = normalized[:idx]
}
normalized = pgsql.NormalizePGType(normalized)
switch normalized {
case "int", "int2", "int4", "int8", "integer", "smallint", "bigint",
"serial", "smallserial", "bigserial":
case "integer", "smallint", "bigint", "serial", "smallserial", "bigserial":
return true
default:
return false