fix(types): fixing type mismatch (#73)

fixing type mismatch

Author: Jacobbrewer1

pkg/entities/column.go

@@ -39,6 +39,9 @@ type Column struct {
 
 func (c *Column) setTypeInfo(tp *types.FieldType) {
 	c.Type = tp.EvalType().String()
+	if tp.GetType() == mysql.TypeLonglong {
+		c.Type = "bigint"
+	}
 	c.TypeSize = tp.GetFlen()
 	c.TypePrecision = tp.GetDecimal()
 	if tp.GetType() == mysql.TypeEnum {
@@ -85,7 +88,7 @@ func (c *Column) setOptions(col *ast.ColumnDef) error {
 			c.InUniqueKey = true
 		default:
 			// Ignore other options
-			slog.Warn("Unknown column option", slog.Int("type", int(opt.Tp)))
+			slog.Warn("Unhandled column option", slog.Int("type", int(opt.Tp)))
 		}
 	}
 	return nil

pkg/generation/template_helpers.go

@@ -257,6 +257,8 @@ func getType(col *entities.Column) string {
 			return "usql.NullDuration"
 		}
 		return "usql.Duration"
+	case "json":
+		return "json.RawMessage"
 	default:
 		fmt.Println("Unknown type:", col.Type)
 		return "unknown"

templates/model.tmpl

@@ -28,7 +28,10 @@ const (
 {{- end }}
 type {{ $struct }} struct {
 	{{ range $column := .Columns -}}
-	{{ .Name | structify }} {{ get_type $column }} {{ get_tags $column }} {{ if .Comment }}// {{ .Comment }}{{ end }}
+	{{- if .Comment -}}
+	// {{ .Comment }}
+	{{- end -}}
+	{{ .Name | structify }} {{ get_type $column }} {{ get_tags $column }}
 	{{ end -}}
 }
 
@@ -182,7 +185,7 @@ func (m *{{ $struct }}) Get{{ $local_col | structify }}{{ $foreign_struct }}(db
   }
 
   {{ end -}}
-	return {{ $foreign_struct }}By{{ $foreign_col | structify }}(db, m.{{ $local_col | structify }}{{ if $col_data.Nullable }}.{{ get_type $col_data }}{{ end }})
+	return {{ $foreign_struct }}By{{ $foreign_col | structify }}(db, m.{{ $local_col | structify }}{{ if $col_data.Nullable }}.Val(){{ end }})
 }
 {{ end -}}
 {{ end -}}

usql/types.go

@@ -19,7 +19,7 @@ type NullBool struct {
 }
 
 // MarshalJSON implements the json.Marshaler interface for a NullBool.
-func (r NullBool) MarshalJSON() ([]byte, error) {
+func (r *NullBool) MarshalJSON() ([]byte, error) {
 	if r.Valid {
 		return json.Marshal(r.Bool)
 	}
@@ -44,6 +44,10 @@ func (r *NullBool) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func (r NullBool) Val() bool {
+	return r.Bool
+}
+
 // NewNullBool returns a valid new NullBool for a given boolean value.
 func NewNullBool(b bool) *NullBool {
 	return &NullBool{NullBool: sql.NullBool{Bool: b, Valid: true}}
@@ -80,6 +84,10 @@ func (r *NullFloat64) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func (r *NullFloat64) Val() float64 {
+	return r.Float64
+}
+
 // NewNullFloat64 returns a valid new NullFloat64 for a given float64 value.
 func NewNullFloat64(f float64) *NullFloat64 {
 	return &NullFloat64{NullFloat64: sql.NullFloat64{Float64: f, Valid: true}}
@@ -116,6 +124,10 @@ func (r *NullInt64) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func (r NullInt64) Val() int64 {
+	return r.Int64
+}
+
 // RedisArg implements redis.Argument.
 //
 // The caller should explicitly check the Valid field when putting NullString
@@ -185,6 +197,10 @@ func (r *NullString) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func (r NullString) Val() string {
+	return r.String
+}
+
 // RedisArg implements redis.Argument.
 //
 // The caller should explicitly check the Valid field when putting NullString
@@ -305,6 +321,10 @@ type NullDuration struct {
 	Valid bool
 }
 
+func (r NullDuration) Val() time.Duration {
+	return time.Duration(r.Duration)
+}
+
 // MarshalJSON implements the json.Marshaler interface for a NullDuration.
 func (r NullDuration) MarshalJSON() ([]byte, error) {
 	if r.Valid {
@@ -341,6 +361,11 @@ type NullTime struct {
 	sql.NullTime
 }
 
+// Val returns the time.Time value of the NullTime.
+func (r NullTime) Val() time.Time {
+	return r.Time
+}
+
 // MarshalJSON implements json.Marshaller.
 func (r NullTime) MarshalJSON() ([]byte, error) {
 	if r.Valid && !r.Time.IsZero() {