fix: make codegen not fail for "blob" columns

- was previously using "[]byte" as a single `ast.NewIdent`, which made comment+blank-line-insertion reparsing fail
This commit is contained in:
2026-02-14 18:33:41 -08:00
parent e53546a7f5
commit 29787b5521
3 changed files with 52 additions and 42 deletions

View File

@@ -27,6 +27,33 @@ func SQLFieldsConstIdent(tbl schema.Table) *ast.Ident {
return ast.NewIdent(strings.ToLower(tbl.GoTypeName) + "SQLFields")
}
// GoTypeForColumn returns a type expression for this column.
//
// For most columns this isjust its mapped name as a `ast.NewIdent`, but for "blob" it needs
// a slice expression (`[]byte`).
func GoTypeForColumn(c schema.Column) ast.Expr {
if c.IsNonCodeTableForeignKey() {
return ast.NewIdent(schema.TypenameFromTablename(c.ForeignKeyTargetTable) + "ID")
}
switch c.Type {
case "integer", "int":
if strings.HasPrefix(c.Name, "is_") || strings.HasPrefix(c.Name, "has_") {
return ast.NewIdent("bool")
} else if strings.HasSuffix(c.Name, "_at") {
return ast.NewIdent("Timestamp")
}
return ast.NewIdent("int")
case "text":
return ast.NewIdent("string")
case "real":
return ast.NewIdent("float32")
case "blob":
return &ast.ArrayType{Elt: ast.NewIdent("byte")}
default:
panic("Unrecognized sqlite column type: " + c.Type)
}
}
// ---------------
// Generators
// ---------------
@@ -63,10 +90,9 @@ func GenerateModelAST(table schema.Table) *ast.GenDecl {
Tag: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("`db:\"%s\" json:\"%s\"`", col.Name, col.Name)},
})
} else {
typeName := col.GoTypeName()
fields = append(fields, &ast.Field{
Names: []*ast.Ident{ast.NewIdent(textutils.SnakeToCamel(col.Name))},
Type: ast.NewIdent(typeName),
Type: GoTypeForColumn(col),
Tag: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("`db:\"%s\" json:\"%s\"`", col.Name, col.Name)},
})
}
@@ -183,7 +209,7 @@ func buildFKCheckLambda(tbl schema.Table) (*ast.AssignStmt, bool) {
Fun: ast.NewIdent("NewForeignKeyError"),
Args: []ast.Expr{
&ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("%q", structFieldName)},
ast.NewIdent(fmt.Sprintf("%q", col.ForeignKeyTargetTable)),
&ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("%q", col.ForeignKeyTargetTable)},
structField,
},
},
@@ -478,7 +504,7 @@ func GenerateGetItemByUniqColFunc(tbl schema.Table, col schema.Column) *ast.Func
Name: ast.NewIdent("Get" + schema.TypenameFromTablename(tbl.TableName) + "By" + col.GoFieldName()),
Type: &ast.FuncType{
Params: &ast.FieldList{List: []*ast.Field{
{Names: []*ast.Ident{param}, Type: ast.NewIdent(col.GoTypeName())},
{Names: []*ast.Ident{param}, Type: GoTypeForColumn(col)},
}},
Results: &ast.FieldList{List: []*ast.Field{
{Names: []*ast.Ident{ast.NewIdent("ret")}, Type: ast.NewIdent(tbl.GoTypeName)},