Merge branch 'main' of github.com:prisma/prisma into integration/undi…

…ci-4

.buildkite/publish/docker-compose.yml

@@ -28,7 +28,8 @@ services:
       - TEST_MSSQL_JDBC_URI_MIGRATE=sqlserver://mssql:1433;database=tests-migrate;user=SA;password=Pr1sm4_Pr1sm4;trustServerCertificate=true;
       - TEST_MSSQL_SHADOWDB_JDBC_URI_MIGRATE=sqlserver://mssql:1433;database=tests-migrate-shadowdb;user=SA;password=Pr1sm4_Pr1sm4;trustServerCertificate=true;
       # MongoDB
-      - TEST_MONGO_URI=mongodb://root:prisma@mongo:27017/tests?authSource=admin
+      - TEST_MONGO_URI=mongodb://root:prisma@mongo:27018/tests?authSource=admin
+      - TEST_MONGO_URI_MIGRATE=mongodb://root:prisma@mongodb_migrate:27017/tests-migrate?authSource=admin
       # CockroachDB
       - TEST_COCKROACH_URI=postgresql://prisma@cockroachdb:26257/
       # Other vars !\ If not defined, they cannot be accessed
@@ -55,10 +56,12 @@ services:
       - postgres
       - postgres_isolated
       - mysql
+      - mysql_isolated
       - mariadb
       - mssql
       - mongo
-      - mongo-seed
+      - mongodb_migrate
+      - mongodb_migrate_seed
       - cockroachdb
 
   postgres:
@@ -68,8 +71,8 @@ services:
       - POSTGRES_DB=tests
       - POSTGRES_USER=prisma
       - POSTGRES_PASSWORD=prisma
-    volumes:
-      - postgres:/var/lib/postgresql/data
+    ports:
+      - '5432:5432'
 
   postgres_isolated:
     image: postgres:10
@@ -78,8 +81,15 @@ services:
       - POSTGRES_DB=tests
       - POSTGRES_USER=prisma
       - POSTGRES_PASSWORD=prisma
-    volumes:
-      - postgres_isolated:/var/lib/postgresql/data
+    ports:
+      - '5435:5432'
+
+  cockroachdb:
+    image: prismagraphql/build:cockroach-custom
+    restart: always
+    command: start-single-node --insecure
+    ports:
+      - '26257:26257'
 
   mysql:
     image: mysql:8.0
@@ -89,9 +99,8 @@ services:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
-      - MYSQL_PASSWORD=prisma
-    volumes:
-      - mysql:/var/lib/mysql
+    ports:
+      - '3306:3306'
 
   mysql_isolated:
     image: mysql:8.0
@@ -102,8 +111,8 @@ services:
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
       - MYSQL_PASSWORD=prisma
-    volumes:
-      - mysql_isolated:/var/lib/mysql
+    ports:
+      - '3307:3306'
 
   mariadb:
     image: mariadb:10
@@ -113,45 +122,40 @@ services:
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
       - MYSQL_PASSWORD=prisma
-    volumes:
-      - mariadb:/var/lib/mysql
+    ports:
+      - '4306:3306'
 
   mssql:
     image: mcr.microsoft.com/mssql/server:2019-latest
     restart: always
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Pr1sm4_Pr1sm4
-    volumes:
-      - mssql:/var/opt/mssql
+    ports:
+      - '1433:1433'
 
-  mongo:
+  mongodb_migrate:
     image: mongo:4
     restart: always
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: prisma
-      MONGO_INITDB_DATABASE: tests
+      MONGO_INITDB_DATABASE: tests-migrate
     ports:
       - '27017:27017'
 
-  mongo-seed:
-    build: ../../docker/mongo-seed
-    links:
-      - mongo
+  mongodb_migrate_seed:
+    build: ../../docker/mongodb_migrate_seed
+    depends_on:
+      - mongodb_migrate
 
-  cockroachdb:
-    image: prismagraphql/build:cockroach-custom
-    restart: always
-    command: start-single-node --insecure
+  mongo:
+    build: ../../docker/mongodb_replica
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: prisma
+      MONGO_REPLICA_HOST: mongo
+      MONGO_REPLICA_PORT: 27018
     ports:
-      - '26257:26257'
-
-volumes:
-  postgres:
-  postgres_isolated:
-  mysql:
-  mysql_isolated:
-  mariadb:
-  mssql:
+      - '27018:27018'
 # TODO: investigate why isolated containers aren't used in the tests

.buildkite/publish/publish.yml

@@ -1,5 +1,5 @@
 steps:
-  - label: ":llama: Publish"
+  - label: ':llama: Publish'
     timeout_in_minutes: 45
     plugins:
       - docker-compose#v3.9.0:

.buildkite/test/docker-compose.14.yml

@@ -28,7 +28,8 @@ services:
       - TEST_MSSQL_JDBC_URI_MIGRATE=sqlserver://mssql:1433;database=tests-migrate;user=SA;password=Pr1sm4_Pr1sm4;trustServerCertificate=true;
       - TEST_MSSQL_SHADOWDB_JDBC_URI_MIGRATE=sqlserver://mssql:1433;database=tests-migrate-shadowdb;user=SA;password=Pr1sm4_Pr1sm4;trustServerCertificate=true;
       # MongoDB
-      - TEST_MONGO_URI=mongodb://root:prisma@mongo:27017/tests?authSource=admin
+      - TEST_MONGO_URI=mongodb://root:prisma@mongo:27018/tests?authSource=admin
+      - TEST_MONGO_URI_MIGRATE=mongodb://root:prisma@mongodb_migrate:27017/tests-migrate?authSource=admin
       # CockroachDB
       - TEST_COCKROACH_URI=postgresql://prisma@cockroachdb:26257/
       # Other vars
@@ -49,7 +50,8 @@ services:
       - mariadb
       - mssql
       - mongo
-      - mongo-seed
+      - mongodb_migrate
+      - mongodb_migrate_seed
       - cockroachdb
 
   postgres:
@@ -59,8 +61,8 @@ services:
       - POSTGRES_DB=tests
       - POSTGRES_USER=prisma
       - POSTGRES_PASSWORD=prisma
-    volumes:
-      - postgres:/var/lib/postgresql/data
+    ports:
+      - '5432:5432'
 
   postgres_isolated:
     image: postgres:10
@@ -69,8 +71,15 @@ services:
       - POSTGRES_DB=tests
       - POSTGRES_USER=prisma
       - POSTGRES_PASSWORD=prisma
-    volumes:
-      - postgres_isolated:/var/lib/postgresql/data
+    ports:
+      - '5435:5432'
+
+  cockroachdb:
+    image: prismagraphql/build:cockroach-custom
+    restart: always
+    command: start-single-node --insecure
+    ports:
+      - '26257:26257'
 
   mysql:
     image: mysql:8.0
@@ -80,9 +89,8 @@ services:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
-      - MYSQL_PASSWORD=prisma
-    volumes:
-      - mysql:/var/lib/mysql
+    ports:
+      - '3306:3306'
 
   mysql_isolated:
     image: mysql:8.0
@@ -93,8 +101,8 @@ services:
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
       - MYSQL_PASSWORD=prisma
-    volumes:
-      - mysql_isolated:/var/lib/mysql
+    ports:
+      - '3307:3306'
 
   mariadb:
     image: mariadb:10
@@ -104,44 +112,39 @@ services:
       - MYSQL_DATABASE=tests
       - MYSQL_USER=prisma
       - MYSQL_PASSWORD=prisma
-    volumes:
-      - mariadb:/var/lib/mysql
+    ports:
+      - '4306:3306'
 
   mssql:
     image: mcr.microsoft.com/mssql/server:2019-latest
     restart: always
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Pr1sm4_Pr1sm4
-    volumes:
-      - mssql:/var/opt/mssql
+    ports:
+      - '1433:1433'
 
-  mongo:
+  mongodb_migrate:
     image: mongo:4
     restart: always
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: prisma
-      MONGO_INITDB_DATABASE: tests
+      MONGO_INITDB_DATABASE: tests-migrate
     ports:
       - '27017:27017'
 
-  mongo-seed:
-    build: ../../docker/mongo-seed
-    links:
-      - mongo
+  mongodb_migrate_seed:
+    build: ../../docker/mongodb_migrate_seed
+    depends_on:
+      - mongodb_migrate
 
-  cockroachdb:
-    image: prismagraphql/build:cockroach-custom
-    restart: always
-    command: start-single-node --insecure
+  mongo:
+    build: ../../docker/mongodb_replica
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: prisma
+      MONGO_REPLICA_HOST: mongo
+      MONGO_REPLICA_PORT: 27018
     ports:
-      - '26257:26257'
-
-volumes:
-  postgres:
-  postgres_isolated:
-  mysql:
-  mysql_isolated:
-  mariadb:
-  mssql:
+      - '27018:27018'

.devcontainer/devcontainer.json

@@ -1,43 +1,43 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/typescript-node
 {
-	"name": "Node.js & TypeScript",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick a Node version: 12, 14, 16
-		"args": { 
-			"VARIANT": "14"
-		}
-	},
+  "name": "Node.js & TypeScript",
+  "build": {
+    "dockerfile": "Dockerfile",
+    // Update 'VARIANT' to pick a Node version: 12, 14, 16
+    "args": {
+      "VARIANT": "14"
+    }
+  },
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"telemetry.enableTelemetry": false,
-		"redhat.telemetry.enabled": false,
-		"vulnCost.sendStatistics": false,
+  // Set *default* container specific settings.json values on container create.
+  "settings": {
+    "telemetry.enableTelemetry": false,
+    "redhat.telemetry.enabled": false,
+    "vulnCost.sendStatistics": false,
 
-		"editor.renderWhitespace": "all",
-		"editor.renderControlCharacters": true,
-		"editor.formatOnSave": true,
+    "editor.renderWhitespace": "all",
+    "editor.renderControlCharacters": true,
+    "editor.formatOnSave": true,
 
-		"files.insertFinalNewline": true,
-	},
+    "files.insertFinalNewline": true
+  },
 
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		// "dbaeumer.vscode-eslint",
-		"Prisma.prisma-insider",
-		"esbenp.prettier-vscode",
-		"Orta.vscode-jest",
-		"GitHub.vscode-pull-request-github"
-	],
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    // "dbaeumer.vscode-eslint",
+    "Prisma.prisma-insider",
+    "esbenp.prettier-vscode",
+    "Orta.vscode-jest",
+    "GitHub.vscode-pull-request-github"
+  ],
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
 
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pnpm install",
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "pnpm install",
 
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "node"
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node"
 }

.eslintignore

@@ -0,0 +1,21 @@
+# common
+dist/
+esm/
+build/
+fixtures/
+byline.ts
+prism.ts
+charm.ts
+pnpm-lock.yaml
+
+# client
+packages/client/generator-build/
+packages/client/declaration/
+packages/client/runtime/
+packages/client/src/__tests__/types/
+
+# cli
+packages/cli/prisma-client/
+packages/cli/install/
+packages/cli/preinstall/
+packages/cli/**/tmp-*