BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1b9b6974
Commit
1b9b6974
authored
Jul 31, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mysql syntax for date INTERVAL arithmatic
parent
cf2d2cd3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+7
-3
No files found.
lib/gitlab/contributions_calendar.rb
View file @
1b9b6974
...
@@ -69,11 +69,15 @@ module Gitlab
...
@@ -69,11 +69,15 @@ module Gitlab
.
and
(
t
[
:created_at
].
lteq
(
Date
.
current
.
end_of_day
))
.
and
(
t
[
:created_at
].
lteq
(
Date
.
current
.
end_of_day
))
.
and
(
t
[
:author_id
].
eq
(
contributor
.
id
))
.
and
(
t
[
:author_id
].
eq
(
contributor
.
id
))
timezone_adjust
=
"INTERVAL '
#{
Time
.
zone
.
now
.
utc_offset
}
SECONDS'"
date_interval
=
if
Gitlab
::
Database
.
postgresql?
"INTERVAL '
#{
Time
.
zone
.
now
.
utc_offset
}
seconds'"
else
"INTERVAL
#{
Time
.
zone
.
now
.
utc_offset
}
SECOND"
end
Event
.
reorder
(
nil
)
Event
.
reorder
(
nil
)
.
select
(
t
[
:project_id
],
t
[
:target_type
],
t
[
:action
],
"date(created_at +
#{
timezone_adjust
}
) AS date"
,
'count(id) as total_amount'
)
.
select
(
t
[
:project_id
],
t
[
:target_type
],
t
[
:action
],
"date(created_at +
#{
date_interval
}
) AS date"
,
'count(id) as total_amount'
)
.
group
(
t
[
:project_id
],
t
[
:target_type
],
t
[
:action
],
"date(created_at +
#{
timezone_adjust
}
)"
)
.
group
(
t
[
:project_id
],
t
[
:target_type
],
t
[
:action
],
"date(created_at +
#{
date_interval
}
)"
)
.
where
(
conditions
)
.
where
(
conditions
)
.
having
(
t
[
:project_id
].
in
(
Arel
::
Nodes
::
SqlLiteral
.
new
(
authed_projects
.
to_sql
)))
.
having
(
t
[
:project_id
].
in
(
Arel
::
Nodes
::
SqlLiteral
.
new
(
authed_projects
.
to_sql
)))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment