mirror of
https://github.com/nushell/nushell
synced 2024-12-27 21:43:09 +00:00
Fix unexpected sqlite insert behaviour (attempt 2) (#12128)
- fixes #11429 - fixes #12011 Refers to: https://github.com/nushell/nushell/pull/12039 In general looks a bit faster now.
This commit is contained in:
parent
8822750048
commit
a9ddc58f21
1 changed files with 32 additions and 26 deletions
|
@ -209,10 +209,22 @@ fn insert_in_transaction(
|
||||||
|
|
||||||
let table_name = table.name().clone();
|
let table_name = table.name().clone();
|
||||||
let tx = table.try_init(first_val)?;
|
let tx = table.try_init(first_val)?;
|
||||||
|
|
||||||
|
// insert all the records
|
||||||
|
stream.try_for_each(|stream_value| {
|
||||||
|
if let Some(ref ctrlc) = ctrlc {
|
||||||
|
if ctrlc.load(Ordering::Relaxed) {
|
||||||
|
return Err(ShellError::InterruptedByUser { span: None });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let val = stream_value.as_record()?;
|
||||||
|
|
||||||
let insert_statement = format!(
|
let insert_statement = format!(
|
||||||
"INSERT INTO [{}] VALUES ({})",
|
"INSERT INTO [{}] ({}) VALUES ({})",
|
||||||
table_name,
|
table_name,
|
||||||
["?"].repeat(first_val.values().len()).join(", ")
|
val.cols.join(", "),
|
||||||
|
["?"].repeat(val.values().len()).join(", ")
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut insert_statement =
|
let mut insert_statement =
|
||||||
|
@ -225,16 +237,7 @@ fn insert_in_transaction(
|
||||||
inner: Vec::new(),
|
inner: Vec::new(),
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
// insert all the records
|
let result = insert_value(stream_value, &mut insert_statement);
|
||||||
stream.try_for_each(|stream_value| {
|
|
||||||
if let Some(ref ctrlc) = ctrlc {
|
|
||||||
if ctrlc.load(Ordering::Relaxed) {
|
|
||||||
return Err(ShellError::InterruptedByUser { span: None });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
insert_value(stream_value, &mut insert_statement)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
insert_statement
|
insert_statement
|
||||||
.finalize()
|
.finalize()
|
||||||
|
@ -246,6 +249,9 @@ fn insert_in_transaction(
|
||||||
inner: Vec::new(),
|
inner: Vec::new(),
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
|
result
|
||||||
|
})?;
|
||||||
|
|
||||||
tx.commit().map_err(|e| ShellError::GenericError {
|
tx.commit().map_err(|e| ShellError::GenericError {
|
||||||
error: "Failed to commit SQLite transaction".into(),
|
error: "Failed to commit SQLite transaction".into(),
|
||||||
msg: e.to_string(),
|
msg: e.to_string(),
|
||||||
|
|
Loading…
Reference in a new issue