Skip to content

Commit eade49c

Browse files
abonanderabonander
committed
0.7.0-alpha.1 release
1 parent c4a2e73 commit eade49c

30 files changed

+487
-1321
lines changed

‎Cargo.lock

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

‎Cargo.toml

+23-17
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@ members = [
66
"sqlx-macros-core",
77
"sqlx-test",
88
"sqlx-cli",
9-
"sqlx-bench",
9+
# "sqlx-bench",
1010
"sqlx-mysql",
1111
"sqlx-postgres",
1212
"sqlx-sqlite",
13-
"examples/mysql/todos",
14-
"examples/postgres/axum-social-with-tests",
15-
"examples/postgres/files",
16-
"examples/postgres/json",
17-
"examples/postgres/listen",
18-
"examples/postgres/todos",
19-
"examples/postgres/mockable-todos",
20-
"examples/postgres/transaction",
21-
"examples/sqlite/todos",
13+
# FIXME: uncomment these for full release
14+
# "examples/mysql/todos",
15+
# "examples/postgres/axum-social-with-tests",
16+
# "examples/postgres/files",
17+
# "examples/postgres/json",
18+
# "examples/postgres/listen",
19+
# "examples/postgres/todos",
20+
# "examples/postgres/mockable-todos",
21+
# "examples/postgres/transaction",
22+
# "examples/sqlite/todos",
2223
]
2324

2425
[workspace.package]
25-
version = "0.6.2"
26+
version = "0.7.0-alpha.1"
2627
license = "MIT OR Apache-2.0"
2728
edition = "2021"
2829
repository = "https://github.com/launchbadge/sqlx"
@@ -112,13 +113,18 @@ uuid = ["sqlx-core/uuid", "sqlx-macros?/uuid", "sqlx-mysql?/uuid", "sqlx-postgre
112113
regexp = ["sqlx-sqlite?/regexp"]
113114

114115
[workspace.dependencies]
116+
# Core Crates
117+
sqlx-core = { version = "=0.7.0-alpha.1", path = "sqlx-core" }
118+
sqlx-macros-core = { version = "=0.7.0-alpha.1", path = "sqlx-macros-core" }
119+
sqlx-macros = { version = "=0.7.0-alpha.1", path = "sqlx-macros" }
120+
115121
# Driver crates
116-
sqlx-mysql = { version = "=0.6.2", path = "sqlx-mysql" }
117-
sqlx-postgres = { version = "=0.6.2", path = "sqlx-postgres" }
118-
sqlx-sqlite = { version = "=0.6.2", path = "sqlx-sqlite" }
122+
sqlx-mysql = { version = "=0.7.0-alpha.1", path = "sqlx-mysql" }
123+
sqlx-postgres = { version = "=0.7.0-alpha.1", path = "sqlx-postgres" }
124+
sqlx-sqlite = { version = "=0.7.0-alpha.1", path = "sqlx-sqlite" }
119125

120126
# Facade crate (for reference from sqlx-cli)
121-
sqlx = {version = "=0.6.2", path = "." }
127+
sqlx = { version = "=0.7.0-alpha.1", path = "." }
122128

123129
# Common type integrations shared by multiple driver crates.
124130
# These are optional unless enabled in a workspace crate.
@@ -144,8 +150,8 @@ features = ["time", "net", "sync", "fs", "io-util", "rt"]
144150
default-features = false
145151

146152
[dependencies]
147-
sqlx-core = { version = "0.6.2", path = "sqlx-core", features = ["offline", "migrate"], default-features = false }
148-
sqlx-macros = { version = "0.6.2", path = "sqlx-macros", default-features = false, optional = true }
153+
sqlx-core = { version = "=0.7.0-alpha.1", path = "sqlx-core", features = ["offline", "migrate"], default-features = false }
154+
sqlx-macros = { version = "=0.7.0-alpha.1", path = "sqlx-macros", default-features = false, optional = true }
149155

150156
sqlx-mysql = { workspace = true, optional = true }
151157
sqlx-postgres = { workspace = true, optional = true }

‎prep-release.sh

-16
This file was deleted.

‎sqlx-bench/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sqlite = ["sqlx/sqlite"]
2929
criterion = "0.3.3"
3030
dotenvy = "0.15.0"
3131
once_cell = "1.4"
32-
sqlx = { version = "0.6", path = "../", default-features = false, features = ["macros"] }
32+
sqlx = { workspace = true, default-features = false, features = ["macros"] }
3333

3434
chrono = "0.4.19"
3535

‎sqlx-cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sqlx-cli"
3-
version = "0.6.2"
3+
version.workspace = true
44
description = "Command-line utility for SQLx, the Rust SQL toolkit."
55
edition = "2021"
66
readme = "README.md"

‎sqlx-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ event-listener = "2.5.2"
9797
dotenvy = "0.15"
9898

9999
[dev-dependencies]
100-
sqlx = { version = "0.6.2", path = "..", features = ["postgres", "sqlite", "mysql", "migrate"] }
100+
sqlx = { workspace = true, features = ["postgres", "sqlite", "mysql", "migrate"] }
101101
tokio = { version = "1", features = ["rt"] }

‎sqlx-core/src/any/arguments.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
use crate::any::value::AnyValueKind;
2-
use crate::any::{Any, AnyValueRef};
2+
use crate::any::Any;
33
use crate::arguments::Arguments;
44
use crate::encode::Encode;
55
use crate::types::Type;
6-
use std::borrow::Cow;
7-
use std::marker::PhantomData;
86

97
pub struct AnyArguments<'q> {
108
#[doc(hidden)]
@@ -22,7 +20,7 @@ impl<'q> Arguments<'q> for AnyArguments<'q> {
2220
where
2321
T: 'q + Send + Encode<'q, Self::Database> + Type<Self::Database>,
2422
{
25-
value.encode(&mut self.values);
23+
let _ = value.encode(&mut self.values);
2624
}
2725
}
2826

‎sqlx-core/src/any/column.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::any::{Any, AnyTypeInfo, AnyValue};
2-
use crate::column::{Column, ColumnIndex};
1+
use crate::any::{Any, AnyTypeInfo};
2+
use crate::column::Column;
33
use crate::ext::ustr::UStr;
44

55
#[derive(Debug, Clone)]

‎sqlx-core/src/any/connection/backend.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::any::{Any, AnyArguments, AnyQueryResult, AnyRow, AnyStatement, AnyTypeInfo};
22
use crate::describe::Describe;
3-
use crate::transaction::Transaction;
43
use either::Either;
54
use futures_core::future::BoxFuture;
65
use futures_core::stream::BoxStream;

‎sqlx-core/src/any/connection/executor.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use crate::executor::{Execute, Executor};
88
use either::Either;
99
use futures_core::future::BoxFuture;
1010
use futures_core::stream::BoxStream;
11-
use futures_util::{StreamExt, TryStreamExt};
1211

1312
impl<'c> Executor<'c> for &'c mut AnyConnection {
1413
type Database = Any;

‎sqlx-core/src/any/connection/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use futures_core::future::BoxFuture;
2-
use std::marker::PhantomData;
3-
use url::Url;
42

5-
use crate::any::{Any, AnyConnectOptions, AnyKind};
3+
use crate::any::{Any, AnyConnectOptions};
64
use crate::connection::{ConnectOptions, Connection};
75
use crate::error::Error;
86

‎sqlx-core/src/any/database.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::any::{
33
AnyStatement, AnyTransactionManager, AnyTypeInfo, AnyValue, AnyValueRef,
44
};
55
use crate::database::{Database, HasArguments, HasStatement, HasStatementCache, HasValueRef};
6-
use std::marker::PhantomData;
76

87
/// Opaque database driver. Capable of being used in place of any SQLx database driver. The actual
98
/// driver used will be selected at runtime, from the connection url.

‎sqlx-core/src/any/options.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ use std::str::FromStr;
77
use std::time::Duration;
88
use url::Url;
99

10-
use crate::any::kind::AnyKind;
11-
1210
/// Opaque options for connecting to a database. These may only be constructed by parsing from
1311
/// a connection url.
1412
///

‎sqlx-core/src/any/row.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::row::Row;
99
use crate::type_info::TypeInfo;
1010
use crate::types::Type;
1111
use crate::value::{Value, ValueRef};
12-
use std::borrow::Cow;
1312
use std::sync::Arc;
1413

1514
#[derive(Clone)]

‎sqlx-core/src/any/statement.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::any::{Any, AnyArguments, AnyColumn, AnyTypeInfo};
22
use crate::column::ColumnIndex;
3-
use crate::database::{Database, HasStatement};
3+
use crate::database::Database;
44
use crate::error::Error;
55
use crate::ext::ustr::UStr;
66
use crate::statement::Statement;

‎sqlx-core/src/any/transaction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use futures_util::future::BoxFuture;
22

33
use crate::any::{Any, AnyConnection};
4-
use crate::database::Database;
54
use crate::error::Error;
65
use crate::transaction::TransactionManager;
76

‎sqlx-core/src/any/types/float.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl Type<Any> for f32 {
1414
}
1515

1616
impl<'q> Encode<'q, Any> for f32 {
17-
fn encode_by_ref(&self, buf: &mut AnyArgumentBuffer) -> IsNull {
17+
fn encode_by_ref(&self, buf: &mut AnyArgumentBuffer<'q>) -> IsNull {
1818
buf.0.push(AnyValueKind::Real(*self));
1919
IsNull::No
2020
}

‎sqlx-core/src/any/types/mod.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@
1717
//! In addition, `Option<T>` is supported where `T` implements `Type`. An `Option<T>` represents
1818
//! a potentially `NULL` value from SQL.
1919
20-
use crate::any::type_info::AnyTypeInfoKind;
21-
use crate::any::value::AnyValueKind;
22-
use crate::any::{Any, AnyTypeInfo, AnyValueRef};
23-
use crate::database::{HasArguments, HasValueRef};
24-
use crate::decode::Decode;
25-
use crate::encode::{Encode, IsNull};
26-
use crate::error::BoxDynError;
27-
use crate::types::Type;
28-
use std::borrow::Cow;
29-
3020
mod blob;
3121
mod bool;
3222
mod float;
@@ -35,6 +25,11 @@ mod str;
3525

3626
#[test]
3727
fn test_type_impls() {
28+
use crate::any::Any;
29+
use crate::decode::Decode;
30+
use crate::encode::Encode;
31+
use crate::types::Type;
32+
3833
fn has_type<T>()
3934
where
4035
T: Type<Any>,

‎sqlx-core/src/describe.rs

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ impl<DB: Database> Describe<DB> {
6464
crate::any::AnyTypeInfo: for<'a> TryFrom<&'a DB::TypeInfo, Error = crate::Error>,
6565
{
6666
use crate::any::AnyTypeInfo;
67-
use std::convert::TryFrom;
6867

6968
let columns = self
7069
.columns

‎sqlx-core/src/pool/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ use futures_core::FusedFuture;
7474
use futures_util::FutureExt;
7575
use std::fmt;
7676
use std::future::Future;
77-
use std::ops::DerefMut;
7877
use std::pin::Pin;
7978
use std::sync::Arc;
8079
use std::task::{Context, Poll};

‎sqlx-core/src/transaction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use futures_core::future::BoxFuture;
66

77
use crate::database::Database;
88
use crate::error::Error;
9-
use crate::executor::Executor;
109
use crate::pool::MaybePoolConnection;
1110

1211
/// Generic management of database transactions.

‎sqlx-core/src/types/json.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::ops::{Deref, DerefMut};
22

3-
use serde::de::DeserializeOwned;
43
use serde::{Deserialize, Serialize};
54
pub use serde_json::value::RawValue as JsonRawValue;
65
pub use serde_json::Value as JsonValue;

‎sqlx-macros-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ time = ["sqlx-core/time", "sqlx-mysql?/time", "sqlx-postgres?/time", "sqlx-sqlit
3636
uuid = ["sqlx-core/uuid", "sqlx-mysql?/uuid", "sqlx-postgres?/uuid", "sqlx-sqlite?/uuid"]
3737

3838
[dependencies]
39-
sqlx-core = { version = "0.6.2", default-features = false, features = ["offline"], path = "../sqlx-core" }
39+
sqlx-core = { workspace = true, default-features = false, features = ["offline"] }
4040
sqlx-mysql = { workspace = true, features = ["offline", "migrate"], optional = true }
4141
sqlx-postgres = { workspace = true, features = ["offline", "migrate"], optional = true }
4242
sqlx-sqlite = { workspace = true, features = ["offline", "migrate"], optional = true }

‎sqlx-macros/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ uuid = ["sqlx-macros-core/uuid"]
3939
json = ["sqlx-macros-core/json"]
4040

4141
[dependencies]
42-
sqlx-core = { version = "=0.6.2", default-features = false, features = ["any"], path = "../sqlx-core" }
43-
sqlx-macros-core = { version = "=0.6.2", path = "../sqlx-macros-core" }
42+
sqlx-core = { workspace = true, default-features = false, features = ["any"] }
43+
sqlx-macros-core = { workspace = true }
4444

4545
proc-macro2 = { version = "1.0.36", default-features = false }
4646
syn = { version = "1.0.84", default-features = false, features = ["full"] }

‎sqlx-mysql/Cargo.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ offline = ["sqlx-core/offline", "serde/derive"]
1717
migrate = ["sqlx-core/migrate"]
1818

1919
[dependencies]
20+
sqlx-core = { workspace = true }
21+
2022
# Futures crates
2123
futures-channel = { version = "0.3.19", default-features = false, features = ["sink", "alloc", "std"] }
2224
futures-core = { version = "0.3.19", default-features = false }
@@ -64,7 +66,3 @@ tracing = { version = "0.1.37", features = ["log"] }
6466
whoami = { version = "1.2.1", default-features = false }
6567

6668
serde = { version = "1.0.144", optional = true }
67-
68-
[dependencies.sqlx-core]
69-
version = "=0.6.2"
70-
path = "../sqlx-core"

‎sqlx-postgres/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ serde = { version = "1.0.144", features = ["derive"] }
6868
serde_json = { version = "1.0.85", features = ["raw_value"] }
6969

7070
[dependencies.sqlx-core]
71-
version = "=0.6.2"
72-
path = "../sqlx-core"
71+
workspace = true
7372
# We use JSON in the driver implementation itself so there's no reason not to enable it here.
7473
features = ["json"]

‎sqlx-sqlite/Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ features = [
5858
]
5959

6060
[dependencies.sqlx-core]
61-
version = "=0.6.2"
62-
path = "../sqlx-core"
61+
workspace = true
6362

6463
[dev-dependencies]
65-
sqlx = { version = "0.6.2", path = "..", default-features = false, features = ["macros", "runtime-tokio", "tls-none"] }
64+
sqlx = { workspace = true, default-features = false, features = ["macros", "runtime-tokio", "tls-none"] }

‎tests/mysql/test-attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The no-arg variant is covered by other tests already.
22

3-
use sqlx::{MySqlPool, Row};
3+
use sqlx::MySqlPool;
44

55
const MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("tests/mysql/migrations");
66

‎tests/postgres/types.rs

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use std::ops::Bound;
55
use sqlx::postgres::types::{Oid, PgInterval, PgMoney, PgRange};
66
use sqlx::postgres::Postgres;
77
use sqlx_test::{test_decode_type, test_prepared_type, test_type};
8+
9+
#[cfg(any(postgres_14, postgres_15))]
810
use std::str::FromStr;
911

1012
test_type!(null<Option<i16>>(Postgres,

‎tests/sqlite/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use sqlx::{error::ErrorKind, query, sqlite::Sqlite, Connection, Executor, Transaction};
1+
use sqlx::{error::ErrorKind, sqlite::Sqlite, Connection, Executor};
22
use sqlx_test::new;
33

44
#[sqlx_macros::test]

0 commit comments

Comments
 (0)