From ad64026b9f9dd5400bb27f4515af54a8add71c13 Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 00:01:31 +0800 Subject: [PATCH 01/11] Delete go.sum --- test/integration/go.sum | 49 ----------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 test/integration/go.sum diff --git a/test/integration/go.sum b/test/integration/go.sum deleted file mode 100644 index 4b7fecb5f..000000000 --- a/test/integration/go.sum +++ /dev/null @@ -1,49 +0,0 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 h1:ECW73yc9MY7935nNYXUkK7Dz17YuSUI9yqRqYS8aBww= -github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= -github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= -github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/takuoki/gocase v1.0.0 h1:gPwLJTWVm2T1kUiCsKirg/faaIUGVTI0FA3SYr75a44= -github.com/takuoki/gocase v1.0.0/go.mod h1:QgOKJrbuJoDrtoKswBX1/Dw8mJrkOV9tbQZJaxaJ6zc= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From d1dfff2197cdac88faae011216df975edade239f Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 00:06:28 +0800 Subject: [PATCH 02/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 9d6e77bda..e17be07d4 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -9,7 +9,8 @@ COPY . ./ WORKDIR /app/test/integration -RUN go mod download -x +# for testing purposes; this prevents failing dependency updates for the main repo +RUN go mod tidy RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma From 5fc130f946537d52569bd381fd6baf1950af2940 Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 20:46:41 +0800 Subject: [PATCH 03/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index e17be07d4..d4d8d76d0 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -10,7 +10,11 @@ COPY . ./ WORKDIR /app/test/integration # for testing purposes; this prevents failing dependency updates for the main repo +RUN go get ./... RUN go mod tidy +RUN ls +RUN cat go.mod +RUN cat go.sum RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma From 7a33503726c1a9c22878878fe2740046aa3ba13b Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 20:48:35 +0800 Subject: [PATCH 04/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index d4d8d76d0..398f5e3fa 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -10,7 +10,6 @@ COPY . ./ WORKDIR /app/test/integration # for testing purposes; this prevents failing dependency updates for the main repo -RUN go get ./... RUN go mod tidy RUN ls RUN cat go.mod From 6de6b293cab39be4e1408480dba6a725471668e1 Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 20:52:44 +0800 Subject: [PATCH 05/11] Update go.mod --- test/integration/go.mod | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 19782d001..e0daeec19 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -3,11 +3,3 @@ module integration go 1.16 replace github.com/prisma/prisma-client-go => ../../ - -require ( - github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 - github.com/joho/godotenv v1.4.0 - github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 - github.com/shopspring/decimal v1.3.1 - github.com/takuoki/gocase v1.0.0 -) From d403ad1aff6d804a5df00acce69c4025dce58cca Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 20:53:23 +0800 Subject: [PATCH 06/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 398f5e3fa..c2e5718e3 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -10,10 +10,7 @@ COPY . ./ WORKDIR /app/test/integration # for testing purposes; this prevents failing dependency updates for the main repo -RUN go mod tidy -RUN ls -RUN cat go.mod -RUN cat go.sum +RUN go get github.com/prisma/prisma-client-go RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma From 3e180000cbab2ecf5ed76c375e45bd5ae3b3f1be Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 20:58:19 +0800 Subject: [PATCH 07/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index c2e5718e3..d3d58886c 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -11,6 +11,7 @@ WORKDIR /app/test/integration # for testing purposes; this prevents failing dependency updates for the main repo RUN go get github.com/prisma/prisma-client-go +RUN go mod tidy RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma From 53bb70bebf35bba2a7de0fcdceed15a9acd7a173 Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Tue, 7 Feb 2023 21:01:04 +0800 Subject: [PATCH 08/11] Update integration.dockerfile --- test/integration/integration.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index d3d58886c..aa38b4491 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -10,6 +10,7 @@ COPY . ./ WORKDIR /app/test/integration # for testing purposes; this prevents failing dependency updates for the main repo +RUN go mod tidy RUN go get github.com/prisma/prisma-client-go RUN go mod tidy From 9b0ecea45e284f2b1165a4f1d82634a99ad9f3fa Mon Sep 17 00:00:00 2001 From: steebchen Date: Fri, 17 Mar 2023 00:56:46 +0700 Subject: [PATCH 09/11] require --- test/integration/go.mod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/go.mod b/test/integration/go.mod index e0daeec19..8886a67fe 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -3,3 +3,7 @@ module integration go 1.16 replace github.com/prisma/prisma-client-go => ../../ + +require ( + github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 +) From 9a5eaddbe8e38ee2f9d891dbe57a3a5d6e4a764a Mon Sep 17 00:00:00 2001 From: steebchen Date: Fri, 17 Mar 2023 01:01:08 +0700 Subject: [PATCH 10/11] try workspace --- go.work | 6 ++++++ test/integration/go.mod | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 go.work diff --git a/go.work b/go.work new file mode 100644 index 000000000..4ff5f7d51 --- /dev/null +++ b/go.work @@ -0,0 +1,6 @@ +go 1.20 + +use ( + test/integration + . +) \ No newline at end of file diff --git a/test/integration/go.mod b/test/integration/go.mod index 8886a67fe..e0daeec19 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -3,7 +3,3 @@ module integration go 1.16 replace github.com/prisma/prisma-client-go => ../../ - -require ( - github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 -) From 03a2cbc88d1dae86a346a46d374f93fb7603602c Mon Sep 17 00:00:00 2001 From: steebchen Date: Fri, 17 Mar 2023 01:13:50 +0700 Subject: [PATCH 11/11] revert stuff --- go.work | 2 +- test/integration/integration.dockerfile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/go.work b/go.work index 4ff5f7d51..0fe99a5ec 100644 --- a/go.work +++ b/go.work @@ -3,4 +3,4 @@ go 1.20 use ( test/integration . -) \ No newline at end of file +) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index aa38b4491..9d6e77bda 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -9,10 +9,7 @@ COPY . ./ WORKDIR /app/test/integration -# for testing purposes; this prevents failing dependency updates for the main repo -RUN go mod tidy -RUN go get github.com/prisma/prisma-client-go -RUN go mod tidy +RUN go mod download -x RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma