diff --git a/server/src/engine/ql/dml.rs b/server/src/engine/ql/dml.rs index 9668aa30..5cda0c8a 100644 --- a/server/src/engine/ql/dml.rs +++ b/server/src/engine/ql/dml.rs @@ -33,6 +33,10 @@ use { }, }; +/* + Impls for insert +*/ + /// Parse a list /// /// **NOTE:** This function will error if the `[` token is passed. Make sure this is forwarded by the caller diff --git a/server/src/engine/ql/lexer.rs b/server/src/engine/ql/lexer.rs index bca8678e..89868f66 100644 --- a/server/src/engine/ql/lexer.rs +++ b/server/src/engine/ql/lexer.rs @@ -38,7 +38,6 @@ use { pub enum Token { Symbol(Symbol), Keyword(Keyword), - UnsafeLit(RawSlice), Ident(RawSlice), #[cfg(test)] /// A comma that can be ignored (used for fuzzing) @@ -76,6 +75,7 @@ pub enum Lit { Str(Box), Bool(bool), Num(u64), + UnsafeLit(RawSlice), } enum_impls! { @@ -599,7 +599,7 @@ impl<'a> Lexer<'a> { okay &= self.remaining() >= size; if compiler::likely(okay) { unsafe { - self.push_token(Token::UnsafeLit(RawSlice::new(self.cursor(), size))); + self.push_token(Lit::UnsafeLit(RawSlice::new(self.cursor(), size))); self.incr_cursor_by(size); } } else { diff --git a/server/src/engine/ql/tests.rs b/server/src/engine/ql/tests.rs index 8f80e82d..ab212fbc 100644 --- a/server/src/engine/ql/tests.rs +++ b/server/src/engine/ql/tests.rs @@ -146,19 +146,22 @@ mod lexer_tests { fn lex_unsafe_literal_mini() { let usl = lex("\r0\n".as_bytes()).unwrap(); assert_eq!(usl.len(), 1); - assert_eq!(Token::UnsafeLit("".into()), usl[0]); + assert_eq!(Token::Lit(Lit::UnsafeLit("".into())), usl[0]); } #[test] fn lex_unsafe_literal() { let usl = lex("\r9\nabcdefghi".as_bytes()).unwrap(); assert_eq!(usl.len(), 1); - assert_eq!(Token::UnsafeLit("abcdefghi".into()), usl[0]); + assert_eq!(Token::Lit(Lit::UnsafeLit("abcdefghi".into())), usl[0]); } #[test] fn lex_unsafe_literal_pro() { let usl = lex("\r18\nabcdefghi123456789".as_bytes()).unwrap(); assert_eq!(usl.len(), 1); - assert_eq!(Token::UnsafeLit("abcdefghi123456789".into()), usl[0]); + assert_eq!( + Token::Lit(Lit::UnsafeLit("abcdefghi123456789".into())), + usl[0] + ); } }