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

Reverting circleci docker-compose

Browse source
This commit is contained in:
Samir Faci 2024-09-22 16:04:11 -04:00
parent 4f80e0d36b
commit d3ce39f275
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.circleci/config.yml
View file

@ -16,7 +16,7 @@ jobs:
POSTGRES_DB: jetdb POSTGRES_DB: jetdb
PGPORT: 50901 PGPORT: 50901
- image: cimg/mysql:8.0 - image: circleci/mysql:8.0.27
command: [ --default-authentication-plugin=mysql_native_password ] command: [ --default-authentication-plugin=mysql_native_password ]
environment: environment:
MYSQL_ROOT_PASSWORD: jet MYSQL_ROOT_PASSWORD: jet
@ -25,7 +25,7 @@ jobs:
MYSQL_PASSWORD: jet MYSQL_PASSWORD: jet
MYSQL_TCP_PORT: 50902 MYSQL_TCP_PORT: 50902
- image: cimg/mariadb:10.3 - image: circleci/mariadb:10.3
command: [ '--default-authentication-plugin=mysql_native_password', '--port=50903' ] command: [ '--default-authentication-plugin=mysql_native_password', '--port=50903' ]
environment: environment:
MYSQL_ROOT_PASSWORD: jet MYSQL_ROOT_PASSWORD: jet
@ -163,4 +163,4 @@ workflows:
version: 2 version: 2
build_and_test: build_and_test:
jobs: jobs:
- build_and_tests - build_and_tests

2
tests/docker-compose.yaml
View file

@ -13,7 +13,7 @@ services:
- ./testdata/init/postgres:/docker-entrypoint-initdb.d - ./testdata/init/postgres:/docker-entrypoint-initdb.d
mysql: mysql:
image: mysql:8.0 image: mysql:8.0.27
command: ['--default-authentication-plugin=mysql_native_password', '--log_bin_trust_function_creators=1'] command: ['--default-authentication-plugin=mysql_native_password', '--log_bin_trust_function_creators=1']
restart: always restart: always
environment: environment:

4
tests/postgres/generator_template_test.go
View file

@ -171,7 +171,7 @@ func TestGeneratorTemplate_Model_RenameFilesAndTypes(t *testing.T) {
mpaaRating := file2.Exists(t, defaultModelPath, "mpaa_rating_enum.go") mpaaRating := file2.Exists(t, defaultModelPath, "mpaa_rating_enum.go")
require.Contains(t, mpaaRating, "type MpaaRatingEnum string") 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) { func TestGeneratorTemplate_Model_SkipTableAndEnum(t *testing.T) {
@ -269,7 +269,6 @@ func UseSchema(schema string) {
FilmList = FilmList.FromSchema(schema) FilmList = FilmList.FromSchema(schema)
} }
`) `)
} }
func TestGeneratorTemplate_SQLBuilder_ChangeTypeAndFileName(t *testing.T) { 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) { func TestGeneratorTemplate_Model_AddTags(t *testing.T) {
err := postgres.Generate( err := postgres.Generate(
tempTestDir, tempTestDir,
dbConnection, dbConnection,