From bf77dd06338592832e70812ec813382f805ef167 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Wed, 12 Dec 2018 20:25:12 +0900 Subject: [PATCH] Update FIELD_TYPEs (#309) --- MySQLdb/__init__.py | 3 +-- MySQLdb/constants/FIELD_TYPE.py | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MySQLdb/__init__.py b/MySQLdb/__init__.py index fa52a83..92b5d26 100644 --- a/MySQLdb/__init__.py +++ b/MySQLdb/__init__.py @@ -37,7 +37,6 @@ except NameError: from sets import ImmutableSet as frozenset class DBAPISet(frozenset): - """A special type of set for which A == x is true if A is a DBAPISet and x is a member of that set.""" @@ -54,7 +53,7 @@ BINARY = DBAPISet([FIELD_TYPE.BLOB, FIELD_TYPE.LONG_BLOB, NUMBER = DBAPISet([FIELD_TYPE.DECIMAL, FIELD_TYPE.DOUBLE, FIELD_TYPE.FLOAT, FIELD_TYPE.INT24, FIELD_TYPE.LONG, FIELD_TYPE.LONGLONG, FIELD_TYPE.TINY, FIELD_TYPE.YEAR, FIELD_TYPE.NEWDECIMAL]) -DATE = DBAPISet([FIELD_TYPE.DATE, FIELD_TYPE.NEWDATE]) +DATE = DBAPISet([FIELD_TYPE.DATE]) TIME = DBAPISet([FIELD_TYPE.TIME]) TIMESTAMP = DBAPISet([FIELD_TYPE.TIMESTAMP, FIELD_TYPE.DATETIME]) DATETIME = TIMESTAMP diff --git a/MySQLdb/constants/FIELD_TYPE.py b/MySQLdb/constants/FIELD_TYPE.py index 2a30764..3c4eca9 100644 --- a/MySQLdb/constants/FIELD_TYPE.py +++ b/MySQLdb/constants/FIELD_TYPE.py @@ -18,9 +18,13 @@ DATE = 10 TIME = 11 DATETIME = 12 YEAR = 13 -NEWDATE = 14 +# NEWDATE = 14 # Internal to MySQL. VARCHAR = 15 BIT = 16 +# TIMESTAMP2 = 17 +# DATETIME2 = 18 +# TIME2 = 19 +JSON = 245 NEWDECIMAL = 246 ENUM = 247 SET = 248