aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/go-xorm/core
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-06-07 01:19:32 -0400
committerUnknwon <u@gogs.io>2017-06-07 01:19:32 -0400
commitb40dc550ed15efd2c6faa1ea619888a400499a84 (patch)
treea5a064eed5e4e913fdbba23f8ab278844655863d /vendor/github.com/go-xorm/core
parentc210984b40a23f20bebe1f905ff6b1297c3ad901 (diff)
vendor: update github.com/go-xorm/* (#4419)
Diffstat (limited to 'vendor/github.com/go-xorm/core')
-rw-r--r--vendor/github.com/go-xorm/core/column.go2
-rw-r--r--vendor/github.com/go-xorm/core/dialect.go4
-rw-r--r--vendor/github.com/go-xorm/core/table.go1
3 files changed, 5 insertions, 2 deletions
diff --git a/vendor/github.com/go-xorm/core/column.go b/vendor/github.com/go-xorm/core/column.go
index c59d0102..d4d83145 100644
--- a/vendor/github.com/go-xorm/core/column.go
+++ b/vendor/github.com/go-xorm/core/column.go
@@ -37,6 +37,7 @@ type Column struct {
SetOptions map[string]int
DisableTimeZone bool
TimeZone *time.Location // column specified time zone
+ Comment string
}
func NewColumn(name, fieldName string, sqlType SQLType, len1, len2 int, nullable bool) *Column {
@@ -60,6 +61,7 @@ func NewColumn(name, fieldName string, sqlType SQLType, len1, len2 int, nullable
IsVersion: false,
DefaultIsEmpty: false,
EnumOptions: make(map[string]int),
+ Comment: "",
}
}
diff --git a/vendor/github.com/go-xorm/core/dialect.go b/vendor/github.com/go-xorm/core/dialect.go
index 70420ee5..74478301 100644
--- a/vendor/github.com/go-xorm/core/dialect.go
+++ b/vendor/github.com/go-xorm/core/dialect.go
@@ -279,9 +279,9 @@ func (b *Base) ForUpdateSql(query string) string {
func (b *Base) LogSQL(sql string, args []interface{}) {
if b.logger != nil && b.logger.IsShowSQL() {
if len(args) > 0 {
- b.logger.Info("[sql]", sql, args)
+ b.logger.Infof("[SQL] %v %v", sql, args)
} else {
- b.logger.Info("[sql]", sql)
+ b.logger.Infof("[SQL] %v", sql)
}
}
}
diff --git a/vendor/github.com/go-xorm/core/table.go b/vendor/github.com/go-xorm/core/table.go
index e6f6a751..88199bed 100644
--- a/vendor/github.com/go-xorm/core/table.go
+++ b/vendor/github.com/go-xorm/core/table.go
@@ -22,6 +22,7 @@ type Table struct {
Cacher Cacher
StoreEngine string
Charset string
+ Comment string
}
func (table *Table) Columns() []*Column {