From 8bf5585080e1149fef6ea6ce0b02d5e6330b2d6f Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@surrealdb.com>
Date: Mon, 17 Apr 2023 13:09:56 +0100
Subject: [PATCH] Simplify parser and improve performance

---
 lib/src/sql/constant.rs |  46 ++--
 lib/src/sql/function.rs | 537 +++++++++++++++++++---------------------
 lib/src/sql/geometry.rs |  81 +-----
 lib/src/sql/idiom.rs    |   8 +-
 4 files changed, 290 insertions(+), 382 deletions(-)

diff --git a/lib/src/sql/constant.rs b/lib/src/sql/constant.rs
index d1fe97a8..7f2ba43d 100644
--- a/lib/src/sql/constant.rs
+++ b/lib/src/sql/constant.rs
@@ -9,6 +9,7 @@ use derive::Store;
 use nom::branch::alt;
 use nom::bytes::complete::tag_no_case;
 use nom::combinator::map;
+use nom::sequence::preceded;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
@@ -154,27 +155,30 @@ pub fn constant(i: &str) -> IResult<&str, Constant> {
 }
 
 fn constant_math(i: &str) -> IResult<&str, Constant> {
-	alt((
-		map(tag_no_case("math::E"), |_| Constant::MathE),
-		map(tag_no_case("math::FRAC_1_PI"), |_| Constant::MathFrac1Pi),
-		map(tag_no_case("math::FRAC_1_SQRT_2"), |_| Constant::MathFrac1Sqrt2),
-		map(tag_no_case("math::FRAC_2_PI"), |_| Constant::MathFrac2Pi),
-		map(tag_no_case("math::FRAC_2_SQRT_PI"), |_| Constant::MathFrac2SqrtPi),
-		map(tag_no_case("math::FRAC_PI_2"), |_| Constant::MathFracPi2),
-		map(tag_no_case("math::FRAC_PI_3"), |_| Constant::MathFracPi3),
-		map(tag_no_case("math::FRAC_PI_4"), |_| Constant::MathFracPi4),
-		map(tag_no_case("math::FRAC_PI_6"), |_| Constant::MathFracPi6),
-		map(tag_no_case("math::FRAC_PI_8"), |_| Constant::MathFracPi8),
-		map(tag_no_case("math::LN_10"), |_| Constant::MathLn10),
-		map(tag_no_case("math::LN_2"), |_| Constant::MathLn2),
-		map(tag_no_case("math::LOG10_2"), |_| Constant::MathLog102),
-		map(tag_no_case("math::LOG10_E"), |_| Constant::MathLog10E),
-		map(tag_no_case("math::LOG2_10"), |_| Constant::MathLog210),
-		map(tag_no_case("math::LOG2_E"), |_| Constant::MathLog2E),
-		map(tag_no_case("math::PI"), |_| Constant::MathPi),
-		map(tag_no_case("math::SQRT_2"), |_| Constant::MathSqrt2),
-		map(tag_no_case("math::TAU"), |_| Constant::MathTau),
-	))(i)
+	preceded(
+		tag_no_case("math::"),
+		alt((
+			map(tag_no_case("E"), |_| Constant::MathE),
+			map(tag_no_case("FRAC_1_PI"), |_| Constant::MathFrac1Pi),
+			map(tag_no_case("FRAC_1_SQRT_2"), |_| Constant::MathFrac1Sqrt2),
+			map(tag_no_case("FRAC_2_PI"), |_| Constant::MathFrac2Pi),
+			map(tag_no_case("FRAC_2_SQRT_PI"), |_| Constant::MathFrac2SqrtPi),
+			map(tag_no_case("FRAC_PI_2"), |_| Constant::MathFracPi2),
+			map(tag_no_case("FRAC_PI_3"), |_| Constant::MathFracPi3),
+			map(tag_no_case("FRAC_PI_4"), |_| Constant::MathFracPi4),
+			map(tag_no_case("FRAC_PI_6"), |_| Constant::MathFracPi6),
+			map(tag_no_case("FRAC_PI_8"), |_| Constant::MathFracPi8),
+			map(tag_no_case("LN_10"), |_| Constant::MathLn10),
+			map(tag_no_case("LN_2"), |_| Constant::MathLn2),
+			map(tag_no_case("LOG10_2"), |_| Constant::MathLog102),
+			map(tag_no_case("LOG10_E"), |_| Constant::MathLog10E),
+			map(tag_no_case("LOG2_10"), |_| Constant::MathLog210),
+			map(tag_no_case("LOG2_E"), |_| Constant::MathLog2E),
+			map(tag_no_case("PI"), |_| Constant::MathPi),
+			map(tag_no_case("SQRT_2"), |_| Constant::MathSqrt2),
+			map(tag_no_case("TAU"), |_| Constant::MathTau),
+		)),
+	)(i)
 }
 
 #[cfg(test)]
diff --git a/lib/src/sql/function.rs b/lib/src/sql/function.rs
index fe237d35..d53e2ad2 100644
--- a/lib/src/sql/function.rs
+++ b/lib/src/sql/function.rs
@@ -21,6 +21,8 @@ use nom::character::complete::char;
 use nom::combinator::recognize;
 use nom::multi::separated_list0;
 use nom::multi::separated_list1;
+use nom::sequence::delimited;
+use nom::sequence::preceded;
 use serde::ser::SerializeTupleVariant;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
@@ -284,7 +286,6 @@ pub fn normal(i: &str) -> IResult<&str, Function> {
 pub fn custom(i: &str) -> IResult<&str, Function> {
 	let (i, _) = tag("fn::")(i)?;
 	let (i, s) = recognize(separated_list1(tag("::"), take_while1(val_char)))(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, _) = char('(')(i)?;
 	let (i, _) = mightbespace(i)?;
 	let (i, a) = separated_list0(commas, value)(i)?;
@@ -295,7 +296,6 @@ pub fn custom(i: &str) -> IResult<&str, Function> {
 
 fn script(i: &str) -> IResult<&str, Function> {
 	let (i, _) = tag("function")(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, _) = tag("(")(i)?;
 	let (i, _) = mightbespace(i)?;
 	let (i, a) = separated_list0(commas, value)(i)?;
@@ -309,15 +309,258 @@ fn script(i: &str) -> IResult<&str, Function> {
 }
 
 fn cast(i: &str) -> IResult<&str, Function> {
-	let (i, _) = char('<')(i)?;
-	let (i, s) = function_casts(i)?;
-	let (i, _) = char('>')(i)?;
+	let (i, s) = delimited(
+		char('<'),
+		alt((
+			tag("bool"),
+			tag("datetime"),
+			tag("decimal"),
+			tag("duration"),
+			tag("float"),
+			tag("int"),
+			tag("number"),
+			tag("string"),
+		)),
+		char('>'),
+	)(i)?;
 	let (i, _) = mightbespace(i)?;
 	let (i, v) = single(i)?;
 	Ok((i, Function::Cast(s.to_string(), v)))
 }
 
-fn function_casts(i: &str) -> IResult<&str, &str> {
+fn function_names(i: &str) -> IResult<&str, &str> {
+	recognize(alt((
+		preceded(tag("array::"), function_array),
+		preceded(tag("crypto::"), function_crypto),
+		preceded(tag("duration::"), function_duration),
+		preceded(tag("geo::"), function_geo),
+		preceded(tag("http::"), function_http),
+		preceded(tag("is::"), function_is),
+		preceded(tag("math::"), function_math),
+		preceded(tag("meta::"), function_meta),
+		preceded(tag("parse::"), function_parse),
+		preceded(tag("rand::"), function_rand),
+		preceded(tag("session::"), function_session),
+		preceded(tag("string::"), function_string),
+		preceded(tag("time::"), function_time),
+		preceded(tag("type::"), function_type),
+		tag("count"),
+		tag("not"),
+		tag("rand"),
+		tag("sleep"),
+	)))(i)
+}
+
+fn function_array(i: &str) -> IResult<&str, &str> {
+	alt((
+		alt((
+			tag("add"),
+			tag("all"),
+			tag("any"),
+			tag("append"),
+			tag("combine"),
+			tag("complement"),
+			tag("concat"),
+			tag("difference"),
+			tag("distinct"),
+			tag("flatten"),
+			tag("group"),
+			tag("insert"),
+		)),
+		alt((
+			tag("intersect"),
+			tag("len"),
+			tag("max"),
+			tag("min"),
+			tag("pop"),
+			tag("prepend"),
+			tag("push"),
+			tag("remove"),
+			tag("reverse"),
+			tag("sort::asc"),
+			tag("sort::desc"),
+			tag("sort"),
+			tag("union"),
+		)),
+	))(i)
+}
+
+fn function_crypto(i: &str) -> IResult<&str, &str> {
+	alt((
+		preceded(tag("argon2::"), alt((tag("compare"), tag("generate")))),
+		preceded(tag("bcrypt::"), alt((tag("compare"), tag("generate")))),
+		preceded(tag("pbkdf2::"), alt((tag("compare"), tag("generate")))),
+		preceded(tag("scrypt::"), alt((tag("compare"), tag("generate")))),
+		tag("md5"),
+		tag("sha1"),
+		tag("sha256"),
+		tag("sha512"),
+	))(i)
+}
+
+fn function_duration(i: &str) -> IResult<&str, &str> {
+	alt((tag("days"), tag("hours"), tag("mins"), tag("secs"), tag("weeks"), tag("years")))(i)
+}
+
+fn function_geo(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("area"),
+		tag("bearing"),
+		tag("centroid"),
+		tag("distance"),
+		preceded(tag("hash::"), alt((tag("decode"), tag("encode")))),
+	))(i)
+}
+
+fn function_http(i: &str) -> IResult<&str, &str> {
+	alt((tag("head"), tag("get"), tag("put"), tag("post"), tag("patch"), tag("delete")))(i)
+}
+
+fn function_is(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("alphanum"),
+		tag("alpha"),
+		tag("ascii"),
+		tag("datetime"),
+		tag("domain"),
+		tag("email"),
+		tag("hexadecimal"),
+		tag("latitude"),
+		tag("longitude"),
+		tag("numeric"),
+		tag("semver"),
+		tag("url"),
+		tag("uuid"),
+	))(i)
+}
+
+fn function_math(i: &str) -> IResult<&str, &str> {
+	alt((
+		alt((
+			tag("abs"),
+			tag("bottom"),
+			tag("ceil"),
+			tag("fixed"),
+			tag("floor"),
+			tag("interquartile"),
+			tag("max"),
+			tag("mean"),
+			tag("median"),
+			tag("midhinge"),
+			tag("min"),
+			tag("mode"),
+		)),
+		alt((
+			tag("nearestrank"),
+			tag("percentile"),
+			tag("pow"),
+			tag("product"),
+			tag("round"),
+			tag("spread"),
+			tag("sqrt"),
+			tag("stddev"),
+			tag("sum"),
+			tag("top"),
+			tag("trimean"),
+			tag("variance"),
+		)),
+	))(i)
+}
+
+fn function_meta(i: &str) -> IResult<&str, &str> {
+	alt((tag("id"), tag("table"), tag("tb")))(i)
+}
+
+fn function_parse(i: &str) -> IResult<&str, &str> {
+	alt((
+		preceded(tag("email::"), alt((tag("host"), tag("user")))),
+		preceded(
+			tag("url::"),
+			alt((
+				tag("domain"),
+				tag("fragment"),
+				tag("host"),
+				tag("path"),
+				tag("port"),
+				tag("query"),
+				tag("scheme"),
+			)),
+		),
+	))(i)
+}
+
+fn function_rand(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("bool"),
+		tag("enum"),
+		tag("float"),
+		tag("guid"),
+		tag("int"),
+		tag("string"),
+		tag("time"),
+		tag("ulid"),
+		tag("uuid::v4"),
+		tag("uuid::v7"),
+		tag("uuid"),
+	))(i)
+}
+
+fn function_session(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("db"),
+		tag("id"),
+		tag("ip"),
+		tag("ns"),
+		tag("origin"),
+		tag("sc"),
+		tag("sd"),
+		tag("token"),
+	))(i)
+}
+
+fn function_string(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("concat"),
+		tag("endsWith"),
+		tag("join"),
+		tag("len"),
+		tag("lowercase"),
+		tag("repeat"),
+		tag("replace"),
+		tag("reverse"),
+		tag("slice"),
+		tag("slug"),
+		tag("split"),
+		tag("startsWith"),
+		tag("trim"),
+		tag("uppercase"),
+		tag("words"),
+	))(i)
+}
+
+fn function_time(i: &str) -> IResult<&str, &str> {
+	alt((
+		tag("day"),
+		tag("floor"),
+		tag("format"),
+		tag("group"),
+		tag("hour"),
+		tag("minute"),
+		tag("month"),
+		tag("nano"),
+		tag("now"),
+		tag("round"),
+		tag("second"),
+		tag("timezone"),
+		tag("unix"),
+		tag("wday"),
+		tag("week"),
+		tag("yday"),
+		tag("year"),
+	))(i)
+}
+
+fn function_type(i: &str) -> IResult<&str, &str> {
 	alt((
 		tag("bool"),
 		tag("datetime"),
@@ -326,285 +569,11 @@ fn function_casts(i: &str) -> IResult<&str, &str> {
 		tag("float"),
 		tag("int"),
 		tag("number"),
+		tag("point"),
+		tag("regex"),
 		tag("string"),
-	))(i)
-}
-
-fn function_names(i: &str) -> IResult<&str, &str> {
-	alt((
-		function_array,
-		function_count,
-		function_crypto,
-		function_duration,
-		function_geo,
-		function_http,
-		function_is,
-		function_math,
-		function_meta,
-		function_not,
-		function_parse,
-		function_rand,
-		function_session,
-		function_sleep,
-		function_string,
-		function_time,
-		function_type,
-	))(i)
-}
-
-fn function_array(i: &str) -> IResult<&str, &str> {
-	alt((
-		alt((
-			tag("array::add"),
-			tag("array::all"),
-			tag("array::any"),
-			tag("array::append"),
-			tag("array::combine"),
-			tag("array::complement"),
-			tag("array::concat"),
-			tag("array::difference"),
-			tag("array::distinct"),
-			tag("array::flatten"),
-			tag("array::group"),
-			tag("array::insert"),
-		)),
-		alt((
-			tag("array::intersect"),
-			tag("array::len"),
-			tag("array::max"),
-			tag("array::min"),
-			tag("array::pop"),
-			tag("array::prepend"),
-			tag("array::push"),
-			tag("array::remove"),
-			tag("array::reverse"),
-			tag("array::sort::asc"),
-			tag("array::sort::desc"),
-			tag("array::sort"),
-			tag("array::union"),
-		)),
-	))(i)
-}
-
-fn function_count(i: &str) -> IResult<&str, &str> {
-	tag("count")(i)
-}
-
-fn function_crypto(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("crypto::argon2::compare"),
-		tag("crypto::argon2::generate"),
-		tag("crypto::bcrypt::compare"),
-		tag("crypto::bcrypt::generate"),
-		tag("crypto::md5"),
-		tag("crypto::pbkdf2::compare"),
-		tag("crypto::pbkdf2::generate"),
-		tag("crypto::scrypt::compare"),
-		tag("crypto::scrypt::generate"),
-		tag("crypto::sha1"),
-		tag("crypto::sha256"),
-		tag("crypto::sha512"),
-	))(i)
-}
-
-fn function_duration(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("duration::days"),
-		tag("duration::hours"),
-		tag("duration::mins"),
-		tag("duration::secs"),
-		tag("duration::weeks"),
-		tag("duration::years"),
-	))(i)
-}
-
-fn function_geo(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("geo::area"),
-		tag("geo::bearing"),
-		tag("geo::centroid"),
-		tag("geo::distance"),
-		tag("geo::hash::decode"),
-		tag("geo::hash::encode"),
-	))(i)
-}
-
-fn function_http(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("http::head"),
-		tag("http::get"),
-		tag("http::put"),
-		tag("http::post"),
-		tag("http::patch"),
-		tag("http::delete"),
-	))(i)
-}
-
-fn function_is(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("is::alphanum"),
-		tag("is::alpha"),
-		tag("is::ascii"),
-		tag("is::datetime"),
-		tag("is::domain"),
-		tag("is::email"),
-		tag("is::hexadecimal"),
-		tag("is::latitude"),
-		tag("is::longitude"),
-		tag("is::numeric"),
-		tag("is::semver"),
-		tag("is::url"),
-		tag("is::uuid"),
-	))(i)
-}
-
-fn function_math(i: &str) -> IResult<&str, &str> {
-	alt((
-		alt((
-			tag("math::abs"),
-			tag("math::bottom"),
-			tag("math::ceil"),
-			tag("math::fixed"),
-			tag("math::floor"),
-			tag("math::interquartile"),
-		)),
-		alt((
-			tag("math::max"),
-			tag("math::mean"),
-			tag("math::median"),
-			tag("math::midhinge"),
-			tag("math::min"),
-			tag("math::mode"),
-		)),
-		alt((
-			tag("math::nearestrank"),
-			tag("math::percentile"),
-			tag("math::pow"),
-			tag("math::product"),
-			tag("math::round"),
-			tag("math::spread"),
-			tag("math::sqrt"),
-			tag("math::stddev"),
-			tag("math::sum"),
-			tag("math::top"),
-			tag("math::trimean"),
-			tag("math::variance"),
-		)),
-	))(i)
-}
-
-fn function_meta(i: &str) -> IResult<&str, &str> {
-	alt((tag("meta::id"), tag("meta::table"), tag("meta::tb")))(i)
-}
-
-fn function_not(i: &str) -> IResult<&str, &str> {
-	tag("not")(i)
-}
-
-fn function_sleep(i: &str) -> IResult<&str, &str> {
-	tag("sleep")(i)
-}
-
-fn function_parse(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("parse::email::host"),
-		tag("parse::email::user"),
-		tag("parse::url::domain"),
-		tag("parse::url::fragment"),
-		tag("parse::url::host"),
-		tag("parse::url::path"),
-		tag("parse::url::port"),
-		tag("parse::url::query"),
-		tag("parse::url::scheme"),
-	))(i)
-}
-
-fn function_rand(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("rand::bool"),
-		tag("rand::enum"),
-		tag("rand::float"),
-		tag("rand::guid"),
-		tag("rand::int"),
-		tag("rand::string"),
-		tag("rand::time"),
-		tag("rand::ulid"),
-		tag("rand::uuid::v4"),
-		tag("rand::uuid::v7"),
-		tag("rand::uuid"),
-		tag("rand"),
-	))(i)
-}
-
-fn function_session(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("session::db"),
-		tag("session::id"),
-		tag("session::ip"),
-		tag("session::ns"),
-		tag("session::origin"),
-		tag("session::sc"),
-		tag("session::sd"),
-		tag("session::token"),
-	))(i)
-}
-
-fn function_string(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("string::concat"),
-		tag("string::endsWith"),
-		tag("string::join"),
-		tag("string::len"),
-		tag("string::lowercase"),
-		tag("string::repeat"),
-		tag("string::replace"),
-		tag("string::reverse"),
-		tag("string::slice"),
-		tag("string::slug"),
-		tag("string::split"),
-		tag("string::startsWith"),
-		tag("string::trim"),
-		tag("string::uppercase"),
-		tag("string::words"),
-	))(i)
-}
-
-fn function_time(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("time::day"),
-		tag("time::floor"),
-		tag("time::format"),
-		tag("time::group"),
-		tag("time::hour"),
-		tag("time::minute"),
-		tag("time::month"),
-		tag("time::nano"),
-		tag("time::now"),
-		tag("time::round"),
-		tag("time::second"),
-		tag("time::timezone"),
-		tag("time::unix"),
-		tag("time::wday"),
-		tag("time::week"),
-		tag("time::yday"),
-		tag("time::year"),
-	))(i)
-}
-
-fn function_type(i: &str) -> IResult<&str, &str> {
-	alt((
-		tag("type::bool"),
-		tag("type::datetime"),
-		tag("type::decimal"),
-		tag("type::duration"),
-		tag("type::float"),
-		tag("type::int"),
-		tag("type::number"),
-		tag("type::point"),
-		tag("type::regex"),
-		tag("type::string"),
-		tag("type::table"),
-		tag("type::thing"),
+		tag("table"),
+		tag("thing"),
 	))(i)
 }
 
diff --git a/lib/src/sql/geometry.rs b/lib/src/sql/geometry.rs
index 79293c72..285213e6 100644
--- a/lib/src/sql/geometry.rs
+++ b/lib/src/sql/geometry.rs
@@ -671,7 +671,7 @@ impl hash::Hash for Geometry {
 }
 
 pub fn geometry(i: &str) -> IResult<&str, Geometry> {
-	alt((simple, point, line, polygon, multipoint, multiline, multipolygon, collection))(i)
+	alt((simple, normal))(i)
 }
 
 fn simple(i: &str) -> IResult<&str, Geometry> {
@@ -685,199 +685,140 @@ fn simple(i: &str) -> IResult<&str, Geometry> {
 	Ok((i, Geometry::Point((x, y).into())))
 }
 
-fn point(i: &str) -> IResult<&str, Geometry> {
+fn normal(i: &str) -> IResult<&str, Geometry> {
 	let (i, _) = char('{')(i)?;
 	let (i, _) = mightbespace(i)?;
+	let (i, v) = alt((point, line, polygon, multipoint, multiline, multipolygon, collection))(i)?;
+	let (i, _) = mightbespace(i)?;
+	let (i, _) = opt(char(','))(i)?;
+	let (i, _) = mightbespace(i)?;
+	let (i, _) = char('}')(i)?;
+	Ok((i, v))
+}
+
+fn point(i: &str) -> IResult<&str, Geometry> {
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, point_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, point_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, point_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, point_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn line(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, line_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, line_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, line_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, line_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn polygon(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, polygon_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, polygon_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, polygon_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, polygon_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn multipoint(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, multipoint_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, multipoint_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, multipoint_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, multipoint_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn multiline(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, multiline_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, multiline_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, multiline_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, multiline_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn multipolygon(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, multipolygon_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_vals, multipolygon_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_vals, multipolygon_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, multipolygon_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
 fn collection(i: &str) -> IResult<&str, Geometry> {
-	let (i, _) = char('{')(i)?;
-	let (i, _) = mightbespace(i)?;
 	let (i, v) = alt((
 		|i| {
 			let (i, _) = preceded(key_type, collection_type)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, v) = preceded(key_geom, collection_vals)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 		|i| {
 			let (i, v) = preceded(key_geom, collection_vals)(i)?;
 			let (i, _) = commas(i)?;
 			let (i, _) = preceded(key_type, collection_type)(i)?;
-			let (i, _) = mightbespace(i)?;
-			let (i, _) = opt(char(','))(i)?;
-			let (i, _) = mightbespace(i)?;
 			Ok((i, v))
 		},
 	))(i)?;
-	let (i, _) = mightbespace(i)?;
-	let (i, _) = char('}')(i)?;
 	Ok((i, v.into()))
 }
 
diff --git a/lib/src/sql/idiom.rs b/lib/src/sql/idiom.rs
index 3df52be9..9127e45f 100644
--- a/lib/src/sql/idiom.rs
+++ b/lib/src/sql/idiom.rs
@@ -215,13 +215,7 @@ pub fn multi(i: &str) -> IResult<&str, Idiom> {
 			Ok((i, Idiom::from(v)))
 		},
 		|i| {
-			let (i, p) = first(i)?;
-			let (i, mut v) = many1(part)(i)?;
-			v.insert(0, p);
-			Ok((i, Idiom::from(v)))
-		},
-		|i| {
-			let (i, p) = value(i)?;
+			let (i, p) = alt((first, value))(i)?;
 			let (i, mut v) = many1(part)(i)?;
 			v.insert(0, p);
 			Ok((i, Idiom::from(v)))