Update xorm and dependencies vendor for feature to dump to other database (#565)

* update xorm and dependencies vendor for feature to dump to other database

* fix golint

cmd/dump.go

@@ -41,6 +41,10 @@ It can be used for backup and capture Gitea server image to send to maintainer`,
 			Value: os.TempDir(),
 			Usage: "Temporary dir path",
 		},
+		cli.StringFlag{
+			Name:  "database, d",
+			Usage: "Specify the database SQL syntax",
+		},
 	},
 }
 
@@ -71,8 +75,14 @@ func runDump(ctx *cli.Context) error {
 		log.Fatalf("Fail to dump local repositories: %v", err)
 	}
 
-	log.Printf("Dumping database...")
-	if err := models.DumpDatabase(dbDump); err != nil {
+	targetDBType := ctx.String("database")
+	if len(targetDBType) > 0 && targetDBType != models.DbCfg.Type {
+		log.Printf("Dumping database %s => %s...", models.DbCfg.Type, targetDBType)
+	} else {
+		log.Printf("Dumping database...")
+	}
+
+	if err := models.DumpDatabase(dbDump, targetDBType); err != nil {
 		log.Fatalf("Fail to dump database: %v", err)
 	}
 

models/models.go

@@ -319,7 +319,14 @@ func Ping() error {
 	return x.Ping()
 }
 
-// DumpDatabase dumps all data from database to file system.
-func DumpDatabase(filePath string) error {
-	return x.DumpAllToFile(filePath)
+// DumpDatabase dumps all data from database according the special database SQL syntax to file system.
+func DumpDatabase(filePath string, dbType string) error {
+	var tbs []*core.Table
+	for _, t := range tables {
+		tbs = append(tbs, x.TableInfo(t).Table)
+	}
+	if len(dbType) > 0 {
+		return x.DumpTablesToFile(tbs, filePath, core.DbType(dbType))
+	}
+	return x.DumpTablesToFile(tbs, filePath)
 }

vendor/github.com/go-xorm/builder/README.md

@@ -1,6 +1,8 @@
 # SQL builder
 
-Package builder is a simple and powerful sql builder for Go.
+[![CircleCI](https://circleci.com/gh/go-xorm/builder/tree/master.svg?style=svg)](https://circleci.com/gh/go-xorm/builder/tree/master)
+
+Package builder is a lightweight and fast SQL builder for Go and XORM.
 
 Make sure you have installed Go 1.1+ and then:
 

vendor/github.com/go-xorm/builder/builder.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 type optype byte
@@ -16,6 +20,7 @@ type join struct {
 	joinCond  Cond
 }
 
+// Builder describes a SQL statement
 type Builder struct {
 	optype
 	tableName string
@@ -26,41 +31,49 @@ type Builder struct {
 	updates   []Eq
 }
 
+// Select creates a select Builder
 func Select(cols ...string) *Builder {
 	builder := &Builder{cond: NewCond()}
 	return builder.Select(cols...)
 }
 
+// Insert creates an insert Builder
 func Insert(eq Eq) *Builder {
 	builder := &Builder{cond: NewCond()}
 	return builder.Insert(eq)
 }
 
+// Update creates an update Builder
 func Update(updates ...Eq) *Builder {
 	builder := &Builder{cond: NewCond()}
 	return builder.Update(updates...)
 }
 
+// Delete creates a delete Builder
 func Delete(conds ...Cond) *Builder {
 	builder := &Builder{cond: NewCond()}
 	return builder.Delete(conds...)
 }
 
+// Where sets where SQL
 func (b *Builder) Where(cond Cond) *Builder {
 	b.cond = b.cond.And(cond)
 	return b
 }
 
+// From sets the table name
 func (b *Builder) From(tableName string) *Builder {
 	b.tableName = tableName
 	return b
 }
 
+// Into sets insert table name
 func (b *Builder) Into(tableName string) *Builder {
 	b.tableName = tableName
 	return b
 }
 
+// Join sets join table and contions
 func (b *Builder) Join(joinType, joinTable string, joinCond interface{}) *Builder {
 	switch joinCond.(type) {
 	case Cond:
@@ -72,60 +85,72 @@ func (b *Builder) Join(joinType, joinTable string, joinCond interface{}) *Builde
 	return b
 }
 
+// InnerJoin sets inner join
 func (b *Builder) InnerJoin(joinTable string, joinCond interface{}) *Builder {
 	return b.Join("INNER", joinTable, joinCond)
 }
 
+// LeftJoin sets left join SQL
 func (b *Builder) LeftJoin(joinTable string, joinCond interface{}) *Builder {
 	return b.Join("LEFT", joinTable, joinCond)
 }
 
+// RightJoin sets right join SQL
 func (b *Builder) RightJoin(joinTable string, joinCond interface{}) *Builder {
 	return b.Join("RIGHT", joinTable, joinCond)
 }
 
+// CrossJoin sets cross join SQL
 func (b *Builder) CrossJoin(joinTable string, joinCond interface{}) *Builder {
 	return b.Join("CROSS", joinTable, joinCond)
 }
 
+// FullJoin sets full join SQL
 func (b *Builder) FullJoin(joinTable string, joinCond interface{}) *Builder {
 	return b.Join("FULL", joinTable, joinCond)
 }
 
+// Select sets select SQL
 func (b *Builder) Select(cols ...string) *Builder {
 	b.selects = cols
 	b.optype = selectType
 	return b
 }
 
+// And sets AND condition
 func (b *Builder) And(cond Cond) *Builder {
 	b.cond = And(b.cond, cond)
 	return b
 }
 
+// Or sets OR condition
 func (b *Builder) Or(cond Cond) *Builder {
 	b.cond = Or(b.cond, cond)
 	return b
 }
 
+// Insert sets insert SQL
 func (b *Builder) Insert(eq Eq) *Builder {
 	b.inserts = eq
 	b.optype = insertType
 	return b
 }
 
+// Update sets update SQL
 func (b *Builder) Update(updates ...Eq) *Builder {
 	b.updates = updates
 	b.optype = updateType
 	return b
 }
 
+// Delete sets delete SQL
 func (b *Builder) Delete(conds ...Cond) *Builder {
 	b.cond = b.cond.And(conds...)
 	b.optype = deleteType
 	return b
 }
 
+// WriteTo implements Writer interface
 func (b *Builder) WriteTo(w Writer) error {
 	switch b.optype {
 	case condType:

vendor/github.com/go-xorm/builder/builder_delete.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (

vendor/github.com/go-xorm/builder/builder_insert.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (

vendor/github.com/go-xorm/builder/builder_select.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (

vendor/github.com/go-xorm/builder/builder_update.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (

vendor/github.com/go-xorm/builder/circle.yml

@@ -0,0 +1,12 @@
+dependencies:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - go get -t -d -v ./...
+    - go build -v
+    - go get -u github.com/golang/lint/golint
+
+test:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - golint ./...
+    - go test -v -race

vendor/github.com/go-xorm/builder/cond.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (
@@ -5,31 +9,39 @@ import (
 	"io"
 )
 
+// Writer defines the interface
 type Writer interface {
 	io.Writer
 	Append(...interface{})
 }
 
-type stringWriter struct {
+var _ Writer = NewWriter()
+
+// BytesWriter implments Writer and save SQL in bytes.Buffer
+type BytesWriter struct {
 	writer *bytes.Buffer
 	buffer []byte
 	args   []interface{}
 }
 
-func NewWriter() *stringWriter {
-	w := &stringWriter{}
+// NewWriter creates a new string writer
+func NewWriter() *BytesWriter {
+	w := &BytesWriter{}
 	w.writer = bytes.NewBuffer(w.buffer)
 	return w
 }
 
-func (s *stringWriter) Write(buf []byte) (int, error) {
+// Write writes data to Writer
+func (s *BytesWriter) Write(buf []byte) (int, error) {
 	return s.writer.Write(buf)
 }
 
-func (s *stringWriter) Append(args ...interface{}) {
+// Append appends args to Writer
+func (s *BytesWriter) Append(args ...interface{}) {
 	s.args = append(s.args, args...)
 }
 
+// Cond defines an interface
 type Cond interface {
 	WriteTo(Writer) error
 	And(...Cond) Cond
@@ -41,6 +53,7 @@ type condEmpty struct{}
 
 var _ Cond = condEmpty{}
 
+// NewCond creates an empty condition
 func NewCond() Cond {
 	return condEmpty{}
 }

vendor/github.com/go-xorm/builder/cond_and.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
@@ -6,6 +10,7 @@ type condAnd []Cond
 
 var _ Cond = condAnd{}
 
+// And generates AND conditions
 func And(conds ...Cond) Cond {
 	var result = make(condAnd, 0, len(conds))
 	for _, cond := range conds {

vendor/github.com/go-xorm/builder/cond_between.go

@@ -1,8 +1,12 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
-// Between
+// Between implmentes between condition
 type Between struct {
 	Col     string
 	LessVal interface{}
@@ -11,6 +15,7 @@ type Between struct {
 
 var _ Cond = Between{}
 
+// WriteTo write data to Writer
 func (between Between) WriteTo(w Writer) error {
 	if _, err := fmt.Fprintf(w, "%s BETWEEN ? AND ?", between.Col); err != nil {
 		return err
@@ -19,14 +24,17 @@ func (between Between) WriteTo(w Writer) error {
 	return nil
 }
 
+// And implments And with other conditions
 func (between Between) And(conds ...Cond) Cond {
 	return And(between, And(conds...))
 }
 
+// Or implments Or with other conditions
 func (between Between) Or(conds ...Cond) Cond {
 	return Or(between, Or(conds...))
 }
 
+// IsValid tests if the condition is valid
 func (between Between) IsValid() bool {
 	return len(between.Col) > 0
 }

vendor/github.com/go-xorm/builder/cond_compare.go

@@ -1,8 +1,12 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
-// WriteMap
+// WriteMap writes conditions' SQL to Writer, op could be =, <>, >, <, <=, >= and etc.
 func WriteMap(w Writer, data map[string]interface{}, op string) error {
 	var args = make([]interface{}, 0, len(data))
 	var i = 0
@@ -49,86 +53,102 @@ func WriteMap(w Writer, data map[string]interface{}, op string) error {
 	return nil
 }
 
-// Lt
+// Lt defines < condition
 type Lt map[string]interface{}
 
 var _ Cond = Lt{}
 
+// WriteTo write SQL to Writer
 func (lt Lt) WriteTo(w Writer) error {
 	return WriteMap(w, lt, "<")
 }
 
+// And implements And with other conditions
 func (lt Lt) And(conds ...Cond) Cond {
 	return condAnd{lt, And(conds...)}
 }
 
+// Or implements Or with other conditions
 func (lt Lt) Or(conds ...Cond) Cond {
 	return condOr{lt, Or(conds...)}
 }
 
+// IsValid tests if this Eq is valid
 func (lt Lt) IsValid() bool {
 	return len(lt) > 0
 }
 
-// Lte
+// Lte defines <= condition
 type Lte map[string]interface{}
 
 var _ Cond = Lte{}
 
+// WriteTo write SQL to Writer
 func (lte Lte) WriteTo(w Writer) error {
 	return WriteMap(w, lte, "<=")
 }
 
+// And implements And with other conditions
 func (lte Lte) And(conds ...Cond) Cond {
 	return And(lte, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (lte Lte) Or(conds ...Cond) Cond {
 	return Or(lte, Or(conds...))
 }
 
+// IsValid tests if this Eq is valid
 func (lte Lte) IsValid() bool {
 	return len(lte) > 0
 }
 
-// Gt
+// Gt defines > condition
 type Gt map[string]interface{}
 
 var _ Cond = Gt{}
 
+// WriteTo write SQL to Writer
 func (gt Gt) WriteTo(w Writer) error {
 	return WriteMap(w, gt, ">")
 }
 
+// And implements And with other conditions
 func (gt Gt) And(conds ...Cond) Cond {
 	return And(gt, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (gt Gt) Or(conds ...Cond) Cond {
 	return Or(gt, Or(conds...))
 }
 
+// IsValid tests if this Eq is valid
 func (gt Gt) IsValid() bool {
 	return len(gt) > 0
 }
 
-// Gte
+// Gte defines >= condition
 type Gte map[string]interface{}
 
 var _ Cond = Gte{}
 
+// WriteTo write SQL to Writer
 func (gte Gte) WriteTo(w Writer) error {
 	return WriteMap(w, gte, ">=")
 }
 
+// And implements And with other conditions
 func (gte Gte) And(conds ...Cond) Cond {
 	return And(gte, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (gte Gte) Or(conds ...Cond) Cond {
 	return Or(gte, Or(conds...))
 }
 
+// IsValid tests if this Eq is valid
 func (gte Gte) IsValid() bool {
 	return len(gte) > 0
 }

vendor/github.com/go-xorm/builder/cond_eq.go

@@ -1,11 +1,18 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
+// Incr implements a type used by Eq
 type Incr int
 
+// Decr implements a type used by Eq
 type Decr int
 
+// Eq defines equals conditions
 type Eq map[string]interface{}
 
 var _ Cond = Eq{}
@@ -68,18 +75,22 @@ func (eq Eq) opWriteTo(op string, w Writer) error {
 	return nil
 }
 
+// WriteTo writes SQL to Writer
 func (eq Eq) WriteTo(w Writer) error {
 	return eq.opWriteTo(" AND ", w)
 }
 
+// And implements And with other conditions
 func (eq Eq) And(conds ...Cond) Cond {
 	return And(eq, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (eq Eq) Or(conds ...Cond) Cond {
 	return Or(eq, Or(conds...))
 }
 
+// IsValid tests if this Eq is valid
 func (eq Eq) IsValid() bool {
 	return len(eq) > 0
 }

vendor/github.com/go-xorm/builder/cond_expr.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
@@ -9,6 +13,7 @@ type expr struct {
 
 var _ Cond = expr{}
 
+// Expr generate customerize SQL
 func Expr(sql string, args ...interface{}) Cond {
 	return expr{sql, args}
 }

vendor/github.com/go-xorm/builder/cond_in.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (
@@ -12,6 +16,7 @@ type condIn struct {
 
 var _ Cond = condIn{}
 
+// In generates IN condition
 func In(col string, values ...interface{}) Cond {
 	return condIn{col, values}
 }

vendor/github.com/go-xorm/builder/cond_like.go

@@ -1,11 +1,17 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
+// Like defines like condition
 type Like [2]string
 
 var _ Cond = Like{"", ""}
 
+// WriteTo write SQL to Writer
 func (like Like) WriteTo(w Writer) error {
 	if _, err := fmt.Fprintf(w, "%s LIKE ?", like[0]); err != nil {
 		return err
@@ -14,14 +20,17 @@ func (like Like) WriteTo(w Writer) error {
 	return nil
 }
 
+// And implements And with other conditions
 func (like Like) And(conds ...Cond) Cond {
 	return And(like, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (like Like) Or(conds ...Cond) Cond {
 	return Or(like, Or(conds...))
 }
 
+// IsValid tests if this condition is valid
 func (like Like) IsValid() bool {
 	return len(like[0]) > 0 && len(like[1]) > 0
 }

vendor/github.com/go-xorm/builder/cond_neq.go

@@ -1,11 +1,17 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
+// Neq defines not equal conditions
 type Neq map[string]interface{}
 
 var _ Cond = Neq{}
 
+// WriteTo writes SQL to Writer
 func (neq Neq) WriteTo(w Writer) error {
 	var args = make([]interface{}, 0, len(neq))
 	var i = 0
@@ -56,14 +62,17 @@ func (neq Neq) WriteTo(w Writer) error {
 	return nil
 }
 
+// And implements And with other conditions
 func (neq Neq) And(conds ...Cond) Cond {
 	return And(neq, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (neq Neq) Or(conds ...Cond) Cond {
 	return Or(neq, Or(conds...))
 }
 
+// IsValid tests if this condition is valid
 func (neq Neq) IsValid() bool {
 	return len(neq) > 0
 }

vendor/github.com/go-xorm/builder/cond_not.go

@@ -1,11 +1,17 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
+// Not defines NOT condition
 type Not [1]Cond
 
 var _ Cond = Not{}
 
+// WriteTo writes SQL to Writer
 func (not Not) WriteTo(w Writer) error {
 	if _, err := fmt.Fprint(w, "NOT "); err != nil {
 		return err
@@ -31,14 +37,17 @@ func (not Not) WriteTo(w Writer) error {
 	return nil
 }
 
+// And implements And with other conditions
 func (not Not) And(conds ...Cond) Cond {
 	return And(not, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (not Not) Or(conds ...Cond) Cond {
 	return Or(not, Or(conds...))
 }
 
+// IsValid tests if this condition is valid
 func (not Not) IsValid() bool {
 	return not[0] != nil && not[0].IsValid()
 }

vendor/github.com/go-xorm/builder/cond_notin.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import (
@@ -9,6 +13,7 @@ type condNotIn condIn
 
 var _ Cond = condNotIn{}
 
+// NotIn generate NOT IN condition
 func NotIn(col string, values ...interface{}) Cond {
 	return condNotIn{col, values}
 }

vendor/github.com/go-xorm/builder/cond_null.go

@@ -1,47 +1,59 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
 
-// IsNull
+// IsNull defines IS NULL condition
 type IsNull [1]string
 
 var _ Cond = IsNull{""}
 
+// WriteTo write SQL to Writer
 func (isNull IsNull) WriteTo(w Writer) error {
 	_, err := fmt.Fprintf(w, "%s IS NULL", isNull[0])
 	return err
 }
 
+// And implements And with other conditions
 func (isNull IsNull) And(conds ...Cond) Cond {
 	return And(isNull, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (isNull IsNull) Or(conds ...Cond) Cond {
 	return Or(isNull, Or(conds...))
 }
 
+// IsValid tests if this condition is valid
 func (isNull IsNull) IsValid() bool {
 	return len(isNull[0]) > 0
 }
 
-// NotNull
+// NotNull defines NOT NULL condition
 type NotNull [1]string
 
 var _ Cond = NotNull{""}
 
+// WriteTo write SQL to Writer
 func (notNull NotNull) WriteTo(w Writer) error {
 	_, err := fmt.Fprintf(w, "%s IS NOT NULL", notNull[0])
 	return err
 }
 
+// And implements And with other conditions
 func (notNull NotNull) And(conds ...Cond) Cond {
 	return And(notNull, And(conds...))
 }
 
+// Or implements Or with other conditions
 func (notNull NotNull) Or(conds ...Cond) Cond {
 	return Or(notNull, Or(conds...))
 }
 
+// IsValid tests if this condition is valid
 func (notNull NotNull) IsValid() bool {
 	return len(notNull[0]) > 0
 }

vendor/github.com/go-xorm/builder/cond_or.go

@@ -1,3 +1,7 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "fmt"
@@ -6,6 +10,7 @@ type condOr []Cond
 
 var _ Cond = condOr{}
 
+// Or sets OR conditions
 func Or(conds ...Cond) Cond {
 	var result = make(condOr, 0, len(conds))
 	for _, cond := range conds {
@@ -17,8 +22,9 @@ func Or(conds ...Cond) Cond {
 	return result
 }
 
-func (or condOr) WriteTo(w Writer) error {
-	for i, cond := range or {
+// WriteTo implments Cond
+func (o condOr) WriteTo(w Writer) error {
+	for i, cond := range o {
 		var needQuote bool
 		switch cond.(type) {
 		case condAnd:
@@ -40,7 +46,7 @@ func (or condOr) WriteTo(w Writer) error {
 			fmt.Fprint(w, ")")
 		}
 
-		if i != len(or)-1 {
+		if i != len(o)-1 {
 			fmt.Fprint(w, " OR ")
 		}
 	}

vendor/github.com/go-xorm/builder/error.go

@@ -1,9 +1,16 @@
+// Copyright 2016 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package builder
 
 import "errors"
 
 var (
-	ErrNotSupportType    = errors.New("not supported SQL type")
+	// ErrNotSupportType not supported SQL type error
+	ErrNotSupportType = errors.New("not supported SQL type")
+	// ErrNoNotInConditions no NOT IN params error
 	ErrNoNotInConditions = errors.New("No NOT IN conditions")
-	ErrNoInConditions    = errors.New("No IN conditions")
+	// ErrNoInConditions no IN params error
+	ErrNoInConditions = errors.New("No IN conditions")
 )

vendor/github.com/go-xorm/core/README.md

@@ -1,5 +1,7 @@
 Core is a lightweight wrapper of sql.DB.
 
+[![CircleCI](https://circleci.com/gh/go-xorm/core/tree/master.svg?style=svg)](https://circleci.com/gh/go-xorm/core/tree/master)
+
 # Open
 ```Go
 db, _ := core.Open(db, connstr)

vendor/github.com/go-xorm/core/circle.yml

@@ -0,0 +1,14 @@
+dependencies:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - go get -t -d -v ./...
+    - go build -v
+
+database:
+  override:
+    - mysql -u root -e "CREATE DATABASE core_test DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"
+    
+test:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - go test -v -race

vendor/github.com/go-xorm/core/dialect.go

@@ -287,16 +287,21 @@ func (b *Base) LogSQL(sql string, args []interface{}) {
 }
 
 var (
-	dialects = map[DbType]func() Dialect{}
+	dialects = map[string]func() Dialect{}
 )
 
+// RegisterDialect register database dialect
 func RegisterDialect(dbName DbType, dialectFunc func() Dialect) {
 	if dialectFunc == nil {
 		panic("core: Register dialect is nil")
 	}
-	dialects[dbName] = dialectFunc // !nashtsai! allow override dialect
+	dialects[strings.ToLower(string(dbName))] = dialectFunc // !nashtsai! allow override dialect
 }
 
+// QueryDialect query if registed database dialect
 func QueryDialect(dbName DbType) Dialect {
-	return dialects[dbName]()
+	if d, ok := dialects[strings.ToLower(string(dbName))]; ok {
+		return d()
+	}
+	return nil
 }

vendor/github.com/go-xorm/core/type.go

@@ -54,7 +54,7 @@ func (s *SQLType) IsNumeric() bool {
 }
 
 func (s *SQLType) IsJson() bool {
-	return s.Name == Json
+	return s.Name == Json || s.Name == Jsonb
 }
 
 var (

vendor/github.com/go-xorm/xorm/README.md

@@ -2,9 +2,7 @@
 
 Xorm is a simple and powerful ORM for Go.
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-[![Build Status](https://drone.io/github.com/go-xorm/tests/status.png)](https://drone.io/github.com/go-xorm/tests/latest)
+[![CircleCI](https://circleci.com/gh/go-xorm/xorm/tree/master.svg?style=svg)](https://circleci.com/gh/go-xorm/xorm/tree/master)  [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # Notice
 

vendor/github.com/go-xorm/xorm/README_CN.md

@@ -4,9 +4,7 @@
 
 xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作非常简便。
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-[![Build Status](https://drone.io/github.com/go-xorm/tests/status.png)](https://drone.io/github.com/go-xorm/tests/latest)  [![Go Walker](http://gowalker.org/api/v1/badge)](http://gowalker.org/github.com/go-xorm/xorm)
+[![CircleCI](https://circleci.com/gh/go-xorm/xorm/tree/master.svg?style=svg)](https://circleci.com/gh/go-xorm/xorm/tree/master)  [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # 注意
 

vendor/github.com/go-xorm/xorm/circle.yml

@@ -0,0 +1,25 @@
+dependencies:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - go get -t -d -v ./...
+    - go get -t -d -v github.com/go-xorm/tests
+    - go build -v
+
+database:
+  override:
+    - mysql -u root -e "CREATE DATABASE xorm_test DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"
+    - mysql -u root -e "CREATE DATABASE xorm_test1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"
+    - mysql -u root -e "CREATE DATABASE xorm_test2 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"
+    - mysql -u root -e "CREATE DATABASE xorm_test3 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"
+    - createdb -p 5432 -e -U postgres xorm_test
+    - createdb -p 5432 -e -U postgres xorm_test1
+    - createdb -p 5432 -e -U postgres xorm_test2
+    - createdb -p 5432 -e -U postgres xorm_test3
+
+test:
+  override:
+    # './...' is a relative pattern which means all subdirectories
+    - go test -v -race
+    - cd /home/ubuntu/.go_workspace/src/github.com/go-xorm/tests && ./sqlite3.sh
+    - cd /home/ubuntu/.go_workspace/src/github.com/go-xorm/tests && ./mysql.sh
+    - cd /home/ubuntu/.go_workspace/src/github.com/go-xorm/tests && ./postgres.sh

vendor/github.com/go-xorm/xorm/engine.go

@@ -168,8 +168,10 @@ func (engine *Engine) quote(sql string) string {
 }
 
 // SqlType will be depracated, please use SQLType instead
+//
+// Deprecated: use SQLType instead
 func (engine *Engine) SqlType(c *core.Column) string {
-	return engine.dialect.SqlType(c)
+	return engine.SQLType(c)
 }
 
 // SQLType A simple wrapper to dialect's core.SqlType method
@@ -295,7 +297,10 @@ func (engine *Engine) logSQLExecutionTime(sqlStr string, args []interface{}, exe
 	return executionBlock()
 }
 
-// Sql will be depracated, please use SQL instead
+// Sql provides raw sql input parameter. When you have a complex SQL statement
+// and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
+//
+// Deprecated: use SQL instead.
 func (engine *Engine) Sql(querystring string, args ...interface{}) *Session {
 	return engine.SQL(querystring, args...)
 }
@@ -434,7 +439,7 @@ func (engine *Engine) dumpAll(w io.Writer, tp ...core.DbType) error {
 	} else {
 		dialect = core.QueryDialect(tp[0])
 		if dialect == nil {
-			return errors.New("Unsupported database type.")
+			return errors.New("Unsupported database type")
 		}
 		dialect.Init(nil, engine.dialect.URI(), "", "")
 	}
@@ -530,18 +535,21 @@ func (engine *Engine) dumpAll(w io.Writer, tp ...core.DbType) error {
 // DumpAll dump database all table structs and data to w with specify db type
 func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.DbType) error {
 	var dialect core.Dialect
+	var distDBName string
 	if len(tp) == 0 {
 		dialect = engine.dialect
+		distDBName = string(engine.dialect.DBType())
 	} else {
 		dialect = core.QueryDialect(tp[0])
 		if dialect == nil {
-			return errors.New("Unsupported database type.")
+			return errors.New("Unsupported database type")
 		}
 		dialect.Init(nil, engine.dialect.URI(), "", "")
+		distDBName = string(tp[0])
 	}
 
 	_, err := io.WriteString(w, fmt.Sprintf("/*Generated by xorm v%s %s, from %s to %s*/\n\n",
-		Version, time.Now().In(engine.TZLocation).Format("2006-01-02 15:04:05"), engine.dialect.DBType(), dialect.DBType()))
+		Version, time.Now().In(engine.TZLocation).Format("2006-01-02 15:04:05"), engine.dialect.DBType(), strings.ToUpper(distDBName)))
 	if err != nil {
 		return err
 	}
@@ -1208,12 +1216,26 @@ func (engine *Engine) IsTableExist(beanOrTableName interface{}) (bool, error) {
 }
 
 // IdOf get id from one struct
+//
+// Deprecated: use IDOf instead.
 func (engine *Engine) IdOf(bean interface{}) core.PK {
+	return engine.IDOf(bean)
+}
+
+// IDOf get id from one struct
+func (engine *Engine) IDOf(bean interface{}) core.PK {
 	return engine.IdOfV(reflect.ValueOf(bean))
 }
 
 // IdOfV get id from one value of struct
+//
+// Deprecated: use IDOfV instead.
 func (engine *Engine) IdOfV(rv reflect.Value) core.PK {
+	return engine.IDOfV(rv)
+}
+
+// IDOfV get id from one value of struct
+func (engine *Engine) IDOfV(rv reflect.Value) core.PK {
 	v := reflect.Indirect(rv)
 	table := engine.autoMapType(v)
 	pk := make([]interface{}, len(table.PrimaryKeys))

vendor/github.com/go-xorm/xorm/error.go

@@ -9,11 +9,18 @@ import (
 )
 
 var (
-	ErrParamsType      error = errors.New("Params type error")
-	ErrTableNotFound   error = errors.New("Not found table")
-	ErrUnSupportedType error = errors.New("Unsupported type error")
-	ErrNotExist        error = errors.New("Not exist error")
-	ErrCacheFailed     error = errors.New("Cache failed")
-	ErrNeedDeletedCond error = errors.New("Delete need at least one condition")
-	ErrNotImplemented  error = errors.New("Not implemented.")
+	// ErrParamsType params error
+	ErrParamsType = errors.New("Params type error")
+	// ErrTableNotFound table not found error
+	ErrTableNotFound = errors.New("Not found table")
+	// ErrUnSupportedType unsupported error
+	ErrUnSupportedType = errors.New("Unsupported type error")
+	// ErrNotExist record is not exist error
+	ErrNotExist = errors.New("Not exist error")
+	// ErrCacheFailed cache failed error
+	ErrCacheFailed = errors.New("Cache failed")
+	// ErrNeedDeletedCond delete needs less one condition error
+	ErrNeedDeletedCond = errors.New("Delete need at least one condition")
+	// ErrNotImplemented not implemented
+	ErrNotImplemented = errors.New("Not implemented")
 )

vendor/github.com/go-xorm/xorm/helpers.go

@@ -490,9 +490,8 @@ func genCols(table *core.Table, session *Session, bean interface{}, useCol bool,
 	args := make([]interface{}, 0, len(table.ColumnsSeq()))
 
 	for _, col := range table.Columns() {
-		lColName := strings.ToLower(col.Name)
 		if useCol && !col.IsVersion && !col.IsCreated && !col.IsUpdated {
-			if _, ok := session.Statement.columnMap[lColName]; !ok {
+			if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok {
 				continue
 			}
 		}
@@ -528,18 +527,18 @@ func genCols(table *core.Table, session *Session, bean interface{}, useCol bool,
 		}
 
 		if session.Statement.ColumnStr != "" {
-			if _, ok := session.Statement.columnMap[lColName]; !ok {
+			if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok {
 				continue
 			}
 		}
 		if session.Statement.OmitStr != "" {
-			if _, ok := session.Statement.columnMap[lColName]; ok {
+			if _, ok := getFlagForColumn(session.Statement.columnMap, col); ok {
 				continue
 			}
 		}
 
 		// !evalphobia! set fieldValue as nil when column is nullable and zero-value
-		if _, ok := session.Statement.nullableMap[lColName]; ok {
+		if _, ok := getFlagForColumn(session.Statement.nullableMap, col); ok {
 			if col.Nullable && isZero(fieldValue.Interface()) {
 				var nilValue *int
 				fieldValue = reflect.ValueOf(nilValue)
@@ -578,3 +577,23 @@ func genCols(table *core.Table, session *Session, bean interface{}, useCol bool,
 func indexName(tableName, idxName string) string {
 	return fmt.Sprintf("IDX_%v_%v", tableName, idxName)
 }
+
+func getFlagForColumn(m map[string]bool, col *core.Column) (val bool, has bool) {
+
+	if len(m) == 0 {
+		return false, false
+	}
+
+	n := len(col.Name)
+
+	for mk := range m {
+		if len(mk) != n {
+			continue
+		}
+		if strings.EqualFold(mk, col.Name) {
+			return m[mk], true
+		}
+	}
+
+	return false, false
+}

vendor/github.com/go-xorm/xorm/logger.go

@@ -20,21 +20,45 @@ const (
 
 var _ core.ILogger = DiscardLogger{}
 
+// DiscardLogger don't log implementation for core.ILogger
 type DiscardLogger struct{}
 
-func (DiscardLogger) Debug(v ...interface{})                 {}
+// Debug empty implementation
+func (DiscardLogger) Debug(v ...interface{}) {}
+
+// Debugf empty implementation
 func (DiscardLogger) Debugf(format string, v ...interface{}) {}
-func (DiscardLogger) Error(v ...interface{})                 {}
+
+// Error empty implementation
+func (DiscardLogger) Error(v ...interface{}) {}
+
+// Errorf empty implementation
 func (DiscardLogger) Errorf(format string, v ...interface{}) {}
-func (DiscardLogger) Info(v ...interface{})                  {}
-func (DiscardLogger) Infof(format string, v ...interface{})  {}
-func (DiscardLogger) Warn(v ...interface{})                  {}
-func (DiscardLogger) Warnf(format string, v ...interface{})  {}
+
+// Info empty implementation
+func (DiscardLogger) Info(v ...interface{}) {}
+
+// Infof empty implementation
+func (DiscardLogger) Infof(format string, v ...interface{}) {}
+
+// Warn empty implementation
+func (DiscardLogger) Warn(v ...interface{}) {}
+
+// Warnf empty implementation
+func (DiscardLogger) Warnf(format string, v ...interface{}) {}
+
+// Level empty implementation
 func (DiscardLogger) Level() core.LogLevel {
 	return core.LOG_UNKNOWN
 }
+
+// SetLevel empty implementation
 func (DiscardLogger) SetLevel(l core.LogLevel) {}
-func (DiscardLogger) ShowSQL(show ...bool)     {}
+
+// ShowSQL empty implementation
+func (DiscardLogger) ShowSQL(show ...bool) {}
+
+// IsShowSQL empty implementation
 func (DiscardLogger) IsShowSQL() bool {
 	return false
 }

vendor/github.com/go-xorm/xorm/lru_cacher.go

@@ -13,6 +13,7 @@ import (
 	"github.com/go-xorm/core"
 )
 
+// LRUCacher implments cache object facilities
 type LRUCacher struct {
 	idList   *list.List
 	sqlList  *list.List
@@ -26,10 +27,12 @@ type LRUCacher struct {
 	GcInterval     time.Duration
 }
 
+// NewLRUCacher creates a cacher
 func NewLRUCacher(store core.CacheStore, maxElementSize int) *LRUCacher {
 	return NewLRUCacher2(store, 3600*time.Second, maxElementSize)
 }
 
+// NewLRUCacher2 creates a cache include different params
 func NewLRUCacher2(store core.CacheStore, expired time.Duration, maxElementSize int) *LRUCacher {
 	cacher := &LRUCacher{store: store, idList: list.New(),
 		sqlList: list.New(), Expired: expired,
@@ -41,10 +44,6 @@ func NewLRUCacher2(store core.CacheStore, expired time.Duration, maxElementSize
 	return cacher
 }
 
-//func NewLRUCacher3(store CacheStore, expired time.Duration, maxSize int) *LRUCacher {
-//    return newLRUCacher(store, expired, maxSize, 0)
-//}
-
 // RunGC run once every m.GcInterval
 func (m *LRUCacher) RunGC() {
 	time.AfterFunc(m.GcInterval, func() {
@@ -101,7 +100,7 @@ func (m *LRUCacher) GetIds(tableName, sql string) interface{} {
 	}
 	if v, err := m.store.Get(sql); err == nil {
 		if el, ok := m.sqlIndex[tableName][sql]; !ok {
-			el = m.sqlList.PushBack(newSqlNode(tableName, sql))
+			el = m.sqlList.PushBack(newSQLNode(tableName, sql))
 			m.sqlIndex[tableName][sql] = el
 		} else {
 			lastTime := el.Value.(*sqlNode).lastVisit
@@ -114,10 +113,10 @@ func (m *LRUCacher) GetIds(tableName, sql string) interface{} {
 			el.Value.(*sqlNode).lastVisit = time.Now()
 		}
 		return v
-	} else {
-		m.delIds(tableName, sql)
 	}
 
+	m.delIds(tableName, sql)
+
 	return nil
 }
 
@@ -128,7 +127,7 @@ func (m *LRUCacher) GetBean(tableName string, id string) interface{} {
 	if _, ok := m.idIndex[tableName]; !ok {
 		m.idIndex[tableName] = make(map[string]*list.Element)
 	}
-	tid := genId(tableName, id)
+	tid := genID(tableName, id)
 	if v, err := m.store.Get(tid); err == nil {
 		if el, ok := m.idIndex[tableName][id]; ok {
 			lastTime := el.Value.(*idNode).lastVisit
@@ -141,19 +140,19 @@ func (m *LRUCacher) GetBean(tableName string, id string) interface{} {
 			m.idList.MoveToBack(el)
 			el.Value.(*idNode).lastVisit = time.Now()
 		} else {
-			el = m.idList.PushBack(newIdNode(tableName, id))
+			el = m.idList.PushBack(newIDNode(tableName, id))
 			m.idIndex[tableName][id] = el
 		}
 		return v
-	} else {
-		// store bean is not exist, then remove memory's index
-		m.delBean(tableName, id)
-		//m.clearIds(tableName)
-		return nil
 	}
+
+	// store bean is not exist, then remove memory's index
+	m.delBean(tableName, id)
+	//m.clearIds(tableName)
+	return nil
 }
 
-// Clear all sql-ids mapping on table tableName from cache
+// clearIds clears all sql-ids mapping on table tableName from cache
 func (m *LRUCacher) clearIds(tableName string) {
 	if tis, ok := m.sqlIndex[tableName]; ok {
 		for sql, v := range tis {
@@ -164,6 +163,7 @@ func (m *LRUCacher) clearIds(tableName string) {
 	m.sqlIndex[tableName] = make(map[string]*list.Element)
 }
 
+// ClearIds clears all sql-ids mapping on table tableName from cache
 func (m *LRUCacher) ClearIds(tableName string) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -174,19 +174,21 @@ func (m *LRUCacher) clearBeans(tableName string) {
 	if tis, ok := m.idIndex[tableName]; ok {
 		for id, v := range tis {
 			m.idList.Remove(v)
-			tid := genId(tableName, id)
+			tid := genID(tableName, id)
 			m.store.Del(tid)
 		}
 	}
 	m.idIndex[tableName] = make(map[string]*list.Element)
 }
 
+// ClearBeans clears all beans in some table
 func (m *LRUCacher) ClearBeans(tableName string) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 	m.clearBeans(tableName)
 }
 
+// PutIds pus ids into table
 func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -194,7 +196,7 @@ func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) {
 		m.sqlIndex[tableName] = make(map[string]*list.Element)
 	}
 	if el, ok := m.sqlIndex[tableName][sql]; !ok {
-		el = m.sqlList.PushBack(newSqlNode(tableName, sql))
+		el = m.sqlList.PushBack(newSQLNode(tableName, sql))
 		m.sqlIndex[tableName][sql] = el
 	} else {
 		el.Value.(*sqlNode).lastVisit = time.Now()
@@ -207,6 +209,7 @@ func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) {
 	}
 }
 
+// PutBean puts beans into table
 func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -214,13 +217,13 @@ func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) {
 	var ok bool
 
 	if el, ok = m.idIndex[tableName][id]; !ok {
-		el = m.idList.PushBack(newIdNode(tableName, id))
+		el = m.idList.PushBack(newIDNode(tableName, id))
 		m.idIndex[tableName][id] = el
 	} else {
 		el.Value.(*idNode).lastVisit = time.Now()
 	}
 
-	m.store.Put(genId(tableName, id), obj)
+	m.store.Put(genID(tableName, id), obj)
 	if m.idList.Len() > m.MaxElementSize {
 		e := m.idList.Front()
 		node := e.Value.(*idNode)
@@ -238,6 +241,7 @@ func (m *LRUCacher) delIds(tableName, sql string) {
 	m.store.Del(sql)
 }
 
+// DelIds deletes ids
 func (m *LRUCacher) DelIds(tableName, sql string) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -245,7 +249,7 @@ func (m *LRUCacher) DelIds(tableName, sql string) {
 }
 
 func (m *LRUCacher) delBean(tableName string, id string) {
-	tid := genId(tableName, id)
+	tid := genID(tableName, id)
 	if el, ok := m.idIndex[tableName][id]; ok {
 		delete(m.idIndex[tableName], id)
 		m.idList.Remove(el)
@@ -254,6 +258,7 @@ func (m *LRUCacher) delBean(tableName string, id string) {
 	m.store.Del(tid)
 }
 
+// DelBean deletes beans in some table
 func (m *LRUCacher) DelBean(tableName string, id string) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
@@ -272,18 +277,18 @@ type sqlNode struct {
 	lastVisit time.Time
 }
 
-func genSqlKey(sql string, args interface{}) string {
+func genSQLKey(sql string, args interface{}) string {
 	return fmt.Sprintf("%v-%v", sql, args)
 }
 
-func genId(prefix string, id string) string {
+func genID(prefix string, id string) string {
 	return fmt.Sprintf("%v-%v", prefix, id)
 }
 
-func newIdNode(tbName string, id string) *idNode {
+func newIDNode(tbName string, id string) *idNode {
 	return &idNode{tbName, id, time.Now()}
 }
 
-func newSqlNode(tbName, sql string) *sqlNode {
+func newSQLNode(tbName, sql string) *sqlNode {
 	return &sqlNode{tbName, sql, time.Now()}
 }

vendor/github.com/go-xorm/xorm/memory_store.go

@@ -18,10 +18,12 @@ type MemoryStore struct {
 	mutex sync.RWMutex
 }
 
+// NewMemoryStore creates a new store in memory
 func NewMemoryStore() *MemoryStore {
 	return &MemoryStore{store: make(map[interface{}]interface{})}
 }
 
+// Put puts object into store
 func (s *MemoryStore) Put(key string, value interface{}) error {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
@@ -29,6 +31,7 @@ func (s *MemoryStore) Put(key string, value interface{}) error {
 	return nil
 }
 
+// Get gets object from store
 func (s *MemoryStore) Get(key string) (interface{}, error) {
 	s.mutex.RLock()
 	defer s.mutex.RUnlock()