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

Disable generating enums from the views for MySQL/MariaDB.

Browse source
This commit is contained in:
go-jet 2019-08-15 17:10:54 +02:00
parent bec0d59be3
commit bcdab0f111
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
generator/internal/metadata/dialect_query_set.go
View file

@ -95,10 +95,10 @@ ORDER BY ordinal_position;
func (m *MySqlQuerySet) ListOfEnumsQuery() string { func (m *MySqlQuerySet) ListOfEnumsQuery() string {
return ` return `
SELECT (CASE DATA_TYPE WHEN 'enum' then CONCAT(TABLE_NAME, '_', COLUMN_NAME) ELSE '' END ), SUBSTRING(COLUMN_TYPE,5) SELECT (CASE c.DATA_TYPE WHEN 'enum' then CONCAT(c.TABLE_NAME, '_', c.COLUMN_NAME) ELSE '' END ), SUBSTRING(c.COLUMN_TYPE,5)
FROM information_schema.columns FROM information_schema.columns as c
WHERE table_schema = ? INNER JOIN information_schema.tables as t on (t.table_schema = c.table_schema AND t.table_name = c.table_name)
AND DATA_TYPE = 'enum'; WHERE c.table_schema = ? AND DATA_TYPE = 'enum' AND t.TABLE_TYPE = 'BASE TABLE';
` `
} }

4
tests/mysql/generator_test.go
View file

@ -73,7 +73,7 @@ func assertGeneratedFiles(t *testing.T) {
enumFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/enum") enumFiles, err := ioutil.ReadDir(genTestDir3 + "/dvds/enum")
assert.NilError(t, err) assert.NilError(t, err)
assertFileNameEqual(t, enumFiles, "film_list_rating.go", "film_rating.go", "nicer_but_slower_film_list_rating.go") assertFileNameEqual(t, enumFiles, "film_rating.go")
assertFileContent(t, genTestDir3+"/dvds/enum/film_rating.go", "\npackage enum", mpaaRatingEnumFile) assertFileContent(t, genTestDir3+"/dvds/enum/film_rating.go", "\npackage enum", mpaaRatingEnumFile)
// Model files // Model files
@ -82,7 +82,7 @@ func assertGeneratedFiles(t *testing.T) {
assertFileNameEqual(t, modelFiles, "actor.go", "address.go", "category.go", "city.go", "country.go", assertFileNameEqual(t, modelFiles, "actor.go", "address.go", "category.go", "city.go", "country.go",
"customer.go", "film.go", "film_actor.go", "film_category.go", "inventory.go", "language.go", "customer.go", "film.go", "film_actor.go", "film_category.go", "inventory.go", "language.go",
"payment.go", "rental.go", "staff.go", "store.go", "film_list_rating.go", "film_rating.go", "nicer_but_slower_film_list_rating.go") "payment.go", "rental.go", "staff.go", "store.go", "film_rating.go")
assertFileContent(t, genTestDir3+"/dvds/model/actor.go", "\npackage model", actorModelFile) assertFileContent(t, genTestDir3+"/dvds/model/actor.go", "\npackage model", actorModelFile)
} }