Skip to content

Commit 4ceede9

Browse files
committed
cargo fmt
1 parent 8d1478a commit 4ceede9

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

libsql-server/src/connection/dump/exporter.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ impl<W: Write> DumpState<W> {
6868

6969
if ty == b"table" {
7070
let table_str = std::str::from_utf8(table)?;
71-
let (row_id_col, colss) = self.list_table_columns(txn, table_str, preserve_rowids)?;
71+
let (row_id_col, colss) =
72+
self.list_table_columns(txn, table_str, preserve_rowids)?;
7273
let mut insert = String::new();
7374
write!(&mut insert, "INSERT INTO {}", Quoted(table_str))?;
7475

@@ -432,7 +433,11 @@ fn find_unused_str(haystack: &str, needle1: &str, needle2: &str) -> String {
432433
}
433434
}
434435

435-
pub fn export_dump(db: &mut rusqlite::Connection, writer: impl Write, preserve_rowids: bool) -> anyhow::Result<()> {
436+
pub fn export_dump(
437+
db: &mut rusqlite::Connection,
438+
writer: impl Write,
439+
preserve_rowids: bool,
440+
) -> anyhow::Result<()> {
436441
let mut txn = db.transaction()?;
437442
txn.execute("PRAGMA writable_schema=ON", ())?;
438443
let savepoint = txn.savepoint_with_name("dump")?;
@@ -519,9 +524,12 @@ mod test {
519524
fn table_preserve_rowids() {
520525
let tmp = tempdir().unwrap();
521526
let mut conn = Connection::open(tmp.path().join("data")).unwrap();
522-
conn.execute(r#"create table test ( id TEXT PRIMARY KEY )"#, ()).unwrap();
523-
conn.execute(r#"insert into test values ( 'a' ), ( 'b' ), ( 'c' )"#, ()).unwrap();
524-
conn.execute(r#"delete from test where id = 'a'"#, ()).unwrap();
527+
conn.execute(r#"create table test ( id TEXT PRIMARY KEY )"#, ())
528+
.unwrap();
529+
conn.execute(r#"insert into test values ( 'a' ), ( 'b' ), ( 'c' )"#, ())
530+
.unwrap();
531+
conn.execute(r#"delete from test where id = 'a'"#, ())
532+
.unwrap();
525533

526534
let mut out = Vec::new();
527535
export_dump(&mut conn, &mut out, true).unwrap();

libsql-server/src/http/user/dump.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use std::future::Future;
22
use std::pin::Pin;
33
use std::task;
44

5-
use serde::Deserialize;
65
use axum::extract::{Query, State as AxumState};
76
use futures::StreamExt;
87
use hyper::HeaderMap;
98
use pin_project_lite::pin_project;
9+
use serde::Deserialize;
1010

1111
use crate::auth::Authenticated;
1212
use crate::connection::dump::exporter::export_dump;
@@ -109,7 +109,9 @@ pub(super) async fn handle_dump(
109109

110110
let join_handle = BLOCKING_RT.spawn_blocking(move || {
111111
let writer = tokio_util::io::SyncIoBridge::new(writer);
112-
conn.with_raw(|conn| export_dump(conn, writer, query.preserve_row_ids.unwrap_or(false)).map_err(Into::into))
112+
conn.with_raw(|conn| {
113+
export_dump(conn, writer, query.preserve_row_ids.unwrap_or(false)).map_err(Into::into)
114+
})
113115
});
114116

115117
let stream = tokio_util::io::ReaderStream::new(reader);

0 commit comments

Comments
 (0)