From 42a37c09d0741acac7ad4239e95cb24531fbdab3 Mon Sep 17 00:00:00 2001 From: Samir Faci Date: Wed, 18 Sep 2024 12:09:43 -0400 Subject: [PATCH] Adding support for enum model AllValues Fixes #368 ChangeLog: - Updating test mysql version as it no longer exists. - Add a simple validation test --- .circleci/config.yml | 4 ++-- generator/template/file_templates.go | 6 ++++++ tests/docker-compose.yaml | 2 +- tests/postgres/generator_template_test.go | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e21f00a..e634858 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: POSTGRES_DB: jetdb PGPORT: 50901 - - image: circleci/mysql:8.0.27 + - image: circleci/mysql:8.0 command: [ --default-authentication-plugin=mysql_native_password ] environment: MYSQL_ROOT_PASSWORD: jet @@ -163,4 +163,4 @@ workflows: version: 2 build_and_test: jobs: - - build_and_tests \ No newline at end of file + - build_and_tests diff --git a/generator/template/file_templates.go b/generator/template/file_templates.go index 731b1af..fa16864 100644 --- a/generator/template/file_templates.go +++ b/generator/template/file_templates.go @@ -156,6 +156,12 @@ const ( {{- end}} ) +var {{$enumTemplate.TypeName}}_AllValues = []{{$enumTemplate.TypeName}} { +{{- range $_, $value := .Values}} + {{valueName $value}}, +{{- end}} +} + func (e *{{$enumTemplate.TypeName}}) Scan(value interface{}) error { var enumValue string switch val := value.(type) { diff --git a/tests/docker-compose.yaml b/tests/docker-compose.yaml index 9b3af50..09ce9d7 100644 --- a/tests/docker-compose.yaml +++ b/tests/docker-compose.yaml @@ -13,7 +13,7 @@ services: - ./testdata/init/postgres:/docker-entrypoint-initdb.d mysql: - image: mysql:8.0.27 + image: mysql:8.0 command: ['--default-authentication-plugin=mysql_native_password', '--log_bin_trust_function_creators=1'] restart: always environment: diff --git a/tests/postgres/generator_template_test.go b/tests/postgres/generator_template_test.go index 4d87295..a9a244b 100644 --- a/tests/postgres/generator_template_test.go +++ b/tests/postgres/generator_template_test.go @@ -171,6 +171,7 @@ func TestGeneratorTemplate_Model_RenameFilesAndTypes(t *testing.T) { mpaaRating := file2.Exists(t, defaultModelPath, "mpaa_rating_enum.go") require.Contains(t, mpaaRating, "type MpaaRatingEnum string") + require.Contains(t, mpaaRating, "MpaaRatingEnum_AllValues") } func TestGeneratorTemplate_Model_SkipTableAndEnum(t *testing.T) {