diff --git a/.buildkite/engineer b/.buildkite/engineer index 880db1967231..71c1211a83b4 100755 --- a/.buildkite/engineer +++ b/.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.62/latest/$OS/engineer.gz" --output engineer.gz + curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.63/latest/$OS/engineer.gz" --output engineer.gz gzip -d engineer.gz chmod +x engineer diff --git a/.github/workflows/query-engine.yml b/.github/workflows/query-engine.yml index 762c3da4a50a..6101bb7948d2 100644 --- a/.github/workflows/query-engine.yml +++ b/.github/workflows/query-engine.yml @@ -25,10 +25,6 @@ jobs: fail-fast: false matrix: database: - - name: 'vitess_5_7' - single_threaded: true - connector: 'vitess' - version: '5.7' - name: 'vitess_8_0' single_threaded: true connector: 'vitess' diff --git a/.github/workflows/schema-engine.yml b/.github/workflows/schema-engine.yml index 03d23317bbd0..36f55368bf58 100644 --- a/.github/workflows/schema-engine.yml +++ b/.github/workflows/schema-engine.yml @@ -94,11 +94,6 @@ jobs: url: 'postgresql://prisma@localhost:26257' - name: sqlite url: sqlite - - name: vitess_5_7 - url: 'mysql://root:prisma@localhost:33577/test' - shadow_database_url: 'mysql://root:prisma@localhost:33578/shadow' - is_vitess: true - single_threaded: true - name: vitess_8_0 url: 'mysql://root:prisma@localhost:33807/test' shadow_database_url: 'mysql://root:prisma@localhost:33808/shadow' diff --git a/.test_database_urls/vitess_5_7 b/.test_database_urls/vitess_5_7 deleted file mode 100644 index 2259628658ac..000000000000 --- a/.test_database_urls/vitess_5_7 +++ /dev/null @@ -1,2 +0,0 @@ -export TEST_DATABASE_URL="mysql://root:prisma@localhost:33577/test" -export TEST_SHADOW_DATABASE_URL="mysql://root:prisma@localhost:33578/shadow" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index b88de804c816..646e5f46d709 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6014,9 +6014,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6024,9 +6024,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", @@ -6051,9 +6051,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6061,9 +6061,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", @@ -6074,9 +6074,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-logger" diff --git a/Makefile b/Makefile index e00c122e2713..b4516e645817 100644 --- a/Makefile +++ b/Makefile @@ -256,12 +256,6 @@ dev-mongodb_5: start-mongodb_5 dev-mongodb_4_2: start-mongodb_4_2 cp $(CONFIG_PATH)/mongodb42 $(CONFIG_FILE) -start-vitess_5_7: - docker compose -f docker-compose.yml up --wait -d --remove-orphans vitess-test-5_7 vitess-shadow-5_7 - -dev-vitess_5_7: start-vitess_5_7 - cp $(CONFIG_PATH)/vitess_5_7 $(CONFIG_FILE) - start-vitess_8_0: docker compose -f docker-compose.yml up --wait -d --remove-orphans vitess-test-8_0 vitess-shadow-8_0 diff --git a/docker-compose.yml b/docker-compose.yml index a8b48748abc4..b8fe3e1e0fa0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -222,26 +222,6 @@ services: - databases tmpfs: /var/lib/mariadb - vitess-test-5_7: - image: vitess/vttestserver:mysql57@sha256:23863a518b34330109c502ac61a396008f5f023e96263bcb2bb1b0f7f7d5dc7f - restart: unless-stopped - ports: - - 33577:33577 - environment: - PORT: 33574 - KEYSPACES: 'test' - NUM_SHARDS: '1' - MYSQL_BIND_HOST: '0.0.0.0' - FOREIGN_KEY_MODE: 'disallow' - ENABLE_ONLINE_DDL: false - MYSQL_MAX_CONNECTIONS: 100000 - TABLET_REFRESH_INTERVAL: '500ms' - healthcheck: - test: ['CMD', 'mysqladmin', 'ping', '-h127.0.0.1', '-P33577'] - interval: 5s - timeout: 2s - retries: 20 - vitess-test-8_0: image: vitess/vttestserver:mysql80@sha256:8bec2644d83cb322eb2cdd596d33c0f858243ba6ade9164c95dfcc519643094e restart: unless-stopped @@ -262,26 +242,6 @@ services: timeout: 2s retries: 20 - vitess-shadow-5_7: - image: vitess/vttestserver:mysql57@sha256:23863a518b34330109c502ac61a396008f5f023e96263bcb2bb1b0f7f7d5dc7f - restart: unless-stopped - ports: - - 33578:33577 - environment: - PORT: 33574 - KEYSPACES: 'shadow' - NUM_SHARDS: '1' - MYSQL_BIND_HOST: '0.0.0.0' - FOREIGN_KEY_MODE: 'disallow' - ENABLE_ONLINE_DDL: false - MYSQL_MAX_CONNECTIONS: 100000 - TABLET_REFRESH_INTERVAL: '500ms' - healthcheck: - test: ['CMD', 'mysqladmin', 'ping', '-h127.0.0.1', '-P33577'] - interval: 5s - timeout: 2s - retries: 20 - vitess-shadow-8_0: image: vitess/vttestserver:mysql80@sha256:8bec2644d83cb322eb2cdd596d33c0f858243ba6ade9164c95dfcc519643094e restart: unless-stopped diff --git a/flake.lock b/flake.lock index c2750d0435ed..b887051dac9b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,23 +2,16 @@ "nodes": { "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" ] }, "locked": { - "lastModified": 1696384830, - "narHash": "sha256-j8ZsVqzmj5sOm5MW9cqwQJUZELFFwOislDmqDDEMl6k=", + "lastModified": 1699548976, + "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", "owner": "ipetkov", "repo": "crane", - "rev": "f2143cd27f8bd09ee4f0121336c65015a2a0a19c", + "rev": "6849911446e18e520970cc6b7a691e64ee90d649", "type": "github" }, "original": { @@ -27,22 +20,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696267196, - "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -50,11 +27,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -105,11 +82,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -139,11 +116,11 @@ ] }, "locked": { - "lastModified": 1696558324, - "narHash": "sha256-TnnP4LGwDB8ZGE7h2n4nA9Faee8xPkMdNcyrzJ57cbw=", + "lastModified": 1700187354, + "narHash": "sha256-RRIVKv+tiI1yn1PqZiVGQ9YlQGZ+/9iEkA4rst1QiNk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fdb37574a04df04aaa8cf7708f94a9309caebe2b", + "rev": "e3ebc177291f5de627d6dfbac817b4a661b15d1c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 67f4042d8c68..e62a09803d3d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,6 @@ crane = { url = "github:ipetkov/crane"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - inputs.flake-utils.follows = "flake-utils"; }; flake-utils = { url = "github:numtide/flake-utils"; diff --git a/prisma-schema-wasm/Cargo.toml b/prisma-schema-wasm/Cargo.toml index 248c726c9ba4..51638e55b1c1 100644 --- a/prisma-schema-wasm/Cargo.toml +++ b/prisma-schema-wasm/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -wasm-bindgen = "=0.2.87" +wasm-bindgen = "=0.2.88" wasm-logger = { version = "0.2.0", optional = true } prisma-fmt = { path = "../prisma-fmt" } diff --git a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs index 5ff7ec8ad9ba..69207f3fff5d 100644 --- a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs +++ b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs @@ -17,7 +17,7 @@ mod smoke_tests { 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) { + match regex.captures(metrics) { Some(capture) => { let value = capture.get(1).unwrap().as_str().parse::().unwrap(); assert!( diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs index 8c21dd93f903..ecc055d5d8d2 100644 --- a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs +++ b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/mod.rs @@ -196,7 +196,6 @@ pub(crate) fn connection_string( None => unreachable!("A versioned connector must have a concrete version to run."), } } - ConnectorVersion::Vitess(Some(VitessVersion::V5_7)) => "mysql://root@localhost:33577/test".into(), ConnectorVersion::Vitess(Some(VitessVersion::V8_0)) => "mysql://root@localhost:33807/test".into(), ConnectorVersion::Vitess(None) => unreachable!("A versioned connector must have a concrete version to run."), } diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/vitess.rs b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/vitess.rs index 7afb78bab630..0376f45abbcf 100644 --- a/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/vitess.rs +++ b/query-engine/connector-test-kit-rs/query-tests-setup/src/connector_tag/vitess.rs @@ -33,7 +33,6 @@ impl ConnectorTagInterface for VitessConnectorTag { #[derive(Debug, Clone, Copy, PartialEq)] pub enum VitessVersion { - V5_7, V8_0, } @@ -42,7 +41,6 @@ impl FromStr for VitessVersion { fn from_str(s: &str) -> Result { let version = match s { - "5.7" => Self::V5_7, "8.0" => Self::V8_0, _ => return Err(TestError::parse_error(format!("Unknown Vitess version `{s}`"))), }; @@ -54,7 +52,6 @@ impl FromStr for VitessVersion { impl Display for VitessVersion { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - Self::V5_7 => write!(f, "5.7"), Self::V8_0 => write!(f, "8.0"), } } diff --git a/query-engine/connector-test-kit-rs/test-configs/vitess_5_7 b/query-engine/connector-test-kit-rs/test-configs/vitess_5_7 deleted file mode 100644 index 64fb5162ac41..000000000000 --- a/query-engine/connector-test-kit-rs/test-configs/vitess_5_7 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "connector": "vitess", - "version": "5.7"} \ No newline at end of file diff --git a/query-engine/driver-adapters/src/proxy.rs b/query-engine/driver-adapters/src/proxy.rs index a708d75c0e32..642c2491757a 100644 --- a/query-engine/driver-adapters/src/proxy.rs +++ b/query-engine/driver-adapters/src/proxy.rs @@ -853,7 +853,7 @@ mod proxy_test { let s = "13:02:20.321"; let json_value = serde_json::Value::String(s.to_string()); let quaint_value = js_value_to_quaint(json_value, column_type, "column_name").unwrap(); - let time: NaiveTime = NaiveTime::from_hms_milli_opt(13, 02, 20, 321).unwrap(); + let time: NaiveTime = NaiveTime::from_hms_milli_opt(13, 2, 20, 321).unwrap(); assert_eq!(quaint_value, QuaintValue::time(time)); } diff --git a/query-engine/query-engine-wasm/Cargo.toml b/query-engine/query-engine-wasm/Cargo.toml index f65f31c2d63b..34ef69df467d 100644 --- a/query-engine/query-engine-wasm/Cargo.toml +++ b/query-engine/query-engine-wasm/Cargo.toml @@ -25,7 +25,7 @@ serde_json.workspace = true serde.workspace = true tokio = { version = "1.25", features = ["macros", "sync", "io-util", "time"] } futures = "0.3" -wasm-bindgen = "=0.2.87" +wasm-bindgen = "=0.2.88" wasm-bindgen-futures = "0.4" serde-wasm-bindgen = "0.5" js-sys = "0.3" diff --git a/schema-engine/sql-introspection-tests/tests/mysql/constraints.rs b/schema-engine/sql-introspection-tests/tests/mysql/constraints.rs index d712b17f684e..537e2233e9ee 100644 --- a/schema-engine/sql-introspection-tests/tests/mysql/constraints.rs +++ b/schema-engine/sql-introspection-tests/tests/mysql/constraints.rs @@ -4,7 +4,7 @@ use indoc::indoc; use sql_introspection_tests::test_api::*; use test_macros::test_connector; -// Note: MySQL 5.6 ad 5.7 do not support check constraints, so this test is only run on MySQL 8.0. +// Note: MySQL 5.6 and 5.7 do not support check constraints, so this test is only run on MySQL 8.0. #[test_connector(tags(Mysql8), exclude(Vitess))] async fn check_constraints_stopgap(api: &mut TestApi) -> TestResult { let raw_sql = indoc! {r#" diff --git a/schema-engine/sql-migration-tests/tests/native_types/mysql.rs b/schema-engine/sql-migration-tests/tests/native_types/mysql.rs index d8cf62f5767c..b74f3dd6bac4 100644 --- a/schema-engine/sql-migration-tests/tests/native_types/mysql.rs +++ b/schema-engine/sql-migration-tests/tests/native_types/mysql.rs @@ -697,8 +697,8 @@ fn filter_from_types(api: &TestApi, cases: Cases) -> Cow<'static, [Case]> { return Cow::Owned( cases .iter() + .filter(|&(ty, _, _)| !type_is_unsupported_mariadb(ty)) .cloned() - .filter(|(ty, _, _)| !type_is_unsupported_mariadb(ty)) .collect(), ); } @@ -707,8 +707,8 @@ fn filter_from_types(api: &TestApi, cases: Cases) -> Cow<'static, [Case]> { return Cow::Owned( cases .iter() + .filter(|&(ty, _, _)| !type_is_unsupported_mysql_5_6(ty)) .cloned() - .filter(|(ty, _, _)| !type_is_unsupported_mysql_5_6(ty)) .collect(), ); }