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

Fix test

This commit is contained in:
Lunny Xiao 2021-07-23 00:55:31 +08:00
parent b11dd70c3c
commit ffaf88ae1a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dialects/dialect.go
View File

@ -333,10 +333,14 @@ func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey bool)
} }
} }
<<<<<<< HEAD
if !col.DefaultIsEmpty { if !col.DefaultIsEmpty {
<<<<<<< HEAD <<<<<<< HEAD
if _, err := bd.WriteString(" DEFAULT "); err != nil { if _, err := bd.WriteString(" DEFAULT "); err != nil {
======= =======
=======
if col.Default != "" {
>>>>>>> 98251fc (Fix test)
if _, err := bd.WriteString("DEFAULT "); err != nil { if _, err := bd.WriteString("DEFAULT "); err != nil {
>>>>>>> ab9b694 (Fix test) >>>>>>> ab9b694 (Fix test)
return "", err return "", err