[fix] makeDateTrunc calculating rolling_month wrong #52579
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also fixed the function returning a string without a timezone, when it always returns times in UTC. This is done by adding 'Z' at the end of the date string. Added unit tests as well, to make sure everything works as expected.
sashaostrikov
approved these changes
May 30, 2023
| // by the unit parameter (e.g. day, week, month, or rolling month [prior 1 month]). | ||
| // Note: If unit is 'week', the function will truncate to the preceding Sunday. | ||
| // This is because some locales start the week on Sunday, unlike the Postgres default | ||
| // (and many parts of the world) which start the week on Monday. |
There was a problem hiding this comment.
and many parts of the world 😁😁😁
There was a problem hiding this comment.
I asked Cody to generate that, so shifting blame to it 😅
There was a problem hiding this comment.
nono, liked that part, actually :)
| @@ -2027,3 +2027,80 @@ func TestEventLogs_AggregatedRepoMetadataStats(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
|
|
|||
| func TestMakeDateTruncExpression(t *testing.T) { | |||
internal/database/event_logs_test.go
Outdated
Comment on lines
2102
to
2103
|
|
||
| require.Equal(t, tc.expected, date) |
There was a problem hiding this comment.
we can use assert here so that we always run all the test cases and accumulate all the errors instead of short-circuiting the test with the first failure.
Suggested change
| require.Equal(t, tc.expected, date) | |
| assert.Equal(t, tc.expected, date) |
There was a problem hiding this comment.
TIL, I was not aware of that behavior.
It was actually running all the tests before for me even with require.Equal. Just that each test case failed on the first failure.
There was a problem hiding this comment.
yep, assert functions effectively call t.Errorf, require functions call t.FailNow()
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.0 5.0
# Navigate to the new working tree
cd .worktrees/backport-5.0
# Create a new branch
git switch --create backport-52579-to-5.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6d2a71eb07b885346b677eee150930abb7e8910f
# Push it to GitHub
git push --set-upstream origin backport-52579-to-5.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.0Then, create a pull request where the |
github-actions
bot
added
backports
failed-backport-to-5.0
release-blocker
kopancek
added a commit
that referenced
this pull request
May 31, 2023
Also fixed the function returning a string without a timezone, when it
always returns times in UTC. This is done by explicitly casting to
timestamptz by using `TIMEZONE('UTC', ...)` function.
Added unit tests as well, to make sure everything works as expected.
Unit tests
(cherry picked from commit 6d2a71e)
keegancsmith
pushed a commit
that referenced
this pull request
May 31, 2023
ErikaRS
pushed a commit
that referenced
this pull request
Jun 22, 2023
Also fixed the function returning a string without a timezone, when it
always returns times in UTC. This is done by explicitly casting to
timestamptz by using `TIMEZONE('UTC', ...)` function.
Added unit tests as well, to make sure everything works as expected.
## Test plan
Unit tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also fixed the function returning a string without a timezone, when it always returns times in UTC. This is done by explicitly casting to timestamptz by using
TIMEZONE('UTC', ...)function.Added unit tests as well, to make sure everything works as expected.
Test plan
Unit tests