Merge branch 'main' into janpio/ci-qe-all

.buildkite/engineer

@@ -54,7 +54,7 @@ fi
 # Check if the system has engineer installed, if not, use a local copy.
 if ! type "engineer" &> /dev/null; then
     # Setup Prisma engine build & test tool (engineer).
-    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.60/latest/$OS/engineer.gz" --output engineer.gz
+    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.62/latest/$OS/engineer.gz" --output engineer.gz
     gzip -d engineer.gz
     chmod +x engineer
 

.github/workflows/query-engine-driver-adapters.yml

@@ -31,8 +31,6 @@ jobs:
             setup_task: 'dev-neon-ws-postgres13'
           - name: 'libsql'
             setup_task: 'dev-libsql-sqlite'
-          - name: 'planetscale'
-            setup_task: 'dev-planetscale-vitess8'
         node_version: ['18']
     env:
       LOG_LEVEL: 'info' # Set to "debug" to trace the query engine and node process running the driver adapter

CODEOWNERS

@@ -1 +1 @@
-* @prisma/team-orm-rust
+* @prisma/ORM-Rust

Makefile

@@ -130,10 +130,10 @@ test-pg-postgres13: dev-pg-postgres13 test-qe-st
 
 test-driver-adapter-pg: test-pg-postgres13
 
-start-neon-postgres13: build-qe-napi build-connector-kit-js
+start-neon-postgres13:
 	docker compose -f docker-compose.yml up --wait -d --remove-orphans neon-postgres13
 
-dev-neon-ws-postgres13: start-neon-postgres13
+dev-neon-ws-postgres13: start-neon-postgres13 build-qe-napi build-connector-kit-js
 	cp $(CONFIG_PATH)/neon-ws-postgres13 $(CONFIG_FILE)
 
 test-neon-ws-postgres13: dev-neon-ws-postgres13 test-qe-st
@@ -268,10 +268,10 @@ start-vitess_8_0:
 dev-vitess_8_0: start-vitess_8_0
 	cp $(CONFIG_PATH)/vitess_8_0 $(CONFIG_FILE)
 
-start-planetscale-vitess8: build-qe-napi build-connector-kit-js
+start-planetscale-vitess8:
 	docker compose -f docker-compose.yml up -d --remove-orphans planetscale-vitess8
 
-dev-planetscale-vitess8: start-planetscale-vitess8
+dev-planetscale-vitess8: start-planetscale-vitess8 build-qe-napi build-connector-kit-js
 	cp $(CONFIG_PATH)/planetscale-vitess8 $(CONFIG_FILE)
 
 test-planetscale-vitess8: dev-planetscale-vitess8 test-qe-st

README.md

@@ -259,6 +259,29 @@ GitHub actions will then pick up the branch name and use it to clone that branch
 
 When it's time to merge the sibling PRs, you'll need to merge the prisma/prisma PR first, so when merging the engines PR you have the code of the adapters ready in prisma/prisma `main` branch.
 
+### Testing engines in `prisma/prisma`
+
+You can trigger releases from this repository to npm that can be used for testing the engines in `prisma/prisma` either automatically or manually:
+
+#### Automated integration releases from this repository to npm
+
+(Since July 2022). Any branch name starting with `integration/` will, first, run the full test suite in Buildkite `[Test] Prisma Engines` and, second, if passing, run the publish pipeline (build and upload engines to S3 & R2)
+
+The journey through the pipeline is the same as a commit on the `main` branch.
+- It will trigger [`prisma/engines-wrapper`](https://github.com/prisma/engines-wrapper) and publish a new [`@prisma/engines-version`](https://www.npmjs.com/package/@prisma/engines-version) npm package but on the `integration` tag.
+- Which triggers [`prisma/prisma`](https://github.com/prisma/prisma) to create a `chore(Automated Integration PR): [...]` PR with a branch name also starting with `integration/`
+- Since in `prisma/prisma` we also trigger the publish pipeline when a branch name starts with `integration/`, this will publish all `prisma/prisma` monorepo packages to npm on the `integration` tag.
+- Our [ecosystem-tests](https://github.com/prisma/ecosystem-tests/) tests will automatically pick up this new version and run tests, results will show in [GitHub Actions](https://github.com/prisma/ecosystem-tests/actions?query=branch%3Aintegration)
+
+This end to end will take minimum ~1h20 to complete, but is completely automated :robot:
+
+Notes:
+- in `prisma/prisma` repository, we do not run tests for `integration/` branches, it is much faster and also means that there is no risk of tests failing (e.g. flaky tests, snapshots) that would stop the publishing process.
+- in `prisma/prisma-engines` the Buildkite test pipeline must first pass, then the engines will be built and uploaded to our storage via the Buildkite release pipeline. These 2 pipelines can fail for different reasons, it's recommended to keep an eye on them (check notifications in Slack) and restart jobs as needed. Finally, it will trigger [`prisma/engines-wrapper`](https://github.com/prisma/engines-wrapper). 
+
+#### Manual integration releases from this repository to npm
+
+Additionally to the automated integration release for `integration/` branches, you can also trigger a publish **manually** in the Buildkite `[Test] Prisma Engines` job if that succeeds for _any_ branch name. Click "🚀 Publish binaries" at the bottom of the test list to unlock the publishing step. When all the jobs in `[Release] Prisma Engines` succeed, you also have to unlock the next step by clicking "🚀 Publish client". This will then trigger the same journey as described above.
 
 ## Parallel rust-analyzer builds
 
@@ -269,22 +292,25 @@ rust-analyzer. To avoid this. Open VSCode settings and search for `Check on Save
 --target-dir:/tmp/rust-analyzer-check
 ```
 
-### Automated integration releases from this repository to npm
 
-(Since July 2022). Any branch name starting with `integration/` will, first, run the full test suite and, second, if passing, run the publish pipeline (build and upload engines to S3)
+## Community PRs: create a local branch for a branch coming from a fork
 
-The journey through the pipeline is the same as a commit on the `main` branch.
-- It will trigger [prisma/engines-wrapper](https://github.com/prisma/engines-wrapper) and publish a new [`@prisma/engines-version`](https://www.npmjs.com/package/@prisma/engines-version) npm package but on the `integration` tag.
-- Which triggers [prisma/prisma](https://github.com/prisma/prisma) to create a `chore(Automated Integration PR): [...]` PR with a branch name also starting with `integration/`
-- Since in prisma/prisma we also trigger the publish pipeline when a branch name starts with `integration/`, this will publish all prisma/prisma monorepo packages to npm on the `integration` tag.
-- Our [ecosystem-tests](https://github.com/prisma/ecosystem-tests/) tests will automatically pick up this new version and run tests, results will show in [GitHub Actions](https://github.com/prisma/ecosystem-tests/actions?query=branch%3Aintegration)
+To trigger an [Automated integration releases from this repository to npm](#automated-integration-releases-from-this-repository-to-npm) or [Manual integration releases from this repository to npm](#manual-integration-releases-from-this-repository-to-npm) branches of forks need to be pulled into this repository so the Buildkite job is triggered. You can use these GitHub and git CLI commands to achieve that easily:
 
-This end to end will take minimum ~1h20 to complete, but is completely automated :robot:
+```
+gh pr checkout 4375
+git checkout -b integration/sql-nested-transactions
+git push --set-upstream origin integration/sql-nested-transactions
+```
 
-Notes:
-- in prisma/prisma repository, we do not run tests for `integration/` branches, it is much faster and also means that there is no risk of test failing (e.g. flaky tests, snapshots) that would stop the publishing process.
-- in prisma/prisma-engines tests must first pass, before publishing starts. So better keep an eye on them and restart them as needed.
+If there is a need to re-create this branch because it has been updated, deleting it and re-creating will make sure the content is identical and avoid any conflicts.
 
+```
+git branch --delete integration/sql-nested-transactions
+gh pr checkout 4375
+git checkout -b integration/sql-nested-transactions
+git push --set-upstream origin integration/sql-nested-transactions --force
+```
 
 ## Security
 

docker-compose.yml

@@ -187,7 +187,6 @@ services:
     restart: unless-stopped
     platform: linux/x86_64
     environment:
-      MYSQL_USER: root
       MYSQL_ROOT_PASSWORD: prisma
       MYSQL_DATABASE: prisma
     ports:

psl/psl-core/src/validate/validation_pipeline/validations.rs

@@ -123,7 +123,7 @@ pub(super) fn validate(ctx: &mut Context<'_>) {
             indexes::supports_clustering_setting(index, ctx);
             indexes::clustering_can_be_defined_only_once(index, ctx);
             indexes::opclasses_are_not_allowed_with_other_than_normal_indices(index, ctx);
-            indexes::composite_types_are_not_allowed_in_index(index, ctx);
+            indexes::composite_type_in_compound_unique_index(index, ctx);
 
             for field_attribute in index.scalar_field_attributes() {
                 let span = index.ast_attribute().span;

psl/psl-core/src/validate/validation_pipeline/validations/indexes.rs

@@ -386,20 +386,25 @@ pub(crate) fn opclasses_are_not_allowed_with_other_than_normal_indices(index: In
     }
 }
 
-pub(crate) fn composite_types_are_not_allowed_in_index(index: IndexWalker<'_>, ctx: &mut Context<'_>) {
-    for field in index.fields() {
-        if field.scalar_field_type().as_composite_type().is_some() {
-            let message = format!(
-                "Indexes can only contain scalar attributes. Please remove {:?} from the argument list of the indexes.",
-                field.name()
-            );
-            ctx.push_error(DatamodelError::new_attribute_validation_error(
-                &message,
-                index.attribute_name(),
-                index.ast_attribute().span,
-            ));
-            return;
-        }
+pub(crate) fn composite_type_in_compound_unique_index(index: IndexWalker<'_>, ctx: &mut Context<'_>) {
+    if !index.is_unique() {
+        return;
+    }
+
+    let composite_type = index
+        .fields()
+        .find(|f| f.scalar_field_type().as_composite_type().is_some());
+
+    if index.fields().len() > 1 && composite_type.is_some() {
+        let message = format!(
+            "Prisma does not currently support composite types in compound unique indices, please remove {:?} from the index. See https://pris.ly/d/mongodb-composite-compound-indices for more details",
+            composite_type.unwrap().name()
+        );
+        ctx.push_error(DatamodelError::new_attribute_validation_error(
+            &message,
+            index.attribute_name(),
+            index.ast_attribute().span,
+        ));
     }
 }
 

query-engine/black-box-tests/Cargo.toml

@@ -15,3 +15,4 @@ user-facing-errors.workspace = true
 insta = "1.7.1"
 enumflags2 = "0.7"
 query-engine-metrics = {path = "../metrics"}
+regex = "1.9.3"

query-engine/black-box-tests/tests/metrics/smoke_tests.rs

@@ -4,6 +4,7 @@ use query_engine_tests::*;
 /// Asserts common basics for composite type writes.
 #[test_suite(schema(schema))]
 mod smoke_tests {
+    use regex::Regex;
     fn schema() -> String {
         let schema = indoc! {
             r#"model Person {
@@ -14,6 +15,24 @@ mod smoke_tests {
         schema.to_owned()
     }
 
+    fn assert_value_in_range(metrics: &str, metric: &str, low: f64, high: f64) {
+        let regex = Regex::new(format!(r"{metric}\s+([+-]?\d+(\.\d+)?)").as_str()).unwrap();
+        match regex.captures(&metrics) {
+            Some(capture) => {
+                let value = capture.get(1).unwrap().as_str().parse::<f64>().unwrap();
+                assert!(
+                    value >= low && value <= high,
+                    "expected {} value of {} to be between {} and {}",
+                    metric,
+                    value,
+                    low,
+                    high
+                );
+            }
+            None => panic!("Metric {} not found in metrics text", metric),
+        }
+    }
+
     #[connector_test]
     #[rustfmt::skip]
     async fn expected_metrics_rendered(r: Runner) -> TestResult<()> {
@@ -62,6 +81,8 @@ mod smoke_tests {
             // counters
             assert_eq!(metrics.matches("# HELP prisma_client_queries_total The total number of Prisma Client queries executed").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_client_queries_total counter").count(), 1);
+            assert_eq!(metrics.matches("prisma_client_queries_total 1").count(), 1);
+
 
             assert_eq!(metrics.matches("# HELP prisma_datasource_queries_total The total number of datasource queries executed").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_datasource_queries_total counter").count(), 1);
@@ -81,13 +102,15 @@ mod smoke_tests {
 
             assert_eq!(metrics.matches("# HELP prisma_pool_connections_busy The number of pool connections currently executing datasource queries").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_pool_connections_busy gauge").count(), 1);
+            assert_value_in_range(&metrics, "prisma_pool_connections_busy", 0f64, 1f64);
 
             assert_eq!(metrics.matches("# HELP prisma_pool_connections_idle The number of pool connections that are not busy running a query").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_pool_connections_idle gauge").count(), 1);
 
             assert_eq!(metrics.matches("# HELP prisma_pool_connections_open The number of pool connections currently open").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_pool_connections_open gauge").count(), 1);
-
+            assert_value_in_range(&metrics, "prisma_pool_connections_open", 0f64, 1f64);
+
             // histograms
             assert_eq!(metrics.matches("# HELP prisma_client_queries_duration_histogram_ms The distribution of the time Prisma Client queries took to run end to end").count(), 1);
             assert_eq!(metrics.matches("# TYPE prisma_client_queries_duration_histogram_ms histogram").count(), 1);

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/assertion_violation_error.rs

@@ -1,8 +1,8 @@
 use query_engine_tests::*;
 
-#[test_suite(schema(generic), only(Postgres))]
+#[test_suite(schema(generic))]
 mod raw_params {
-    #[connector_test]
+    #[connector_test(only(Postgres), exclude(JS))]
     async fn value_too_many_bind_variables(runner: Runner) -> TestResult<()> {
         let n = 32768;
 

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/interactive_tx.rs

@@ -213,7 +213,7 @@ mod interactive_tx {
         Ok(())
     }
 
-    #[connector_test(exclude(JS))]
+    #[connector_test]
     async fn batch_queries_failure(mut runner: Runner) -> TestResult<()> {
         // Tx expires after five second.
         let tx_id = runner.start_tx(5000, 5000, None).await?;
@@ -256,7 +256,7 @@ mod interactive_tx {
         Ok(())
     }
 
-    #[connector_test(exclude(JS))]
+    #[connector_test]
     async fn tx_expiration_failure_cycle(mut runner: Runner) -> TestResult<()> {
         // Tx expires after one seconds.
         let tx_id = runner.start_tx(5000, 1000, None).await?;

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/ref_actions/on_delete/set_default.rs

@@ -66,7 +66,7 @@ mod one2one_req {
     }
 
     /// Deleting the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL))]
     async fn delete_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, child: { create: { id: 1 }}}) { id }}"#),
@@ -167,7 +167,7 @@ mod one2one_opt {
     }
 
     /// Deleting the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL))]
     async fn delete_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, child: { create: { id: 1 }}}) { id }}"#),
@@ -270,7 +270,7 @@ mod one2many_req {
     }
 
     /// Deleting the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL))]
     async fn delete_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, children: { create: { id: 1 }}}) { id }}"#),
@@ -371,7 +371,7 @@ mod one2many_opt {
     }
 
     /// Deleting the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL))]
     async fn delete_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, children: { create: { id: 1 }}}) { id }}"#),

query-engine/connector-test-kit-rs/query-engine-tests/tests/new/ref_actions/on_update/set_default.rs

@@ -68,7 +68,7 @@ mod one2one_req {
     }
 
     /// Updating the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL))]
     async fn update_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, uniq: "1", child: { create: { id: 1 }}}) { id }}"#),
@@ -171,7 +171,7 @@ mod one2one_opt {
     }
 
     /// Updating the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL))]
     async fn update_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, uniq: "1", child: { create: { id: 1 }}}) { id }}"#),
@@ -276,7 +276,7 @@ mod one2many_req {
     }
 
     /// Updating the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(required_with_default), exclude(MongoDb, MySQL))]
     async fn update_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, uniq: "1", children: { create: { id: 1 }}}) { id }}"#),
@@ -379,7 +379,7 @@ mod one2many_opt {
     }
 
     /// Updating the parent reconnects the child to the default and fails (the default doesn't exist).
-    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL, JS))]
+    #[connector_test(schema(optional_with_default), exclude(MongoDb, MySQL))]
     async fn update_parent_no_exist_fail(runner: Runner) -> TestResult<()> {
         insta::assert_snapshot!(
           run_query!(&runner, r#"mutation { createOneParent(data: { id: 1, uniq: "1", children: { create: { id: 1 }}}) { id }}"#),