HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

postgres uuid bug fixed

This commit is contained in:
Lunny Xiao 2014-06-26 14:35:40 +08:00
parent d614a7e3f2
commit 207db2f97d
1 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
postgres_dialect.go
View File

@ -44,8 +44,10 @@ func (db *postgres) SqlType(c *core.Column) string {
return "timestamp with time zone" return "timestamp with time zone"
case core.Float: case core.Float:
res = core.Real res = core.Real
case core.TinyText, core.MediumText, core.LongText, core.Uuid: case core.TinyText, core.MediumText, core.LongText:
res = core.Text res = core.Text
case core.Uuid:
res = core.Uuid
case core.Blob, core.TinyBlob, core.MediumBlob, core.LongBlob: case core.Blob, core.TinyBlob, core.MediumBlob, core.LongBlob:
return core.Bytea return core.Bytea
case core.Double: case core.Double:
@ -170,8 +172,8 @@ WHERE c.relkind = 'r'::char AND c.relname = $1 AND f.attnum > 0 ORDER BY f.attnu
var colName, isNullable, dataType string var colName, isNullable, dataType string
var maxLenStr, colDefault, numPrecision, numRadix *string var maxLenStr, colDefault, numPrecision, numRadix *string
var isPK ,isUnique bool var isPK, isUnique bool
err = rows.Scan(&colName, &colDefault, &isNullable, &dataType, &maxLenStr, &numPrecision, &numRadix,&isPK,&isUnique) err = rows.Scan(&colName, &colDefault, &isNullable, &dataType, &maxLenStr, &numPrecision, &numRadix, &isPK, &isUnique)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -220,7 +222,7 @@ WHERE c.relkind = 'r'::char AND c.relname = $1 AND f.attnum > 0 ORDER BY f.attnu
if col.SQLType.IsText() { if col.SQLType.IsText() {
if col.Default != "" { if col.Default != "" {
col.Default = "'"+col.Default+"'" col.Default = "'" + col.Default + "'"
} else { } else {
if col.DefaultIsEmpty { if col.DefaultIsEmpty {
col.Default = "''" col.Default = "''"