Print the elapsed time & # of returned rows in the interactive repl (#…

…344)

* Print the elapsed time & # of returned rows in the interactive repl

* Fixed clippy warning

* Change formatting of timings to be like psql & remove it from direct sql calls

---------

Co-authored-by: Tyler Cloutier <[email protected]>

crates/cli/src/subcommands/repl.rs

@@ -1,6 +1,8 @@
 use crate::api::{ClientApi, Connection};
 use crate::sql::run_sql;
 use colored::*;
+use dirs::home_dir;
+use std::env::temp_dir;
 
 use rustyline::completion::Completer;
 use rustyline::error::ReadlineError;
@@ -39,7 +41,8 @@ sort by
 pub async fn exec(con: Connection) -> Result<(), anyhow::Error> {
     let database = con.database.clone();
     let mut rl = Editor::<ReplHelper, DefaultHistory>::new().unwrap();
-    if rl.load_history(".history.txt").is_err() {
+    let history = home_dir().unwrap_or_else(temp_dir).join(".stdb.history.txt");
+    if rl.load_history(&history).is_err() {
         eprintln!("No previous history.");
     }
     rl.set_helper(Some(ReplHelper::new().unwrap()));
@@ -68,7 +71,7 @@ pub async fn exec(con: Connection) -> Result<(), anyhow::Error> {
                 sql => {
                     rl.add_history_entry(sql).ok();
 
-                    if let Err(err) = run_sql(api.sql(), sql).await {
+                    if let Err(err) = run_sql(api.sql(), sql, true).await {
                         eprintln!("{}", err.to_string().red())
                     }
                 }
@@ -84,7 +87,7 @@ pub async fn exec(con: Connection) -> Result<(), anyhow::Error> {
         }
     }
 
-    rl.save_history(".history.txt").ok();
+    rl.save_history(&history).ok();
 
     Ok(())
 }

crates/cli/src/subcommands/sql.rs

@@ -1,3 +1,5 @@
+use std::time::Instant;
+
 use crate::api::{from_json_seed, ClientApi, Connection, StmtResultJson};
 use clap::{Arg, ArgAction, ArgGroup, ArgMatches};
 use reqwest::RequestBuilder;
@@ -73,7 +75,23 @@ pub(crate) async fn parse_req(mut config: Config, args: &ArgMatches) -> Result<C
     })
 }
 
-pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str) -> Result<(), anyhow::Error> {
+// Need to report back timings from each query from the backend instead of infer here...
+fn print_row_count(rows: usize, with_stats: bool) {
+    if with_stats {
+        let txt = if rows == 1 { "row" } else { "rows" };
+        println!("({rows} {txt})");
+    }
+}
+
+fn print_timings(now: Instant, with_stats: bool) {
+    if with_stats {
+        println!("Time: {:.2?}", now.elapsed());
+    }
+}
+
+pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str, with_stats: bool) -> Result<(), anyhow::Error> {
+    let now = Instant::now();
+
     let json = builder
         .body(sql.to_owned())
         .send()
@@ -86,6 +104,7 @@ pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str) -> Result<(), an
 
     // Print only `OK for empty tables as it's likely a command like `INSERT`.
     if stmt_result_json.is_empty() {
+        print_timings(now, with_stats);
         println!("OK");
         return Ok(());
     };
@@ -121,7 +140,9 @@ pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str) -> Result<(), an
         } else {
             println!("{}", table);
         }
+        print_row_count(rows.len(), with_stats);
     }
+    print_timings(now, with_stats);
 
     Ok(())
 }
@@ -138,7 +159,7 @@ pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), anyhow::Error
         let con = parse_req(config, args).await?;
         let api = ClientApi::new(con);
 
-        run_sql(api.sql(), query).await?;
+        run_sql(api.sql(), query, false).await?;
     }
     Ok(())
 }