itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-02 15:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some remaining usage of PoolOptions

Browse Source
This commit is contained in:
Ryan Leckey 2020-07-14 06:33:36 -07:00
parent 05cf469945
commit 54c857b448
5 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -161,9 +161,9 @@ use sqlx::postgres::PgPool;
#[async_std::main] // or #[tokio::main]
async fn main() -> Result<(), sqlx::Error> {
// Create a connection pool
let pool = PgPoolOptions::new(&env::var("DATABASE_URL")?)?
let pool = PgPoolOptions::new()
.max_connections(5)
.connect().await?;
.connect(&env::var("DATABASE_URL")?).await?;
// Make a simple query to return the given parameter
let row: (i64,) = sqlx::query_as("SELECT $1")

8
sqlx-bench/benches/pg_pool.rs
View File

@ -24,9 +24,7 @@ fn bench_pgpool_acquire(c: &mut Criterion) {
fn do_bench_acquire(b: &mut Bencher, concurrent: u32, fair: bool) {
let pool = sqlx_rt::block_on(
PgPoolOptions::new(
&dotenv::var("DATABASE_URL").expect("DATABASE_URL must be set to run benchmarks"),
)
PgPoolOptions::new()
// we don't want timeouts because we want to see how the pool degrades
.connect_timeout(Duration::from_secs(3600))
// force the pool to start full
@ -35,7 +33,9 @@ fn do_bench_acquire(b: &mut Bencher, concurrent: u32, fair: bool) {
// we're not benchmarking `ping()`
.test_before_acquire(false)
.__fair(fair)
.connect(),
.connect(
&dotenv::var("DATABASE_URL").expect("DATABASE_URL must be set to run benchmarks"),
),
)
.expect("failed to open PgPool");

4
tests/mysql/mysql.rs
View File

@ -76,11 +76,11 @@ CREATE TEMPORARY TABLE users (id INTEGER PRIMARY KEY);
#[sqlx_macros::test]
async fn it_executes_with_pool() -> anyhow::Result<()> {
let pool: MySqlPool = MySqlPoolOptions::new(&dotenv::var("DATABASE_URL")?)?
let pool: MySqlPool = MySqlPoolOptions::new()
.min_connections(2)
.max_connections(2)
.test_before_acquire(false)
.connect()
.connect(&dotenv::var("DATABASE_URL")?)
.await?;
let rows = pool.fetch_all("SELECT 1; SELECT 2").await?;

4
tests/postgres/postgres.rs
View File

@ -370,11 +370,11 @@ async fn pool_smoke_test() -> anyhow::Result<()> {
eprintln!("starting pool");
let pool = PgPoolOptions::new(&dotenv::var("DATABASE_URL")?)?
let pool = PgPoolOptions::new()
.connect_timeout(Duration::from_secs(30))
.min_connections(5)
.max_connections(10)
.connect()
.connect(&dotenv::var("DATABASE_URL")?)
.await?;
// spin up more tasks than connections available, and ensure we don't deadlock

4
tests/sqlite/sqlite.rs
View File

@ -127,11 +127,11 @@ async fn it_fetches_in_loop() -> anyhow::Result<()> {
#[sqlx_macros::test]
async fn it_executes_with_pool() -> anyhow::Result<()> {
let pool: SqlitePool = SqlitePoolOptions::new(&dotenv::var("DATABASE_URL")?)?
let pool: SqlitePool = SqlitePoolOptions::new()?
.min_connections(2)
.max_connections(2)
.test_before_acquire(false)
.connect()
.connect(&dotenv::var("DATABASE_URL")?)
.await?;
let rows = pool.fetch_all("SELECT 1; SElECT 2").await?;