@@ -890,10 +890,7 @@ impl Parser {
890
890
} else if self . parse_keyword ( "VIEW" ) {
891
891
SQLObjectType :: View
892
892
} else {
893
- return parser_err ! ( format!(
894
- "Unexpected token after DROP: {:?}" ,
895
- self . peek_token( )
896
- ) ) ;
893
+ return self . expected ( "TABLE or VIEW after DROP" , self . peek_token ( ) ) ;
897
894
} ;
898
895
let if_exists = self . parse_keywords ( vec ! [ "IF" , "EXISTS" ] ) ;
899
896
let mut names = vec ! [ ] ;
@@ -1015,10 +1012,7 @@ impl Parser {
1015
1012
self . expect_token ( & Token :: RParen ) ?;
1016
1013
ColumnOption :: Check ( expr)
1017
1014
} else {
1018
- return parser_err ! ( format!(
1019
- "Unexpected token in column definition: {:?}" ,
1020
- self . peek_token( )
1021
- ) ) ;
1015
+ return self . expected ( "column option" , self . peek_token ( ) ) ;
1022
1016
} ;
1023
1017
1024
1018
Ok ( ColumnOptionDef { name, option } )
@@ -1216,7 +1210,7 @@ impl Parser {
1216
1210
pub fn parse_literal_string ( & mut self ) -> Result < String , ParserError > {
1217
1211
match self . next_token ( ) {
1218
1212
Some ( Token :: SingleQuotedString ( ref s) ) => Ok ( s. clone ( ) ) ,
1219
- other => parser_err ! ( format! ( "Expected literal string, found {:?} ", other) ) ,
1213
+ other => self . expected ( " literal string", other) ,
1220
1214
}
1221
1215
}
1222
1216
0 commit comments