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
002b4d34
Commit
002b4d34
authored
Oct 10, 2017
by
Daniel Lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql: fix interpolation for numbers in temp vars
parent
68829a82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
public/app/plugins/datasource/mysql/datasource.ts
+8
-0
public/app/plugins/datasource/mysql/specs/datasource_specs.ts
+20
-0
No files found.
public/app/plugins/datasource/mysql/datasource.ts
View file @
002b4d34
...
...
@@ -20,7 +20,15 @@ export class MysqlDatasource {
return
'
\'
'
+
value
+
'
\'
'
;
}
if
(
typeof
value
===
'number'
)
{
return
value
;
}
var
quotedValues
=
_
.
map
(
value
,
function
(
val
)
{
if
(
typeof
value
===
'number'
)
{
return
value
;
}
return
'
\'
'
+
val
+
'
\'
'
;
});
return
quotedValues
.
join
(
','
);
...
...
public/app/plugins/datasource/mysql/specs/datasource_specs.ts
View file @
002b4d34
...
...
@@ -193,4 +193,24 @@ describe('MySQLDatasource', function() {
expect
(
results
[
0
].
value
).
to
.
be
(
'same'
);
});
});
describe
(
'When interpolating variables'
,
()
=>
{
describe
(
'and value is a string'
,
()
=>
{
it
(
'should return a quoted value'
,
()
=>
{
expect
(
ctx
.
ds
.
interpolateVariable
(
'abc'
)).
to
.
eql
(
'
\'
abc
\'
'
);
});
});
describe
(
'and value is a number'
,
()
=>
{
it
(
'should return an unquoted value'
,
()
=>
{
expect
(
ctx
.
ds
.
interpolateVariable
(
1000
)).
to
.
eql
(
1000
);
});
});
describe
(
'and value is an array of strings'
,
()
=>
{
it
(
'should return comma separated quoted values'
,
()
=>
{
expect
(
ctx
.
ds
.
interpolateVariable
([
'a'
,
'b'
,
'c'
])).
to
.
eql
(
'
\'
a
\'
,
\'
b
\'
,
\'
c
\'
'
);
});
});
});
});
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