aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/go-xorm/core/cache.go8
-rw-r--r--vendor/github.com/go-xorm/core/circle.yml3
-rw-r--r--vendor/github.com/go-xorm/core/column.go19
-rw-r--r--vendor/github.com/go-xorm/core/dialect.go3
-rw-r--r--vendor/github.com/go-xorm/core/rows.go12
-rw-r--r--vendor/github.com/go-xorm/core/scan.go3
-rw-r--r--vendor/github.com/go-xorm/core/type.go41
7 files changed, 57 insertions, 32 deletions
diff --git a/vendor/github.com/go-xorm/core/cache.go b/vendor/github.com/go-xorm/core/cache.go
index bf81bd52..8f9531da 100644
--- a/vendor/github.com/go-xorm/core/cache.go
+++ b/vendor/github.com/go-xorm/core/cache.go
@@ -1,11 +1,12 @@
package core
import (
+ "bytes"
+ "encoding/gob"
"errors"
"fmt"
+ "strings"
"time"
- "bytes"
- "encoding/gob"
)
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
diff --git a/vendor/github.com/go-xorm/core/circle.yml b/vendor/github.com/go-xorm/core/circle.yml
index 006e1230..e6a05be2 100644
--- a/vendor/github.com/go-xorm/core/circle.yml
+++ b/vendor/github.com/go-xorm/core/circle.yml
@@ -11,4 +11,5 @@ database:
test:
override:
# './...' is a relative pattern which means all subdirectories
- - go test -v -race \ No newline at end of file
+ - go test -v -race
+ - go test -v -race --dbtype=sqlite3
diff --git a/vendor/github.com/go-xorm/core/column.go b/vendor/github.com/go-xorm/core/column.go
index d4d83145..65370bb5 100644
--- a/vendor/github.com/go-xorm/core/column.go
+++ b/vendor/github.com/go-xorm/core/column.go
@@ -13,12 +13,13 @@ const (
ONLYFROMDB
)
-// database column
+// Column defines database column
type Column struct {
Name string
TableName string
FieldName string
SQLType SQLType
+ IsJSON bool
Length int
Length2 int
Nullable bool
@@ -78,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 "
@@ -86,10 +91,6 @@ func (col *Column) String(d Dialect) string {
}
}
- if col.Default != "" {
- sql += "DEFAULT " + col.Default + " "
- }
-
return sql
}
@@ -98,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 "
@@ -106,10 +111,6 @@ func (col *Column) StringNoPk(d Dialect) string {
}
}
- if col.Default != "" {
- sql += "DEFAULT " + col.Default + " "
- }
-
return sql
}
diff --git a/vendor/github.com/go-xorm/core/dialect.go b/vendor/github.com/go-xorm/core/dialect.go
index 74478301..6f2e81d0 100644
--- a/vendor/github.com/go-xorm/core/dialect.go
+++ b/vendor/github.com/go-xorm/core/dialect.go
@@ -244,6 +244,9 @@ func (b *Base) CreateTableSql(table *Table, tableName, storeEngine, charset stri
sql += col.StringNoPk(b.dialect)
}
sql = strings.TrimSpace(sql)
+ if b.DriverName() == MYSQL && len(col.Comment) > 0 {
+ sql += " COMMENT '" + col.Comment + "'"
+ }
sql += ", "
}
diff --git a/vendor/github.com/go-xorm/core/rows.go b/vendor/github.com/go-xorm/core/rows.go
index c4dec23e..4a4acaa4 100644
--- a/vendor/github.com/go-xorm/core/rows.go
+++ b/vendor/github.com/go-xorm/core/rows.go
@@ -247,6 +247,18 @@ type Row struct {
err error // deferred error for easy chaining
}
+// ErrorRow return an error row
+func ErrorRow(err error) *Row {
+ return &Row{
+ err: err,
+ }
+}
+
+// NewRow from rows
+func NewRow(rows *Rows, err error) *Row {
+ return &Row{rows, err}
+}
+
func (row *Row) Columns() ([]string, error) {
if row.err != nil {
return nil, row.err
diff --git a/vendor/github.com/go-xorm/core/scan.go b/vendor/github.com/go-xorm/core/scan.go
index 7da338d8..b7c159b2 100644
--- a/vendor/github.com/go-xorm/core/scan.go
+++ b/vendor/github.com/go-xorm/core/scan.go
@@ -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)
diff --git a/vendor/github.com/go-xorm/core/type.go b/vendor/github.com/go-xorm/core/type.go
index 86048225..9171ce2d 100644
--- a/vendor/github.com/go-xorm/core/type.go
+++ b/vendor/github.com/go-xorm/core/type.go
@@ -69,15 +69,17 @@ var (
Enum = "ENUM"
Set = "SET"
- Char = "CHAR"
- Varchar = "VARCHAR"
- NVarchar = "NVARCHAR"
- TinyText = "TINYTEXT"
- Text = "TEXT"
- Clob = "CLOB"
- MediumText = "MEDIUMTEXT"
- LongText = "LONGTEXT"
- Uuid = "UUID"
+ Char = "CHAR"
+ Varchar = "VARCHAR"
+ NVarchar = "NVARCHAR"
+ TinyText = "TINYTEXT"
+ Text = "TEXT"
+ Clob = "CLOB"
+ MediumText = "MEDIUMTEXT"
+ LongText = "LONGTEXT"
+ Uuid = "UUID"
+ UniqueIdentifier = "UNIQUEIDENTIFIER"
+ SysName = "SYSNAME"
Date = "DATE"
DateTime = "DATETIME"
@@ -100,7 +102,8 @@ var (
LongBlob = "LONGBLOB"
Bytea = "BYTEA"
- Bool = "BOOL"
+ Bool = "BOOL"
+ Boolean = "BOOLEAN"
Serial = "SERIAL"
BigSerial = "BIGSERIAL"
@@ -131,6 +134,7 @@ var (
LongText: TEXT_TYPE,
Uuid: TEXT_TYPE,
Clob: TEXT_TYPE,
+ SysName: TEXT_TYPE,
Date: TIME_TYPE,
DateTime: TIME_TYPE,
@@ -147,11 +151,12 @@ var (
Binary: BLOB_TYPE,
VarBinary: BLOB_TYPE,
- TinyBlob: BLOB_TYPE,
- Blob: BLOB_TYPE,
- MediumBlob: BLOB_TYPE,
- LongBlob: BLOB_TYPE,
- Bytea: BLOB_TYPE,
+ TinyBlob: BLOB_TYPE,
+ Blob: BLOB_TYPE,
+ MediumBlob: BLOB_TYPE,
+ LongBlob: BLOB_TYPE,
+ Bytea: BLOB_TYPE,
+ UniqueIdentifier: BLOB_TYPE,
Bool: NUMERIC_TYPE,
@@ -163,7 +168,7 @@ var (
uintTypes = sort.StringSlice{"*uint", "*uint16", "*uint32", "*uint8"}
)
-// !nashtsai! treat following var as interal const values, these are used for reflect.TypeOf comparision
+// !nashtsai! treat following var as interal const values, these are used for reflect.TypeOf comparison
var (
c_EMPTY_STRING string
c_BOOL_DEFAULT bool
@@ -288,9 +293,9 @@ func SQLType2Type(st SQLType) reflect.Type {
return reflect.TypeOf(float32(1))
case Double:
return reflect.TypeOf(float64(1))
- case Char, Varchar, NVarchar, TinyText, Text, MediumText, LongText, Enum, Set, Uuid, Clob:
+ case Char, Varchar, NVarchar, TinyText, Text, MediumText, LongText, Enum, Set, Uuid, Clob, SysName:
return reflect.TypeOf("")
- case TinyBlob, Blob, LongBlob, Bytea, Binary, MediumBlob, VarBinary:
+ case TinyBlob, Blob, LongBlob, Bytea, Binary, MediumBlob, VarBinary, UniqueIdentifier:
return reflect.TypeOf([]byte{})
case Bool:
return reflect.TypeOf(true)
Powered by cgit, Themed by Ted Yin.