diff options
| author | John Bodley <john.bodley@airbnb.com> | 2020-01-20 13:09:52 -0800 |
|---|---|---|
| committer | Andi Albrecht <albrecht.andi@gmail.com> | 2020-02-02 21:19:41 +0100 |
| commit | 44eacf2e2f4a4255829109a5e67e0c1d2af542da (patch) | |
| tree | f3f01426f2caaa15096adca34509b584654e5623 /sqlparse | |
| parent | aaf5403f05e2cdb4f36a507b92e039c8cc2016a0 (diff) | |
| download | sqlparse-44eacf2e2f4a4255829109a5e67e0c1d2af542da.tar.gz | |
[fix] Fixing typed literal regression
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/engine/grouping.py | 2 | ||||
| -rw-r--r-- | sqlparse/sql.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py index 3f06e8a..b634128 100644 --- a/sqlparse/engine/grouping.py +++ b/sqlparse/engine/grouping.py @@ -108,7 +108,7 @@ def group_typed_literal(tlist): # https://www.postgresql.org/docs/9.1/datatype-datetime.html # https://www.postgresql.org/docs/9.1/functions-datetime.html def match(token): - return token.match(*sql.TypedLiteral.M_OPEN) + return imt(token, m=sql.TypedLiteral.M_OPEN) def match_to_extend(token): return isinstance(token, sql.TypedLiteral) diff --git a/sqlparse/sql.py b/sqlparse/sql.py index 77f980b..a942bcd 100644 --- a/sqlparse/sql.py +++ b/sqlparse/sql.py @@ -491,10 +491,9 @@ class IdentifierList(TokenList): class TypedLiteral(TokenList): """A typed literal, such as "date '2001-09-28'" or "interval '2 hours'".""" - M_OPEN = T.Name.Builtin, None + M_OPEN = [(T.Name.Builtin, None), (T.Keyword, "TIMESTAMP")] M_CLOSE = T.String.Single, None - M_EXTEND = T.Keyword, ( - "DAY", "HOUR", "MINUTE", "MONTH", "SECOND", "TIMESTAMP", "YEAR") + M_EXTEND = T.Keyword, ("DAY", "HOUR", "MINUTE", "MONTH", "SECOND", "YEAR") class Parenthesis(TokenList): |