diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4d69da7..da6d0697 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,36 +79,6 @@ jobs: name: Build changed tests run: ./run.sh build_image "${{ matrix.framework }}" - - id: run-mysql57 - name: Run changed tests against upstream MySQL 5.7 - run: ./run.sh run_test "${{ matrix.framework }}" - env: - VT_USERNAME: root - VT_PASSWORD: root - VT_DATABASE: test - VT_HOST: 127.0.0.1 - VT_PORT: 33576 - - - id: run-mysql80 - name: Run changed tests against upstream MySQL 8.0 - run: ./run.sh run_test "${{ matrix.framework }}" - env: - VT_USERNAME: root - VT_PASSWORD: root - VT_DATABASE: test - VT_HOST: 127.0.0.1 - VT_PORT: 33578 - - - id: run-vttestserver57 - name: Run changed tests against vttestserver:mysql57 - run: ./run.sh run_test "${{ matrix.framework }}" - env: - VT_USERNAME: test - VT_PASSWORD: test - VT_DATABASE: test - VT_HOST: 127.0.0.1 - VT_PORT: 33577 - - id: run-vttestserver80 name: Run changed tests against vttestserver:mysql80 run: ./run.sh run_test "${{ matrix.framework }}" diff --git a/frameworks/javascript/prisma/hacks.patch b/frameworks/javascript/prisma/hacks.patch index f46d6e92..064ee275 100644 --- a/frameworks/javascript/prisma/hacks.patch +++ b/frameworks/javascript/prisma/hacks.patch @@ -93,3 +93,23 @@ index 2a1d7a85..a21f66fe 100644 const credentials = uriToCredentials(connectionString) return { +diff --git a/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts b/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts +index 94ef4b343..87c68fa4a 100644 +--- a/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts ++++ b/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts +@@ -11,7 +11,7 @@ process.setMaxListeners(200) + + process.env.SKIP_GENERATE = 'true' + +-const engine = new IntrospectionEngine() ++let engine = new IntrospectionEngine() + + /** + * A potentially async value +@@ -323,6 +323,7 @@ async function setupScenario(kind: string, input: Input, scenario: Scenario) { + ${datasourceBlock} + ` + ++ engine = new IntrospectionEngine() + const introspectionResult = await engine.introspect(schemaBase) + const prismaSchemaPath = ctx.fs.path('schema.prisma')