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

fix -ignore-tables, -ignore-enums and -ignore-views when -dsn is present

Browse source
This commit is contained in:
Nikita Konin 2022-04-13 20:47:56 +03:00
parent f17d05e823
commit 971e2df442
3 changed files with 138 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/jet/main.go
View file

@ -3,6 +3,9 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"os"
"strings"
"github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/generator/metadata"
sqlitegen "github.com/go-jet/jet/v2/generator/sqlite" sqlitegen "github.com/go-jet/jet/v2/generator/sqlite"
"github.com/go-jet/jet/v2/generator/template" "github.com/go-jet/jet/v2/generator/template"
@ -11,8 +14,6 @@ import (
"github.com/go-jet/jet/v2/mysql" "github.com/go-jet/jet/v2/mysql"
postgres2 "github.com/go-jet/jet/v2/postgres" postgres2 "github.com/go-jet/jet/v2/postgres"
"github.com/go-jet/jet/v2/sqlite" "github.com/go-jet/jet/v2/sqlite"
"os"
"strings"
mysqlgen "github.com/go-jet/jet/v2/generator/mysql" mysqlgen "github.com/go-jet/jet/v2/generator/mysql"
postgresgen "github.com/go-jet/jet/v2/generator/postgres" postgresgen "github.com/go-jet/jet/v2/generator/postgres"
@ -112,8 +113,9 @@ func main() {
switch source { switch source {
case "postgresql", "postgres": case "postgresql", "postgres":
generatorTemplate := genTemplate(postgres2.Dialect, ignoreTablesList, ignoreViewsList, ignoreEnumsList)
if dsn != "" { if dsn != "" {
err = postgresgen.GenerateDSN(dsn, schemaName, destDir) err = postgresgen.GenerateDSN(dsn, schemaName, destDir, generatorTemplate)
break break
} }
dbConn := postgresgen.DBConnection{ dbConn := postgresgen.DBConnection{
@ -131,12 +133,13 @@ func main() {
err = postgresgen.Generate( err = postgresgen.Generate(
destDir, destDir,
dbConn, dbConn,
genTemplate(postgres2.Dialect, ignoreTablesList, ignoreViewsList, ignoreEnumsList), generatorTemplate,
) )
case "mysql", "mysqlx", "mariadb": case "mysql", "mysqlx", "mariadb":
generatorTemplate := genTemplate(mysql.Dialect, ignoreTablesList, ignoreViewsList, ignoreEnumsList)
if dsn != "" { if dsn != "" {
err = mysqlgen.GenerateDSN(dsn, destDir) err = mysqlgen.GenerateDSN(dsn, destDir, generatorTemplate)
break break
} }
dbConn := mysqlgen.DBConnection{ dbConn := mysqlgen.DBConnection{
@ -151,7 +154,7 @@ func main() {
err = mysqlgen.Generate( err = mysqlgen.Generate(
destDir, destDir,
dbConn, dbConn,
genTemplate(mysql.Dialect, ignoreTablesList, ignoreViewsList, ignoreEnumsList), generatorTemplate,
) )
case "sqlite": case "sqlite":
if dsn == "" { if dsn == "" {

89
tests/mysql/generator_test.go
View file

@ -88,45 +88,70 @@ func TestCmdGenerator(t *testing.T) {
} }
func TestIgnoreTablesViewsEnums(t *testing.T) { func TestIgnoreTablesViewsEnums(t *testing.T) {
cmd := exec.Command("jet", tests := []struct {
"-source=MySQL", name string
"-dbname=dvds", args []string
"-host="+dbconfig.MySqLHost, }{
"-port="+strconv.Itoa(dbconfig.MySQLPort), {
"-user="+dbconfig.MySQLUser, name: "with dsn",
"-password="+dbconfig.MySQLPassword, args: []string{
"-ignore-tables=actor,ADDRESS,Category, city ,country,staff,store,rental", "-dsn=mysql://" + dbconfig.MySQLConnectionString(sourceIsMariaDB(), "dvds"),
"-ignore-views=actor_info,CUSTomER_LIST, film_list", "-ignore-tables=actor,ADDRESS,Category, city ,country,staff,store,rental",
"-ignore-enums=film_list_rating,film_rating", "-ignore-views=actor_info,CUSTomER_LIST, film_list",
"-path="+genTestDir3) "-ignore-enums=film_list_rating,film_rating",
"-path=" + genTestDir3,
},
},
{
name: "without dsn",
args: []string{
"-source=MySQL",
"-dbname=dvds",
"-host=" + dbconfig.MySqLHost,
"-port=" + strconv.Itoa(dbconfig.MySQLPort),
"-user=" + dbconfig.MySQLUser,
"-password=" + dbconfig.MySQLPassword,
"-ignore-tables=actor,ADDRESS,Category, city ,country,staff,store,rental",
"-ignore-views=actor_info,CUSTomER_LIST, film_list",
"-ignore-enums=film_list_rating,film_rating",
"-path=" + genTestDir3,
},
},
}
cmd.Stderr = os.Stderr for _, tt := range tests {
cmd.Stdout = os.Stdout t.Run(tt.name, func(t *testing.T) {
cmd := exec.Command("jet", tt.args...)
err := cmd.Run() cmd.Stderr = os.Stderr
require.NoError(t, err) cmd.Stdout = os.Stdout
tableSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/table") err := cmd.Run()
require.NoError(t, err) require.NoError(t, err)
testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "customer.go", "film.go", "film_actor.go",
"film_category.go", "film_text.go", "inventory.go", "language.go", "payment.go")
viewSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/view") tableSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/table")
require.NoError(t, err) require.NoError(t, err)
testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "nicer_but_slower_film_list.go", testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "customer.go", "film.go", "film_actor.go",
"sales_by_film_category.go", "sales_by_store.go", "staff_list.go") "film_category.go", "film_text.go", "inventory.go", "language.go", "payment.go")
enumFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/enum") viewSQLBuilderFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/view")
require.NoError(t, err) require.NoError(t, err)
testutils.AssertFileNamesEqual(t, enumFiles, "nicer_but_slower_film_list_rating.go") testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "nicer_but_slower_film_list.go",
"sales_by_film_category.go", "sales_by_store.go", "staff_list.go")
modelFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/model") enumFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/enum")
require.NoError(t, err) require.NoError(t, err)
testutils.AssertFileNamesEqual(t, enumFiles, "nicer_but_slower_film_list_rating.go")
testutils.AssertFileNamesEqual(t, modelFiles, modelFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/model")
"customer.go", "film.go", "film_actor.go", "film_category.go", "film_text.go", "inventory.go", "language.go", require.NoError(t, err)
"payment.go", "nicer_but_slower_film_list_rating.go", "nicer_but_slower_film_list.go", "sales_by_film_category.go",
"sales_by_store.go", "staff_list.go") testutils.AssertFileNamesEqual(t, modelFiles,
"customer.go", "film.go", "film_actor.go", "film_category.go", "film_text.go", "inventory.go", "language.go",
"payment.go", "nicer_but_slower_film_list_rating.go", "nicer_but_slower_film_list.go", "sales_by_film_category.go",
"sales_by_store.go", "staff_list.go")
})
}
} }
func assertGeneratedFiles(t *testing.T) { func assertGeneratedFiles(t *testing.T) {

112
tests/postgres/generator_test.go
View file

@ -93,56 +93,88 @@ func TestCmdGenerator(t *testing.T) {
} }
func TestGeneratorIgnoreTables(t *testing.T) { func TestGeneratorIgnoreTables(t *testing.T) {
err := os.RemoveAll(genTestDir2) tests := []struct {
require.NoError(t, err) name string
args []string
}{
{
name: "with dsn",
args: []string{
"-dsn=" + fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable",
dbconfig.PgUser,
dbconfig.PgPassword,
dbconfig.PgHost,
dbconfig.PgPort,
"jetdb",
),
"-schema=dvds",
"-ignore-tables=actor,ADDRESS,country, Film , cITY,",
"-ignore-views=Actor_info, FILM_LIST ,staff_list",
"-ignore-enums=mpaa_rating",
"-path=" + genTestDir2,
},
},
{
name: "without dsn",
args: []string{
"-source=PostgreSQL",
"-host=localhost",
"-port=" + strconv.Itoa(dbconfig.PgPort),
"-user=jet",
"-password=jet",
"-dbname=jetdb",
"-schema=dvds",
"-ignore-tables=actor,ADDRESS,country, Film , cITY,",
"-ignore-views=Actor_info, FILM_LIST ,staff_list",
"-ignore-enums=mpaa_rating",
"-path=" + genTestDir2,
},
},
}
cmd := exec.Command("jet", for _, tt := range tests {
"-source=PostgreSQL", t.Run(tt.name, func(t *testing.T) {
"-host=localhost", err := os.RemoveAll(genTestDir2)
"-port="+strconv.Itoa(dbconfig.PgPort), require.NoError(t, err)
"-user=jet",
"-password=jet",
"-dbname=jetdb",
"-schema=dvds",
"-ignore-tables=actor,ADDRESS,country, Film , cITY,",
"-ignore-views=Actor_info, FILM_LIST ,staff_list",
"-ignore-enums=mpaa_rating",
"-path="+genTestDir2)
fmt.Println(cmd.Args) cmd := exec.Command("jet", tt.args...)
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
err = cmd.Run() fmt.Println(cmd.Args)
require.NoError(t, err) cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
// Table SQL Builder files err = cmd.Run()
tableSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/table") require.NoError(t, err)
require.NoError(t, err)
testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "category.go", // Table SQL Builder files
"customer.go", "film_actor.go", "film_category.go", "inventory.go", "language.go", tableSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/table")
"payment.go", "rental.go", "staff.go", "store.go") require.NoError(t, err)
// View SQL Builder files testutils.AssertFileNamesEqual(t, tableSQLBuilderFiles, "category.go",
viewSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/view") "customer.go", "film_actor.go", "film_category.go", "inventory.go", "language.go",
require.NoError(t, err) "payment.go", "rental.go", "staff.go", "store.go")
testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "nicer_but_slower_film_list.go", // View SQL Builder files
"sales_by_film_category.go", "customer_list.go", "sales_by_store.go") viewSQLBuilderFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/view")
require.NoError(t, err)
// Enums SQL Builder files testutils.AssertFileNamesEqual(t, viewSQLBuilderFiles, "nicer_but_slower_film_list.go",
_, err = ioutil.ReadDir("./.gentestdata2/jetdb/dvds/enum") "sales_by_film_category.go", "customer_list.go", "sales_by_store.go")
require.Error(t, err, "open ./.gentestdata2/jetdb/dvds/enum: no such file or directory")
modelFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/model") // Enums SQL Builder files
require.NoError(t, err) _, err = ioutil.ReadDir("./.gentestdata2/jetdb/dvds/enum")
require.Error(t, err, "open ./.gentestdata2/jetdb/dvds/enum: no such file or directory")
testutils.AssertFileNamesEqual(t, modelFiles, "category.go", modelFiles, err := ioutil.ReadDir("./.gentestdata2/jetdb/dvds/model")
"customer.go", "film_actor.go", "film_category.go", "inventory.go", "language.go", require.NoError(t, err)
"payment.go", "rental.go", "staff.go", "store.go",
"nicer_but_slower_film_list.go", "sales_by_film_category.go", testutils.AssertFileNamesEqual(t, modelFiles, "category.go",
"customer_list.go", "sales_by_store.go") "customer.go", "film_actor.go", "film_category.go", "inventory.go", "language.go",
"payment.go", "rental.go", "staff.go", "store.go",
"nicer_but_slower_film_list.go", "sales_by_film_category.go",
"customer_list.go", "sales_by_store.go")
})
}
} }
func TestGenerator(t *testing.T) { func TestGenerator(t *testing.T) {