Allow alphanumeric characters in SQLLite style parameters.

Author: Paul Roskell

src/lib.rs

@@ -1067,6 +1067,21 @@ mod tests {
         assert_eq!(format(input, &QueryParams::None, options), expected);
     }
 
+    #[test]
+    fn it_recognizes_dollar_sign_alphanumeric_placeholders() {
+        let input = "SELECT $hash, $foo, $bar;";
+        let options = FormatOptions::default();
+        let expected = indoc!(
+            "
+            SELECT
+              $hash,
+              $foo,
+              $bar;"
+        );
+
+        assert_eq!(format(input, &QueryParams::None, options), expected);
+    }
+
     #[test]
     fn it_recognizes_dollar_sign_numbered_placeholders_with_param_values() {
         let input = "SELECT $2, $3, $1;";
@@ -1090,6 +1105,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn it_recognizes_dollar_sign_alphanumeric_placeholders_with_param_values() {
+        let input =
+            "SELECT $hash, $salt;";
+        let params = vec![
+            ("hash".to_string(), "hash value".to_string()),
+            ("salt".to_string(), "salt value".to_string()),
+        ];
+        let options = FormatOptions::default();
+        let expected = indoc!(
+            "
+            SELECT
+              hash value,
+              salt value;"
+        );
+
+        assert_eq!(
+            format(input, &QueryParams::Named(params), options),
+            expected
+        );
+    }
+
     #[test]
     fn it_formats_query_with_go_batch_separator() {
         let input = "SELECT 1 GO SELECT 2";

src/tokenizer.rs

@@ -290,9 +290,9 @@ fn get_close_paren_token(input: &str) -> IResult<&str, Token<'_>> {
 
 fn get_placeholder_token(input: &str) -> IResult<&str, Token<'_>> {
     alt((
-        get_ident_named_placeholder_token,
-        get_string_named_placeholder_token,
         get_indexed_placeholder_token,
+        get_ident_named_placeholder_token,
+        get_string_named_placeholder_token
     ))(input)
 }
 
@@ -327,7 +327,7 @@ fn get_indexed_placeholder_token(input: &str) -> IResult<&str, Token<'_>> {
 
 fn get_ident_named_placeholder_token(input: &str) -> IResult<&str, Token<'_>> {
     recognize(tuple((
-        alt((char('@'), char(':'))),
+        alt((char('@'), char(':'), char('$'))),
         take_while1(|item: char| {
             item.is_alphanumeric() || item == '.' || item == '_' || item == '$'
         }),