mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-09-06 22:20:31 +00:00
Fix a mistake in merge conflict resolution earlier
This commit is contained in:
parent
ac365bd44e
commit
dce09f8054
3 changed files with 3 additions and 4 deletions
|
@ -12,8 +12,7 @@ impl Dialect for GenericSqlDialect {
|
|||
CHAR, CHARACTER, VARYING, LARGE, OBJECT, VARCHAR, CLOB, BINARY, VARBINARY, BLOB, FLOAT,
|
||||
REAL, DOUBLE, PRECISION, INT, INTEGER, SMALLINT, BIGINT, NUMERIC, DECIMAL, DEC,
|
||||
BOOLEAN, DATE, TIME, TIMESTAMP, CASE, WHEN, THEN, ELSE, END, JOIN, LEFT, RIGHT, FULL,
|
||||
CROSS, OUTER, INNER, NATURAL, ON, USING,
|
||||
BOOLEAN, DATE, TIME, TIMESTAMP, CASE, WHEN, THEN, ELSE, END, LIKE,
|
||||
CROSS, OUTER, INNER, NATURAL, ON, USING, LIKE,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,8 @@ impl Dialect for PostgreSqlDialect {
|
|||
DOUBLE, PRECISION, INT, INTEGER, SMALLINT, BIGINT, NUMERIC, DECIMAL, DEC, BOOLEAN,
|
||||
DATE, TIME, TIMESTAMP, VALUES, DEFAULT, ZONE, REGCLASS, TEXT, BYTEA, TRUE, FALSE, COPY,
|
||||
STDIN, PRIMARY, KEY, UNIQUE, UUID, ADD, CONSTRAINT, FOREIGN, REFERENCES, CASE, WHEN,
|
||||
THEN, ELSE, END, JOIN, LEFT, RIGHT, FULL, CROSS, OUTER, INNER, NATURAL, ON, USING, LIKE
|
||||
THEN, ELSE, END, JOIN, LEFT, RIGHT, FULL, CROSS, OUTER, INNER, NATURAL, ON, USING,
|
||||
LIKE,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -90,7 +90,6 @@ impl Parser {
|
|||
let mut expr = self.parse_prefix()?;
|
||||
debug!("prefix: {:?}", expr);
|
||||
loop {
|
||||
|
||||
// stop parsing on `NULL` | `NOT NULL`
|
||||
match self.peek_token() {
|
||||
Some(Token::Keyword(ref k)) if k == "NOT" || k == "NULL" => break,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue