Merging upstream version 21.0.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
3759c601a7
commit
96b10de29a
115 changed files with 66603 additions and 60920 deletions
|
@ -125,6 +125,7 @@ class TokenType(AutoName):
|
|||
NCHAR = auto()
|
||||
VARCHAR = auto()
|
||||
NVARCHAR = auto()
|
||||
BPCHAR = auto()
|
||||
TEXT = auto()
|
||||
MEDIUMTEXT = auto()
|
||||
LONGTEXT = auto()
|
||||
|
@ -801,6 +802,7 @@ class Tokenizer(metaclass=_Tokenizer):
|
|||
"VARCHAR2": TokenType.VARCHAR,
|
||||
"NVARCHAR": TokenType.NVARCHAR,
|
||||
"NVARCHAR2": TokenType.NVARCHAR,
|
||||
"BPCHAR": TokenType.BPCHAR,
|
||||
"STR": TokenType.TEXT,
|
||||
"STRING": TokenType.TEXT,
|
||||
"TEXT": TokenType.TEXT,
|
||||
|
@ -1141,7 +1143,7 @@ class Tokenizer(metaclass=_Tokenizer):
|
|||
self._comments.append(self._text[comment_start_size : -comment_end_size + 1])
|
||||
self._advance(comment_end_size - 1)
|
||||
else:
|
||||
while not self._end and not self.WHITE_SPACE.get(self._peek) is TokenType.BREAK:
|
||||
while not self._end and self.WHITE_SPACE.get(self._peek) is not TokenType.BREAK:
|
||||
self._advance(alnum=True)
|
||||
self._comments.append(self._text[comment_start_size:])
|
||||
|
||||
|
@ -1259,7 +1261,7 @@ class Tokenizer(metaclass=_Tokenizer):
|
|||
if base:
|
||||
try:
|
||||
int(text, base)
|
||||
except:
|
||||
except Exception:
|
||||
raise TokenError(
|
||||
f"Numeric string contains invalid characters from {self._line}:{self._start}"
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue