Skip to content

Commit a5d8d3b

Browse files
committed
docs: Acquire examples and alternative
1 parent fd4d219 commit a5d8d3b

File tree

5 files changed

+75
-1
lines changed

5 files changed

+75
-1
lines changed

.github/workflows/sqlx.yml

+7
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
runs-on: ubuntu-20.04
7272
strategy:
7373
matrix:
74+
postgres: [14, 9_6]
7475
runtime: [async-std, tokio, actix]
7576
tls: [native-tls, rustls]
7677
steps:
@@ -90,12 +91,18 @@ jobs:
9091
target
9192
key: ${{ runner.os }}-test-${{ hashFiles('**/Cargo.lock') }}
9293

94+
- run: |
95+
docker-compose -f tests/docker-compose.yml run -d -p 5432:5432 --name postgres_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
96+
docker exec postgres_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
97+
9398
- uses: actions-rs/cargo@v1
9499
with:
95100
command: test
96101
args: >
97102
--manifest-path sqlx-core/Cargo.toml
98103
--features offline,all-databases,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
104+
env:
105+
DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
99106

100107
cli:
101108
name: CLI Binaries

Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sqlx-core/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,6 @@ bstr = { version = "0.2.17", default-features = false, features = ["std"], optio
165165
git2 = { version = "0.13.25", default-features = false, optional = true }
166166
hashlink = "0.7.0"
167167
indexmap = "1.7.0"
168+
169+
[dev-dependencies]
170+
sqlx = { version = "0.5.10", path = "..", features = ["postgres", "sqlite"] }

sqlx-core/src/acquire.rs

+64
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,70 @@ use crate::transaction::Transaction;
55
use futures_core::future::BoxFuture;
66
use std::ops::{Deref, DerefMut};
77

8+
/// Acquire connections or transactions from a database in a generic way.
9+
///
10+
/// If you want to accept generic database connections that implement
11+
/// [`Acquire`] which then allows you to [`acquire`][`Acquire::acquire`] a
12+
/// connection or [`begin`][`Acquire::begin`] a transaction, then you can do it
13+
/// like that:
14+
///
15+
/// ```rust
16+
/// # use sqlx::{Acquire, postgres::Postgres, error::BoxDynError};
17+
/// #[cfg(any(postgres_9_6, postgres_14))]
18+
/// async fn run_query<'a, A>(conn: A) -> Result<(), BoxDynError>
19+
/// where
20+
/// A: Acquire<'a, Database = Postgres>,
21+
/// {
22+
/// let mut conn = conn.acquire().await?;
23+
///
24+
/// sqlx::query!("SELECT 1 as v").fetch_one(&mut *conn).await?;
25+
/// sqlx::query!("SELECT 2 as v").fetch_one(&mut *conn).await?;
26+
///
27+
/// Ok(())
28+
/// }
29+
/// ```
30+
///
31+
/// If you run into a lifetime error about "implementation of `sqlx::Acquire` is
32+
/// not general enough", the [workaround] looks like this:
33+
///
34+
/// ```rust
35+
/// # use std::future::Future;
36+
/// # use sqlx::{Acquire, postgres::Postgres, error::BoxDynError};
37+
/// #[cfg(any(postgres_9_6, postgres_14))]
38+
/// fn run_query<'a, 'c, A>(conn: A) -> impl Future<Output = Result<(), BoxDynError>> + Send + 'a
39+
/// where
40+
/// A: Acquire<'c, Database = Postgres> + Send + 'a,
41+
/// {
42+
/// async move {
43+
/// let mut conn = conn.acquire().await?;
44+
///
45+
/// sqlx::query!("SELECT 1 as v").fetch_one(&mut *conn).await?;
46+
/// sqlx::query!("SELECT 2 as v").fetch_one(&mut *conn).await?;
47+
///
48+
/// Ok(())
49+
/// }
50+
/// }
51+
/// ```
52+
///
53+
/// However, if you really just want to accept both, a transaction or a
54+
/// connection as an argument to a function, then it's easier to just accept a
55+
/// mutable reference to a database connection like so:
56+
///
57+
/// ```rust
58+
/// # use sqlx::{postgres::PgConnection, error::BoxDynError};
59+
/// #[cfg(any(postgres_9_6, postgres_14))]
60+
/// async fn run_query(conn: &mut PgConnection) -> Result<(), BoxDynError> {
61+
/// sqlx::query!("SELECT 1 as v").fetch_one(&mut *conn).await?;
62+
/// sqlx::query!("SELECT 2 as v").fetch_one(&mut *conn).await?;
63+
///
64+
/// Ok(())
65+
/// }
66+
/// ```
67+
///
68+
/// The downside of this approach is that you have to `acquire` a connection
69+
/// from a pool first and can't directly pass the pool as argument.
70+
///
71+
/// [workaround]: https://github.com/launchbadge/sqlx/issues/1015#issuecomment-767787777
872
pub trait Acquire<'c> {
973
type Database: Database;
1074

sqlx-core/src/sqlite/options/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ use indexmap::IndexMap;
3636
/// # Example
3737
///
3838
/// ```rust,no_run
39-
/// # use sqlx_core as sqlx;
4039
/// # use sqlx_core::connection::ConnectOptions;
4140
/// # use sqlx_core::error::Error;
4241
/// use sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode};

0 commit comments

Comments
 (0)