Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sqlx-mysql/src/connection/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ impl<S: Socket> MySqlStream<S> {
let mut capabilities = Capabilities::PROTOCOL_41
| Capabilities::IGNORE_SPACE
| Capabilities::DEPRECATE_EOF
| Capabilities::FOUND_ROWS
| Capabilities::TRANSACTIONS
| Capabilities::SECURE_CONNECTION
| Capabilities::PLUGIN_AUTH_LENENC_DATA
Expand All @@ -49,6 +48,10 @@ impl<S: Socket> MySqlStream<S> {
capabilities |= Capabilities::CONNECT_WITH_DB;
}

if options.found_rows {
capabilities |= Capabilities::FOUND_ROWS;
}

Self {
waiting: VecDeque::new(),
capabilities,
Expand Down
11 changes: 11 additions & 0 deletions sqlx-mysql/src/options/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ pub struct MySqlConnectOptions {
pub(crate) no_engine_substitution: bool,
pub(crate) timezone: Option<String>,
pub(crate) set_names: bool,
pub(crate) found_rows: bool,
}

impl Default for MySqlConnectOptions {
Expand Down Expand Up @@ -111,6 +112,7 @@ impl MySqlConnectOptions {
no_engine_substitution: true,
timezone: Some(String::from("+00:00")),
set_names: true,
found_rows: true,
}
}

Expand Down Expand Up @@ -414,6 +416,15 @@ impl MySqlConnectOptions {
self.set_names = flag_val;
self
}

/// Sets the flag that enables or disables CLIENT_FOUND_ROWS,
/// to return the number of found (matched) rows, and not the number of changed rows.
///
/// The default value is set to true.
pub fn found_rows(mut self, flag_val: bool) -> Self {
self.found_rows = flag_val;
self
}
}

impl MySqlConnectOptions {
Expand Down
52 changes: 52 additions & 0 deletions tests/mysql/mysql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -727,3 +727,55 @@ async fn any_blob_conversions() -> anyhow::Result<()> {

Ok(())
}

#[sqlx_macros::test]
async fn test_client_found_rows() -> anyhow::Result<()> {
setup_if_needed();

let url = url::Url::parse(&env::var("DATABASE_URL")?)?;

// CLIENT_AFFECTED_ROWS unspecified = true by default.
let mut conn = MySqlConnectOptions::from_url(&url)?.connect().await?;
let mut tx = conn.begin().await?;

tx.execute(sqlx::query(
"CREATE TEMPORARY TABLE found_rows_testing (id INT PRIMARY KEY, field INT NOT NULL)",
))
.await?;

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 10) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 1);

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 10) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 1);

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 20) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 2);

tx.rollback().await?;

// Explicitly unset CLIENT_AFFECTED_ROWS.
let mut conn = MySqlConnectOptions::from_url(&url)?
.found_rows(false)
.connect()
.await?;
let mut tx = conn.begin().await?;

tx.execute(sqlx::query(
"CREATE TEMPORARY TABLE found_rows_testing (id INT PRIMARY KEY, field INT NOT NULL)",
))
.await?;

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 10) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 1);

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 10) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 0);

let result = tx.execute(sqlx::query("INSERT INTO found_rows_testing VALUES (0, 20) ON DUPLICATE KEY UPDATE field = VALUES(field)")).await?;
assert_eq!(result.rows_affected(), 2);

tx.rollback().await?;

Ok(())
}
Loading