Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
da6430ac
Commit
da6430ac
authored
Oct 25, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
datasource as cfg: explain why cmd.version can be higher
parent
89923bf7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
pkg/services/sqlstore/datasource.go
+5
-1
No files found.
pkg/services/sqlstore/datasource.go
View file @
da6430ac
...
@@ -152,7 +152,11 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
...
@@ -152,7 +152,11 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
var
updateSession
*
xorm
.
Session
var
updateSession
*
xorm
.
Session
if
cmd
.
Version
!=
0
{
if
cmd
.
Version
!=
0
{
updateSession
=
sess
.
Where
(
"id=? and org_id=? and (version = ? or version < ?)"
,
ds
.
Id
,
ds
.
OrgId
,
cmd
.
Version
,
cmd
.
Version
)
// the reason we allow cmd.version > db.version is make it possible for people to force
// updates to datasources using the datasource.yaml file without knowing exactly what version
// a datasource have in the db.
updateSession
=
sess
.
Where
(
"id=? and org_id=? and version < ?"
,
ds
.
Id
,
ds
.
OrgId
,
ds
.
Version
)
}
else
{
}
else
{
updateSession
=
sess
.
Where
(
"id=? and org_id=?"
,
ds
.
Id
,
ds
.
OrgId
)
updateSession
=
sess
.
Where
(
"id=? and org_id=?"
,
ds
.
Id
,
ds
.
OrgId
)
}
}
...
...
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