Improve error messages with additional colons (#1319)

Author: LorrensP-2158466

src/parser/mod.rs

@@ -3116,7 +3116,7 @@ impl<'a> Parser<'a> {
     /// Report `found` was encountered instead of `expected`
     pub fn expected<T>(&self, expected: &str, found: TokenWithLocation) -> Result<T, ParserError> {
         parser_err!(
-            format!("Expected {expected}, found: {found}"),
+            format!("Expected: {expected}, found: {found}"),
             found.location
         )
     }
@@ -11581,7 +11581,7 @@ mod tests {
         assert_eq!(
             ast,
             Err(ParserError::TokenizerError(
-                "Unterminated string literal at Line: 1, Column 5".to_string()
+                "Unterminated string literal at Line: 1, Column: 5".to_string()
             ))
         );
     }
@@ -11593,7 +11593,7 @@ mod tests {
         assert_eq!(
             ast,
             Err(ParserError::ParserError(
-                "Expected [NOT] NULL or TRUE|FALSE or [NOT] DISTINCT FROM after IS, found: a at Line: 1, Column 16"
+                "Expected: [NOT] NULL or TRUE|FALSE or [NOT] DISTINCT FROM after IS, found: a at Line: 1, Column: 16"
                     .to_string()
             ))
         );

src/tokenizer.rs

@@ -429,7 +429,7 @@ impl fmt::Display for Location {
         write!(
             f,
             // TODO: use standard compiler location syntax (<path>:<line>:<col>)
-            " at Line: {}, Column {}",
+            " at Line: {}, Column: {}",
             self.line, self.column,
         )
     }
@@ -1816,7 +1816,7 @@ mod tests {
             use std::error::Error;
             assert!(err.source().is_none());
         }
-        assert_eq!(err.to_string(), "test at Line: 1, Column 1");
+        assert_eq!(err.to_string(), "test at Line: 1, Column: 1");
     }
 
     #[test]

tests/sqlparser_bigquery.rs

@@ -535,7 +535,7 @@ fn parse_invalid_brackets() {
         bigquery_and_generic()
             .parse_sql_statements(sql)
             .unwrap_err(),
-        ParserError::ParserError("Expected (, found: >".to_string())
+        ParserError::ParserError("Expected: (, found: >".to_string())
     );
 
     let sql = "CREATE TABLE table (x STRUCT<STRUCT<INT64>>>)";
@@ -544,7 +544,7 @@ fn parse_invalid_brackets() {
             .parse_sql_statements(sql)
             .unwrap_err(),
         ParserError::ParserError(
-            "Expected ',' or ')' after column definition, found: >".to_string()
+            "Expected: ',' or ')' after column definition, found: >".to_string()
         )
     );
 }
@@ -1753,11 +1753,11 @@ fn parse_merge_invalid_statements() {
     for (sql, err_msg) in [
         (
             "MERGE T USING U ON TRUE WHEN MATCHED BY TARGET AND 1 THEN DELETE",
-            "Expected THEN, found: BY",
+            "Expected: THEN, found: BY",
         ),
         (
             "MERGE T USING U ON TRUE WHEN MATCHED BY SOURCE AND 1 THEN DELETE",
-            "Expected THEN, found: BY",
+            "Expected: THEN, found: BY",
         ),
         (
             "MERGE T USING U ON TRUE WHEN NOT MATCHED BY SOURCE THEN INSERT(a) VALUES (b)",
@@ -1898,13 +1898,13 @@ fn parse_big_query_declare() {
 
     let error_sql = "DECLARE x";
     assert_eq!(
-        ParserError::ParserError("Expected a data type name, found: EOF".to_owned()),
+        ParserError::ParserError("Expected: a data type name, found: EOF".to_owned()),
         bigquery().parse_sql_statements(error_sql).unwrap_err()
     );
 
     let error_sql = "DECLARE x 42";
     assert_eq!(
-        ParserError::ParserError("Expected a data type name, found: 42".to_owned()),
+        ParserError::ParserError("Expected: a data type name, found: 42".to_owned()),
         bigquery().parse_sql_statements(error_sql).unwrap_err()
     );
 }
@@ -2069,23 +2069,23 @@ fn test_bigquery_create_function() {
                 "AS ((SELECT 1 FROM mytable)) ",
                 "OPTIONS(a = [1, 2])",
             ),
-            "Expected end of statement, found: OPTIONS",
+            "Expected: end of statement, found: OPTIONS",
         ),
         (
             concat!(
                 "CREATE TEMPORARY FUNCTION myfunction() ",
                 "IMMUTABLE ",
                 "AS ((SELECT 1 FROM mytable)) ",
             ),
-            "Expected AS, found: IMMUTABLE",
+            "Expected: AS, found: IMMUTABLE",
         ),
         (
             concat!(
                 "CREATE TEMPORARY FUNCTION myfunction() ",
                 "AS \"console.log('hello');\" ",
                 "LANGUAGE js ",
             ),
-            "Expected end of statement, found: LANGUAGE",
+            "Expected: end of statement, found: LANGUAGE",
         ),
     ];
     for (sql, error) in error_sqls {
@@ -2116,7 +2116,7 @@ fn test_bigquery_trim() {
     // missing comma separation
     let error_sql = "SELECT TRIM('xyz' 'a')";
     assert_eq!(
-        ParserError::ParserError("Expected ), found: 'a'".to_owned()),
+        ParserError::ParserError("Expected: ), found: 'a'".to_owned()),
         bigquery().parse_sql_statements(error_sql).unwrap_err()
     );
 }