Skip to content

Stabilize import order #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stabilize import order #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions generator/template/model_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package template

import (
"fmt"
"github.com/lib/pq"
"path/filepath"
"reflect"
"strings"
"time"

"github.com/lib/pq"

"github.com/google/uuid"
"github.com/jackc/pgtype"

Expand Down Expand Up @@ -112,21 +113,17 @@ func (t TableModel) UseField(structFieldFunc func(columnMetaData metadata.Column
}

func getTableModelImports(modelType TableModel, tableMetaData metadata.Table) []string {
importPaths := map[string]bool{}
seen := map[string]bool{}
var ret []string
for _, columnMetaData := range tableMetaData.Columns {
field := modelType.Field(columnMetaData)
for _, importPath := range append([]string{field.Type.ImportPath}, field.Type.AdditionalImportPaths...) {
if importPath != "" {
importPaths[importPath] = true
if importPath != "" && !seen[importPath] {
ret = append(ret, importPath)
}
Copy link
Owner

@go-jet go-jet Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, how this change would stabilize import order??

}
}

var ret []string
for importPath := range importPaths {
ret = append(ret, importPath)
}

return ret
}

Expand Down Expand Up @@ -318,7 +315,6 @@ func toGoArrayType(elemType any, column metadata.Column) any {

// toGoType returns model type for column info.
func toGoType(column metadata.Column) interface{} {

switch strings.ToLower(column.DataType.Name) {
case "user-defined", "enum":
return ""
Expand All @@ -329,14 +325,13 @@ func toGoType(column metadata.Column) interface{} {
return uint8(0)
}
return int8(0)
case "smallint", "int2",
"year":
case "smallint", "int2", "year":
if column.DataType.IsUnsigned {
return uint16(0)
}
return int16(0)
case "integer", "int4",
"mediumint", "int": //MySQL
"mediumint", "int": // MySQL
if column.DataType.IsUnsigned {
return uint32(0)
}
Expand All @@ -354,7 +349,7 @@ func toGoType(column metadata.Column) interface{} {
"datetime": // MySQL
return time.Time{}
case "bytea",
"binary", "varbinary", "tinyblob", "blob", "mediumblob", "longblob": //MySQL
"binary", "varbinary", "tinyblob", "blob", "mediumblob", "longblob": // MySQL
return []byte("")
case "text",
"character", "bpchar",
Expand Down