Break utils package into subpackages.

This commit is contained in:
go-jet 2023-07-21 14:11:31 +02:00
parent 06ecd73f67
commit d7a5adb239
25 changed files with 276 additions and 318 deletions

View file

@ -8,7 +8,7 @@ import (
"github.com/go-jet/jet/v2/generator/template"
"github.com/go-jet/jet/v2/internal/3rdparty/snaker"
"github.com/go-jet/jet/v2/internal/testutils"
"github.com/go-jet/jet/v2/internal/utils"
"github.com/go-jet/jet/v2/internal/utils/dbidentifier"
postgres2 "github.com/go-jet/jet/v2/postgres"
"github.com/go-jet/jet/v2/tests/dbconfig"
file2 "github.com/go-jet/jet/v2/tests/internal/utils/file"
@ -144,17 +144,17 @@ func TestGeneratorTemplate_Model_RenameFilesAndTypes(t *testing.T) {
UseTable(func(table metadata.Table) template.TableModel {
return template.DefaultTableModel(table).
UseFileName(schemaMetaData.Name + "_" + table.Name).
UseTypeName(utils.ToGoIdentifier(table.Name) + "Table")
UseTypeName(dbidentifier.ToGoIdentifier(table.Name) + "Table")
}).
UseView(func(table metadata.Table) template.ViewModel {
return template.DefaultViewModel(table).
UseFileName(schemaMetaData.Name + "_" + table.Name + "_view").
UseTypeName(utils.ToGoIdentifier(table.Name) + "View")
UseTypeName(dbidentifier.ToGoIdentifier(table.Name) + "View")
}).
UseEnum(func(enumMetaData metadata.Enum) template.EnumModel {
return template.DefaultEnumModel(enumMetaData).
UseFileName(enumMetaData.Name + "_enum").
UseTypeName(utils.ToGoIdentifier(enumMetaData.Name) + "Enum")
UseTypeName(dbidentifier.ToGoIdentifier(enumMetaData.Name) + "Enum")
}),
)
}),
@ -280,19 +280,19 @@ func TestGeneratorTemplate_SQLBuilder_ChangeTypeAndFileName(t *testing.T) {
UseTable(func(table metadata.Table) template.TableSQLBuilder {
return template.DefaultTableSQLBuilder(table).
UseFileName(schemaMetaData.Name + "_" + table.Name + "_table").
UseTypeName(utils.ToGoIdentifier(table.Name) + "TableSQLBuilder").
UseInstanceName("T_" + utils.ToGoIdentifier(table.Name))
UseTypeName(dbidentifier.ToGoIdentifier(table.Name) + "TableSQLBuilder").
UseInstanceName("T_" + dbidentifier.ToGoIdentifier(table.Name))
}).
UseView(func(table metadata.Table) template.ViewSQLBuilder {
return template.DefaultViewSQLBuilder(table).
UseFileName(schemaMetaData.Name + "_" + table.Name + "_view").
UseTypeName(utils.ToGoIdentifier(table.Name) + "ViewSQLBuilder").
UseInstanceName("V_" + utils.ToGoIdentifier(table.Name))
UseTypeName(dbidentifier.ToGoIdentifier(table.Name) + "ViewSQLBuilder").
UseInstanceName("V_" + dbidentifier.ToGoIdentifier(table.Name))
}).
UseEnum(func(enum metadata.Enum) template.EnumSQLBuilder {
return template.DefaultEnumSQLBuilder(enum).
UseFileName(schemaMetaData.Name + "_" + enum.Name + "_enum").
UseInstanceName(utils.ToGoIdentifier(enum.Name) + "EnumSQLBuilder")
UseInstanceName(dbidentifier.ToGoIdentifier(enum.Name) + "EnumSQLBuilder")
}),
)
}),