From 7768e8514595e78f0496d90f9520b5d78117b18f Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Wed, 31 Mar 2021 12:54:20 +0100
Subject: [PATCH] Enable embedded paths in param names

---
 src/sql/param.rs | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/sql/param.rs b/src/sql/param.rs
index 1b70bd8d..931d58b0 100644
--- a/src/sql/param.rs
+++ b/src/sql/param.rs
@@ -4,6 +4,7 @@ use crate::dbs::Executor;
 use crate::doc::Document;
 use crate::err::Error;
 use crate::sql::common::val_char;
+use crate::sql::idiom::{idiom, Idiom};
 use crate::sql::literal::Literal;
 use nom::bytes::complete::tag;
 use nom::bytes::complete::take_while1;
@@ -14,13 +15,21 @@ use std::str;
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Serialize, Deserialize)]
 pub struct Param {
-	pub name: String,
+	pub name: Idiom,
+}
+
+impl From<Idiom> for Param {
+	fn from(p: Idiom) -> Param {
+		Param {
+			name: p,
+		}
+	}
 }
 
 impl<'a> From<&'a str> for Param {
 	fn from(p: &str) -> Param {
 		Param {
-			name: String::from(p),
+			name: Idiom::from(p),
 		}
 	}
 }
@@ -48,7 +57,7 @@ impl dbs::Process for Param {
 
 pub fn param(i: &str) -> IResult<&str, Param> {
 	let (i, _) = tag("$")(i)?;
-	let (i, v) = take_while1(val_char)(i)?;
+	let (i, v) = idiom(i)?;
 	Ok((i, Param::from(v)))
 }
 
@@ -76,4 +85,14 @@ mod tests {
 		assert_eq!("$test_and_deliver", format!("{}", out));
 		assert_eq!(out, Param::from("test_and_deliver"));
 	}
+
+	#[test]
+	fn param_embedded() {
+		let sql = "$test.temporary[0].embedded";
+		let res = param(sql);
+		assert!(res.is_ok());
+		let out = res.unwrap().1;
+		assert_eq!("$test.temporary[0].embedded", format!("{}", out));
+		assert_eq!(out, Param::from("test.temporary[0].embedded"));
+	}
 }