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
e5c64732
Commit
e5c64732
authored
Sep 23, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(sql): Add boolstr to all dialects
closes #6116
parent
521b5cf0
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
3 deletions
+20
-3
pkg/services/sqlstore/alert.go
+1
-1
pkg/services/sqlstore/alert_notification.go
+2
-1
pkg/services/sqlstore/annotation.go
+1
-1
pkg/services/sqlstore/migrator/dialect.go
+1
-0
pkg/services/sqlstore/migrator/mysql_dialect.go
+4
-0
pkg/services/sqlstore/migrator/postgres_dialect.go
+4
-0
pkg/services/sqlstore/migrator/sqlite_dialect.go
+7
-0
No files found.
pkg/services/sqlstore/alert.go
View file @
e5c64732
...
@@ -92,7 +92,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
...
@@ -92,7 +92,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
params
=
append
(
params
,
query
.
Limit
)
params
=
append
(
params
,
query
.
Limit
)
}
}
sql
.
WriteString
(
"ORDER BY name ASC"
)
sql
.
WriteString
(
"
ORDER BY name ASC"
)
alerts
:=
make
([]
*
m
.
Alert
,
0
)
alerts
:=
make
([]
*
m
.
Alert
,
0
)
if
err
:=
x
.
Sql
(
sql
.
String
(),
params
...
)
.
Find
(
&
alerts
);
err
!=
nil
{
if
err
:=
x
.
Sql
(
sql
.
String
(),
params
...
)
.
Find
(
&
alerts
);
err
!=
nil
{
...
...
pkg/services/sqlstore/alert_notification.go
View file @
e5c64732
...
@@ -66,7 +66,8 @@ func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) erro
...
@@ -66,7 +66,8 @@ func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) erro
sql
.
WriteString
(
` WHERE alert_notification.org_id = ?`
)
sql
.
WriteString
(
` WHERE alert_notification.org_id = ?`
)
params
=
append
(
params
,
query
.
OrgId
)
params
=
append
(
params
,
query
.
OrgId
)
sql
.
WriteString
(
` AND ((alert_notification.is_default = 1)`
)
sql
.
WriteString
(
` AND ((alert_notification.is_default = ?)`
)
params
=
append
(
params
,
dialect
.
BooleanStr
(
true
))
if
len
(
query
.
Ids
)
>
0
{
if
len
(
query
.
Ids
)
>
0
{
sql
.
WriteString
(
` OR alert_notification.id IN (?`
+
strings
.
Repeat
(
",?"
,
len
(
query
.
Ids
)
-
1
)
+
")"
)
sql
.
WriteString
(
` OR alert_notification.id IN (?`
+
strings
.
Repeat
(
",?"
,
len
(
query
.
Ids
)
-
1
)
+
")"
)
for
_
,
v
:=
range
query
.
Ids
{
for
_
,
v
:=
range
query
.
Ids
{
...
...
pkg/services/sqlstore/annotation.go
View file @
e5c64732
...
@@ -75,7 +75,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
...
@@ -75,7 +75,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
query
.
Limit
=
10
query
.
Limit
=
10
}
}
sql
.
WriteString
(
fmt
.
Sprintf
(
"ORDER BY epoch DESC LIMIT %v"
,
query
.
Limit
))
sql
.
WriteString
(
fmt
.
Sprintf
(
"
ORDER BY epoch DESC LIMIT %v"
,
query
.
Limit
))
items
:=
make
([]
*
annotations
.
Item
,
0
)
items
:=
make
([]
*
annotations
.
Item
,
0
)
if
err
:=
x
.
Sql
(
sql
.
String
(),
params
...
)
.
Find
(
&
items
);
err
!=
nil
{
if
err
:=
x
.
Sql
(
sql
.
String
(),
params
...
)
.
Find
(
&
items
);
err
!=
nil
{
...
...
pkg/services/sqlstore/migrator/dialect.go
View file @
e5c64732
...
@@ -18,6 +18,7 @@ type Dialect interface {
...
@@ -18,6 +18,7 @@ type Dialect interface {
SupportEngine
()
bool
SupportEngine
()
bool
LikeStr
()
string
LikeStr
()
string
Default
(
col
*
Column
)
string
Default
(
col
*
Column
)
string
BooleanStr
(
bool
)
string
CreateIndexSql
(
tableName
string
,
index
*
Index
)
string
CreateIndexSql
(
tableName
string
,
index
*
Index
)
string
CreateTableSql
(
table
*
Table
)
string
CreateTableSql
(
table
*
Table
)
string
...
...
pkg/services/sqlstore/migrator/mysql_dialect.go
View file @
e5c64732
...
@@ -29,6 +29,10 @@ func (db *Mysql) AutoIncrStr() string {
...
@@ -29,6 +29,10 @@ func (db *Mysql) AutoIncrStr() string {
return
"AUTO_INCREMENT"
return
"AUTO_INCREMENT"
}
}
func
(
db
*
Mysql
)
BooleanStr
(
value
bool
)
string
{
return
strconv
.
FormatBool
(
value
)
}
func
(
db
*
Mysql
)
SqlType
(
c
*
Column
)
string
{
func
(
db
*
Mysql
)
SqlType
(
c
*
Column
)
string
{
var
res
string
var
res
string
switch
c
.
Type
{
switch
c
.
Type
{
...
...
pkg/services/sqlstore/migrator/postgres_dialect.go
View file @
e5c64732
...
@@ -36,6 +36,10 @@ func (db *Postgres) AutoIncrStr() string {
...
@@ -36,6 +36,10 @@ func (db *Postgres) AutoIncrStr() string {
return
""
return
""
}
}
func
(
db
*
Postgres
)
BooleanStr
(
value
bool
)
string
{
return
strconv
.
FormatBool
(
value
)
}
func
(
b
*
Postgres
)
Default
(
col
*
Column
)
string
{
func
(
b
*
Postgres
)
Default
(
col
*
Column
)
string
{
if
col
.
Type
==
DB_Bool
{
if
col
.
Type
==
DB_Bool
{
if
col
.
Default
==
"0"
{
if
col
.
Default
==
"0"
{
...
...
pkg/services/sqlstore/migrator/sqlite_dialect.go
View file @
e5c64732
...
@@ -29,6 +29,13 @@ func (db *Sqlite3) AutoIncrStr() string {
...
@@ -29,6 +29,13 @@ func (db *Sqlite3) AutoIncrStr() string {
return
"AUTOINCREMENT"
return
"AUTOINCREMENT"
}
}
func
(
db
*
Sqlite3
)
BooleanStr
(
value
bool
)
string
{
if
value
{
return
"1"
}
return
"0"
}
func
(
db
*
Sqlite3
)
SqlType
(
c
*
Column
)
string
{
func
(
db
*
Sqlite3
)
SqlType
(
c
*
Column
)
string
{
switch
c
.
Type
{
switch
c
.
Type
{
case
DB_Date
,
DB_DateTime
,
DB_TimeStamp
,
DB_Time
:
case
DB_Date
,
DB_DateTime
,
DB_TimeStamp
,
DB_Time
:
...
...
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