Skip to content

fix: use DAYS_PER_YEAR (365) for whole years in interval math #43

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

fix: use DAYS_PER_YEAR (365) for whole years in interval math #43

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion src_cpp/py_query_result.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,12 @@ py::object PyQueryResult::convertValueToPyObject(const Value& value) {
}
case LogicalTypeID::INTERVAL: {
auto intervalVal = value.getValue<interval_t>();
auto days = Interval::DAYS_PER_MONTH * intervalVal.months + intervalVal.days;
// Use DAYS_PER_YEAR for whole years instead of DAYS_PER_MONTH * 12,
// giving 365 days/year + 30 days/month for the remainder.
auto years = intervalVal.months / Interval::MONTHS_PER_YEAR;
auto months = intervalVal.months % Interval::MONTHS_PER_YEAR;
auto days = years * Interval::DAYS_PER_YEAR + months * Interval::DAYS_PER_MONTH +
intervalVal.days;

return py::cast<py::object>(importCache->datetime.timedelta()(py::arg("days") = days,
py::arg("microseconds") = intervalVal.micros));
Expand Down
16 changes: 12 additions & 4 deletions src_py/_lbug_capi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,7 +1853,11 @@ def _convert_value(self, value: _LbugValue) -> Any:
),
"Failed to read interval",
)
total_days = int(out.days) + int(out.months) * 30
total_days = (
int(out.days)
+ (int(out.months) // 12) * 365
+ (int(out.months) % 12) * 30
)
return dt.timedelta(days=total_days, microseconds=int(out.micros))
if type_id in (_LBUG_LIST, _LBUG_ARRAY):
size = ctypes.c_uint64(0)
Expand Down Expand Up @@ -1937,7 +1941,8 @@ def _convert_value(self, value: _LbugValue) -> Any:
):
total_days = (
int(interval_probe.days)
+ int(interval_probe.months) * 30
+ (int(interval_probe.months) // 12) * 365
+ (int(interval_probe.months) % 12) * 30
)
out_obj[key] = dt.timedelta(
days=total_days,
Expand Down Expand Up @@ -2042,7 +2047,8 @@ def _convert_value(self, value: _LbugValue) -> Any:
):
total_days = (
int(interval_probe.days)
+ int(interval_probe.months) * 30
+ (int(interval_probe.months) // 12) * 365
+ (int(interval_probe.months) % 12) * 30
)
out_obj[key] = dt.timedelta(
days=total_days,
Expand Down Expand Up @@ -2095,7 +2101,9 @@ def _convert_value(self, value: _LbugValue) -> Any:
== _LBUG_SUCCESS
):
total_days = (
int(interval_probe.days) + int(interval_probe.months) * 30
int(interval_probe.days)
+ (int(interval_probe.months) // 12) * 365
+ (int(interval_probe.months) % 12) * 30
)
return dt.timedelta(
days=total_days, microseconds=int(interval_probe.micros)
Expand Down
Loading