From 44eacf2e2f4a4255829109a5e67e0c1d2af542da Mon Sep 17 00:00:00 2001 From: John Bodley Date: Mon, 20 Jan 2020 13:09:52 -0800 Subject: [fix] Fixing typed literal regression --- sqlparse/engine/grouping.py | 2 +- sqlparse/sql.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'sqlparse') 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): -- cgit v1.2.1