From 002edeae1e9303e1f4ea35680c65faa3725d601d Mon Sep 17 00:00:00 2001
From: Emily Toop <etoop@mozilla.com>
Date: Tue, 23 May 2017 10:34:07 +0100
Subject: [PATCH] Execute queries and transacts passed in at startup

---
 tools/cli/src/mentat_cli/lib.rs  | 18 +++++++++++++++++-
 tools/cli/src/mentat_cli/repl.rs | 22 ++++++++++++++--------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/tools/cli/src/mentat_cli/lib.rs b/tools/cli/src/mentat_cli/lib.rs
index b2cf272d..e05339a7 100644
--- a/tools/cli/src/mentat_cli/lib.rs
+++ b/tools/cli/src/mentat_cli/lib.rs
@@ -42,6 +42,8 @@ pub fn run() -> i32 {
 
     opts.optopt("d", "", "The path to a database to open", "DATABASE");
     opts.optflag("h", "help", "Print this help message and exit");
+    opts.optopt("q", "query", "Execute a query on startup. Queries are executed after any transacts.", "QUERY");
+    opts.optopt("t", "transact", "Execute a transact on startup. Transacts are executed before queries.", "TRANSACT");
     opts.optflag("v", "version", "Print version and exit");
 
     let matches = match opts.parse(&args[1..]) {
@@ -64,9 +66,23 @@ pub fn run() -> i32 {
 
     let db_name = matches.opt_str("d");
 
+    let transacts = matches.opt_strs("t");
+    let queries = matches.opt_strs("q");
+
+    let mut cmds = Vec::with_capacity(transacts.len() + queries.len());
+
+    for transact in transacts {
+        cmds.push(command_parser::Command::Transact(transact));
+    }
+    for query in queries {
+        cmds.push(command_parser::Command::Query(query));
+    }
+
+
     let repl = repl::Repl::new(db_name);
     if repl.is_ok() {
-        repl.unwrap().run();
+        repl.unwrap().run(Some(cmds));
+
     } else {
         println!("{}", repl.err().unwrap());
     }
diff --git a/tools/cli/src/mentat_cli/repl.rs b/tools/cli/src/mentat_cli/repl.rs
index 2eca3268..e493026b 100644
--- a/tools/cli/src/mentat_cli/repl.rs
+++ b/tools/cli/src/mentat_cli/repl.rs
@@ -20,7 +20,7 @@ use command_parser::{
     QUERY_COMMAND,
     ALT_QUERY_COMMAND,
     TRANSACT_COMMAND,
-    ALT_TRANSACT_COMMAND
+    ALT_TRANSACT_COMMAND,
 };
 use input::InputReader;
 use input::InputResult::{
@@ -49,22 +49,29 @@ lazy_static! {
 
 /// Executes input and maintains state of persistent items.
 pub struct Repl {
-    store: Store,
+    store: Store
 }
 
 impl Repl {
     /// Constructs a new `Repl`.
     pub fn new(db_name: Option<String>) -> Result<Repl, String> {
         let store = try!(Store::new(db_name.clone()).map_err(|e| e.to_string()));
+        println!("Database {:?} opened", db_output_name(&db_name.unwrap_or("".to_string())));
         Ok(Repl{
             store: store,
         })
     }
 
     /// Runs the REPL interactively.
-    pub fn run(&mut self) {
+    pub fn run(&mut self, startup_commands: Option<Vec<Command>>) {
         let mut input = InputReader::new();
 
+        if let Some(cmds) = startup_commands {
+            for command in cmds.iter() {
+                self.handle_command(command.clone());
+            }
+        }
+
         loop {
             let res = input.read_input();
 
@@ -103,9 +110,8 @@ impl Repl {
                     Err(e) => println!("{}", e.to_string())
                 };
             },
-            Command::Query(query) => self.query_command(query),
-            Command::Transact(transaction) => self.transact_command(transaction),
-            _ => unimplemented!(),
+            Command::Query(query) => self.execute_query(query),
+            Command::Transact(transaction) => self.execute_transact(transaction),
         }
     }
 
@@ -129,7 +135,7 @@ impl Repl {
         }
     }
 
-    fn query_command(&self, query: String) {
+    pub fn execute_query(&self, query: String) {
         let results = match self.store.query(query){
             Result::Ok(vals) => {
                 vals
@@ -169,7 +175,7 @@ impl Repl {
         println!("\n{}", output);
     }
 
-    fn transact_command(&mut self, transaction: String) {
+    pub fn execute_transact(&mut self, transaction: String) {
         match self.store.transact(transaction) {
             Result::Ok(report) => println!("{:?}", report),
             Result::Err(err) => println!("{:?}.", err),