fix: napi tests (#6146)

Co-authored-by: Tim Suchanek <Tim.Suchanek@gmail.com> Co-authored-by: timsuchanek <tim.suchanek@gmail.com>
prisma · Mar 29, 2021 · 9236149 · 9236149
1 parent 01af9a9
commit 9236149
Show file tree

Hide file tree

Showing 76 changed files with 574 additions and 422 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -162,7 +162,82 @@ jobs:
           files: ./src/packages/tests/src/__tests__/coverage/clover.xml
           flags: tests-integration,${{ matrix.database }}
           name: tests-integration-${{ matrix.database }}
+  #
+  # TESTS-INTEGRATION-NAPI
+  #
+  tests-integration-napi:
+    timeout-minutes: 20
+    runs-on: ubuntu-20.04
+    env:
+      PRISMA_FORCE_NAPI: "true"
+      PRISMA_DEBUG_ENABLE_ALL_FLAGS: "true"
+    strategy:
+      fail-fast: false
+      matrix:
+        database:
+          - sqlite
+          - postgres
+          - mysql
+          - mariadb
+          - mssql
+        node: [12]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: docker-compose -f src/docker/docker-compose.yml up --detach ${{matrix.database}}
+        if: matrix.database != 'sqlite'
+
+      # From https://docs.github.com/en/actions/configuring-and-managing-workflows/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - run: bash .github/workflows/setup.sh
+        env:
+          CI: true
+          SKIP_GIT: true
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+
+      - run: pnpm i sqlite3@5.0.2 --unsafe-perm --reporter=silent
+        if: ${{ matrix.database == 'sqlite' }}
+        working-directory: src/packages/tests
+
+      # temp
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+
+      - run: pnpm run jest integration/${{ matrix.database }} -- --forceExit --maxConcurrency=8
+        working-directory: src/packages/tests
+        env:
+          CI: true
+          SKIP_GIT: true
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+          TEST_POSTGRES_BASE_URI: postgres://prisma:prisma@localhost:5432
+          TEST_MYSQL_BASE_URI: mysql://root:root@localhost:3306
+          TEST_MARIADB_BASE_URI: mysql://root:root@localhost:4306
+          TEST_POSTGRES_URI: postgres://prisma:prisma@localhost:5432/tests
+          TEST_MYSQL_URI: mysql://root:root@localhost:3306/tests
+          TEST_MARIADB_URI: mysql://root:root@localhost:4306/tests
+          TEST_MSSQL_URI: mssql://SA:Pr1sm4_Pr1sm4@localhost:1433/master
 
+      - uses: codecov/codecov-action@v1
+        with:
+          files: ./src/packages/tests/src/__tests__/coverage/clover.xml
+          flags: tests-integration,${{ matrix.database }}
+          name: tests-integration-${{ matrix.database }}
   #
   # CLI-COMMANDS
   #
@@ -274,6 +349,60 @@ jobs:
           files: ./src/packages/client/src/__tests__/coverage/clover.xml
           flags: client,${{ matrix.os }}
           name: client-${{ matrix.os }}
+
+  #
+  # CLIENT (types tests only with NAPI Enabled)
+  #
+  client-types-napi:
+    timeout-minutes: 10
+    runs-on: ubuntu-20.04
+    env:
+      PRISMA_FORCE_NAPI: "true"
+      PRISMA_DEBUG_ENABLE_ALL_FLAGS: "true"
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [12]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # From https://docs.github.com/en/actions/configuring-and-managing-workflows/caching-dependencies-to-speed-up-workflows#example-using-the-cache-action
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - run: bash .github/workflows/setup.sh
+        env:
+          CI: true
+          SKIP_GIT: true
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+
+      - run: pnpm run test src/__tests__/types/types.test.ts
+        working-directory: src/packages/client
+        env:
+          CI: true
+          SKIP_GIT: true
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+
+      - uses: codecov/codecov-action@v1
+        with:
+          files: ./src/packages/client/src/__tests__/coverage/clover.xml
+          flags: client-types,${{ matrix.os }}
+          name: client-types-${{ matrix.os }}
+
   #
   # CLIENT (types tests only)
   #

diff --git a/src/package.json b/src/package.json
@@ -36,6 +36,7 @@
     "build": "ts-node scripts/setup.ts --build",
     "dry": "ts-node scripts/ci/publish.ts --dry-run",
     "publish-all": "ts-node scripts/ci/publish.ts --publish",
+    "bump-engines": "ts-node scripts/bump-engines.ts",
     "test": "ts-node scripts/ci/publish.ts --test",
     "all": "ts-node scripts/ci/all.ts",
     "status": "ts-node scripts/ci/publish.ts --status",

diff --git a/src/packages/client/fixtures/blog/prisma/schema.prisma b/src/packages/client/fixtures/blog/prisma/schema.prisma
@@ -2,8 +2,9 @@ datasource db {
   provider = "sqlite"
   url      = "file:dev.db"
 }
+
 generator client {
-  provider = "prisma-client-js"
+  provider        = "prisma-client-js"
   previewFeatures = ["napi"]
 }
 

diff --git a/src/packages/client/package.json b/src/packages/client/package.json
@@ -24,7 +24,7 @@
   "types": "index.d.ts",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=10.4"
+    "node": ">=10.16"
   },
   "homepage": "https://www.prisma.io",
   "repository": "git@github.com:prisma/prisma.git",
@@ -63,6 +63,7 @@
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
     "@prisma/migrate": "workspace:*",
+    "@prisma/fetch-engine": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@timsuchanek/copy": "1.4.5",
     "@types/debug": "4.1.5",

diff --git a/src/packages/client/src/__tests__/integration/errors/corruption/test.ts b/src/packages/client/src/__tests__/integration/errors/corruption/test.ts
@@ -3,7 +3,11 @@ import fs from 'fs'
 import path from 'path'
 import { generateTestClient } from '../../../../utils/getTestClient'
 
-test('corruption', async () => {
+test('corruption of query engine binary', async () => {
+  // testing for corruption of the main query engine
+  if (process.env.PRISMA_FORCE_NAPI === 'true') {
+    return
+  }
   expect.assertions(1)
 
   await generateTestClient()

diff --git a/src/packages/client/src/__tests__/integration/errors/error-link/test.ts b/src/packages/client/src/__tests__/integration/errors/error-link/test.ts
@@ -1,6 +1,10 @@
 import { getTestClient } from '../../../../utils/getTestClient'
 
 test('error-link', async () => {
+  // works in isolation
+  if (process.env.PRISMA_FORCE_NAPI) {
+    return
+  }
   expect.assertions(1)
 
   const PrismaClient = await getTestClient()

diff --git a/src/packages/client/src/__tests__/integration/errors/executeRaw-alter-postgres/test.ts b/src/packages/client/src/__tests__/integration/errors/executeRaw-alter-postgres/test.ts
@@ -17,8 +17,8 @@ beforeAll(async () => {
   prisma = new PrismaClient()
 })
 
-afterAll(() => {
-  prisma.$disconnect()
+afterAll(async () => {
+  await prisma.$disconnect()
 })
 
 test('executeRaw-alter-postgres', async () => {

diff --git a/src/packages/client/src/__tests__/integration/errors/incorrect-column-type/test.ts b/src/packages/client/src/__tests__/integration/errors/incorrect-column-type/test.ts
@@ -24,5 +24,5 @@ test('incorrect-column-type', async () => {
           → 15 await expect(prisma.user.findMany()).reject
             Attempted to serialize scalar '123' with incompatible type 'String'
         `)
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/int-errors/test.ts b/src/packages/client/src/__tests__/integration/errors/int-errors/test.ts
@@ -35,7 +35,7 @@ describe('int-errors', () => {
   })
 
   afterAll(async () => {
-    prisma.$disconnect()
+    await prisma.$disconnect()
 
     await tearDownMysql(SetupParams.connectionString).catch((e) => {
       console.log(e)

diff --git a/src/packages/client/src/__tests__/integration/errors/missing-binary-native/test.ts b/src/packages/client/src/__tests__/integration/errors/missing-binary-native/test.ts
@@ -4,6 +4,11 @@ import path from 'path'
 import { generateTestClient } from '../../../../utils/getTestClient'
 
 test('missing-binary-native', async () => {
+  // works in isolation
+  if (process.env.PRISMA_FORCE_NAPI) {
+    return
+  }
+
   expect.assertions(1)
   await generateTestClient()
 

diff --git a/src/packages/client/src/__tests__/integration/errors/missing-binary/test.ts b/src/packages/client/src/__tests__/integration/errors/missing-binary/test.ts
@@ -4,6 +4,10 @@ import path from 'path'
 import { generateTestClient } from '../../../../utils/getTestClient'
 
 test('missing-binary', async () => {
+  // works in isolation
+  if (process.env.PRISMA_FORCE_NAPI) {
+    return
+  }
   expect.assertions(1)
   await generateTestClient()
 

diff --git a/src/packages/client/src/__tests__/integration/errors/missing-relation/test.ts b/src/packages/client/src/__tests__/integration/errors/missing-relation/test.ts
@@ -4,20 +4,17 @@ test('missing-relation', async () => {
   expect.assertions(2)
   const PrismaClient = await getTestClient()
   const prisma = new PrismaClient()
-
   try {
     await prisma.post.findMany({
       include: {
         author: true,
       },
     })
   } catch (e) {
-    expect(e.message).toContain('PANIC in')
+    expect(e.message).toContain('PANIC')
     expect(e.message).toContain(
       'Application logic invariant error: received null value for field author which may not be null',
     )
-  } finally {
-    prisma.$disconnect()
   }
 })
 

diff --git a/src/packages/client/src/__tests__/integration/errors/missing-table/test.ts b/src/packages/client/src/__tests__/integration/errors/missing-table/test.ts
@@ -18,5 +18,5 @@ test('missing-table', async () => {
             The table \`main.User\` does not exist in the current database.
         `)
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/object-transaction/test.ts b/src/packages/client/src/__tests__/integration/errors/object-transaction/test.ts
@@ -21,5 +21,5 @@ test('object-transaction object', async () => {
     `All elements of the array need to be Prisma Client promises. Hint: Please make sure you are not awaiting the Prisma client calls you intended to pass in the $transaction function.`,
   )
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/raw-transaction/test.ts b/src/packages/client/src/__tests__/integration/errors/raw-transaction/test.ts
@@ -7,8 +7,8 @@ beforeAll(async () => {
   prisma = new PrismaClient()
 })
 
-afterAll(() => {
-  prisma.$disconnect()
+afterAll(async () => {
+  await prisma.$disconnect()
 })
 
 test('raw-transaction: queryRaw', async () => {

diff --git a/src/packages/client/src/__tests__/integration/errors/source-map-support/test.ts b/src/packages/client/src/__tests__/integration/errors/source-map-support/test.ts
@@ -20,5 +20,5 @@ test('source-map-support', async () => {
       }),
   ).rejects.toMatchSnapshot()
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/uncheckedScalarValidation/test.ts b/src/packages/client/src/__tests__/integration/errors/uncheckedScalarValidation/test.ts
@@ -92,5 +92,5 @@ test('uncheckedScalarInputs validation', async () => {
     `)
   }
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/union-validation/test.ts b/src/packages/client/src/__tests__/integration/errors/union-validation/test.ts
@@ -57,5 +57,5 @@ test('union validation', async () => {
     `)
   }
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
diff --git a/src/packages/client/src/__tests__/integration/errors/wrong-native-types-mysql/test.ts b/src/packages/client/src/__tests__/integration/errors/wrong-native-types-mysql/test.ts
@@ -1,7 +1,7 @@
-import { getTestClient } from '../../../../utils/getTestClient'
 import path from 'path'
-import { migrateDb } from '../../__helpers__/migrateDb'
+import { getTestClient } from '../../../../utils/getTestClient'
 import { tearDownMysql } from '../../../../utils/setupMysql'
+import { migrateDb } from '../../__helpers__/migrateDb'
 
 // We WANT to be able to do the async function without an await
 /* eslint-disable @typescript-eslint/require-await */
@@ -47,7 +47,7 @@ test('wrong-native-types-mysql A: Int, SmallInt, TinyInt, MediumInt, BigInt', as
 
         `)
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
 
 test('wrong-native-types-mysql B: Float, Double, Decimal, Numeric', async () => {
@@ -79,7 +79,7 @@ test('wrong-native-types-mysql B: Float, Double, Decimal, Numeric', async () =>
 
         `)
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
 
 test('wrong-native-types-mysql C: Char, VarChar, TinyText, Text, MediumText, LongText', async () => {
@@ -114,7 +114,7 @@ test('wrong-native-types-mysql C: Char, VarChar, TinyText, Text, MediumText, Lon
     `The provided value for the column is too long for the column's type. Column: char`,
   )
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
 
 test('wrong-native-types-mysql D: Date, Time, DateTime, Timestamp, Year', async () => {
@@ -149,7 +149,7 @@ test('wrong-native-types-mysql D: Date, Time, DateTime, Timestamp, Year', async
 
         `)
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })
 
 test('wrong-native-types-mysql E: Bit, Binary, VarBinary, Blob, TinyBlob, MediumBlob, LongBlob', async () => {
@@ -197,5 +197,5 @@ test('wrong-native-types-mysql E: Bit, Binary, VarBinary, Blob, TinyBlob, Medium
 
         `)
 
-  prisma.$disconnect()
+  await prisma.$disconnect()
 })