Merge branch 'launchbadge:main' into read-pool-options

Author: FSMaxB

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]]

src/macros/mod.rs

@@ -733,7 +733,7 @@ macro_rules! query_file_scalar_unchecked (
 ///
 /// This is because our ability to tell the compiler to watch external files for changes
 /// from a proc-macro is very limited. The compiler by default only re-runs proc macros when
-/// one ore more source files have changed, because normally it shouldn't have to otherwise. SQLx is
+/// one or more source files have changed, because normally it shouldn't have to otherwise. SQLx is
 /// just weird in that external factors can change the output of proc macros, much to the chagrin of
 /// the compiler team and IDE plugin authors.
 ///