From 67d6289d0edb5074941efa01539bdcc9a6c57801 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Fri, 14 Jan 2022 08:31:14 +0000
Subject: [PATCH] Attach request variables to query executor context

---
 src/dbs/dbs.rs       | 10 ++++++----
 src/dbs/mod.rs       |  2 ++
 src/dbs/variables.rs | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 src/dbs/variables.rs

diff --git a/src/dbs/dbs.rs b/src/dbs/dbs.rs
index 0fe21d0f..2dbfabfa 100644
--- a/src/dbs/dbs.rs
+++ b/src/dbs/dbs.rs
@@ -1,19 +1,19 @@
 use crate::dbs::executor::Executor;
 use crate::dbs::response::Responses;
 use crate::dbs::session::Session;
+use crate::dbs::variables::Attach;
+use crate::dbs::variables::Variables;
 use crate::err::Error;
 use crate::sql;
 use crate::sql::query::Query;
-use crate::sql::value::Value;
-use std::collections::HashMap;
-
-pub type Variables = Option<HashMap<String, Value>>;
 
 pub async fn execute(txt: &str, session: Session, vars: Variables) -> Result<Responses, Error> {
 	// Create a new query executor
 	let mut exe = Executor::new();
 	// Create a new execution context
 	let ctx = session.context();
+	// Attach the defined variables
+	let ctx = vars.attach(ctx);
 	// Parse the SQL query text
 	let ast = sql::parse(txt)?;
 	// Process all statements
@@ -27,6 +27,8 @@ pub async fn process(ast: Query, session: Session, vars: Variables) -> Result<Re
 	let mut exe = Executor::new();
 	// Store session info on context
 	let ctx = session.context();
+	// Attach the defined variables
+	let ctx = vars.attach(ctx);
 	// Process all statements
 	exe.ns = session.ns;
 	exe.db = session.db;
diff --git a/src/dbs/mod.rs b/src/dbs/mod.rs
index b7beeffb..4f1e4d6b 100644
--- a/src/dbs/mod.rs
+++ b/src/dbs/mod.rs
@@ -6,6 +6,7 @@ mod options;
 mod response;
 mod runtime;
 mod session;
+mod variables;
 
 pub use self::auth::*;
 pub use self::dbs::*;
@@ -15,6 +16,7 @@ pub use self::options::*;
 pub use self::response::*;
 pub use self::runtime::*;
 pub use self::session::*;
+pub use self::variables::*;
 
 #[cfg(test)]
 pub(crate) mod test;
diff --git a/src/dbs/variables.rs b/src/dbs/variables.rs
new file mode 100644
index 00000000..7a6b863b
--- /dev/null
+++ b/src/dbs/variables.rs
@@ -0,0 +1,25 @@
+use crate::ctx::Context;
+use crate::sql::value::Value;
+use std::collections::HashMap;
+use std::sync::Arc;
+
+pub type Variables = Option<HashMap<String, Value>>;
+
+pub(crate) trait Attach {
+	fn attach(self, ctx: Arc<Context>) -> Arc<Context>;
+}
+
+impl Attach for Variables {
+	fn attach(self, ctx: Arc<Context>) -> Arc<Context> {
+		match self {
+			Some(m) => {
+				let mut ctx = Context::new(&ctx);
+				for (key, val) in m {
+					ctx.add_value(key, val);
+				}
+				ctx.freeze()
+			}
+			None => ctx,
+		}
+	}
+}