Skip to content

fix(db): order swap_states correctly #1046

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

Open
Einliterflasche wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(db): order swap_states correctly #1046

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
18 changes: 0 additions & 18 deletions .sqlx/query-0d465a17ebbb5761421def759c73cad023c30705d5b41a1399ef79d8d2571d7c.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...23c693e941ddbe1d6fe0c50a47e120ac2332.json → ...3f2b225d397a4884178390439eefb2362dc3.json
View file
Open in desktop

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

20 changes: 20 additions & 0 deletions .sqlx/query-fe50517ee36f9140c7591cb30d1f40bb1c5482d7a1af1e86fa8e578454abc811.json
View file
Open in desktop

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

13 changes: 7 additions & 6 deletions swap/src/database/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,18 @@ impl Database for SqliteDatabase {

let row = sqlx::query!(
r#"
SELECT min(entered_at) as start_date
SELECT entered_at as start_date
FROM swap_states
WHERE swap_id = ?
ORDER BY id ASC
LIMIT 1
"#,
swap_id
)
.fetch_one(&self.pool)
.await?;

row.start_date
.ok_or_else(|| anyhow!("Could not get swap start date"))
Ok(row.start_date)
}

async fn insert_latest_state(&self, swap_id: Uuid, state: State) -> Result<()> {
Expand Down Expand Up @@ -420,17 +421,17 @@ impl Database for SqliteDatabase {
oldest.state AS "first_state!: String",
newest.state AS "last_state!: String",
oldest.entered_at AS start_date
FROM (SELECT swap_id, state, MIN(entered_at) AS entered_at
FROM (SELECT swap_id, state, entered_at, MIN(id) AS id
FROM swap_states GROUP BY swap_id) oldest
JOIN (SELECT swap_id, state, MAX(entered_at) AS entered_at
JOIN (SELECT swap_id, state, MAX(id) AS id
FROM swap_states GROUP BY swap_id) newest
ON newest.swap_id = oldest.swap_id
JOIN peers ON peers.swap_id = oldest.swap_id
WHERE NOT (
json_extract(oldest.state, '$.Alice.Done') IS 'SafelyAborted'
AND json_extract(newest.state, '$.Alice.Done') IS 'SafelyAborted'
)
ORDER BY oldest.entered_at
ORDER BY oldest.id
LIMIT ?
OFFSET ?
"#,
Expand Down
Loading