Skip to content

Treat empty string as None in _todate/_totime/_todatetime filter_in #760

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
nursix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Treat empty string as None in _todate/_totime/_todatetime filter_in #760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions pydal/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,8 +2223,8 @@ def __init__(

@staticmethod
def _todate(value, regex=re.compile(r"^\d\d\d\d-\d\d-\d\d$")):
if value is None:
return value
if value in (None, ""):
return None
if isinstance(value, datetime.date):
value = value.isoformat()
value = str(value)[:10]
Expand All @@ -2233,8 +2233,8 @@ def _todate(value, regex=re.compile(r"^\d\d\d\d-\d\d-\d\d$")):

@staticmethod
def _totime(value, regex=re.compile(r"^\d\d:\d\d:\d\d$")):
if value is None:
return value
if value in (None, ""):
return None
if isinstance(value, datetime.time):
value = str(value)
value = f"{value}:00:00"[:8]
Expand All @@ -2243,8 +2243,8 @@ def _totime(value, regex=re.compile(r"^\d\d:\d\d:\d\d$")):

@staticmethod
def _todatetime(value, regex=re.compile(r"^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$")):
if value is None:
return value
if value in (None, ""):
return None
if isinstance(value, (datetime.date, datetime.datetime)):
value = str(value)
value = value.replace("T", " ")
Expand Down