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.

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

chore! Update rusqlite to v0.33 #173

Merged
merged 4 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ members = [
"rusqlite_migration_tests",
"examples/*",
]

# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
resolver = "2"

Expand Down
4 changes: 2 additions & 2 deletions examples/async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ env_logger = "0.11"
anyhow = "1"
lazy_static = "1.5.0"
mktemp = "0.5"
tokio-rusqlite = "0.5.0"
tokio-rusqlite = "0.6.0"
tokio = { version = "1.40.0", features = ["full"] }

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

[dependencies.rusqlite]
version = "=0.31.0"
version = "=0.32.0"
default-features = false
features = []
2 changes: 1 addition & 1 deletion examples/from-directory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ path = "../../rusqlite_migration"
features = ["from-directory"]

[dependencies.rusqlite]
version = "0.31.0"
version = "0.32.0"
default-features = false
features = []
2 changes: 1 addition & 1 deletion examples/simple/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ lazy_static = "1.5.0"
mktemp = "0.5"

[dependencies.rusqlite]
version = "0.31.0"
version = "0.32.0"
features = ["extra_check"] # A realistic use case
4 changes: 2 additions & 2 deletions rusqlite_migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ from-directory = ["dep:include_dir"]
[dependencies]
include_dir = { version = "0.7.4", optional = true }
log = "0.4"
tokio-rusqlite = { version = "0.5.0", optional = true }
tokio-rusqlite = { version = "0.6.0", optional = true }

[dependencies.tokio]
version = "1.40"
features = ["macros"]
optional = true

[dependencies.rusqlite]
version = "0.31.0"
version = "0.32.0"
default-features = false
features = []

Expand Down
13 changes: 13 additions & 0 deletions rusqlite_migration/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,19 @@ impl<'m> Migrations<'m> {
/// ```
/// If rusqlite `extra_check` feature is enabled, any migration that returns a value will error
/// and no further migrations will be applied.
///
/// # Transaction Behavior
///
/// Since rusqlite 0.33, a [default transaction behavior][default_behavior] can be set. For
/// now, when applying migrations, this setting will be respected.
///
/// Please note that future minor versions of rusqlite_migration might decide to ignore the
/// setting and to instead use any transaction behavior deemed most appropriate. You can read
/// more in the [corresponding page of the SQLite documentation][sqlite_doc].
cljoly marked this conversation as resolved.
Show resolved Hide resolved
///
///
/// [default_behavior]: https://github.com/rusqlite/rusqlite/pull/1532
/// [sqlite_doc]: https://sqlite.org/lang_transaction.html
pub fn to_latest(&self, conn: &mut Connection) -> Result<()> {
let v_max = self.max_schema_version();
match v_max {
Expand Down
4 changes: 2 additions & 2 deletions rusqlite_migration_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ version.workspace = true

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

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

[dependencies.rusqlite]
version = "0.31.0"
version = "0.32.0"
features = ["extra_check"]

[dev-dependencies]
Expand Down
Loading