From 8ddbc834aec63ac120c8642c40ae56c2047300bb Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@twinql.com>
Date: Mon, 17 Apr 2017 13:30:35 -0700
Subject: [PATCH] Pre: take Variables instead of Strings in public API, for
 now.

---
 src/conn.rs  | 10 ++++++++--
 src/query.rs |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/conn.rs b/src/conn.rs
index 0aa642f0..340e0210 100644
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -16,18 +16,24 @@ use std::sync::{Arc, Mutex};
 use rusqlite;
 
 use edn;
-use errors::*;
+
 use mentat_core::{
     Schema,
     TypedValue,
 };
+
 use mentat_db::db;
 use mentat_db::{
     transact,
     PartitionMap,
     TxReport,
 };
+
+use mentat_query::Variable;
+
 use mentat_tx_parser;
+
+use errors::*;
 use query::{
     q_once,
     QueryResults,
@@ -112,7 +118,7 @@ impl Conn {
                      query: &str,
                      inputs: T,
                      limit: U) -> Result<QueryResults>
-        where T: Into<Option<HashMap<String, TypedValue>>>,
+        where T: Into<Option<HashMap<Variable, TypedValue>>>,
               U: Into<Option<u64>>
         {
 
diff --git a/src/query.rs b/src/query.rs
index d1dbd0e2..89515499 100644
--- a/src/query.rs
+++ b/src/query.rs
@@ -23,6 +23,7 @@ use mentat_query_algebrizer::algebrize;
 pub use mentat_query::{
     NamespacedKeyword,
     PlainSymbol,
+    Variable,
 };
 
 use mentat_query_parser::{
@@ -59,7 +60,7 @@ pub fn q_once<'sqlite, 'schema, 'query, T, U>
  query: &'query str,
  inputs: T,
  limit: U) -> QueryExecutionResult
-        where T: Into<Option<HashMap<String, TypedValue>>>,
+        where T: Into<Option<HashMap<Variable, TypedValue>>>,
               U: Into<Option<u64>>
 {
     // TODO: validate inputs.