Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rusqlite #109

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Update rusqlite #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/async/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ env_logger = "0.10"
anyhow = "1"
lazy_static = "1.4.0"
mktemp = "0.5"
tokio-rusqlite = "0.4.0"
tokio-rusqlite = "0.5.0"
tokio = { version = "1.25.0", features = ["full"] }

[dependencies.rusqlite_migration]
path = "../../rusqlite_migration"
features = ["async-tokio-rusqlite"]

[dependencies.rusqlite]
version = "=0.29.0"
version = "=0.30.0"
default-features = false
features = []
2 changes: 1 addition & 1 deletion examples/from-directory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ mktemp = "0.5"
include_dir = "0.7.3"

[dependencies.rusqlite]
version = "=0.29.0"
version = "=0.30.0"
default-features = false
features = []
2 changes: 1 addition & 1 deletion examples/simple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ lazy_static = "1.4.0"
mktemp = "0.5"

[dependencies.rusqlite]
version = "=0.29.0"
version = "=0.30.0"
default-features = false
features = []
4 changes: 2 additions & 2 deletions rusqlite_migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ from-directory = ["dep:include_dir"]
[dependencies]
include_dir = { version = "0.7.3", optional = true }
tokio = { version = "1.25", features = ["macros"], optional = true }
tokio-rusqlite = { version = "0.4.0", optional = true }
tokio-rusqlite = { version = "0.5.0", optional = true }
czocher marked this conversation as resolved.
Show resolved Hide resolved
log = "0.4"

[dependencies.rusqlite]
version = "=0.29.0"
version = "=0.30.0"
default-features = false
features = []

Expand Down
4 changes: 2 additions & 2 deletions rusqlite_migration/src/asynch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ impl AsyncMigrations {
/// migrations.to_latest(&mut conn).await.unwrap();
///
/// // You can then insert values in the database
/// conn.call(|conn| conn.execute("INSERT INTO animals (name) VALUES (?)", ["dog"])).await.unwrap();
/// conn.call(|conn| conn.execute("INSERT INTO food (name) VALUES (?)", ["carrot"])).await.unwrap();
/// conn.call_unwrap(|conn| conn.execute("INSERT INTO animals (name) VALUES (?)", ["dog"])).await.unwrap();
/// conn.call_unwrap(|conn| conn.execute("INSERT INTO food (name) VALUES (?)", ["carrot"])).await.unwrap();
/// # });
/// ```
#[allow(clippy::missing_errors_doc)]
Expand Down
4 changes: 2 additions & 2 deletions rusqlite_migration_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ publish = false

[dependencies]
tokio = { version = "1.25", features = ["macros"] }
tokio-rusqlite = { version = "0.4.0" }
tokio-rusqlite = { version = "0.5.0" }
log = "0.4"

[dependencies.rusqlite_migration]
path = "../rusqlite_migration"
features = ["async-tokio-rusqlite", "from-directory"]

[dependencies.rusqlite]
version = "=0.29.0"
version = "=0.30.0"
default-features = false
features = []

Expand Down
6 changes: 3 additions & 3 deletions rusqlite_migration_tests/tests/async_integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async fn main_test() {
migrations.current_version(&conn).await
);

conn.call(|c| {
conn.call_unwrap(|c| {
c.execute(
"INSERT INTO friend (name, birthday) VALUES (?1, ?2)",
params!["John", "1970-01-01"],
Expand All @@ -46,7 +46,7 @@ async fn main_test() {
migrations.current_version(&conn).await
);

conn.call(|c| {
conn.call_unwrap(|c| {
c.execute(
"INSERT INTO friend (name, birth) VALUES (?1, ?2)",
params!["Alice", "2000-01-01"],
Expand All @@ -68,7 +68,7 @@ async fn main_test() {
migrations.current_version(&conn).await
);

conn.call(|c| {
conn.call_unwrap(|c| {
c.execute(
"INSERT INTO friend (name, birth) VALUES (?1, ?2)",
params!["Alice", "2000-01-01"],
Expand Down
4 changes: 2 additions & 2 deletions rusqlite_migration_tests/tests/async_up_and_down.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ async fn main_test() {

migrations.to_version(&mut conn, 5).await.unwrap();

conn.call(|conn| {
conn.call_unwrap(|conn| {
conn.execute(
"INSERT INTO habitats (id, name) VALUES (?1, ?2)",
params![0, "Forest"],
Expand Down Expand Up @@ -119,7 +119,7 @@ async fn main_test() {

// the table is gone now
assert!(conn
.call(|conn| {
.call_unwrap(|conn| {
conn.execute("INSERT INTO habitats (name) VALUES (?1)", params!["Beach"])
})
.await
Expand Down
Loading