fix: use owned Builder pattern for ConnectOptions (#2132)

* CHANGELOG: mention that users should upgrade CLI

* fix(sqlx-core): use owned builder pattern for ConnectOptions

---------

Co-authored-by: Austin Bonander <austin.bonander@gmail.com>

CHANGELOG.md

@@ -34,7 +34,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [[#2057]]: Make begin,commit,rollback cancel-safe in sqlite  [[@madadam]]
 * [[#2058]]: fix typo in documentation [[@lovasoa]]
 * [[#2067]]: fix(docs): close code block in query_builder.rs [[@abonander]]
-* [[#2069]]: Fix `prepare` race condition in workspaces [[@cycraig]]
+* [[#2069]]: Fix `prepare` race condition in workspaces [[@cycraig]]\
+    * NOTE: this changes the directory structure under `target/` that `cargo sqlx prepare` depends on.
+      If you use offline mode in your workflow, please rerun `cargo install sqlx-cli` to upgrade.
 * [[#2072]]: SqliteConnectOptions typo [[@fasterthanlime]]
 * [[#2074]]: fix: mssql uses unsigned for tinyint instead of signed [[@he4d]]
 * [[#2081]]: close unnamed portal after each executed extended query [[@DXist]]

sqlx-core/src/any/options.rs

@@ -50,12 +50,12 @@ impl ConnectOptions for AnyConnectOptions {
         Box::pin(AnyConnection::establish(self))
     }
 
-    fn log_statements(&mut self, level: LevelFilter) -> &mut Self {
+    fn log_statements(mut self, level: LevelFilter) -> Self {
         self.log_settings.statements_level = level;
         self
     }
 
-    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self {
+    fn log_slow_statements(mut self, level: LevelFilter, duration: Duration) -> Self {
         self.log_settings.slow_statements_level = level;
         self.log_settings.slow_statements_duration = duration;
         self

sqlx-core/src/connection.rs

@@ -170,14 +170,14 @@ pub trait ConnectOptions: 'static + Send + Sync + FromStr<Err = Error> + Debug +
         Self::Connection: Sized;
 
     /// Log executed statements with the specified `level`
-    fn log_statements(&mut self, level: LevelFilter) -> &mut Self;
+    fn log_statements(self, level: LevelFilter) -> Self;
 
     /// Log executed statements with a duration above the specified `duration`
     /// at the specified `level`.
-    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self;
+    fn log_slow_statements(self, level: LevelFilter, duration: Duration) -> Self;
 
     /// Entirely disables statement logging (both slow and regular).
-    fn disable_statement_logging(&mut self) -> &mut Self {
+    fn disable_statement_logging(self) -> Self {
         self.log_statements(LevelFilter::Off)
             .log_slow_statements(LevelFilter::Off, Duration::default())
     }

sqlx-mysql/src/options/connect.rs

@@ -67,12 +67,12 @@ impl ConnectOptions for MySqlConnectOptions {
         })
     }
 
-    fn log_statements(&mut self, level: LevelFilter) -> &mut Self {
+    fn log_statements(mut self, level: LevelFilter) -> Self {
         self.log_settings.log_statements(level);
         self
     }
 
-    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self {
+    fn log_slow_statements(mut self, level: LevelFilter, duration: Duration) -> Self {
         self.log_settings.log_slow_statements(level, duration);
         self
     }

sqlx-postgres/src/options/connect.rs

@@ -20,12 +20,12 @@ impl ConnectOptions for PgConnectOptions {
         Box::pin(PgConnection::establish(self))
     }
 
-    fn log_statements(&mut self, level: LevelFilter) -> &mut Self {
+    fn log_statements(mut self, level: LevelFilter) -> Self {
         self.log_settings.log_statements(level);
         self
     }
 
-    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self {
+    fn log_slow_statements(mut self, level: LevelFilter, duration: Duration) -> Self {
         self.log_settings.log_slow_statements(level, duration);
         self
     }

sqlx-sqlite/src/options/connect.rs

@@ -37,12 +37,12 @@ impl ConnectOptions for SqliteConnectOptions {
         })
     }
 
-    fn log_statements(&mut self, level: LevelFilter) -> &mut Self {
+    fn log_statements(mut self, level: LevelFilter) -> Self {
         self.log_settings.log_statements(level);
         self
     }
 
-    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self {
+    fn log_slow_statements(mut self, level: LevelFilter, duration: Duration) -> Self {
         self.log_settings.log_slow_statements(level, duration);
         self
     }