Skip to content

Commit

Permalink
Merge branch 'main' into feat/errors-uqv
Browse files Browse the repository at this point in the history
  • Loading branch information
steebchen committed Nov 21, 2023
2 parents 81241c4 + 4bd40a9 commit d240e78
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 59 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ test/**/*.json

# build folder for Prisma CLI binaries
build/
out/

schema.temp.*.prisma
# sqlite artifacts
Expand Down
8 changes: 7 additions & 1 deletion binaries/binaries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"log"
"os"
"path"
"testing"
"time"

Expand Down Expand Up @@ -34,7 +35,12 @@ func TestFetch_localDir(t *testing.T) {
t.Fatal(err)
}

if err := FetchNative(wd); err != nil {
dir := path.Join(wd, "out")

//goland:noinspection GoUnhandledErrorResult
defer os.RemoveAll(dir)

if err := FetchNative(dir); err != nil {
t.Fatalf("fetchEngine failed: %s", err)
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"dependencies": {
"@types/gtag.js": "0.0.18",
"@vercel/analytics": "1.1.1",
"next": "14.0.2",
"next": "14.0.3",
"nextra": "2.13.1",
"nextra-theme-docs": "2.13.1",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@types/node": "20.9.0",
"@types/node": "20.9.2",
"next-sitemap": "4.2.3",
"typescript": "5.2.2"
}
Expand Down
108 changes: 54 additions & 54 deletions docs/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions test/features/enums/enums_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ type Func func(t *testing.T, client *PrismaClient, ctx cx)
func TestEnums(t *testing.T) {
t.Parallel()

// casing test no-ops
_ = StuffLast7D
_ = StuffLast30D
_ = StuffSlack
_ = StuffLast7DAnd
_ = StuffLast30Dand
_ = StuffID

tests := []struct {
name string
before []string
Expand All @@ -28,15 +36,15 @@ func TestEnums(t *testing.T) {
admin := RoleAdmin
mod := RoleModerator

stuffCASING := StuffCasing
stuffCasing := StuffCasing
stuffDifferent := StuffDifferent
stuffHaHa := StuffHaHa
expected := &UserModel{
InnerUser: InnerUser{
ID: "123",
Role: admin,
RoleOpt: &mod,
Stuff1: &stuffCASING,
Stuff1: &stuffCasing,
Stuff2: &stuffDifferent,
Stuff3: &stuffHaHa,
},
Expand Down
6 changes: 6 additions & 0 deletions test/features/enums/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,10 @@ enum Stuff {
different
CASING
HaHa
last7d
last30D
last7dAnd
last30DAnd
Slack
id
}

0 comments on commit d240e78

Please sign in to comment.