Fix error handling

gwenn · Jan 7, 2024 · 4717969 · 4717969
1 parent 7f31aac
commit 4717969
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/lexer/sql/error.rs b/src/lexer/sql/error.rs
@@ -45,7 +45,8 @@ impl fmt::Display for Error {
             Error::MalformedHexInteger(pos) => {
                 write!(f, "malformed hex integer at {:?}", pos.unwrap())
             }
-            Error::ParserError(ref msg, pos) => write!(f, "{} at {:?}", msg, pos.unwrap()),
+            Error::ParserError(ref msg, Some(pos)) => write!(f, "{} at {:?}", msg, pos),
+            Error::ParserError(ref msg, _) => write!(f, "{}", msg),
         }
     }
 }

diff --git a/src/lexer/sql/mod.rs b/src/lexer/sql/mod.rs
@@ -232,7 +232,10 @@ impl<'input> FallibleIterator for Parser<'input> {
         }
         let cmd = self.parser.ctx.cmd();
         if let Some(ref cmd) = cmd {
-            cmd.check()?;
+            if let Err(e) = cmd.check() {
+                let err = Error::ParserError(e, Some((self.scanner.line(), self.scanner.column())));
+                return Err(err);
+            }
         }
         Ok(cmd)
     }