Reverting circleci docker-compose

go-jet · Sep 22, 2024 · d3ce39f · d3ce39f
1 parent 4f80e0d
commit d3ce39f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
           POSTGRES_DB: jetdb
           PGPORT: 50901
 
-      - image: cimg/mysql:8.0
+      - image: circleci/mysql:8.0.27
         command: [ --default-authentication-plugin=mysql_native_password ]
         environment:
           MYSQL_ROOT_PASSWORD: jet
@@ -25,7 +25,7 @@ jobs:
           MYSQL_PASSWORD: jet
           MYSQL_TCP_PORT: 50902
 
-      - image: cimg/mariadb:10.3
+      - image: circleci/mariadb:10.3
         command: [ '--default-authentication-plugin=mysql_native_password', '--port=50903' ]
         environment:
           MYSQL_ROOT_PASSWORD: jet
@@ -163,4 +163,4 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build_and_tests
+      - build_and_tests
diff --git 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
+    image: mysql:8.0.27
     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
@@ -171,7 +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")
+	require.Contains(t, mpaaRating, "MpaaRatingEnumAllValues")
 }
 
 func TestGeneratorTemplate_Model_SkipTableAndEnum(t *testing.T) {
@@ -269,7 +269,6 @@ func UseSchema(schema string) {
 	FilmList = FilmList.FromSchema(schema)
 }
 `)
-
 }
 
 func TestGeneratorTemplate_SQLBuilder_ChangeTypeAndFileName(t *testing.T) {
@@ -367,7 +366,6 @@ func TestGeneratorTemplate_SQLBuilder_DefaultAlias(t *testing.T) {
 }
 
 func TestGeneratorTemplate_Model_AddTags(t *testing.T) {
-
 	err := postgres.Generate(
 		tempTestDir,
 		dbConnection,