Skip to content

Bump sqlx from 0.7.4 to 0.8.0 in /bundler #145

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

Merged
garryod merged 2 commits into from
Jul 29, 2024
Merged

Bump sqlx from 0.7.4 to 0.8.0 in /bundler #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1b01e
Bump sqlx from 0.7.4 to 0.8.0 in /bundler
dependabot[bot] Jul 29, 2024
94e4618
Use simplifed fixture declaration in sqlx tests
garryod Jul 29, 2024
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
186 changes: 91 additions & 95 deletions bundler/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] }
schemars = { version = "0.8.21" }
serde = { version = "1.0.204", features = ["derive"] }
serde_json = { version = "1.0.121" }
sqlx = { version = "0.7.4", features = [
sqlx = { version = "0.8.0", features = [
"runtime-tokio",
"tls-rustls",
"mysql",
Expand Down
2 changes: 1 addition & 1 deletion bundler/src/permissionables/beamlines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ mod tests {

#[sqlx::test(
migrations = "tests/migrations",
fixtures(path = "../../tests/fixtures", scripts("beamline_sessions"))
fixtures("../../tests/fixtures/beamline_sessions.sql")
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
let beamlines = Beamlines::fetch(&ispyb_pool).await.unwrap();
Expand Down
4 changes: 2 additions & 2 deletions bundler/src/permissionables/proposals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ mod tests {
#[sqlx::test(
migrations = "tests/migrations",
fixtures(
path = "../../tests/fixtures",
scripts("beamline_sessions", "proposals")
"../../tests/fixtures/beamline_sessions.sql",
"../../tests/fixtures/proposals.sql"
)
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
Expand Down
4 changes: 2 additions & 2 deletions bundler/src/permissionables/sessions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ mod tests {
#[sqlx::test(
migrations = "tests/migrations",
fixtures(
path = "../../tests/fixtures",
scripts("beamline_sessions", "proposals")
"../../tests/fixtures/beamline_sessions.sql",
"../../tests/fixtures/proposals.sql"
)
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
Expand Down
13 changes: 5 additions & 8 deletions bundler/src/permissionables/subjects/permissions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,11 @@ mod tests {
#[sqlx::test(
migrations = "tests/migrations",
fixtures(
path = "../../../tests/fixtures",
scripts(
"persons",
"user_groups",
"user_group_membership",
"permissions",
"group_permissions"
)
"../../../tests/fixtures/persons.sql",
"../../../tests/fixtures/user_groups.sql",
"../../../tests/fixtures/user_group_membership.sql",
"../../../tests/fixtures/permissions.sql",
"../../../tests/fixtures/group_permissions.sql"
)
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
Expand Down
5 changes: 3 additions & 2 deletions bundler/src/permissionables/subjects/proposals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ mod tests {
#[sqlx::test(
migrations = "tests/migrations",
fixtures(
path = "../../../tests/fixtures",
scripts("proposal_membership", "persons", "proposals")
"../../../tests/fixtures/proposal_membership.sql",
"../../../tests/fixtures/persons.sql",
"../../../tests/fixtures/proposals.sql"
)
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
Expand Down
4 changes: 2 additions & 2 deletions bundler/src/permissionables/subjects/sessions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ mod tests {
#[sqlx::test(
migrations = "tests/migrations",
fixtures(
path = "../../../tests/fixtures",
scripts("session_membership", "persons")
"../../../tests/fixtures/session_membership.sql",
"../../../tests/fixtures/persons.sql"
)
)]
async fn fetch_some(ispyb_pool: MySqlPool) {
Expand Down