Skip to content

Using periods in relative timeframes will now work properly #133

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

Merged
dorian-krefft-dt merged 2 commits into from
Feb 13, 2026
Merged

Using periods in relative timeframes will now work properly #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1da093
Using periods in relative timeframes will now work properly
dorian-krefft-dt Feb 13, 2026
c4d593f
Using system's zone instead of UTC for local dates calculation
dorian-krefft-dt Feb 13, 2026
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@
### Bug fixes

- Creating an empty DQL variable using the `$type: dql` syntax will now create a multiline comment instead of causing an
error
error.
- When modifying or deleting a Dynatrace tenant that was already used, files using it will require the user to select
a new tenant.
- Using periods (`-1y` for years, `-1q` for quarters, or `-1w` for weeks) in relative timeframes will now work properly.

## [1.4.0] - 2026-01-28

Expand Down
19 changes: 14 additions & 5 deletions src/main/java/pl/thedeem/intellij/dql/definition/model/DQLDurationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import java.time.Duration;
import java.time.Instant;
import java.time.Period;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -53,10 +54,18 @@ public Instant getInstant(int duration, @NotNull Instant base) {
case MINUTE -> base.plus(Duration.ofMinutes(duration));
case HOUR -> base.plus(Duration.ofHours(duration));
case DAY -> base.plus(Duration.ofDays(duration));
case WEEK -> base.plus(Period.ofWeeks(duration));
case MONTH -> base.plus(Period.ofMonths(duration));
case QUARTER -> base.plus(Period.ofMonths(duration * 4));
case YEAR -> base.plus(Period.ofYears(duration));
case WEEK -> ZonedDateTime.ofInstant(base, ZoneOffset.systemDefault())
.plusWeeks(duration)
.toInstant();
case MONTH -> ZonedDateTime.ofInstant(base, ZoneOffset.systemDefault())
.plusMonths(duration)
.toInstant();
case QUARTER -> ZonedDateTime.ofInstant(base, ZoneOffset.systemDefault())
.plusMonths(duration * 3L)
.toInstant();
case YEAR -> ZonedDateTime.ofInstant(base, ZoneOffset.systemDefault())
.plusYears(duration)
.toInstant();
};
}
}
Loading