mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
This commit is contained in:
parent
10f66fa78f
commit
c7e3ed096f
@ -55,7 +55,7 @@ func (col *Column) StringNoPk(d Dialect) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if col.Default != "" {
|
if col.Default != "" {
|
||||||
sql += "DEFAULT " + col.Default + " "
|
sql += "DEFAULT " + d.Default(col) + " "
|
||||||
}
|
}
|
||||||
|
|
||||||
return sql
|
return sql
|
||||||
|
@ -17,10 +17,11 @@ type Dialect interface {
|
|||||||
SqlType(col *Column) string
|
SqlType(col *Column) string
|
||||||
SupportEngine() bool
|
SupportEngine() bool
|
||||||
LikeStr() string
|
LikeStr() string
|
||||||
|
Default(col *Column) string
|
||||||
|
|
||||||
CreateIndexSql(tableName string, index *Index) string
|
CreateIndexSql(tableName string, index *Index) string
|
||||||
CreateTableSql(table *Table) string
|
CreateTableSql(table *Table) string
|
||||||
AddColumnSql(tableName string, Col *Column) string
|
AddColumnSql(tableName string, col *Column) string
|
||||||
CopyTableData(sourceTable string, targetTable string, sourceCols []string, targetCols []string) string
|
CopyTableData(sourceTable string, targetTable string, sourceCols []string, targetCols []string) string
|
||||||
DropTable(tableName string) string
|
DropTable(tableName string) string
|
||||||
DropIndexSql(tableName string, index *Index) string
|
DropIndexSql(tableName string, index *Index) string
|
||||||
@ -71,6 +72,10 @@ func (b *BaseDialect) EqStr() string {
|
|||||||
return "="
|
return "="
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *BaseDialect) Default(col *Column) string {
|
||||||
|
return col.Default
|
||||||
|
}
|
||||||
|
|
||||||
func (b *BaseDialect) CreateTableSql(table *Table) string {
|
func (b *BaseDialect) CreateTableSql(table *Table) string {
|
||||||
var sql string
|
var sql string
|
||||||
sql = "CREATE TABLE IF NOT EXISTS "
|
sql = "CREATE TABLE IF NOT EXISTS "
|
||||||
|
@ -36,6 +36,17 @@ func (db *Postgres) AutoIncrStr() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *Postgres) Default(col *Column) string {
|
||||||
|
if col.Type == DB_Bool {
|
||||||
|
if col.Default == "0" {
|
||||||
|
return "FALSE"
|
||||||
|
} else {
|
||||||
|
return "TRUE"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return col.Default
|
||||||
|
}
|
||||||
|
|
||||||
func (db *Postgres) SqlType(c *Column) string {
|
func (db *Postgres) SqlType(c *Column) string {
|
||||||
var res string
|
var res string
|
||||||
switch t := c.Type; t {
|
switch t := c.Type; t {
|
||||||
|
Loading…
Reference in New Issue
Block a user