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

Replace path package with filepath

Browse source
This commit is contained in:
Jamius Siam 2024-11-26 15:40:34 +06:00
parent d6f1f28db8
commit cab3cc63bf
8 changed files with 35 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/jet/main.go
View file

@ -8,7 +8,6 @@ import (
"github.com/go-jet/jet/v2/internal/utils/errfmt" "github.com/go-jet/jet/v2/internal/utils/errfmt"
"github.com/go-jet/jet/v2/internal/utils/strslice" "github.com/go-jet/jet/v2/internal/utils/strslice"
"os" "os"
"path/filepath"
"strings" "strings"
"github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/generator/metadata"
@ -80,19 +79,12 @@ func init() {
flag.StringVar(&tablePkg, "table-pkg", "table", "Relative path for the Table files package from the destination directory.") flag.StringVar(&tablePkg, "table-pkg", "table", "Relative path for the Table files package from the destination directory.")
flag.StringVar(&viewPkg, "view-pkg", "view", "Relative path for the View files package from the destination directory.") flag.StringVar(&viewPkg, "view-pkg", "view", "Relative path for the View files package from the destination directory.")
flag.StringVar(&enumPkg, "enum-pkg", "enum", "Relative path for the Enum files package from the destination directory.") flag.StringVar(&enumPkg, "enum-pkg", "enum", "Relative path for the Enum files package from the destination directory.")
flag.Usage = usage
flag.Parse()
// Convert the OS-specific path separator to slashes for cross-platform compatibility.
destDir = filepath.ToSlash(destDir)
modelPkg = filepath.ToSlash(modelPkg)
tablePkg = filepath.ToSlash(tablePkg)
viewPkg = filepath.ToSlash(viewPkg)
enumPkg = filepath.ToSlash(enumPkg)
} }
func main() { func main() {
flag.Usage = usage
flag.Parse()
if dsn == "" && (source == "" || host == "" || port == 0 || user == "" || dbName == "") { if dsn == "" && (source == "" || host == "" || port == 0 || user == "" || dbName == "") {
printErrorAndExit("ERROR: required flag(s) missing") printErrorAndExit("ERROR: required flag(s) missing")
} }

4
generator/postgres/postgres_generator.go
View file

@ -4,7 +4,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"net/url" "net/url"
"path" "path/filepath"
"strconv" "strconv"
"github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/generator/metadata"
@ -66,7 +66,7 @@ func GenerateDSN(dsn, schema, destDir string, templates ...template.Template) er
return fmt.Errorf("failed to get '%s' schema metadata: %w", schema, err) return fmt.Errorf("failed to get '%s' schema metadata: %w", schema, err)
} }
dirPath := path.Join(destDir, cfg.Database) dirPath := filepath.Join(destDir, cfg.Database)
err = template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate) err = template.ProcessSchema(dirPath, schemaMetadata, generatorTemplate)
if err != nil { if err != nil {

4
generator/template/model_template.go
View file

@ -6,7 +6,7 @@ import (
"github.com/go-jet/jet/v2/internal/utils/dbidentifier" "github.com/go-jet/jet/v2/internal/utils/dbidentifier"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/jackc/pgtype" "github.com/jackc/pgtype"
"path" "path/filepath"
"reflect" "reflect"
"strings" "strings"
"time" "time"
@ -23,7 +23,7 @@ type Model struct {
// PackageName returns package name of model types // PackageName returns package name of model types
func (m Model) PackageName() string { func (m Model) PackageName() string {
return path.Base(m.Path) return filepath.Base(m.Path)
} }
// UsePath returns new Model template with replaced file path // UsePath returns new Model template with replaced file path

14
generator/template/process.go
View file

@ -5,7 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/go-jet/jet/v2/internal/utils/filesys" "github.com/go-jet/jet/v2/internal/utils/filesys"
"path" "path/filepath"
"strings" "strings"
"text/template" "text/template"
@ -20,7 +20,7 @@ func ProcessSchema(dirPath string, schemaMetaData metadata.Schema, generatorTemp
} }
schemaTemplate := generatorTemplate.Schema(schemaMetaData) schemaTemplate := generatorTemplate.Schema(schemaMetaData)
schemaPath := path.Join(dirPath, schemaTemplate.Path) schemaPath := filepath.Join(dirPath, schemaTemplate.Path)
fmt.Println("Destination directory:", schemaPath) fmt.Println("Destination directory:", schemaPath)
fmt.Println("Cleaning up destination directory...") fmt.Println("Cleaning up destination directory...")
@ -50,7 +50,7 @@ func processModel(dirPath string, schemaMetaData metadata.Schema, schemaTemplate
return nil return nil
} }
modelDirPath := path.Join(dirPath, modelTemplate.Path) modelDirPath := filepath.Join(dirPath, modelTemplate.Path)
err := filesys.EnsureDirPathExist(modelDirPath) err := filesys.EnsureDirPathExist(modelDirPath)
if err != nil { if err != nil {
@ -83,7 +83,7 @@ func processSQLBuilder(dirPath string, dialect jet.Dialect, schemaMetaData metad
return nil return nil
} }
sqlBuilderPath := path.Join(dirPath, sqlBuilderTemplate.Path) sqlBuilderPath := filepath.Join(dirPath, sqlBuilderTemplate.Path)
err := processTableSQLBuilder("table", sqlBuilderPath, dialect, schemaMetaData, schemaMetaData.TablesMetaData, sqlBuilderTemplate) err := processTableSQLBuilder("table", sqlBuilderPath, dialect, schemaMetaData, schemaMetaData.TablesMetaData, sqlBuilderTemplate)
if err != nil { if err != nil {
@ -117,7 +117,7 @@ func processEnumSQLBuilder(dirPath string, dialect jet.Dialect, enumsMetaData []
continue continue
} }
enumSQLBuilderPath := path.Join(dirPath, enumTemplate.Path) enumSQLBuilderPath := filepath.Join(dirPath, enumTemplate.Path)
err := filesys.EnsureDirPathExist(enumSQLBuilderPath) err := filesys.EnsureDirPathExist(enumSQLBuilderPath)
if err != nil { if err != nil {
@ -182,7 +182,7 @@ func processTableSQLBuilder(fileTypes, dirPath string,
continue continue
} }
tableSQLBuilderPath := path.Join(dirPath, tableSQLBuilder.Path) tableSQLBuilderPath := filepath.Join(dirPath, tableSQLBuilder.Path)
err := filesys.EnsureDirPathExist(tableSQLBuilderPath) err := filesys.EnsureDirPathExist(tableSQLBuilderPath)
if err != nil { if err != nil {
@ -255,7 +255,7 @@ func generateUseSchemaFunc(dirPath, fileTypes string, builders []TableSQLBuilder
return fmt.Errorf("failed to generate use schema template: %w", err) return fmt.Errorf("failed to generate use schema template: %w", err)
} }
basePath := path.Join(dirPath, builders[0].Path) basePath := filepath.Join(dirPath, builders[0].Path)
fileName := fileTypes + "_use_schema" fileName := fileTypes + "_use_schema"
err = filesys.FormatAndSaveGoFile(basePath, fileName, text) err = filesys.FormatAndSaveGoFile(basePath, fileName, text)

6
generator/template/sql_builder_template.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/generator/metadata"
"github.com/go-jet/jet/v2/internal/utils/dbidentifier" "github.com/go-jet/jet/v2/internal/utils/dbidentifier"
"path" "path/filepath"
"slices" "slices"
"strings" "strings"
"unicode" "unicode"
@ -90,7 +90,7 @@ func DefaultViewSQLBuilder(viewMetaData metadata.Table) ViewSQLBuilder {
// PackageName returns package name of table sql builder types // PackageName returns package name of table sql builder types
func (tb TableSQLBuilder) PackageName() string { func (tb TableSQLBuilder) PackageName() string {
return path.Base(tb.Path) return filepath.Base(tb.Path)
} }
// UsePath returns new TableSQLBuilder with new relative path set // UsePath returns new TableSQLBuilder with new relative path set
@ -228,7 +228,7 @@ func DefaultEnumSQLBuilder(enumMetaData metadata.Enum) EnumSQLBuilder {
// PackageName returns enum sql builder package name // PackageName returns enum sql builder package name
func (e EnumSQLBuilder) PackageName() string { func (e EnumSQLBuilder) PackageName() string {
return path.Base(e.Path) return filepath.Base(e.Path)
} }
// UsePath returns new EnumSQLBuilder with new path set // UsePath returns new EnumSQLBuilder with new path set

6
tests/internal/utils/file/file.go
View file

@ -3,13 +3,13 @@ package file
import ( import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"os" "os"
"path" "path/filepath"
"testing" "testing"
) )
// Exists expects file to exist on path constructed from pathElems and returns content of the file // Exists expects file to exist on path constructed from pathElems and returns content of the file
func Exists(t *testing.T, pathElems ...string) (fileContent string) { func Exists(t *testing.T, pathElems ...string) (fileContent string) {
modelFilePath := path.Join(pathElems...) modelFilePath := filepath.Join(pathElems...)
file, err := os.ReadFile(modelFilePath) // #nosec G304 file, err := os.ReadFile(modelFilePath) // #nosec G304
require.Nil(t, err) require.Nil(t, err)
require.NotEmpty(t, file) require.NotEmpty(t, file)
@ -18,7 +18,7 @@ func Exists(t *testing.T, pathElems ...string) (fileContent string) {
// NotExists expects file not to exist on path constructed from pathElems // NotExists expects file not to exist on path constructed from pathElems
func NotExists(t *testing.T, pathElems ...string) { func NotExists(t *testing.T, pathElems ...string) {
modelFilePath := path.Join(pathElems...) modelFilePath := filepath.Join(pathElems...)
_, err := os.ReadFile(modelFilePath) // #nosec G304 _, err := os.ReadFile(modelFilePath) // #nosec G304
require.True(t, os.IsNotExist(err)) require.True(t, os.IsNotExist(err))
} }

14
tests/mysql/generator_template_test.go
View file

@ -12,18 +12,18 @@ import (
"github.com/go-jet/jet/v2/tests/dbconfig" "github.com/go-jet/jet/v2/tests/dbconfig"
file2 "github.com/go-jet/jet/v2/tests/internal/utils/file" file2 "github.com/go-jet/jet/v2/tests/internal/utils/file"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"path" "path/filepath"
"testing" "testing"
) )
const tempTestDir = "./.tempTestDir" const tempTestDir = "./.tempTestDir"
var defaultModelPath = path.Join(tempTestDir, "dvds/model") var defaultModelPath = filepath.Join(tempTestDir, "dvds/model")
var defaultActorModelFilePath = path.Join(tempTestDir, "dvds/model", "actor.go") var defaultActorModelFilePath = filepath.Join(tempTestDir, "dvds/model", "actor.go")
var defaultTableSQLBuilderFilePath = path.Join(tempTestDir, "dvds/table") var defaultTableSQLBuilderFilePath = filepath.Join(tempTestDir, "dvds/table")
var defaultViewSQLBuilderFilePath = path.Join(tempTestDir, "dvds/view") var defaultViewSQLBuilderFilePath = filepath.Join(tempTestDir, "dvds/view")
var defaultEnumSQLBuilderFilePath = path.Join(tempTestDir, "dvds/enum") var defaultEnumSQLBuilderFilePath = filepath.Join(tempTestDir, "dvds/enum")
var defaultActorSQLBuilderFilePath = path.Join(tempTestDir, "dvds/table", "actor.go") var defaultActorSQLBuilderFilePath = filepath.Join(tempTestDir, "dvds/table", "actor.go")
func dbConnection(dbName string) mysql2.DBConnection { func dbConnection(dbName string) mysql2.DBConnection {
if sourceIsMariaDB() { if sourceIsMariaDB() {

16
tests/postgres/generator_template_test.go
View file

@ -3,7 +3,7 @@ package postgres
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"path" "path/filepath"
"testing" "testing"
"github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/generator/metadata"
@ -20,13 +20,13 @@ import (
const tempTestDir = "./.tempTestDir" const tempTestDir = "./.tempTestDir"
var defaultModelPath = path.Join(tempTestDir, "jetdb/dvds/model") var defaultModelPath = filepath.Join(tempTestDir, "jetdb/dvds/model")
var defaultSqlBuilderPath = path.Join(tempTestDir, "jetdb/dvds/table") var defaultSqlBuilderPath = filepath.Join(tempTestDir, "jetdb/dvds/table")
var defaultActorModelFilePath = path.Join(tempTestDir, "jetdb/dvds/model", "actor.go") var defaultActorModelFilePath = filepath.Join(tempTestDir, "jetdb/dvds/model", "actor.go")
var defaultTableSQLBuilderFilePath = path.Join(tempTestDir, "jetdb/dvds/table") var defaultTableSQLBuilderFilePath = filepath.Join(tempTestDir, "jetdb/dvds/table")
var defaultViewSQLBuilderFilePath = path.Join(tempTestDir, "jetdb/dvds/view") var defaultViewSQLBuilderFilePath = filepath.Join(tempTestDir, "jetdb/dvds/view")
var defaultEnumSQLBuilderFilePath = path.Join(tempTestDir, "jetdb/dvds/enum") var defaultEnumSQLBuilderFilePath = filepath.Join(tempTestDir, "jetdb/dvds/enum")
var defaultActorSQLBuilderFilePath = path.Join(tempTestDir, "jetdb/dvds/table", "actor.go") var defaultActorSQLBuilderFilePath = filepath.Join(tempTestDir, "jetdb/dvds/table", "actor.go")
var dbConnection = postgres.DBConnection{ var dbConnection = postgres.DBConnection{
Host: dbconfig.PgHost, Host: dbconfig.PgHost,