Merge remote-tracking branch 'origin/main' into fix/postgres-left-join-rewrite-nullability

Author: luca992

.github/workflows/sqlx.yml

@@ -301,6 +301,22 @@ jobs:
           SQLX_OFFLINE_DIR: .sqlx
           RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"
 
+      # Run tests again with implied linux user
+      - run: |
+          SKIP_ARGS=()
+          for test in $PG_ISOLATED_TESTS; do
+            SKIP_ARGS+=(--skip "$test")
+          done
+          cargo test \
+            --no-default-features \
+            --features any,postgres,macros,migrate,_unstable-all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }} \
+            -- \
+            "${SKIP_ARGS[@]}"
+        env:
+          DATABASE_URL: postgres:///sqlx?password=runner-password
+          SQLX_OFFLINE_DIR: .sqlx
+          RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}"
+
       # Run the `test-attr` test again to cover cleanup.
       - run: >
           cargo test

sqlx-core/Cargo.toml

@@ -91,7 +91,7 @@ percent-encoding = "2.3.0"
 serde = { version = "1.0.219", features = ["derive", "rc"], optional = true }
 serde_json = { version = "1.0.142", features = ["raw_value"], optional = true }
 toml = { version = "0.8.16", optional = true }
-sha2 = { version = "0.10.0", default-features = false, optional = true }
+sha2 = { workspace = true, optional = true }
 #sqlformat = "0.2.0"
 tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
 tracing = { version = "0.1.37", features = ["log"] }

sqlx-macros-core/Cargo.toml

@@ -75,7 +75,7 @@ either = "1.6.1"
 proc-macro2 = { version = "1.0.83", default-features = false }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = { version = "1.0.142" }
-sha2 = { version = "0.10.0" }
+sha2 = { workspace = true }
 syn = { version = "2.0.87", default-features = false, features = ["full", "derive", "parsing", "printing", "clone-impls"] }
 quote = { version = "1.0.35", default-features = false }
 url = { version = "2.2.2" }

sqlx-macros-core/src/query/metadata.rs

@@ -22,8 +22,11 @@ pub struct MacrosEnv {
 
 impl Metadata {
     pub fn env(&self) -> crate::Result<Arc<MacrosEnv>> {
-        self.env
-            .get_or_try_init(|builder| load_env(&self.manifest_dir, &self.config, builder))
+        let workspace_root = self.workspace_root();
+
+        self.env.get_or_try_init(|builder| {
+            load_env(&self.manifest_dir, &workspace_root, &self.config, builder)
+        })
     }
 
     pub fn workspace_root(&self) -> PathBuf {
@@ -91,6 +94,7 @@ pub fn try_for_crate() -> crate::Result<Arc<Metadata>> {
 
 fn load_env(
     manifest_dir: &Path,
+    workspace_root: &Path,
     config: &Config,
     builder: &mut MtimeCacheBuilder,
 ) -> crate::Result<Arc<MacrosEnv>> {
@@ -108,7 +112,22 @@ fn load_env(
         offline: None,
     };
 
-    for dir in manifest_dir.ancestors() {
+    // https://github.com/launchbadge/sqlx/issues/4276
+    let dirs = if manifest_dir.starts_with(workspace_root) {
+        // Often just `[manifest_dir, workspace_dir]` but project structures can absolutely
+        // be more complicated
+        manifest_dir
+            .ancestors()
+            .take_while(|dir| dir.starts_with(workspace_root))
+            .collect::<Vec<_>>()
+    } else {
+        // Thinking of edge cases, there's the possibility that the package directory
+        // isn't actually a child of the workspace directory. There isn't really any other sane
+        // thing to do here; we shouldn't traverse into unrelated paths.
+        [manifest_dir, workspace_root].to_vec()
+    };
+
+    for dir in dirs {
         let path = dir.join(".env");
 
         let dotenv = match dotenvy::from_path_iter(&path) {

sqlx-postgres/Cargo.toml

@@ -64,7 +64,7 @@ num-bigint = { version = "0.4.3", optional = true }
 smallvec = { version = "1.13.1" }
 stringprep = "0.1.2"
 tracing = { version = "0.1.37", features = ["log"] }
-whoami = { version = "2.0.2", default-features = false }
+whoami = { version = "2.0.2", features = ["std"], default-features = false }
 
 dotenvy.workspace = true
 thiserror.workspace = true

sqlx-sqlite/src/connection/execute.rs

@@ -108,7 +108,15 @@ impl Iterator for ExecuteIter<'_> {
             Ok(false) => {
                 let last_insert_rowid = self.handle.last_insert_rowid();
 
-                let changes = statement.handle.changes();
+                // `sqlite3_changes()` returns the row count for the most recently completed
+                // INSERT/UPDATE/DELETE on the connection, not necessarily this statement.
+                // For read-only statements (SELECT, BEGIN, COMMIT, etc.) we must report 0.
+                // See https://sqlite.org/c3ref/changes.html
+                let changes = if statement.handle.read_only() {
+                    0
+                } else {
+                    statement.handle.changes()
+                };
                 self.logger.increase_rows_affected(changes);
 
                 let done = SqliteQueryResult {

tests/postgres/setup.sql

@@ -1,3 +1,6 @@
+-- Create extra user to be used on runner
+CREATE USER runner WITH SUPERUSER PASSWORD 'runner-password';
+
 -- https://www.postgresql.org/docs/current/ltree.html
 CREATE EXTENSION IF NOT EXISTS ltree;
 

tests/sqlite/migrations_issue_4300/000_init.sql

@@ -1437,3 +1437,35 @@ async fn issue_3982() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[sqlx_macros::test]
+async fn issue_4300() -> anyhow::Result<()> {
+    use sqlx::migrate::Migrator;
+    use sqlx::sqlite::SqlitePoolOptions;
+    use std::path::Path;
+
+    let pool = SqlitePoolOptions::new().connect("sqlite::memory:").await?;
+
+    let migrator = Migrator::new(Path::new("tests/sqlite/migrations_issue_4300")).await?;
+    migrator.run(&pool).await?;
+
+    sqlx::query("CREATE TABLE my_table ( qqq TEXT )")
+        .execute(&pool)
+        .await?;
+
+    sqlx::query("CREATE TABLE other_table ( www TEXT )")
+        .execute(&pool)
+        .await?;
+
+    sqlx::query("INSERT INTO my_table (qqq) VALUES ('temporary')")
+        .execute(&pool)
+        .await?;
+
+    let result = sqlx::query("BEGIN TRANSACTION; COMMIT;")
+        .execute(&pool)
+        .await?;
+
+    assert_eq!(result.rows_affected(), 0);
+
+    Ok(())
+}