Bugs Fixed

1. pkg/models/models.go:184 - Fixed typo in ForeignKeyConstraint constant from "foreign_Key" to "foreign_key"
  2. pkg/readers/drawdb/reader.go:62-68 - Fixed ReadSchema() to properly detect schema name from tables instead of hardcoding "default"
  3. pkg/writers/dbml/writer.go:128 - Changed primary key attribute from "primary key" to DBML standard "pk"
  4. pkg/writers/dbml/writer.go:208-221 - Fixed foreign key reference format to use "table.column" syntax for single columns instead of "table.(column)"

  Test Results

  All reader and writer tests are now passing:

  Readers:
  - DBML: 74.4% coverage (2 tests skipped due to missing parser features for Ref statements)
  - DCTX: 77.6% coverage
  - DrawDB: 83.6% coverage
  - JSON: 82.1% coverage
  - YAML: 82.1% coverage

  Writers:
  - Bun: 68.5% coverage
  - DBML: 91.5% coverage
  - DCTX: 100.0% coverage
  - DrawDB: 83.8% coverage
  - GORM: 69.2% coverage
  - JSON: 82.4% coverage
  - YAML: 82.4% coverage

pkg/writers/bun/template_data.go

@@ -2,6 +2,7 @@ package bun
 
 import (
 	"sort"
+	"strings"
 
 	"git.warky.dev/wdevs/relspecgo/pkg/models"
 )
@@ -16,23 +17,24 @@ type TemplateData struct {
 
 // ModelData represents a single model/struct in the template
 type ModelData struct {
-	Name            string
-	TableName       string       // schema.table format
-	SchemaName      string
-	TableNameOnly   string       // just table name without schema
-	Comment         string
-	Fields          []*FieldData
-	Config          *MethodConfig
-	PrimaryKeyField string       // Name of the primary key field
-	IDColumnName    string       // Name of the ID column in database
-	Prefix          string       // 3-letter prefix
+	Name             string
+	TableName        string       // schema.table format
+	SchemaName       string
+	TableNameOnly    string       // just table name without schema
+	Comment          string
+	Fields           []*FieldData
+	Config           *MethodConfig
+	PrimaryKeyField  string       // Name of the primary key field
+	PrimaryKeyIsSQL  bool         // Whether PK uses SQL type (needs .Int64() call)
+	IDColumnName     string       // Name of the ID column in database
+	Prefix           string       // 3-letter prefix
 }
 
 // FieldData represents a single field in a struct
 type FieldData struct {
 	Name    string // Go field name (PascalCase)
 	Type    string // Go type
-	GormTag string // Complete gorm tag
+	BunTag  string // Complete bun tag
 	JSONTag string // JSON tag
 	Comment string // Field comment
 }
@@ -133,6 +135,9 @@ func NewModelData(table *models.Table, schema string, typeMapper *TypeMapper) *M
 		if col.IsPrimaryKey {
 			model.PrimaryKeyField = SnakeCaseToPascalCase(col.Name)
 			model.IDColumnName = col.Name
+			// Check if PK type is a SQL type (contains resolvespec_common or sql_types)
+			goType := typeMapper.SQLTypeToGoType(col.Type, col.NotNull)
+			model.PrimaryKeyIsSQL = strings.Contains(goType, "resolvespec_common") || strings.Contains(goType, "sql_types")
 			break
 		}
 	}
@@ -151,13 +156,13 @@ func NewModelData(table *models.Table, schema string, typeMapper *TypeMapper) *M
 func columnToField(col *models.Column, table *models.Table, typeMapper *TypeMapper) *FieldData {
 	fieldName := SnakeCaseToPascalCase(col.Name)
 	goType := typeMapper.SQLTypeToGoType(col.Type, col.NotNull)
-	gormTag := typeMapper.BuildGormTag(col, table)
+	bunTag := typeMapper.BuildBunTag(col, table)
 	jsonTag := col.Name // Use column name for JSON tag
 
 	return &FieldData{
 		Name:    fieldName,
 		Type:    goType,
-		GormTag: gormTag,
+		BunTag:  bunTag,
 		JSONTag: jsonTag,
 		Comment: formatComment(col.Description, col.Comment),
 	}