Skip to content

Implement adding and subtracting durations from datetimes #565

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

Closed
DrRataplan wants to merge 1 commit into from
Closed

Implement adding and subtracting durations from datetimes #565

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
48 changes: 43 additions & 5 deletions src/expressions/dataTypes/valueTypes/DateTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,51 @@ export function subtract(
return new DayTimeDuration(secondsOfDuration);
}

export function addDuration(dateTime: DateTime, _duration: AbstractDuration): DateTime {
throw new Error(`Not implemented: adding durations to ${valueTypeToString(dateTime.type)}`);
export function addDuration(dateTime: DateTime, duration: AbstractDuration): DateTime {
const jsDateTime = dateTime.toJavaScriptDate();
jsDateTime.setUTCFullYear(jsDateTime.getUTCFullYear() + duration.getYears());
jsDateTime.setUTCMonth(jsDateTime.getUTCMonth() + duration.getMonths());
jsDateTime.setUTCDate(jsDateTime.getUTCDate() + duration.getDays());
jsDateTime.setUTCHours(jsDateTime.getUTCHours() + duration.getHours());
jsDateTime.setUTCMinutes(jsDateTime.getUTCMinutes() + duration.getMinutes());
jsDateTime.setUTCSeconds(jsDateTime.getUTCSeconds() + Math.floor(duration.getSeconds()));
jsDateTime.setUTCMilliseconds(jsDateTime.getUTCMilliseconds() + (duration.getSeconds() % 1));

return new DateTime(
jsDateTime.getUTCFullYear(),
jsDateTime.getUTCMonth() + 1,
jsDateTime.getUTCDate(),
jsDateTime.getUTCHours(),
jsDateTime.getUTCMinutes(),
jsDateTime.getUTCSeconds(),
jsDateTime.getUTCMilliseconds(),

dateTime.getTimezone(),
dateTime.type,
);
}

export function subtractDuration(dateTime: DateTime, _duration: AbstractDuration): DateTime {
throw new Error(
`Not implemented: subtracting durations from ${valueTypeToString(dateTime.type)}`,
export function subtractDuration(dateTime: DateTime, duration: AbstractDuration): DateTime {
const jsDateTime = dateTime.toJavaScriptDate();
jsDateTime.setUTCFullYear(jsDateTime.getUTCFullYear() - duration.getYears());
jsDateTime.setUTCMonth(jsDateTime.getUTCMonth() - duration.getMonths());
jsDateTime.setUTCDate(jsDateTime.getUTCDate() - duration.getDays());
jsDateTime.setUTCHours(jsDateTime.getUTCHours() - duration.getHours());
jsDateTime.setUTCMinutes(jsDateTime.getUTCMinutes() - duration.getMinutes());
jsDateTime.setUTCSeconds(jsDateTime.getUTCSeconds() - Math.floor(duration.getSeconds()));
jsDateTime.setUTCMilliseconds(jsDateTime.getUTCMilliseconds() - (duration.getSeconds() % 1));

return new DateTime(
jsDateTime.getUTCFullYear(),
jsDateTime.getUTCMonth() + 1,
jsDateTime.getUTCDate(),
jsDateTime.getUTCHours(),
jsDateTime.getUTCMinutes(),
jsDateTime.getUTCSeconds(),
jsDateTime.getUTCMilliseconds(),

dateTime.getTimezone(),
dateTime.type,
);
}

Expand Down
Loading