Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[Bug241] Remove control characters from mysql column comment

Browse source
This commit is contained in:
go-jet 2023-07-22 12:01:49 +02:00
parent dbcf614140
commit bb22b80984
3 changed files with 104 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
generator/metadata/column_meta_data.go
View file

@ -1,5 +1,7 @@
package metadata
import "regexp"
// Column struct
type Column struct {
Name string
@ -10,6 +12,16 @@ type Column struct {
Comment string
}
// GoLangComment returns column comment without ascii control characters
func (c Column) GoLangComment() string {
if c.Comment == "" {
return ""
}
// remove ascii control characters from string
return regexp.MustCompile(`[[:cntrl:]]+`).ReplaceAllString(c.Comment, "")
}
// DataTypeKind is database type kind(base, enum, user-defined, array)
type DataTypeKind string

4
generator/template/file_templates.go
View file

@ -32,7 +32,7 @@ type {{structImplName}} struct {
// Columns
{{- range $i, $c := .Columns}}
{{- $field := columnField $c}}
{{$field.Name}} {{dialect.PackageName}}.Column{{$field.Type}} {{- if $c.Comment }} // {{$c.Comment}} {{end}}
{{$field.Name}} {{dialect.PackageName}}.Column{{$field.Type}} {{- if $c.Comment }} // {{$c.GoLangComment}} {{end}}
{{- end}}
AllColumns {{dialect.PackageName}}.ColumnList
@ -122,7 +122,7 @@ import (
type {{$modelTableTemplate.TypeName}} struct {
{{- range .Columns}}
{{- $field := structField .}}
{{$field.Name}} {{$field.Type.Name}} ` + "{{$field.TagsString}}" + ` {{- if .Comment }} // {{.Comment}} {{end}}
{{$field.Name}} {{$field.Type.Name}} ` + "{{$field.TagsString}}" + ` {{- if .Comment }} // {{.GoLangComment}} {{end}}
{{- end}}
}