Commit e5c64732 by bergquist

fix(sql): Add boolstr to all dialects

closes #6116
parent 521b5cf0
...@@ -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 {
......
...@@ -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 {
......
...@@ -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 {
......
...@@ -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
......
...@@ -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 {
......
...@@ -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" {
......
...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment