Adapt for improved history isolation in reedline (nushell#10402)

Depends on nushell/reedline#634 --------- Co-authored-by: WindSoilder <[email protected]>
hardfau1t · Dec 14, 2023 · 84d79a2 · 84d79a2
1 parent e76faaa
commit 84d79a2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/nu-cli/src/commands/history.rs b/crates/nu-cli/src/commands/history.rs
@@ -70,12 +70,14 @@ impl Command for History {
             } else {
                 let history_reader: Option<Box<dyn ReedlineHistory>> =
                     match engine_state.config.history_file_format {
-                        HistoryFileFormat::Sqlite => SqliteBackedHistory::with_file(history_path)
-                            .map(|inner| {
-                                let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
-                                boxed
-                            })
-                            .ok(),
+                        HistoryFileFormat::Sqlite => {
+                            SqliteBackedHistory::with_file(history_path, None, None)
+                                .map(|inner| {
+                                    let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
+                                    boxed
+                                })
+                                .ok()
+                        }
 
                         HistoryFileFormat::PlainText => FileBackedHistory::with_file(
                             engine_state.config.max_history_size as usize,

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
@@ -730,9 +730,14 @@ fn update_line_editor_history(
             )
             .into_diagnostic()?,
         ),
-        HistoryFileFormat::Sqlite => {
-            Box::new(SqliteBackedHistory::with_file(history_path.to_path_buf()).into_diagnostic()?)
-        }
+        HistoryFileFormat::Sqlite => Box::new(
+            SqliteBackedHistory::with_file(
+                history_path.to_path_buf(),
+                history_session_id,
+                Some(chrono::Utc::now()),
+            )
+            .into_diagnostic()?,
+        ),
     };
     let line_editor = line_editor
         .with_history_session_id(history_session_id)