Skip to content

use 0 as date/datetime zero value #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

use 0 as date/datetime zero value #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac6e6a6
use 0 as date/datetime zero value
xiezhenye Aug 1, 2016
5f92ace
fix unit tests
xiezhenye Aug 1, 2016
3c0c7cb
fix tests for zero datetime type
xiezhenye Aug 16, 2016
ed903c5
fix tests for zero datetime type
xiezhenye Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pymysqlreplication/row_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,13 @@ def __read_time2(self, column):
def __read_date(self):
time = self.packet.read_uint24()
if time == 0: # nasty mysql 0000-00-00 dates
return None
return 0

year = (time & ((1 << 15) - 1) << 9) >> 9
month = (time & ((1 << 4) - 1) << 5) >> 5
day = (time & ((1 << 5) - 1))
if year == 0 or month == 0 or day == 0:
return None
return 0

date = datetime.date(
year=year,
Expand All @@ -268,7 +268,7 @@ def __read_date(self):
def __read_datetime(self):
value = self.packet.read_uint64()
if value == 0: # nasty mysql 0000-00-00 dates
return None
return 0

date = value / 1000000
time = int(value % 1000000)
Expand All @@ -277,7 +277,7 @@ def __read_datetime(self):
month = int((date % 10000) / 100)
day = int(date % 100)
if year == 0 or month == 0 or day == 0:
return None
return 0

date = datetime.datetime(
year=year,
Expand Down Expand Up @@ -311,7 +311,7 @@ def __read_datetime2(self, column):
minute=self.__read_binary_slice(data, 28, 6, 40),
second=self.__read_binary_slice(data, 34, 6, 40))
except ValueError:
return None
return 0
return self.__add_fsp_to_time(t, column)

def __read_new_decimal(self, column):
Expand Down
10 changes: 5 additions & 5 deletions pymysqlreplication/tests/test_data_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,23 +247,23 @@ def test_zero_date(self):
insert_query = "INSERT INTO test (id, test2) VALUES(1, '0000-01-21')"
event = self.create_and_insert_value(create_query, insert_query)
self.assertEqual(event.rows[0]["values"]["test"], None)
self.assertEqual(event.rows[0]["values"]["test2"], None)
self.assertEqual(event.rows[0]["values"]["test2"], 0)

def test_zero_month(self):
self.set_sql_mode()
create_query = "CREATE TABLE test (id INTEGER, test DATE, test2 DATE);"
insert_query = "INSERT INTO test (id, test2) VALUES(1, '2015-00-21')"
event = self.create_and_insert_value(create_query, insert_query)
self.assertEqual(event.rows[0]["values"]["test"], None)
self.assertEqual(event.rows[0]["values"]["test2"], None)
self.assertEqual(event.rows[0]["values"]["test2"], 0)

def test_zero_day(self):
self.set_sql_mode()
create_query = "CREATE TABLE test (id INTEGER, test DATE, test2 DATE);"
insert_query = "INSERT INTO test (id, test2) VALUES(1, '2015-05-00')"
event = self.create_and_insert_value(create_query, insert_query)
self.assertEqual(event.rows[0]["values"]["test"], None)
self.assertEqual(event.rows[0]["values"]["test2"], None)
self.assertEqual(event.rows[0]["values"]["test2"], 0)

def test_time(self):
create_query = "CREATE TABLE test (test TIME);"
Expand All @@ -288,14 +288,14 @@ def test_zero_datetime(self):
create_query = "CREATE TABLE test (id INTEGER, test DATETIME NOT NULL DEFAULT 0);"
insert_query = "INSERT INTO test (id) VALUES(1)"
event = self.create_and_insert_value(create_query, insert_query)
self.assertEqual(event.rows[0]["values"]["test"], None)
self.assertEqual(event.rows[0]["values"]["test"], 0)

def test_broken_datetime(self):
self.set_sql_mode()
create_query = "CREATE TABLE test (test DATETIME NOT NULL);"
insert_query = "INSERT INTO test VALUES('2013-00-00 00:00:00')"
event = self.create_and_insert_value(create_query, insert_query)
self.assertEqual(event.rows[0]["values"]["test"], None)
self.assertEqual(event.rows[0]["values"]["test"], 0)

def test_year(self):
if self.isMySQL57():
Expand Down