fix MSSQL bug on org (#3405)
This commit is contained in:
parent
a0c397df08
commit
97fe773491
28 changed files with 1011 additions and 164 deletions
10
vendor/github.com/go-xorm/core/cache.go
generated
vendored
10
vendor/github.com/go-xorm/core/cache.go
generated
vendored
|
@ -1,11 +1,12 @@
|
|||
package core
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
"bytes"
|
||||
"encoding/gob"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -55,11 +56,10 @@ func encodeIds(ids []PK) (string, error) {
|
|||
return buf.String(), err
|
||||
}
|
||||
|
||||
|
||||
func decodeIds(s string) ([]PK, error) {
|
||||
pks := make([]PK, 0)
|
||||
|
||||
dec := gob.NewDecoder(bytes.NewBufferString(s))
|
||||
dec := gob.NewDecoder(strings.NewReader(s))
|
||||
err := dec.Decode(&pks)
|
||||
|
||||
return pks, err
|
||||
|
|
3
vendor/github.com/go-xorm/core/circle.yml
generated
vendored
3
vendor/github.com/go-xorm/core/circle.yml
generated
vendored
|
@ -11,4 +11,5 @@ database:
|
|||
test:
|
||||
override:
|
||||
# './...' is a relative pattern which means all subdirectories
|
||||
- go test -v -race
|
||||
- go test -v -race
|
||||
- go test -v -race --dbtype=sqlite3
|
||||
|
|
16
vendor/github.com/go-xorm/core/column.go
generated
vendored
16
vendor/github.com/go-xorm/core/column.go
generated
vendored
|
@ -79,6 +79,10 @@ func (col *Column) String(d Dialect) string {
|
|||
}
|
||||
}
|
||||
|
||||
if col.Default != "" {
|
||||
sql += "DEFAULT " + col.Default + " "
|
||||
}
|
||||
|
||||
if d.ShowCreateNull() {
|
||||
if col.Nullable {
|
||||
sql += "NULL "
|
||||
|
@ -87,10 +91,6 @@ func (col *Column) String(d Dialect) string {
|
|||
}
|
||||
}
|
||||
|
||||
if col.Default != "" {
|
||||
sql += "DEFAULT " + col.Default + " "
|
||||
}
|
||||
|
||||
return sql
|
||||
}
|
||||
|
||||
|
@ -99,6 +99,10 @@ func (col *Column) StringNoPk(d Dialect) string {
|
|||
|
||||
sql += d.SqlType(col) + " "
|
||||
|
||||
if col.Default != "" {
|
||||
sql += "DEFAULT " + col.Default + " "
|
||||
}
|
||||
|
||||
if d.ShowCreateNull() {
|
||||
if col.Nullable {
|
||||
sql += "NULL "
|
||||
|
@ -107,10 +111,6 @@ func (col *Column) StringNoPk(d Dialect) string {
|
|||
}
|
||||
}
|
||||
|
||||
if col.Default != "" {
|
||||
sql += "DEFAULT " + col.Default + " "
|
||||
}
|
||||
|
||||
return sql
|
||||
}
|
||||
|
||||
|
|
3
vendor/github.com/go-xorm/core/scan.go
generated
vendored
3
vendor/github.com/go-xorm/core/scan.go
generated
vendored
|
@ -44,6 +44,9 @@ func convertTime(dest *NullTime, src interface{}) error {
|
|||
}
|
||||
*dest = NullTime(t)
|
||||
return nil
|
||||
case time.Time:
|
||||
*dest = NullTime(s)
|
||||
return nil
|
||||
case nil:
|
||||
default:
|
||||
return fmt.Errorf("unsupported driver -> Scan pair: %T -> %T", src, dest)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue