* update xorm and dependencies vendor for feature to dump to other database * fix golinttags/v1.2.0-rc1
@@ -41,6 +41,10 @@ It can be used for backup and capture Gitea server image to send to maintainer`, | |||||
Value: os.TempDir(), | Value: os.TempDir(), | ||||
Usage: "Temporary dir path", | 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.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) | log.Fatalf("Fail to dump database: %v", err) | ||||
} | } | ||||
@@ -319,7 +319,14 @@ func Ping() error { | |||||
return x.Ping() | 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) | |||||
} | } |
@@ -1,6 +1,8 @@ | |||||
# SQL builder | # SQL builder | ||||
Package builder is a simple and powerful sql builder for Go. | |||||
[](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: | Make sure you have installed Go 1.1+ and then: | ||||
@@ -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 | package builder | ||||
type optype byte | type optype byte | ||||
@@ -16,6 +20,7 @@ type join struct { | |||||
joinCond Cond | joinCond Cond | ||||
} | } | ||||
// Builder describes a SQL statement | |||||
type Builder struct { | type Builder struct { | ||||
optype | optype | ||||
tableName string | tableName string | ||||
@@ -26,41 +31,49 @@ type Builder struct { | |||||
updates []Eq | updates []Eq | ||||
} | } | ||||
// Select creates a select Builder | |||||
func Select(cols ...string) *Builder { | func Select(cols ...string) *Builder { | ||||
builder := &Builder{cond: NewCond()} | builder := &Builder{cond: NewCond()} | ||||
return builder.Select(cols...) | return builder.Select(cols...) | ||||
} | } | ||||
// Insert creates an insert Builder | |||||
func Insert(eq Eq) *Builder { | func Insert(eq Eq) *Builder { | ||||
builder := &Builder{cond: NewCond()} | builder := &Builder{cond: NewCond()} | ||||
return builder.Insert(eq) | return builder.Insert(eq) | ||||
} | } | ||||
// Update creates an update Builder | |||||
func Update(updates ...Eq) *Builder { | func Update(updates ...Eq) *Builder { | ||||
builder := &Builder{cond: NewCond()} | builder := &Builder{cond: NewCond()} | ||||
return builder.Update(updates...) | return builder.Update(updates...) | ||||
} | } | ||||
// Delete creates a delete Builder | |||||
func Delete(conds ...Cond) *Builder { | func Delete(conds ...Cond) *Builder { | ||||
builder := &Builder{cond: NewCond()} | builder := &Builder{cond: NewCond()} | ||||
return builder.Delete(conds...) | return builder.Delete(conds...) | ||||
} | } | ||||
// Where sets where SQL | |||||
func (b *Builder) Where(cond Cond) *Builder { | func (b *Builder) Where(cond Cond) *Builder { | ||||
b.cond = b.cond.And(cond) | b.cond = b.cond.And(cond) | ||||
return b | return b | ||||
} | } | ||||
// From sets the table name | |||||
func (b *Builder) From(tableName string) *Builder { | func (b *Builder) From(tableName string) *Builder { | ||||
b.tableName = tableName | b.tableName = tableName | ||||
return b | return b | ||||
} | } | ||||
// Into sets insert table name | |||||
func (b *Builder) Into(tableName string) *Builder { | func (b *Builder) Into(tableName string) *Builder { | ||||
b.tableName = tableName | b.tableName = tableName | ||||
return b | return b | ||||
} | } | ||||
// Join sets join table and contions | |||||
func (b *Builder) Join(joinType, joinTable string, joinCond interface{}) *Builder { | func (b *Builder) Join(joinType, joinTable string, joinCond interface{}) *Builder { | ||||
switch joinCond.(type) { | switch joinCond.(type) { | ||||
case Cond: | case Cond: | ||||
@@ -72,60 +85,72 @@ func (b *Builder) Join(joinType, joinTable string, joinCond interface{}) *Builde | |||||
return b | return b | ||||
} | } | ||||
// InnerJoin sets inner join | |||||
func (b *Builder) InnerJoin(joinTable string, joinCond interface{}) *Builder { | func (b *Builder) InnerJoin(joinTable string, joinCond interface{}) *Builder { | ||||
return b.Join("INNER", joinTable, joinCond) | return b.Join("INNER", joinTable, joinCond) | ||||
} | } | ||||
// LeftJoin sets left join SQL | |||||
func (b *Builder) LeftJoin(joinTable string, joinCond interface{}) *Builder { | func (b *Builder) LeftJoin(joinTable string, joinCond interface{}) *Builder { | ||||
return b.Join("LEFT", joinTable, joinCond) | return b.Join("LEFT", joinTable, joinCond) | ||||
} | } | ||||
// RightJoin sets right join SQL | |||||
func (b *Builder) RightJoin(joinTable string, joinCond interface{}) *Builder { | func (b *Builder) RightJoin(joinTable string, joinCond interface{}) *Builder { | ||||
return b.Join("RIGHT", joinTable, joinCond) | return b.Join("RIGHT", joinTable, joinCond) | ||||
} | } | ||||
// CrossJoin sets cross join SQL | |||||
func (b *Builder) CrossJoin(joinTable string, joinCond interface{}) *Builder { | func (b *Builder) CrossJoin(joinTable string, joinCond interface{}) *Builder { | ||||
return b.Join("CROSS", joinTable, joinCond) | return b.Join("CROSS", joinTable, joinCond) | ||||
} | } | ||||
// FullJoin sets full join SQL | |||||
func (b *Builder) FullJoin(joinTable string, joinCond interface{}) *Builder { | func (b *Builder) FullJoin(joinTable string, joinCond interface{}) *Builder { | ||||
return b.Join("FULL", joinTable, joinCond) | return b.Join("FULL", joinTable, joinCond) | ||||
} | } | ||||
// Select sets select SQL | |||||
func (b *Builder) Select(cols ...string) *Builder { | func (b *Builder) Select(cols ...string) *Builder { | ||||
b.selects = cols | b.selects = cols | ||||
b.optype = selectType | b.optype = selectType | ||||
return b | return b | ||||
} | } | ||||
// And sets AND condition | |||||
func (b *Builder) And(cond Cond) *Builder { | func (b *Builder) And(cond Cond) *Builder { | ||||
b.cond = And(b.cond, cond) | b.cond = And(b.cond, cond) | ||||
return b | return b | ||||
} | } | ||||
// Or sets OR condition | |||||
func (b *Builder) Or(cond Cond) *Builder { | func (b *Builder) Or(cond Cond) *Builder { | ||||
b.cond = Or(b.cond, cond) | b.cond = Or(b.cond, cond) | ||||
return b | return b | ||||
} | } | ||||
// Insert sets insert SQL | |||||
func (b *Builder) Insert(eq Eq) *Builder { | func (b *Builder) Insert(eq Eq) *Builder { | ||||
b.inserts = eq | b.inserts = eq | ||||
b.optype = insertType | b.optype = insertType | ||||
return b | return b | ||||
} | } | ||||
// Update sets update SQL | |||||
func (b *Builder) Update(updates ...Eq) *Builder { | func (b *Builder) Update(updates ...Eq) *Builder { | ||||
b.updates = updates | b.updates = updates | ||||
b.optype = updateType | b.optype = updateType | ||||
return b | return b | ||||
} | } | ||||
// Delete sets delete SQL | |||||
func (b *Builder) Delete(conds ...Cond) *Builder { | func (b *Builder) Delete(conds ...Cond) *Builder { | ||||
b.cond = b.cond.And(conds...) | b.cond = b.cond.And(conds...) | ||||
b.optype = deleteType | b.optype = deleteType | ||||
return b | return b | ||||
} | } | ||||
// WriteTo implements Writer interface | |||||
func (b *Builder) WriteTo(w Writer) error { | func (b *Builder) WriteTo(w Writer) error { | ||||
switch b.optype { | switch b.optype { | ||||
case condType: | case condType: | ||||
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -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 |
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -5,31 +9,39 @@ import ( | |||||
"io" | "io" | ||||
) | ) | ||||
// Writer defines the interface | |||||
type Writer interface { | type Writer interface { | ||||
io.Writer | io.Writer | ||||
Append(...interface{}) | Append(...interface{}) | ||||
} | } | ||||
type stringWriter struct { | |||||
var _ Writer = NewWriter() | |||||
// BytesWriter implments Writer and save SQL in bytes.Buffer | |||||
type BytesWriter struct { | |||||
writer *bytes.Buffer | writer *bytes.Buffer | ||||
buffer []byte | buffer []byte | ||||
args []interface{} | args []interface{} | ||||
} | } | ||||
func NewWriter() *stringWriter { | |||||
w := &stringWriter{} | |||||
// NewWriter creates a new string writer | |||||
func NewWriter() *BytesWriter { | |||||
w := &BytesWriter{} | |||||
w.writer = bytes.NewBuffer(w.buffer) | w.writer = bytes.NewBuffer(w.buffer) | ||||
return w | 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) | 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...) | s.args = append(s.args, args...) | ||||
} | } | ||||
// Cond defines an interface | |||||
type Cond interface { | type Cond interface { | ||||
WriteTo(Writer) error | WriteTo(Writer) error | ||||
And(...Cond) Cond | And(...Cond) Cond | ||||
@@ -41,6 +53,7 @@ type condEmpty struct{} | |||||
var _ Cond = condEmpty{} | var _ Cond = condEmpty{} | ||||
// NewCond creates an empty condition | |||||
func NewCond() Cond { | func NewCond() Cond { | ||||
return condEmpty{} | return condEmpty{} | ||||
} | } | ||||
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
@@ -6,6 +10,7 @@ type condAnd []Cond | |||||
var _ Cond = condAnd{} | var _ Cond = condAnd{} | ||||
// And generates AND conditions | |||||
func And(conds ...Cond) Cond { | func And(conds ...Cond) Cond { | ||||
var result = make(condAnd, 0, len(conds)) | var result = make(condAnd, 0, len(conds)) | ||||
for _, cond := range conds { | for _, cond := range conds { | ||||
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// Between | |||||
// Between implmentes between condition | |||||
type Between struct { | type Between struct { | ||||
Col string | Col string | ||||
LessVal interface{} | LessVal interface{} | ||||
@@ -11,6 +15,7 @@ type Between struct { | |||||
var _ Cond = Between{} | var _ Cond = Between{} | ||||
// WriteTo write data to Writer | |||||
func (between Between) WriteTo(w Writer) error { | func (between Between) WriteTo(w Writer) error { | ||||
if _, err := fmt.Fprintf(w, "%s BETWEEN ? AND ?", between.Col); err != nil { | if _, err := fmt.Fprintf(w, "%s BETWEEN ? AND ?", between.Col); err != nil { | ||||
return err | return err | ||||
@@ -19,14 +24,17 @@ func (between Between) WriteTo(w Writer) error { | |||||
return nil | return nil | ||||
} | } | ||||
// And implments And with other conditions | |||||
func (between Between) And(conds ...Cond) Cond { | func (between Between) And(conds ...Cond) Cond { | ||||
return And(between, And(conds...)) | return And(between, And(conds...)) | ||||
} | } | ||||
// Or implments Or with other conditions | |||||
func (between Between) Or(conds ...Cond) Cond { | func (between Between) Or(conds ...Cond) Cond { | ||||
return Or(between, Or(conds...)) | return Or(between, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if the condition is valid | |||||
func (between Between) IsValid() bool { | func (between Between) IsValid() bool { | ||||
return len(between.Col) > 0 | return len(between.Col) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | 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 { | func WriteMap(w Writer, data map[string]interface{}, op string) error { | ||||
var args = make([]interface{}, 0, len(data)) | var args = make([]interface{}, 0, len(data)) | ||||
var i = 0 | var i = 0 | ||||
@@ -49,86 +53,102 @@ func WriteMap(w Writer, data map[string]interface{}, op string) error { | |||||
return nil | return nil | ||||
} | } | ||||
// Lt | |||||
// Lt defines < condition | |||||
type Lt map[string]interface{} | type Lt map[string]interface{} | ||||
var _ Cond = Lt{} | var _ Cond = Lt{} | ||||
// WriteTo write SQL to Writer | |||||
func (lt Lt) WriteTo(w Writer) error { | func (lt Lt) WriteTo(w Writer) error { | ||||
return WriteMap(w, lt, "<") | return WriteMap(w, lt, "<") | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (lt Lt) And(conds ...Cond) Cond { | func (lt Lt) And(conds ...Cond) Cond { | ||||
return condAnd{lt, And(conds...)} | return condAnd{lt, And(conds...)} | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (lt Lt) Or(conds ...Cond) Cond { | func (lt Lt) Or(conds ...Cond) Cond { | ||||
return condOr{lt, Or(conds...)} | return condOr{lt, Or(conds...)} | ||||
} | } | ||||
// IsValid tests if this Eq is valid | |||||
func (lt Lt) IsValid() bool { | func (lt Lt) IsValid() bool { | ||||
return len(lt) > 0 | return len(lt) > 0 | ||||
} | } | ||||
// Lte | |||||
// Lte defines <= condition | |||||
type Lte map[string]interface{} | type Lte map[string]interface{} | ||||
var _ Cond = Lte{} | var _ Cond = Lte{} | ||||
// WriteTo write SQL to Writer | |||||
func (lte Lte) WriteTo(w Writer) error { | func (lte Lte) WriteTo(w Writer) error { | ||||
return WriteMap(w, lte, "<=") | return WriteMap(w, lte, "<=") | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (lte Lte) And(conds ...Cond) Cond { | func (lte Lte) And(conds ...Cond) Cond { | ||||
return And(lte, And(conds...)) | return And(lte, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (lte Lte) Or(conds ...Cond) Cond { | func (lte Lte) Or(conds ...Cond) Cond { | ||||
return Or(lte, Or(conds...)) | return Or(lte, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this Eq is valid | |||||
func (lte Lte) IsValid() bool { | func (lte Lte) IsValid() bool { | ||||
return len(lte) > 0 | return len(lte) > 0 | ||||
} | } | ||||
// Gt | |||||
// Gt defines > condition | |||||
type Gt map[string]interface{} | type Gt map[string]interface{} | ||||
var _ Cond = Gt{} | var _ Cond = Gt{} | ||||
// WriteTo write SQL to Writer | |||||
func (gt Gt) WriteTo(w Writer) error { | func (gt Gt) WriteTo(w Writer) error { | ||||
return WriteMap(w, gt, ">") | return WriteMap(w, gt, ">") | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (gt Gt) And(conds ...Cond) Cond { | func (gt Gt) And(conds ...Cond) Cond { | ||||
return And(gt, And(conds...)) | return And(gt, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (gt Gt) Or(conds ...Cond) Cond { | func (gt Gt) Or(conds ...Cond) Cond { | ||||
return Or(gt, Or(conds...)) | return Or(gt, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this Eq is valid | |||||
func (gt Gt) IsValid() bool { | func (gt Gt) IsValid() bool { | ||||
return len(gt) > 0 | return len(gt) > 0 | ||||
} | } | ||||
// Gte | |||||
// Gte defines >= condition | |||||
type Gte map[string]interface{} | type Gte map[string]interface{} | ||||
var _ Cond = Gte{} | var _ Cond = Gte{} | ||||
// WriteTo write SQL to Writer | |||||
func (gte Gte) WriteTo(w Writer) error { | func (gte Gte) WriteTo(w Writer) error { | ||||
return WriteMap(w, gte, ">=") | return WriteMap(w, gte, ">=") | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (gte Gte) And(conds ...Cond) Cond { | func (gte Gte) And(conds ...Cond) Cond { | ||||
return And(gte, And(conds...)) | return And(gte, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (gte Gte) Or(conds ...Cond) Cond { | func (gte Gte) Or(conds ...Cond) Cond { | ||||
return Or(gte, Or(conds...)) | return Or(gte, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this Eq is valid | |||||
func (gte Gte) IsValid() bool { | func (gte Gte) IsValid() bool { | ||||
return len(gte) > 0 | return len(gte) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// Incr implements a type used by Eq | |||||
type Incr int | type Incr int | ||||
// Decr implements a type used by Eq | |||||
type Decr int | type Decr int | ||||
// Eq defines equals conditions | |||||
type Eq map[string]interface{} | type Eq map[string]interface{} | ||||
var _ Cond = Eq{} | var _ Cond = Eq{} | ||||
@@ -68,18 +75,22 @@ func (eq Eq) opWriteTo(op string, w Writer) error { | |||||
return nil | return nil | ||||
} | } | ||||
// WriteTo writes SQL to Writer | |||||
func (eq Eq) WriteTo(w Writer) error { | func (eq Eq) WriteTo(w Writer) error { | ||||
return eq.opWriteTo(" AND ", w) | return eq.opWriteTo(" AND ", w) | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (eq Eq) And(conds ...Cond) Cond { | func (eq Eq) And(conds ...Cond) Cond { | ||||
return And(eq, And(conds...)) | return And(eq, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (eq Eq) Or(conds ...Cond) Cond { | func (eq Eq) Or(conds ...Cond) Cond { | ||||
return Or(eq, Or(conds...)) | return Or(eq, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this Eq is valid | |||||
func (eq Eq) IsValid() bool { | func (eq Eq) IsValid() bool { | ||||
return len(eq) > 0 | return len(eq) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
@@ -9,6 +13,7 @@ type expr struct { | |||||
var _ Cond = expr{} | var _ Cond = expr{} | ||||
// Expr generate customerize SQL | |||||
func Expr(sql string, args ...interface{}) Cond { | func Expr(sql string, args ...interface{}) Cond { | ||||
return expr{sql, args} | return expr{sql, args} | ||||
} | } | ||||
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -12,6 +16,7 @@ type condIn struct { | |||||
var _ Cond = condIn{} | var _ Cond = condIn{} | ||||
// In generates IN condition | |||||
func In(col string, values ...interface{}) Cond { | func In(col string, values ...interface{}) Cond { | ||||
return condIn{col, values} | return condIn{col, values} | ||||
} | } | ||||
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// Like defines like condition | |||||
type Like [2]string | type Like [2]string | ||||
var _ Cond = Like{"", ""} | var _ Cond = Like{"", ""} | ||||
// WriteTo write SQL to Writer | |||||
func (like Like) WriteTo(w Writer) error { | func (like Like) WriteTo(w Writer) error { | ||||
if _, err := fmt.Fprintf(w, "%s LIKE ?", like[0]); err != nil { | if _, err := fmt.Fprintf(w, "%s LIKE ?", like[0]); err != nil { | ||||
return err | return err | ||||
@@ -14,14 +20,17 @@ func (like Like) WriteTo(w Writer) error { | |||||
return nil | return nil | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (like Like) And(conds ...Cond) Cond { | func (like Like) And(conds ...Cond) Cond { | ||||
return And(like, And(conds...)) | return And(like, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (like Like) Or(conds ...Cond) Cond { | func (like Like) Or(conds ...Cond) Cond { | ||||
return Or(like, Or(conds...)) | return Or(like, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this condition is valid | |||||
func (like Like) IsValid() bool { | func (like Like) IsValid() bool { | ||||
return len(like[0]) > 0 && len(like[1]) > 0 | return len(like[0]) > 0 && len(like[1]) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// Neq defines not equal conditions | |||||
type Neq map[string]interface{} | type Neq map[string]interface{} | ||||
var _ Cond = Neq{} | var _ Cond = Neq{} | ||||
// WriteTo writes SQL to Writer | |||||
func (neq Neq) WriteTo(w Writer) error { | func (neq Neq) WriteTo(w Writer) error { | ||||
var args = make([]interface{}, 0, len(neq)) | var args = make([]interface{}, 0, len(neq)) | ||||
var i = 0 | var i = 0 | ||||
@@ -56,14 +62,17 @@ func (neq Neq) WriteTo(w Writer) error { | |||||
return nil | return nil | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (neq Neq) And(conds ...Cond) Cond { | func (neq Neq) And(conds ...Cond) Cond { | ||||
return And(neq, And(conds...)) | return And(neq, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (neq Neq) Or(conds ...Cond) Cond { | func (neq Neq) Or(conds ...Cond) Cond { | ||||
return Or(neq, Or(conds...)) | return Or(neq, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this condition is valid | |||||
func (neq Neq) IsValid() bool { | func (neq Neq) IsValid() bool { | ||||
return len(neq) > 0 | return len(neq) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// Not defines NOT condition | |||||
type Not [1]Cond | type Not [1]Cond | ||||
var _ Cond = Not{} | var _ Cond = Not{} | ||||
// WriteTo writes SQL to Writer | |||||
func (not Not) WriteTo(w Writer) error { | func (not Not) WriteTo(w Writer) error { | ||||
if _, err := fmt.Fprint(w, "NOT "); err != nil { | if _, err := fmt.Fprint(w, "NOT "); err != nil { | ||||
return err | return err | ||||
@@ -31,14 +37,17 @@ func (not Not) WriteTo(w Writer) error { | |||||
return nil | return nil | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (not Not) And(conds ...Cond) Cond { | func (not Not) And(conds ...Cond) Cond { | ||||
return And(not, And(conds...)) | return And(not, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (not Not) Or(conds ...Cond) Cond { | func (not Not) Or(conds ...Cond) Cond { | ||||
return Or(not, Or(conds...)) | return Or(not, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this condition is valid | |||||
func (not Not) IsValid() bool { | func (not Not) IsValid() bool { | ||||
return not[0] != nil && not[0].IsValid() | return not[0] != nil && not[0].IsValid() | ||||
} | } |
@@ -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 | package builder | ||||
import ( | import ( | ||||
@@ -9,6 +13,7 @@ type condNotIn condIn | |||||
var _ Cond = condNotIn{} | var _ Cond = condNotIn{} | ||||
// NotIn generate NOT IN condition | |||||
func NotIn(col string, values ...interface{}) Cond { | func NotIn(col string, values ...interface{}) Cond { | ||||
return condNotIn{col, values} | return condNotIn{col, values} | ||||
} | } | ||||
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
// IsNull | |||||
// IsNull defines IS NULL condition | |||||
type IsNull [1]string | type IsNull [1]string | ||||
var _ Cond = IsNull{""} | var _ Cond = IsNull{""} | ||||
// WriteTo write SQL to Writer | |||||
func (isNull IsNull) WriteTo(w Writer) error { | func (isNull IsNull) WriteTo(w Writer) error { | ||||
_, err := fmt.Fprintf(w, "%s IS NULL", isNull[0]) | _, err := fmt.Fprintf(w, "%s IS NULL", isNull[0]) | ||||
return err | return err | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (isNull IsNull) And(conds ...Cond) Cond { | func (isNull IsNull) And(conds ...Cond) Cond { | ||||
return And(isNull, And(conds...)) | return And(isNull, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (isNull IsNull) Or(conds ...Cond) Cond { | func (isNull IsNull) Or(conds ...Cond) Cond { | ||||
return Or(isNull, Or(conds...)) | return Or(isNull, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this condition is valid | |||||
func (isNull IsNull) IsValid() bool { | func (isNull IsNull) IsValid() bool { | ||||
return len(isNull[0]) > 0 | return len(isNull[0]) > 0 | ||||
} | } | ||||
// NotNull | |||||
// NotNull defines NOT NULL condition | |||||
type NotNull [1]string | type NotNull [1]string | ||||
var _ Cond = NotNull{""} | var _ Cond = NotNull{""} | ||||
// WriteTo write SQL to Writer | |||||
func (notNull NotNull) WriteTo(w Writer) error { | func (notNull NotNull) WriteTo(w Writer) error { | ||||
_, err := fmt.Fprintf(w, "%s IS NOT NULL", notNull[0]) | _, err := fmt.Fprintf(w, "%s IS NOT NULL", notNull[0]) | ||||
return err | return err | ||||
} | } | ||||
// And implements And with other conditions | |||||
func (notNull NotNull) And(conds ...Cond) Cond { | func (notNull NotNull) And(conds ...Cond) Cond { | ||||
return And(notNull, And(conds...)) | return And(notNull, And(conds...)) | ||||
} | } | ||||
// Or implements Or with other conditions | |||||
func (notNull NotNull) Or(conds ...Cond) Cond { | func (notNull NotNull) Or(conds ...Cond) Cond { | ||||
return Or(notNull, Or(conds...)) | return Or(notNull, Or(conds...)) | ||||
} | } | ||||
// IsValid tests if this condition is valid | |||||
func (notNull NotNull) IsValid() bool { | func (notNull NotNull) IsValid() bool { | ||||
return len(notNull[0]) > 0 | return len(notNull[0]) > 0 | ||||
} | } |
@@ -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 | package builder | ||||
import "fmt" | import "fmt" | ||||
@@ -6,6 +10,7 @@ type condOr []Cond | |||||
var _ Cond = condOr{} | var _ Cond = condOr{} | ||||
// Or sets OR conditions | |||||
func Or(conds ...Cond) Cond { | func Or(conds ...Cond) Cond { | ||||
var result = make(condOr, 0, len(conds)) | var result = make(condOr, 0, len(conds)) | ||||
for _, cond := range conds { | for _, cond := range conds { | ||||
@@ -17,8 +22,9 @@ func Or(conds ...Cond) Cond { | |||||
return result | 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 | var needQuote bool | ||||
switch cond.(type) { | switch cond.(type) { | ||||
case condAnd: | case condAnd: | ||||
@@ -40,7 +46,7 @@ func (or condOr) WriteTo(w Writer) error { | |||||
fmt.Fprint(w, ")") | fmt.Fprint(w, ")") | ||||
} | } | ||||
if i != len(or)-1 { | |||||
if i != len(o)-1 { | |||||
fmt.Fprint(w, " OR ") | fmt.Fprint(w, " OR ") | ||||
} | } | ||||
} | } | ||||
@@ -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 | package builder | ||||
import "errors" | import "errors" | ||||
var ( | 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") | ErrNoNotInConditions = errors.New("No NOT IN conditions") | ||||
ErrNoInConditions = errors.New("No IN conditions") | |||||
// ErrNoInConditions no IN params error | |||||
ErrNoInConditions = errors.New("No IN conditions") | |||||
) | ) |
@@ -1,5 +1,7 @@ | |||||
Core is a lightweight wrapper of sql.DB. | Core is a lightweight wrapper of sql.DB. | ||||
[](https://circleci.com/gh/go-xorm/core/tree/master) | |||||
# Open | # Open | ||||
```Go | ```Go | ||||
db, _ := core.Open(db, connstr) | db, _ := core.Open(db, connstr) | ||||
@@ -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 |
@@ -287,16 +287,21 @@ func (b *Base) LogSQL(sql string, args []interface{}) { | |||||
} | } | ||||
var ( | var ( | ||||
dialects = map[DbType]func() Dialect{} | |||||
dialects = map[string]func() Dialect{} | |||||
) | ) | ||||
// RegisterDialect register database dialect | |||||
func RegisterDialect(dbName DbType, dialectFunc func() Dialect) { | func RegisterDialect(dbName DbType, dialectFunc func() Dialect) { | ||||
if dialectFunc == nil { | if dialectFunc == nil { | ||||
panic("core: Register dialect is 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 { | func QueryDialect(dbName DbType) Dialect { | ||||
return dialects[dbName]() | |||||
if d, ok := dialects[strings.ToLower(string(dbName))]; ok { | |||||
return d() | |||||
} | |||||
return nil | |||||
} | } |
@@ -54,7 +54,7 @@ func (s *SQLType) IsNumeric() bool { | |||||
} | } | ||||
func (s *SQLType) IsJson() bool { | func (s *SQLType) IsJson() bool { | ||||
return s.Name == Json | |||||
return s.Name == Json || s.Name == Jsonb | |||||
} | } | ||||
var ( | var ( | ||||
@@ -2,9 +2,7 @@ | |||||
Xorm is a simple and powerful ORM for Go. | Xorm is a simple and powerful ORM for Go. | ||||
[](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | |||||
[](https://drone.io/github.com/go-xorm/tests/latest) | |||||
[](https://circleci.com/gh/go-xorm/xorm/tree/master) [](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | |||||
# Notice | # Notice | ||||
@@ -4,9 +4,7 @@ | |||||
xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作非常简便。 | xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作非常简便。 | ||||
[](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | |||||
[](https://drone.io/github.com/go-xorm/tests/latest) [](http://gowalker.org/github.com/go-xorm/xorm) | |||||
[](https://circleci.com/gh/go-xorm/xorm/tree/master) [](https://gitter.im/go-xorm/xorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | |||||
# 注意 | # 注意 | ||||
@@ -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 |
@@ -168,8 +168,10 @@ func (engine *Engine) quote(sql string) string { | |||||
} | } | ||||
// SqlType will be depracated, please use SQLType instead | // SqlType will be depracated, please use SQLType instead | ||||
// | |||||
// Deprecated: use SQLType instead | |||||
func (engine *Engine) SqlType(c *core.Column) string { | 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 | // 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() | 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 { | func (engine *Engine) Sql(querystring string, args ...interface{}) *Session { | ||||
return engine.SQL(querystring, args...) | return engine.SQL(querystring, args...) | ||||
} | } | ||||
@@ -434,7 +439,7 @@ func (engine *Engine) dumpAll(w io.Writer, tp ...core.DbType) error { | |||||
} else { | } else { | ||||
dialect = core.QueryDialect(tp[0]) | dialect = core.QueryDialect(tp[0]) | ||||
if dialect == nil { | if dialect == nil { | ||||
return errors.New("Unsupported database type.") | |||||
return errors.New("Unsupported database type") | |||||
} | } | ||||
dialect.Init(nil, engine.dialect.URI(), "", "") | 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 | // 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 { | func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.DbType) error { | ||||
var dialect core.Dialect | var dialect core.Dialect | ||||
var distDBName string | |||||
if len(tp) == 0 { | if len(tp) == 0 { | ||||
dialect = engine.dialect | dialect = engine.dialect | ||||
distDBName = string(engine.dialect.DBType()) | |||||
} else { | } else { | ||||
dialect = core.QueryDialect(tp[0]) | dialect = core.QueryDialect(tp[0]) | ||||
if dialect == nil { | if dialect == nil { | ||||
return errors.New("Unsupported database type.") | |||||
return errors.New("Unsupported database type") | |||||
} | } | ||||
dialect.Init(nil, engine.dialect.URI(), "", "") | 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", | _, 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 { | if err != nil { | ||||
return err | return err | ||||
} | } | ||||
@@ -1208,12 +1216,26 @@ func (engine *Engine) IsTableExist(beanOrTableName interface{}) (bool, error) { | |||||
} | } | ||||
// IdOf get id from one struct | // IdOf get id from one struct | ||||
// | |||||
// Deprecated: use IDOf instead. | |||||
func (engine *Engine) IdOf(bean interface{}) core.PK { | 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)) | return engine.IdOfV(reflect.ValueOf(bean)) | ||||
} | } | ||||
// IdOfV get id from one value of struct | // IdOfV get id from one value of struct | ||||
// | |||||
// Deprecated: use IDOfV instead. | |||||
func (engine *Engine) IdOfV(rv reflect.Value) core.PK { | 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) | v := reflect.Indirect(rv) | ||||
table := engine.autoMapType(v) | table := engine.autoMapType(v) | ||||
pk := make([]interface{}, len(table.PrimaryKeys)) | pk := make([]interface{}, len(table.PrimaryKeys)) | ||||
@@ -9,11 +9,18 @@ import ( | |||||
) | ) | ||||
var ( | 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") | |||||
) | ) |
@@ -490,9 +490,8 @@ func genCols(table *core.Table, session *Session, bean interface{}, useCol bool, | |||||
args := make([]interface{}, 0, len(table.ColumnsSeq())) | args := make([]interface{}, 0, len(table.ColumnsSeq())) | ||||
for _, col := range table.Columns() { | for _, col := range table.Columns() { | ||||
lColName := strings.ToLower(col.Name) | |||||
if useCol && !col.IsVersion && !col.IsCreated && !col.IsUpdated { | if useCol && !col.IsVersion && !col.IsCreated && !col.IsUpdated { | ||||
if _, ok := session.Statement.columnMap[lColName]; !ok { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok { | |||||
continue | continue | ||||
} | } | ||||
} | } | ||||
@@ -528,18 +527,18 @@ func genCols(table *core.Table, session *Session, bean interface{}, useCol bool, | |||||
} | } | ||||
if session.Statement.ColumnStr != "" { | if session.Statement.ColumnStr != "" { | ||||
if _, ok := session.Statement.columnMap[lColName]; !ok { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok { | |||||
continue | continue | ||||
} | } | ||||
} | } | ||||
if session.Statement.OmitStr != "" { | if session.Statement.OmitStr != "" { | ||||
if _, ok := session.Statement.columnMap[lColName]; ok { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); ok { | |||||
continue | continue | ||||
} | } | ||||
} | } | ||||
// !evalphobia! set fieldValue as nil when column is nullable and zero-value | // !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()) { | if col.Nullable && isZero(fieldValue.Interface()) { | ||||
var nilValue *int | var nilValue *int | ||||
fieldValue = reflect.ValueOf(nilValue) | 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 { | func indexName(tableName, idxName string) string { | ||||
return fmt.Sprintf("IDX_%v_%v", tableName, idxName) | 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 | |||||
} |
@@ -20,21 +20,45 @@ const ( | |||||
var _ core.ILogger = DiscardLogger{} | var _ core.ILogger = DiscardLogger{} | ||||
// DiscardLogger don't log implementation for core.ILogger | |||||
type DiscardLogger struct{} | 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) 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) 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 { | func (DiscardLogger) Level() core.LogLevel { | ||||
return core.LOG_UNKNOWN | return core.LOG_UNKNOWN | ||||
} | } | ||||
// SetLevel empty implementation | |||||
func (DiscardLogger) SetLevel(l core.LogLevel) {} | 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 { | func (DiscardLogger) IsShowSQL() bool { | ||||
return false | return false | ||||
} | } | ||||
@@ -13,6 +13,7 @@ import ( | |||||
"github.com/go-xorm/core" | "github.com/go-xorm/core" | ||||
) | ) | ||||
// LRUCacher implments cache object facilities | |||||
type LRUCacher struct { | type LRUCacher struct { | ||||
idList *list.List | idList *list.List | ||||
sqlList *list.List | sqlList *list.List | ||||
@@ -26,10 +27,12 @@ type LRUCacher struct { | |||||
GcInterval time.Duration | GcInterval time.Duration | ||||
} | } | ||||
// NewLRUCacher creates a cacher | |||||
func NewLRUCacher(store core.CacheStore, maxElementSize int) *LRUCacher { | func NewLRUCacher(store core.CacheStore, maxElementSize int) *LRUCacher { | ||||
return NewLRUCacher2(store, 3600*time.Second, maxElementSize) | 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 { | func NewLRUCacher2(store core.CacheStore, expired time.Duration, maxElementSize int) *LRUCacher { | ||||
cacher := &LRUCacher{store: store, idList: list.New(), | cacher := &LRUCacher{store: store, idList: list.New(), | ||||
sqlList: list.New(), Expired: expired, | sqlList: list.New(), Expired: expired, | ||||
@@ -41,10 +44,6 @@ func NewLRUCacher2(store core.CacheStore, expired time.Duration, maxElementSize | |||||
return cacher | return cacher | ||||
} | } | ||||
//func NewLRUCacher3(store CacheStore, expired time.Duration, maxSize int) *LRUCacher { | |||||
// return newLRUCacher(store, expired, maxSize, 0) | |||||
//} | |||||
// RunGC run once every m.GcInterval | // RunGC run once every m.GcInterval | ||||
func (m *LRUCacher) RunGC() { | func (m *LRUCacher) RunGC() { | ||||
time.AfterFunc(m.GcInterval, func() { | 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 v, err := m.store.Get(sql); err == nil { | ||||
if el, ok := m.sqlIndex[tableName][sql]; !ok { | 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 | m.sqlIndex[tableName][sql] = el | ||||
} else { | } else { | ||||
lastTime := el.Value.(*sqlNode).lastVisit | lastTime := el.Value.(*sqlNode).lastVisit | ||||
@@ -114,10 +113,10 @@ func (m *LRUCacher) GetIds(tableName, sql string) interface{} { | |||||
el.Value.(*sqlNode).lastVisit = time.Now() | el.Value.(*sqlNode).lastVisit = time.Now() | ||||
} | } | ||||
return v | return v | ||||
} else { | |||||
m.delIds(tableName, sql) | |||||
} | } | ||||
m.delIds(tableName, sql) | |||||
return nil | return nil | ||||
} | } | ||||
@@ -128,7 +127,7 @@ func (m *LRUCacher) GetBean(tableName string, id string) interface{} { | |||||
if _, ok := m.idIndex[tableName]; !ok { | if _, ok := m.idIndex[tableName]; !ok { | ||||
m.idIndex[tableName] = make(map[string]*list.Element) | 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 v, err := m.store.Get(tid); err == nil { | ||||
if el, ok := m.idIndex[tableName][id]; ok { | if el, ok := m.idIndex[tableName][id]; ok { | ||||
lastTime := el.Value.(*idNode).lastVisit | lastTime := el.Value.(*idNode).lastVisit | ||||
@@ -141,19 +140,19 @@ func (m *LRUCacher) GetBean(tableName string, id string) interface{} { | |||||
m.idList.MoveToBack(el) | m.idList.MoveToBack(el) | ||||
el.Value.(*idNode).lastVisit = time.Now() | el.Value.(*idNode).lastVisit = time.Now() | ||||
} else { | } else { | ||||
el = m.idList.PushBack(newIdNode(tableName, id)) | |||||
el = m.idList.PushBack(newIDNode(tableName, id)) | |||||
m.idIndex[tableName][id] = el | m.idIndex[tableName][id] = el | ||||
} | } | ||||
return v | 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) { | func (m *LRUCacher) clearIds(tableName string) { | ||||
if tis, ok := m.sqlIndex[tableName]; ok { | if tis, ok := m.sqlIndex[tableName]; ok { | ||||
for sql, v := range tis { | for sql, v := range tis { | ||||
@@ -164,6 +163,7 @@ func (m *LRUCacher) clearIds(tableName string) { | |||||
m.sqlIndex[tableName] = make(map[string]*list.Element) | 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) { | func (m *LRUCacher) ClearIds(tableName string) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | defer m.mutex.Unlock() | ||||
@@ -174,19 +174,21 @@ func (m *LRUCacher) clearBeans(tableName string) { | |||||
if tis, ok := m.idIndex[tableName]; ok { | if tis, ok := m.idIndex[tableName]; ok { | ||||
for id, v := range tis { | for id, v := range tis { | ||||
m.idList.Remove(v) | m.idList.Remove(v) | ||||
tid := genId(tableName, id) | |||||
tid := genID(tableName, id) | |||||
m.store.Del(tid) | m.store.Del(tid) | ||||
} | } | ||||
} | } | ||||
m.idIndex[tableName] = make(map[string]*list.Element) | m.idIndex[tableName] = make(map[string]*list.Element) | ||||
} | } | ||||
// ClearBeans clears all beans in some table | |||||
func (m *LRUCacher) ClearBeans(tableName string) { | func (m *LRUCacher) ClearBeans(tableName string) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | defer m.mutex.Unlock() | ||||
m.clearBeans(tableName) | m.clearBeans(tableName) | ||||
} | } | ||||
// PutIds pus ids into table | |||||
func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) { | func (m *LRUCacher) PutIds(tableName, sql string, ids interface{}) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | 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) | m.sqlIndex[tableName] = make(map[string]*list.Element) | ||||
} | } | ||||
if el, ok := m.sqlIndex[tableName][sql]; !ok { | 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 | m.sqlIndex[tableName][sql] = el | ||||
} else { | } else { | ||||
el.Value.(*sqlNode).lastVisit = time.Now() | 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{}) { | func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | defer m.mutex.Unlock() | ||||
@@ -214,13 +217,13 @@ func (m *LRUCacher) PutBean(tableName string, id string, obj interface{}) { | |||||
var ok bool | var ok bool | ||||
if el, ok = m.idIndex[tableName][id]; !ok { | 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 | m.idIndex[tableName][id] = el | ||||
} else { | } else { | ||||
el.Value.(*idNode).lastVisit = time.Now() | 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 { | if m.idList.Len() > m.MaxElementSize { | ||||
e := m.idList.Front() | e := m.idList.Front() | ||||
node := e.Value.(*idNode) | node := e.Value.(*idNode) | ||||
@@ -238,6 +241,7 @@ func (m *LRUCacher) delIds(tableName, sql string) { | |||||
m.store.Del(sql) | m.store.Del(sql) | ||||
} | } | ||||
// DelIds deletes ids | |||||
func (m *LRUCacher) DelIds(tableName, sql string) { | func (m *LRUCacher) DelIds(tableName, sql string) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | defer m.mutex.Unlock() | ||||
@@ -245,7 +249,7 @@ func (m *LRUCacher) DelIds(tableName, sql string) { | |||||
} | } | ||||
func (m *LRUCacher) delBean(tableName string, id 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 { | if el, ok := m.idIndex[tableName][id]; ok { | ||||
delete(m.idIndex[tableName], id) | delete(m.idIndex[tableName], id) | ||||
m.idList.Remove(el) | m.idList.Remove(el) | ||||
@@ -254,6 +258,7 @@ func (m *LRUCacher) delBean(tableName string, id string) { | |||||
m.store.Del(tid) | m.store.Del(tid) | ||||
} | } | ||||
// DelBean deletes beans in some table | |||||
func (m *LRUCacher) DelBean(tableName string, id string) { | func (m *LRUCacher) DelBean(tableName string, id string) { | ||||
m.mutex.Lock() | m.mutex.Lock() | ||||
defer m.mutex.Unlock() | defer m.mutex.Unlock() | ||||
@@ -272,18 +277,18 @@ type sqlNode struct { | |||||
lastVisit time.Time | lastVisit time.Time | ||||
} | } | ||||
func genSqlKey(sql string, args interface{}) string { | |||||
func genSQLKey(sql string, args interface{}) string { | |||||
return fmt.Sprintf("%v-%v", sql, args) | 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) | 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()} | return &idNode{tbName, id, time.Now()} | ||||
} | } | ||||
func newSqlNode(tbName, sql string) *sqlNode { | |||||
func newSQLNode(tbName, sql string) *sqlNode { | |||||
return &sqlNode{tbName, sql, time.Now()} | return &sqlNode{tbName, sql, time.Now()} | ||||
} | } |
@@ -18,10 +18,12 @@ type MemoryStore struct { | |||||
mutex sync.RWMutex | mutex sync.RWMutex | ||||
} | } | ||||
// NewMemoryStore creates a new store in memory | |||||
func NewMemoryStore() *MemoryStore { | func NewMemoryStore() *MemoryStore { | ||||
return &MemoryStore{store: make(map[interface{}]interface{})} | return &MemoryStore{store: make(map[interface{}]interface{})} | ||||
} | } | ||||
// Put puts object into store | |||||
func (s *MemoryStore) Put(key string, value interface{}) error { | func (s *MemoryStore) Put(key string, value interface{}) error { | ||||
s.mutex.Lock() | s.mutex.Lock() | ||||
defer s.mutex.Unlock() | defer s.mutex.Unlock() | ||||
@@ -29,6 +31,7 @@ func (s *MemoryStore) Put(key string, value interface{}) error { | |||||
return nil | return nil | ||||
} | } | ||||
// Get gets object from store | |||||
func (s *MemoryStore) Get(key string) (interface{}, error) { | func (s *MemoryStore) Get(key string) (interface{}, error) { | ||||
s.mutex.RLock() | s.mutex.RLock() | ||||
defer s.mutex.RUnlock() | defer s.mutex.RUnlock() | ||||
@@ -39,6 +42,7 @@ func (s *MemoryStore) Get(key string) (interface{}, error) { | |||||
return nil, ErrNotExist | return nil, ErrNotExist | ||||
} | } | ||||
// Del deletes object | |||||
func (s *MemoryStore) Del(key string) error { | func (s *MemoryStore) Del(key string) error { | ||||
s.mutex.Lock() | s.mutex.Lock() | ||||
defer s.mutex.Unlock() | defer s.mutex.Unlock() | ||||
@@ -242,8 +242,8 @@ func (db *mssql) SqlType(c *core.Column) string { | |||||
c.Length = 7 | c.Length = 7 | ||||
case core.MediumInt: | case core.MediumInt: | ||||
res = core.Int | res = core.Int | ||||
case core.MediumText, core.TinyText, core.LongText, core.Json: | |||||
res = core.Text | |||||
case core.Text, core.MediumText, core.TinyText, core.LongText, core.Json: | |||||
res = core.Varchar + "(MAX)" | |||||
case core.Double: | case core.Double: | ||||
res = core.Real | res = core.Real | ||||
case core.Uuid: | case core.Uuid: | ||||
@@ -783,6 +783,11 @@ func (db *postgres) SqlType(c *core.Column) string { | |||||
return core.Serial | return core.Serial | ||||
} | } | ||||
return core.Integer | return core.Integer | ||||
case core.BigInt: | |||||
if c.IsAutoIncrement { | |||||
return core.BigSerial | |||||
} | |||||
return core.BigInt | |||||
case core.Serial, core.BigSerial: | case core.Serial, core.BigSerial: | ||||
c.IsAutoIncrement = true | c.IsAutoIncrement = true | ||||
c.Nullable = false | c.Nullable = false | ||||
@@ -19,10 +19,12 @@ type BeforeDeleteProcessor interface { | |||||
BeforeDelete() | BeforeDelete() | ||||
} | } | ||||
// BeforeSetProcessor executed before data set to the struct fields | |||||
type BeforeSetProcessor interface { | type BeforeSetProcessor interface { | ||||
BeforeSet(string, Cell) | BeforeSet(string, Cell) | ||||
} | } | ||||
// AfterSetProcessor executed after data set to the struct fields | |||||
type AfterSetProcessor interface { | type AfterSetProcessor interface { | ||||
AfterSet(string, Cell) | AfterSet(string, Cell) | ||||
} | } | ||||
@@ -0,0 +1,238 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"errors" | |||||
"fmt" | |||||
"strconv" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
func (session *Session) cacheDelete(sqlStr string, args ...interface{}) error { | |||||
if session.Statement.RefTable == nil || | |||||
session.Tx != nil { | |||||
return ErrCacheFailed | |||||
} | |||||
for _, filter := range session.Engine.dialect.Filters() { | |||||
sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable) | |||||
} | |||||
newsql := session.Statement.convertIDSQL(sqlStr) | |||||
if newsql == "" { | |||||
return ErrCacheFailed | |||||
} | |||||
cacher := session.Engine.getCacher2(session.Statement.RefTable) | |||||
tableName := session.Statement.TableName() | |||||
ids, err := core.GetCacheSql(cacher, tableName, newsql, args) | |||||
if err != nil { | |||||
resultsSlice, err := session.query(newsql, args...) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
ids = make([]core.PK, 0) | |||||
if len(resultsSlice) > 0 { | |||||
for _, data := range resultsSlice { | |||||
var id int64 | |||||
var pk core.PK = make([]interface{}, 0) | |||||
for _, col := range session.Statement.RefTable.PKColumns() { | |||||
if v, ok := data[col.Name]; !ok { | |||||
return errors.New("no id") | |||||
} else if col.SQLType.IsText() { | |||||
pk = append(pk, string(v)) | |||||
} else if col.SQLType.IsNumeric() { | |||||
id, err = strconv.ParseInt(string(v), 10, 64) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
pk = append(pk, id) | |||||
} else { | |||||
return errors.New("not supported primary key type") | |||||
} | |||||
} | |||||
ids = append(ids, pk) | |||||
} | |||||
} | |||||
} /*else { | |||||
session.Engine.LogDebug("delete cache sql %v", newsql) | |||||
cacher.DelIds(tableName, genSqlKey(newsql, args)) | |||||
}*/ | |||||
for _, id := range ids { | |||||
session.Engine.logger.Debug("[cacheDelete] delete cache obj", tableName, id) | |||||
sid, err := id.ToString() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
cacher.DelBean(tableName, sid) | |||||
} | |||||
session.Engine.logger.Debug("[cacheDelete] clear cache sql", tableName) | |||||
cacher.ClearIds(tableName) | |||||
return nil | |||||
} | |||||
// Delete records, bean's non-empty fields are conditions | |||||
func (session *Session) Delete(bean interface{}) (int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
session.Statement.setRefValue(rValue(bean)) | |||||
var table = session.Statement.RefTable | |||||
// handle before delete processors | |||||
for _, closure := range session.beforeClosures { | |||||
closure(bean) | |||||
} | |||||
cleanupProcessorsClosures(&session.beforeClosures) | |||||
if processor, ok := interface{}(bean).(BeforeDeleteProcessor); ok { | |||||
processor.BeforeDelete() | |||||
} | |||||
// -- | |||||
condSQL, condArgs, _ := session.Statement.genConds(bean) | |||||
if len(condSQL) == 0 && session.Statement.LimitN == 0 { | |||||
return 0, ErrNeedDeletedCond | |||||
} | |||||
var tableName = session.Engine.Quote(session.Statement.TableName()) | |||||
var deleteSQL string | |||||
if len(condSQL) > 0 { | |||||
deleteSQL = fmt.Sprintf("DELETE FROM %v WHERE %v", tableName, condSQL) | |||||
} else { | |||||
deleteSQL = fmt.Sprintf("DELETE FROM %v", tableName) | |||||
} | |||||
var orderSQL string | |||||
if len(session.Statement.OrderStr) > 0 { | |||||
orderSQL += fmt.Sprintf(" ORDER BY %s", session.Statement.OrderStr) | |||||
} | |||||
if session.Statement.LimitN > 0 { | |||||
orderSQL += fmt.Sprintf(" LIMIT %d", session.Statement.LimitN) | |||||
} | |||||
if len(orderSQL) > 0 { | |||||
switch session.Engine.dialect.DBType() { | |||||
case core.POSTGRES: | |||||
inSQL := fmt.Sprintf("ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQL) | |||||
if len(condSQL) > 0 { | |||||
deleteSQL += " AND " + inSQL | |||||
} else { | |||||
deleteSQL += " WHERE " + inSQL | |||||
} | |||||
case core.SQLITE: | |||||
inSQL := fmt.Sprintf("rowid IN (SELECT rowid FROM %s%s)", tableName, orderSQL) | |||||
if len(condSQL) > 0 { | |||||
deleteSQL += " AND " + inSQL | |||||
} else { | |||||
deleteSQL += " WHERE " + inSQL | |||||
} | |||||
// TODO: how to handle delete limit on mssql? | |||||
case core.MSSQL: | |||||
return 0, ErrNotImplemented | |||||
default: | |||||
deleteSQL += orderSQL | |||||
} | |||||
} | |||||
var realSQL string | |||||
argsForCache := make([]interface{}, 0, len(condArgs)*2) | |||||
if session.Statement.unscoped || table.DeletedColumn() == nil { // tag "deleted" is disabled | |||||
realSQL = deleteSQL | |||||
copy(argsForCache, condArgs) | |||||
argsForCache = append(condArgs, argsForCache...) | |||||
} else { | |||||
// !oinume! sqlStrForCache and argsForCache is needed to behave as executing "DELETE FROM ..." for cache. | |||||
copy(argsForCache, condArgs) | |||||
argsForCache = append(condArgs, argsForCache...) | |||||
deletedColumn := table.DeletedColumn() | |||||
realSQL = fmt.Sprintf("UPDATE %v SET %v = ? WHERE %v", | |||||
session.Engine.Quote(session.Statement.TableName()), | |||||
session.Engine.Quote(deletedColumn.Name), | |||||
condSQL) | |||||
if len(orderSQL) > 0 { | |||||
switch session.Engine.dialect.DBType() { | |||||
case core.POSTGRES: | |||||
inSQL := fmt.Sprintf("ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQL) | |||||
if len(condSQL) > 0 { | |||||
realSQL += " AND " + inSQL | |||||
} else { | |||||
realSQL += " WHERE " + inSQL | |||||
} | |||||
case core.SQLITE: | |||||
inSQL := fmt.Sprintf("rowid IN (SELECT rowid FROM %s%s)", tableName, orderSQL) | |||||
if len(condSQL) > 0 { | |||||
realSQL += " AND " + inSQL | |||||
} else { | |||||
realSQL += " WHERE " + inSQL | |||||
} | |||||
// TODO: how to handle delete limit on mssql? | |||||
case core.MSSQL: | |||||
return 0, ErrNotImplemented | |||||
default: | |||||
realSQL += orderSQL | |||||
} | |||||
} | |||||
// !oinume! Insert NowTime to the head of session.Statement.Params | |||||
condArgs = append(condArgs, "") | |||||
paramsLen := len(condArgs) | |||||
copy(condArgs[1:paramsLen], condArgs[0:paramsLen-1]) | |||||
val, t := session.Engine.NowTime2(deletedColumn.SQLType.Name) | |||||
condArgs[0] = val | |||||
var colName = deletedColumn.Name | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnTime(bean, col, t) | |||||
}) | |||||
} | |||||
if cacher := session.Engine.getCacher2(session.Statement.RefTable); cacher != nil && session.Statement.UseCache { | |||||
session.cacheDelete(deleteSQL, argsForCache...) | |||||
} | |||||
res, err := session.exec(realSQL, condArgs...) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
// handle after delete processors | |||||
if session.IsAutoCommit { | |||||
for _, closure := range session.afterClosures { | |||||
closure(bean) | |||||
} | |||||
if processor, ok := interface{}(bean).(AfterDeleteProcessor); ok { | |||||
processor.AfterDelete() | |||||
} | |||||
} else { | |||||
lenAfterClosures := len(session.afterClosures) | |||||
if lenAfterClosures > 0 { | |||||
if value, has := session.afterDeleteBeans[bean]; has && value != nil { | |||||
*value = append(*value, session.afterClosures...) | |||||
} else { | |||||
afterClosures := make([]func(interface{}), lenAfterClosures) | |||||
copy(afterClosures, session.afterClosures) | |||||
session.afterDeleteBeans[bean] = &afterClosures | |||||
} | |||||
} else { | |||||
if _, ok := interface{}(bean).(AfterInsertProcessor); ok { | |||||
session.afterDeleteBeans[bean] = nil | |||||
} | |||||
} | |||||
} | |||||
cleanupProcessorsClosures(&session.afterClosures) | |||||
// -- | |||||
return res.RowsAffected() | |||||
} |
@@ -0,0 +1,458 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"errors" | |||||
"fmt" | |||||
"reflect" | |||||
"strconv" | |||||
"strings" | |||||
"github.com/go-xorm/builder" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
const ( | |||||
tpStruct = iota | |||||
tpNonStruct | |||||
) | |||||
// Find retrieve records from table, condiBeans's non-empty fields | |||||
// are conditions. beans could be []Struct, []*Struct, map[int64]Struct | |||||
// map[int64]*Struct | |||||
func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{}) error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr)) | |||||
if sliceValue.Kind() != reflect.Slice && sliceValue.Kind() != reflect.Map { | |||||
return errors.New("needs a pointer to a slice or a map") | |||||
} | |||||
sliceElementType := sliceValue.Type().Elem() | |||||
var tp = tpStruct | |||||
if session.Statement.RefTable == nil { | |||||
if sliceElementType.Kind() == reflect.Ptr { | |||||
if sliceElementType.Elem().Kind() == reflect.Struct { | |||||
pv := reflect.New(sliceElementType.Elem()) | |||||
session.Statement.setRefValue(pv.Elem()) | |||||
} else { | |||||
//return errors.New("slice type") | |||||
tp = tpNonStruct | |||||
} | |||||
} else if sliceElementType.Kind() == reflect.Struct { | |||||
pv := reflect.New(sliceElementType) | |||||
session.Statement.setRefValue(pv.Elem()) | |||||
} else { | |||||
//return errors.New("slice type") | |||||
tp = tpNonStruct | |||||
} | |||||
} | |||||
var table = session.Statement.RefTable | |||||
var addedTableName = (len(session.Statement.JoinStr) > 0) | |||||
var autoCond builder.Cond | |||||
if tp == tpStruct { | |||||
if !session.Statement.noAutoCondition && len(condiBean) > 0 { | |||||
var err error | |||||
autoCond, err = session.Statement.buildConds(table, condiBean[0], true, true, false, true, addedTableName) | |||||
if err != nil { | |||||
panic(err) | |||||
} | |||||
} else { | |||||
// !oinume! Add "<col> IS NULL" to WHERE whatever condiBean is given. | |||||
// See https://github.com/go-xorm/xorm/issues/179 | |||||
if col := table.DeletedColumn(); col != nil && !session.Statement.unscoped { // tag "deleted" is enabled | |||||
var colName = session.Engine.Quote(col.Name) | |||||
if addedTableName { | |||||
var nm = session.Statement.TableName() | |||||
if len(session.Statement.TableAlias) > 0 { | |||||
nm = session.Statement.TableAlias | |||||
} | |||||
colName = session.Engine.Quote(nm) + "." + colName | |||||
} | |||||
if session.Engine.dialect.DBType() == core.MSSQL { | |||||
autoCond = builder.IsNull{colName} | |||||
} else { | |||||
autoCond = builder.IsNull{colName}.Or(builder.Eq{colName: "0001-01-01 00:00:00"}) | |||||
} | |||||
} | |||||
} | |||||
} | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if session.Statement.RawSQL == "" { | |||||
if len(session.Statement.TableName()) <= 0 { | |||||
return ErrTableNotFound | |||||
} | |||||
var columnStr = session.Statement.ColumnStr | |||||
if len(session.Statement.selectStr) > 0 { | |||||
columnStr = session.Statement.selectStr | |||||
} else { | |||||
if session.Statement.JoinStr == "" { | |||||
if columnStr == "" { | |||||
if session.Statement.GroupByStr != "" { | |||||
columnStr = session.Statement.Engine.Quote(strings.Replace(session.Statement.GroupByStr, ",", session.Engine.Quote(","), -1)) | |||||
} else { | |||||
columnStr = session.Statement.genColumnStr() | |||||
} | |||||
} | |||||
} else { | |||||
if columnStr == "" { | |||||
if session.Statement.GroupByStr != "" { | |||||
columnStr = session.Statement.Engine.Quote(strings.Replace(session.Statement.GroupByStr, ",", session.Engine.Quote(","), -1)) | |||||
} else { | |||||
columnStr = "*" | |||||
} | |||||
} | |||||
} | |||||
if columnStr == "" { | |||||
columnStr = "*" | |||||
} | |||||
} | |||||
condSQL, condArgs, _ := builder.ToSQL(session.Statement.cond.And(autoCond)) | |||||
args = append(session.Statement.joinArgs, condArgs...) | |||||
sqlStr = session.Statement.genSelectSQL(columnStr, condSQL) | |||||
// for mssql and use limit | |||||
qs := strings.Count(sqlStr, "?") | |||||
if len(args)*2 == qs { | |||||
args = append(args, args...) | |||||
} | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
var err error | |||||
if session.canCache() { | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && | |||||
!session.Statement.IsDistinct && | |||||
!session.Statement.unscoped { | |||||
err = session.cacheFind(sliceElementType, sqlStr, rowsSlicePtr, args...) | |||||
if err != ErrCacheFailed { | |||||
return err | |||||
} | |||||
err = nil // !nashtsai! reset err to nil for ErrCacheFailed | |||||
session.Engine.logger.Warn("Cache Find Failed") | |||||
} | |||||
} | |||||
if sliceValue.Kind() != reflect.Map { | |||||
return session.noCacheFind(sliceValue, sqlStr, args...) | |||||
} | |||||
resultsSlice, err := session.query(sqlStr, args...) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
keyType := sliceValue.Type().Key() | |||||
for _, results := range resultsSlice { | |||||
var newValue reflect.Value | |||||
if sliceElementType.Kind() == reflect.Ptr { | |||||
newValue = reflect.New(sliceElementType.Elem()) | |||||
} else { | |||||
newValue = reflect.New(sliceElementType) | |||||
} | |||||
err := session.scanMapIntoStruct(newValue.Interface(), results) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var key interface{} | |||||
// if there is only one pk, we can put the id as map key. | |||||
if len(table.PrimaryKeys) == 1 { | |||||
key, err = str2PK(string(results[table.PrimaryKeys[0]]), keyType) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} else { | |||||
if keyType.Kind() != reflect.Slice { | |||||
panic("don't support multiple primary key's map has non-slice key type") | |||||
} else { | |||||
var keys core.PK = make([]interface{}, 0, len(table.PrimaryKeys)) | |||||
for _, pk := range table.PrimaryKeys { | |||||
skey, err := str2PK(string(results[pk]), keyType) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
keys = append(keys, skey) | |||||
} | |||||
key = keys | |||||
} | |||||
} | |||||
if sliceElementType.Kind() == reflect.Ptr { | |||||
sliceValue.SetMapIndex(reflect.ValueOf(key), reflect.ValueOf(newValue.Interface())) | |||||
} else { | |||||
sliceValue.SetMapIndex(reflect.ValueOf(key), reflect.Indirect(reflect.ValueOf(newValue.Interface()))) | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
func (session *Session) noCacheFind(sliceValue reflect.Value, sqlStr string, args ...interface{}) error { | |||||
var rawRows *core.Rows | |||||
var err error | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
if session.IsAutoCommit { | |||||
_, rawRows, err = session.innerQuery(sqlStr, args...) | |||||
} else { | |||||
rawRows, err = session.Tx.Query(sqlStr, args...) | |||||
} | |||||
if err != nil { | |||||
return err | |||||
} | |||||
defer rawRows.Close() | |||||
fields, err := rawRows.Columns() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var newElemFunc func() reflect.Value | |||||
sliceElementType := sliceValue.Type().Elem() | |||||
if sliceElementType.Kind() == reflect.Ptr { | |||||
newElemFunc = func() reflect.Value { | |||||
return reflect.New(sliceElementType.Elem()) | |||||
} | |||||
} else { | |||||
newElemFunc = func() reflect.Value { | |||||
return reflect.New(sliceElementType) | |||||
} | |||||
} | |||||
var sliceValueSetFunc func(*reflect.Value) | |||||
if sliceValue.Kind() == reflect.Slice { | |||||
if sliceElementType.Kind() == reflect.Ptr { | |||||
sliceValueSetFunc = func(newValue *reflect.Value) { | |||||
sliceValue.Set(reflect.Append(sliceValue, reflect.ValueOf(newValue.Interface()))) | |||||
} | |||||
} else { | |||||
sliceValueSetFunc = func(newValue *reflect.Value) { | |||||
sliceValue.Set(reflect.Append(sliceValue, reflect.Indirect(reflect.ValueOf(newValue.Interface())))) | |||||
} | |||||
} | |||||
} | |||||
var newValue = newElemFunc() | |||||
dataStruct := rValue(newValue.Interface()) | |||||
if dataStruct.Kind() == reflect.Struct { | |||||
return session.rows2Beans(rawRows, fields, len(fields), session.Engine.autoMapType(dataStruct), newElemFunc, sliceValueSetFunc) | |||||
} | |||||
for rawRows.Next() { | |||||
var newValue = newElemFunc() | |||||
bean := newValue.Interface() | |||||
if err := rawRows.Scan(bean); err != nil { | |||||
return err | |||||
} | |||||
sliceValueSetFunc(&newValue) | |||||
} | |||||
return nil | |||||
} | |||||
func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr interface{}, args ...interface{}) (err error) { | |||||
if !session.canCache() || | |||||
indexNoCase(sqlStr, "having") != -1 || | |||||
indexNoCase(sqlStr, "group by") != -1 { | |||||
return ErrCacheFailed | |||||
} | |||||
for _, filter := range session.Engine.dialect.Filters() { | |||||
sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable) | |||||
} | |||||
newsql := session.Statement.convertIDSQL(sqlStr) | |||||
if newsql == "" { | |||||
return ErrCacheFailed | |||||
} | |||||
tableName := session.Statement.TableName() | |||||
table := session.Statement.RefTable | |||||
cacher := session.Engine.getCacher2(table) | |||||
ids, err := core.GetCacheSql(cacher, tableName, newsql, args) | |||||
if err != nil { | |||||
rows, err := session.DB().Query(newsql, args...) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
defer rows.Close() | |||||
var i int | |||||
ids = make([]core.PK, 0) | |||||
for rows.Next() { | |||||
i++ | |||||
if i > 500 { | |||||
session.Engine.logger.Debug("[cacheFind] ids length > 500, no cache") | |||||
return ErrCacheFailed | |||||
} | |||||
var res = make([]string, len(table.PrimaryKeys)) | |||||
err = rows.ScanSlice(&res) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var pk core.PK = make([]interface{}, len(table.PrimaryKeys)) | |||||
for i, col := range table.PKColumns() { | |||||
if col.SQLType.IsNumeric() { | |||||
n, err := strconv.ParseInt(res[i], 10, 64) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
pk[i] = n | |||||
} else if col.SQLType.IsText() { | |||||
pk[i] = res[i] | |||||
} else { | |||||
return errors.New("not supported") | |||||
} | |||||
} | |||||
ids = append(ids, pk) | |||||
} | |||||
session.Engine.logger.Debug("[cacheFind] cache sql:", ids, tableName, newsql, args) | |||||
err = core.PutCacheSql(cacher, ids, tableName, newsql, args) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheFind] cache hit sql:", newsql, args) | |||||
} | |||||
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr)) | |||||
ididxes := make(map[string]int) | |||||
var ides []core.PK | |||||
var temps = make([]interface{}, len(ids)) | |||||
for idx, id := range ids { | |||||
sid, err := id.ToString() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
bean := cacher.GetBean(tableName, sid) | |||||
if bean == nil { | |||||
ides = append(ides, id) | |||||
ididxes[sid] = idx | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheFind] cache hit bean:", tableName, id, bean) | |||||
pk := session.Engine.IdOf(bean) | |||||
xid, err := pk.ToString() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
if sid != xid { | |||||
session.Engine.logger.Error("[cacheFind] error cache", xid, sid, bean) | |||||
return ErrCacheFailed | |||||
} | |||||
temps[idx] = bean | |||||
} | |||||
} | |||||
if len(ides) > 0 { | |||||
newSession := session.Engine.NewSession() | |||||
defer newSession.Close() | |||||
slices := reflect.New(reflect.SliceOf(t)) | |||||
beans := slices.Interface() | |||||
if len(table.PrimaryKeys) == 1 { | |||||
ff := make([]interface{}, 0, len(ides)) | |||||
for _, ie := range ides { | |||||
ff = append(ff, ie[0]) | |||||
} | |||||
newSession.In("`"+table.PrimaryKeys[0]+"`", ff...) | |||||
} else { | |||||
for _, ie := range ides { | |||||
cond := builder.NewCond() | |||||
for i, name := range table.PrimaryKeys { | |||||
cond = cond.And(builder.Eq{"`" + name + "`": ie[i]}) | |||||
} | |||||
newSession.Or(cond) | |||||
} | |||||
} | |||||
err = newSession.NoCache().Find(beans) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
vs := reflect.Indirect(reflect.ValueOf(beans)) | |||||
for i := 0; i < vs.Len(); i++ { | |||||
rv := vs.Index(i) | |||||
if rv.Kind() != reflect.Ptr { | |||||
rv = rv.Addr() | |||||
} | |||||
id := session.Engine.IdOfV(rv) | |||||
sid, err := id.ToString() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
bean := rv.Interface() | |||||
temps[ididxes[sid]] = bean | |||||
session.Engine.logger.Debug("[cacheFind] cache bean:", tableName, id, bean, temps) | |||||
cacher.PutBean(tableName, sid, bean) | |||||
} | |||||
} | |||||
for j := 0; j < len(temps); j++ { | |||||
bean := temps[j] | |||||
if bean == nil { | |||||
session.Engine.logger.Warn("[cacheFind] cache no hit:", tableName, ids[j], temps) | |||||
// return errors.New("cache error") // !nashtsai! no need to return error, but continue instead | |||||
continue | |||||
} | |||||
if sliceValue.Kind() == reflect.Slice { | |||||
if t.Kind() == reflect.Ptr { | |||||
sliceValue.Set(reflect.Append(sliceValue, reflect.ValueOf(bean))) | |||||
} else { | |||||
sliceValue.Set(reflect.Append(sliceValue, reflect.Indirect(reflect.ValueOf(bean)))) | |||||
} | |||||
} else if sliceValue.Kind() == reflect.Map { | |||||
var key = ids[j] | |||||
keyType := sliceValue.Type().Key() | |||||
var ikey interface{} | |||||
if len(key) == 1 { | |||||
ikey, err = str2PK(fmt.Sprintf("%v", key[0]), keyType) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} else { | |||||
if keyType.Kind() != reflect.Slice { | |||||
return errors.New("table have multiple primary keys, key is not core.PK or slice") | |||||
} | |||||
ikey = key | |||||
} | |||||
if t.Kind() == reflect.Ptr { | |||||
sliceValue.SetMapIndex(reflect.ValueOf(ikey), reflect.ValueOf(bean)) | |||||
} else { | |||||
sliceValue.SetMapIndex(reflect.ValueOf(ikey), reflect.Indirect(reflect.ValueOf(bean))) | |||||
} | |||||
} | |||||
} | |||||
return nil | |||||
} |
@@ -0,0 +1,176 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"errors" | |||||
"reflect" | |||||
"strconv" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
// Get retrieve one record from database, bean's non-empty fields | |||||
// will be as conditions | |||||
func (session *Session) Get(bean interface{}) (bool, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
session.Statement.setRefValue(rValue(bean)) | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if session.Statement.RawSQL == "" { | |||||
if len(session.Statement.TableName()) <= 0 { | |||||
return false, ErrTableNotFound | |||||
} | |||||
session.Statement.Limit(1) | |||||
sqlStr, args = session.Statement.genGetSQL(bean) | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
if session.canCache() { | |||||
if cacher := session.Engine.getCacher2(session.Statement.RefTable); cacher != nil && | |||||
!session.Statement.unscoped { | |||||
has, err := session.cacheGet(bean, sqlStr, args...) | |||||
if err != ErrCacheFailed { | |||||
return has, err | |||||
} | |||||
} | |||||
} | |||||
return session.nocacheGet(bean, sqlStr, args...) | |||||
} | |||||
func (session *Session) nocacheGet(bean interface{}, sqlStr string, args ...interface{}) (bool, error) { | |||||
var rawRows *core.Rows | |||||
var err error | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
if session.IsAutoCommit { | |||||
_, rawRows, err = session.innerQuery(sqlStr, args...) | |||||
} else { | |||||
rawRows, err = session.Tx.Query(sqlStr, args...) | |||||
} | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
defer rawRows.Close() | |||||
if rawRows.Next() { | |||||
if fields, err := rawRows.Columns(); err == nil { | |||||
err = session.row2Bean(rawRows, fields, len(fields), bean) | |||||
} | |||||
return true, err | |||||
} | |||||
return false, nil | |||||
} | |||||
func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interface{}) (has bool, err error) { | |||||
// if has no reftable, then don't use cache currently | |||||
if !session.canCache() { | |||||
return false, ErrCacheFailed | |||||
} | |||||
for _, filter := range session.Engine.dialect.Filters() { | |||||
sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable) | |||||
} | |||||
newsql := session.Statement.convertIDSQL(sqlStr) | |||||
if newsql == "" { | |||||
return false, ErrCacheFailed | |||||
} | |||||
cacher := session.Engine.getCacher2(session.Statement.RefTable) | |||||
tableName := session.Statement.TableName() | |||||
session.Engine.logger.Debug("[cacheGet] find sql:", newsql, args) | |||||
ids, err := core.GetCacheSql(cacher, tableName, newsql, args) | |||||
table := session.Statement.RefTable | |||||
if err != nil { | |||||
var res = make([]string, len(table.PrimaryKeys)) | |||||
rows, err := session.DB().Query(newsql, args...) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
defer rows.Close() | |||||
if rows.Next() { | |||||
err = rows.ScanSlice(&res) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
} else { | |||||
return false, ErrCacheFailed | |||||
} | |||||
var pk core.PK = make([]interface{}, len(table.PrimaryKeys)) | |||||
for i, col := range table.PKColumns() { | |||||
if col.SQLType.IsText() { | |||||
pk[i] = res[i] | |||||
} else if col.SQLType.IsNumeric() { | |||||
n, err := strconv.ParseInt(res[i], 10, 64) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
pk[i] = n | |||||
} else { | |||||
return false, errors.New("unsupported") | |||||
} | |||||
} | |||||
ids = []core.PK{pk} | |||||
session.Engine.logger.Debug("[cacheGet] cache ids:", newsql, ids) | |||||
err = core.PutCacheSql(cacher, ids, tableName, newsql, args) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheGet] cache hit sql:", newsql) | |||||
} | |||||
if len(ids) > 0 { | |||||
structValue := reflect.Indirect(reflect.ValueOf(bean)) | |||||
id := ids[0] | |||||
session.Engine.logger.Debug("[cacheGet] get bean:", tableName, id) | |||||
sid, err := id.ToString() | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
cacheBean := cacher.GetBean(tableName, sid) | |||||
if cacheBean == nil { | |||||
/*newSession := session.Engine.NewSession() | |||||
defer newSession.Close() | |||||
cacheBean = reflect.New(structValue.Type()).Interface() | |||||
newSession.Id(id).NoCache() | |||||
if session.Statement.AltTableName != "" { | |||||
newSession.Table(session.Statement.AltTableName) | |||||
} | |||||
if !session.Statement.UseCascade { | |||||
newSession.NoCascade() | |||||
} | |||||
has, err = newSession.Get(cacheBean) | |||||
*/ | |||||
cacheBean = bean | |||||
has, err = session.nocacheGet(cacheBean, sqlStr, args...) | |||||
if err != nil || !has { | |||||
return has, err | |||||
} | |||||
session.Engine.logger.Debug("[cacheGet] cache bean:", tableName, id, cacheBean) | |||||
cacher.PutBean(tableName, sid, cacheBean) | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheGet] cache hit bean:", tableName, id, cacheBean) | |||||
has = true | |||||
} | |||||
structValue.Set(reflect.Indirect(reflect.ValueOf(cacheBean))) | |||||
return has, nil | |||||
} | |||||
return false, nil | |||||
} |
@@ -0,0 +1,527 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"errors" | |||||
"fmt" | |||||
"reflect" | |||||
"strconv" | |||||
"strings" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
// Insert insert one or more beans | |||||
func (session *Session) Insert(beans ...interface{}) (int64, error) { | |||||
var affected int64 | |||||
var err error | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
defer session.resetStatement() | |||||
for _, bean := range beans { | |||||
sliceValue := reflect.Indirect(reflect.ValueOf(bean)) | |||||
if sliceValue.Kind() == reflect.Slice { | |||||
size := sliceValue.Len() | |||||
if size > 0 { | |||||
if session.Engine.SupportInsertMany() { | |||||
cnt, err := session.innerInsertMulti(bean) | |||||
if err != nil { | |||||
return affected, err | |||||
} | |||||
affected += cnt | |||||
} else { | |||||
for i := 0; i < size; i++ { | |||||
cnt, err := session.innerInsert(sliceValue.Index(i).Interface()) | |||||
if err != nil { | |||||
return affected, err | |||||
} | |||||
affected += cnt | |||||
} | |||||
} | |||||
} | |||||
} else { | |||||
cnt, err := session.innerInsert(bean) | |||||
if err != nil { | |||||
return affected, err | |||||
} | |||||
affected += cnt | |||||
} | |||||
} | |||||
return affected, err | |||||
} | |||||
func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error) { | |||||
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr)) | |||||
if sliceValue.Kind() != reflect.Slice { | |||||
return 0, errors.New("needs a pointer to a slice") | |||||
} | |||||
if sliceValue.Len() <= 0 { | |||||
return 0, errors.New("could not insert a empty slice") | |||||
} | |||||
session.Statement.setRefValue(sliceValue.Index(0)) | |||||
if len(session.Statement.TableName()) <= 0 { | |||||
return 0, ErrTableNotFound | |||||
} | |||||
table := session.Statement.RefTable | |||||
size := sliceValue.Len() | |||||
var colNames []string | |||||
var colMultiPlaces []string | |||||
var args []interface{} | |||||
var cols []*core.Column | |||||
for i := 0; i < size; i++ { | |||||
v := sliceValue.Index(i) | |||||
vv := reflect.Indirect(v) | |||||
elemValue := v.Interface() | |||||
var colPlaces []string | |||||
// handle BeforeInsertProcessor | |||||
// !nashtsai! does user expect it's same slice to passed closure when using Before()/After() when insert multi?? | |||||
for _, closure := range session.beforeClosures { | |||||
closure(elemValue) | |||||
} | |||||
if processor, ok := interface{}(elemValue).(BeforeInsertProcessor); ok { | |||||
processor.BeforeInsert() | |||||
} | |||||
// -- | |||||
if i == 0 { | |||||
for _, col := range table.Columns() { | |||||
ptrFieldValue, err := col.ValueOfV(&vv) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
fieldValue := *ptrFieldValue | |||||
if col.IsAutoIncrement && isZero(fieldValue.Interface()) { | |||||
continue | |||||
} | |||||
if col.MapType == core.ONLYFROMDB { | |||||
continue | |||||
} | |||||
if col.IsDeleted { | |||||
continue | |||||
} | |||||
if session.Statement.ColumnStr != "" { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok { | |||||
continue | |||||
} | |||||
} | |||||
if session.Statement.OmitStr != "" { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); ok { | |||||
continue | |||||
} | |||||
} | |||||
if (col.IsCreated || col.IsUpdated) && session.Statement.UseAutoTime { | |||||
val, t := session.Engine.NowTime2(col.SQLType.Name) | |||||
args = append(args, val) | |||||
var colName = col.Name | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnTime(bean, col, t) | |||||
}) | |||||
} else if col.IsVersion && session.Statement.checkVersion { | |||||
args = append(args, 1) | |||||
var colName = col.Name | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnInt(bean, col, 1) | |||||
}) | |||||
} else { | |||||
arg, err := session.value2Interface(col, fieldValue) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
args = append(args, arg) | |||||
} | |||||
colNames = append(colNames, col.Name) | |||||
cols = append(cols, col) | |||||
colPlaces = append(colPlaces, "?") | |||||
} | |||||
} else { | |||||
for _, col := range cols { | |||||
ptrFieldValue, err := col.ValueOfV(&vv) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
fieldValue := *ptrFieldValue | |||||
if col.IsAutoIncrement && isZero(fieldValue.Interface()) { | |||||
continue | |||||
} | |||||
if col.MapType == core.ONLYFROMDB { | |||||
continue | |||||
} | |||||
if col.IsDeleted { | |||||
continue | |||||
} | |||||
if session.Statement.ColumnStr != "" { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); !ok { | |||||
continue | |||||
} | |||||
} | |||||
if session.Statement.OmitStr != "" { | |||||
if _, ok := getFlagForColumn(session.Statement.columnMap, col); ok { | |||||
continue | |||||
} | |||||
} | |||||
if (col.IsCreated || col.IsUpdated) && session.Statement.UseAutoTime { | |||||
val, t := session.Engine.NowTime2(col.SQLType.Name) | |||||
args = append(args, val) | |||||
var colName = col.Name | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnTime(bean, col, t) | |||||
}) | |||||
} else if col.IsVersion && session.Statement.checkVersion { | |||||
args = append(args, 1) | |||||
var colName = col.Name | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnInt(bean, col, 1) | |||||
}) | |||||
} else { | |||||
arg, err := session.value2Interface(col, fieldValue) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
args = append(args, arg) | |||||
} | |||||
colPlaces = append(colPlaces, "?") | |||||
} | |||||
} | |||||
colMultiPlaces = append(colMultiPlaces, strings.Join(colPlaces, ", ")) | |||||
} | |||||
cleanupProcessorsClosures(&session.beforeClosures) | |||||
statement := fmt.Sprintf("INSERT INTO %s (%v%v%v) VALUES (%v)", | |||||
session.Engine.Quote(session.Statement.TableName()), | |||||
session.Engine.QuoteStr(), | |||||
strings.Join(colNames, session.Engine.QuoteStr()+", "+session.Engine.QuoteStr()), | |||||
session.Engine.QuoteStr(), | |||||
strings.Join(colMultiPlaces, "),(")) | |||||
res, err := session.exec(statement, args...) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && session.Statement.UseCache { | |||||
session.cacheInsert(session.Statement.TableName()) | |||||
} | |||||
lenAfterClosures := len(session.afterClosures) | |||||
for i := 0; i < size; i++ { | |||||
elemValue := reflect.Indirect(sliceValue.Index(i)).Addr().Interface() | |||||
// handle AfterInsertProcessor | |||||
if session.IsAutoCommit { | |||||
// !nashtsai! does user expect it's same slice to passed closure when using Before()/After() when insert multi?? | |||||
for _, closure := range session.afterClosures { | |||||
closure(elemValue) | |||||
} | |||||
if processor, ok := interface{}(elemValue).(AfterInsertProcessor); ok { | |||||
processor.AfterInsert() | |||||
} | |||||
} else { | |||||
if lenAfterClosures > 0 { | |||||
if value, has := session.afterInsertBeans[elemValue]; has && value != nil { | |||||
*value = append(*value, session.afterClosures...) | |||||
} else { | |||||
afterClosures := make([]func(interface{}), lenAfterClosures) | |||||
copy(afterClosures, session.afterClosures) | |||||
session.afterInsertBeans[elemValue] = &afterClosures | |||||
} | |||||
} else { | |||||
if _, ok := interface{}(elemValue).(AfterInsertProcessor); ok { | |||||
session.afterInsertBeans[elemValue] = nil | |||||
} | |||||
} | |||||
} | |||||
} | |||||
cleanupProcessorsClosures(&session.afterClosures) | |||||
return res.RowsAffected() | |||||
} | |||||
// InsertMulti insert multiple records | |||||
func (session *Session) InsertMulti(rowsSlicePtr interface{}) (int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr)) | |||||
if sliceValue.Kind() != reflect.Slice { | |||||
return 0, ErrParamsType | |||||
} | |||||
if sliceValue.Len() <= 0 { | |||||
return 0, nil | |||||
} | |||||
return session.innerInsertMulti(rowsSlicePtr) | |||||
} | |||||
func (session *Session) innerInsert(bean interface{}) (int64, error) { | |||||
session.Statement.setRefValue(rValue(bean)) | |||||
if len(session.Statement.TableName()) <= 0 { | |||||
return 0, ErrTableNotFound | |||||
} | |||||
table := session.Statement.RefTable | |||||
// handle BeforeInsertProcessor | |||||
for _, closure := range session.beforeClosures { | |||||
closure(bean) | |||||
} | |||||
cleanupProcessorsClosures(&session.beforeClosures) // cleanup after used | |||||
if processor, ok := interface{}(bean).(BeforeInsertProcessor); ok { | |||||
processor.BeforeInsert() | |||||
} | |||||
// -- | |||||
colNames, args, err := genCols(session.Statement.RefTable, session, bean, false, false) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
// insert expr columns, override if exists | |||||
exprColumns := session.Statement.getExpr() | |||||
exprColVals := make([]string, 0, len(exprColumns)) | |||||
for _, v := range exprColumns { | |||||
// remove the expr columns | |||||
for i, colName := range colNames { | |||||
if colName == v.colName { | |||||
colNames = append(colNames[:i], colNames[i+1:]...) | |||||
args = append(args[:i], args[i+1:]...) | |||||
} | |||||
} | |||||
// append expr column to the end | |||||
colNames = append(colNames, v.colName) | |||||
exprColVals = append(exprColVals, v.expr) | |||||
} | |||||
colPlaces := strings.Repeat("?, ", len(colNames)-len(exprColumns)) | |||||
if len(exprColVals) > 0 { | |||||
colPlaces = colPlaces + strings.Join(exprColVals, ", ") | |||||
} else { | |||||
colPlaces = colPlaces[0 : len(colPlaces)-2] | |||||
} | |||||
sqlStr := fmt.Sprintf("INSERT INTO %s (%v%v%v) VALUES (%v)", | |||||
session.Engine.Quote(session.Statement.TableName()), | |||||
session.Engine.QuoteStr(), | |||||
strings.Join(colNames, session.Engine.Quote(", ")), | |||||
session.Engine.QuoteStr(), | |||||
colPlaces) | |||||
handleAfterInsertProcessorFunc := func(bean interface{}) { | |||||
if session.IsAutoCommit { | |||||
for _, closure := range session.afterClosures { | |||||
closure(bean) | |||||
} | |||||
if processor, ok := interface{}(bean).(AfterInsertProcessor); ok { | |||||
processor.AfterInsert() | |||||
} | |||||
} else { | |||||
lenAfterClosures := len(session.afterClosures) | |||||
if lenAfterClosures > 0 { | |||||
if value, has := session.afterInsertBeans[bean]; has && value != nil { | |||||
*value = append(*value, session.afterClosures...) | |||||
} else { | |||||
afterClosures := make([]func(interface{}), lenAfterClosures) | |||||
copy(afterClosures, session.afterClosures) | |||||
session.afterInsertBeans[bean] = &afterClosures | |||||
} | |||||
} else { | |||||
if _, ok := interface{}(bean).(AfterInsertProcessor); ok { | |||||
session.afterInsertBeans[bean] = nil | |||||
} | |||||
} | |||||
} | |||||
cleanupProcessorsClosures(&session.afterClosures) // cleanup after used | |||||
} | |||||
// for postgres, many of them didn't implement lastInsertId, so we should | |||||
// implemented it ourself. | |||||
if session.Engine.dialect.DBType() == core.ORACLE && len(table.AutoIncrement) > 0 { | |||||
//assert table.AutoIncrement != "" | |||||
res, err := session.query("select seq_atable.currval from dual", args...) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
handleAfterInsertProcessorFunc(bean) | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && session.Statement.UseCache { | |||||
session.cacheInsert(session.Statement.TableName()) | |||||
} | |||||
if table.Version != "" && session.Statement.checkVersion { | |||||
verValue, err := table.VersionColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} else if verValue.IsValid() && verValue.CanSet() { | |||||
verValue.SetInt(1) | |||||
} | |||||
} | |||||
if len(res) < 1 { | |||||
return 0, errors.New("insert no error but not returned id") | |||||
} | |||||
idByte := res[0][table.AutoIncrement] | |||||
id, err := strconv.ParseInt(string(idByte), 10, 64) | |||||
if err != nil || id <= 0 { | |||||
return 1, err | |||||
} | |||||
aiValue, err := table.AutoIncrColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} | |||||
if aiValue == nil || !aiValue.IsValid() || !aiValue.CanSet() { | |||||
return 1, nil | |||||
} | |||||
aiValue.Set(int64ToIntValue(id, aiValue.Type())) | |||||
return 1, nil | |||||
} else if session.Engine.dialect.DBType() == core.POSTGRES && len(table.AutoIncrement) > 0 { | |||||
//assert table.AutoIncrement != "" | |||||
sqlStr = sqlStr + " RETURNING " + session.Engine.Quote(table.AutoIncrement) | |||||
res, err := session.query(sqlStr, args...) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
handleAfterInsertProcessorFunc(bean) | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && session.Statement.UseCache { | |||||
session.cacheInsert(session.Statement.TableName()) | |||||
} | |||||
if table.Version != "" && session.Statement.checkVersion { | |||||
verValue, err := table.VersionColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} else if verValue.IsValid() && verValue.CanSet() { | |||||
verValue.SetInt(1) | |||||
} | |||||
} | |||||
if len(res) < 1 { | |||||
return 0, errors.New("insert no error but not returned id") | |||||
} | |||||
idByte := res[0][table.AutoIncrement] | |||||
id, err := strconv.ParseInt(string(idByte), 10, 64) | |||||
if err != nil || id <= 0 { | |||||
return 1, err | |||||
} | |||||
aiValue, err := table.AutoIncrColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} | |||||
if aiValue == nil || !aiValue.IsValid() || !aiValue.CanSet() { | |||||
return 1, nil | |||||
} | |||||
aiValue.Set(int64ToIntValue(id, aiValue.Type())) | |||||
return 1, nil | |||||
} else { | |||||
res, err := session.exec(sqlStr, args...) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
defer handleAfterInsertProcessorFunc(bean) | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && session.Statement.UseCache { | |||||
session.cacheInsert(session.Statement.TableName()) | |||||
} | |||||
if table.Version != "" && session.Statement.checkVersion { | |||||
verValue, err := table.VersionColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} else if verValue.IsValid() && verValue.CanSet() { | |||||
verValue.SetInt(1) | |||||
} | |||||
} | |||||
if table.AutoIncrement == "" { | |||||
return res.RowsAffected() | |||||
} | |||||
var id int64 | |||||
id, err = res.LastInsertId() | |||||
if err != nil || id <= 0 { | |||||
return res.RowsAffected() | |||||
} | |||||
aiValue, err := table.AutoIncrColumn().ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} | |||||
if aiValue == nil || !aiValue.IsValid() || !aiValue.CanSet() { | |||||
return res.RowsAffected() | |||||
} | |||||
aiValue.Set(int64ToIntValue(id, aiValue.Type())) | |||||
return res.RowsAffected() | |||||
} | |||||
} | |||||
// InsertOne insert only one struct into database as a record. | |||||
// The in parameter bean must a struct or a point to struct. The return | |||||
// parameter is inserted and error | |||||
func (session *Session) InsertOne(bean interface{}) (int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
return session.innerInsert(bean) | |||||
} | |||||
func (session *Session) cacheInsert(tables ...string) error { | |||||
if session.Statement.RefTable == nil { | |||||
return ErrCacheFailed | |||||
} | |||||
table := session.Statement.RefTable | |||||
cacher := session.Engine.getCacher2(table) | |||||
for _, t := range tables { | |||||
session.Engine.logger.Debug("[cache] clear sql:", t) | |||||
cacher.ClearIds(t) | |||||
} | |||||
return nil | |||||
} |
@@ -0,0 +1,42 @@ | |||||
// 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 xorm | |||||
import "reflect" | |||||
// IterFunc only use by Iterate | |||||
type IterFunc func(idx int, bean interface{}) error | |||||
// Rows return sql.Rows compatible Rows obj, as a forward Iterator object for iterating record by record, bean's non-empty fields | |||||
// are conditions. | |||||
func (session *Session) Rows(bean interface{}) (*Rows, error) { | |||||
return newRows(session, bean) | |||||
} | |||||
// Iterate record by record handle records from table, condiBeans's non-empty fields | |||||
// are conditions. beans could be []Struct, []*Struct, map[int64]Struct | |||||
// map[int64]*Struct | |||||
func (session *Session) Iterate(bean interface{}, fun IterFunc) error { | |||||
rows, err := session.Rows(bean) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
defer rows.Close() | |||||
i := 0 | |||||
for rows.Next() { | |||||
b := reflect.New(rows.beanType).Interface() | |||||
err = rows.Scan(b) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
err = fun(i, b) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
i++ | |||||
} | |||||
return err | |||||
} |
@@ -0,0 +1,144 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"database/sql" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
func (session *Session) query(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) { | |||||
session.queryPreprocess(&sqlStr, paramStr...) | |||||
if session.IsAutoCommit { | |||||
return session.innerQuery2(sqlStr, paramStr...) | |||||
} | |||||
return session.txQuery(session.Tx, sqlStr, paramStr...) | |||||
} | |||||
func (session *Session) txQuery(tx *core.Tx, sqlStr string, params ...interface{}) (resultsSlice []map[string][]byte, err error) { | |||||
rows, err := tx.Query(sqlStr, params...) | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
defer rows.Close() | |||||
return rows2maps(rows) | |||||
} | |||||
func (session *Session) innerQuery(sqlStr string, params ...interface{}) (*core.Stmt, *core.Rows, error) { | |||||
var callback func() (*core.Stmt, *core.Rows, error) | |||||
if session.prepareStmt { | |||||
callback = func() (*core.Stmt, *core.Rows, error) { | |||||
stmt, err := session.doPrepare(sqlStr) | |||||
if err != nil { | |||||
return nil, nil, err | |||||
} | |||||
rows, err := stmt.Query(params...) | |||||
if err != nil { | |||||
return nil, nil, err | |||||
} | |||||
return stmt, rows, nil | |||||
} | |||||
} else { | |||||
callback = func() (*core.Stmt, *core.Rows, error) { | |||||
rows, err := session.DB().Query(sqlStr, params...) | |||||
if err != nil { | |||||
return nil, nil, err | |||||
} | |||||
return nil, rows, err | |||||
} | |||||
} | |||||
stmt, rows, err := session.Engine.logSQLQueryTime(sqlStr, params, callback) | |||||
if err != nil { | |||||
return nil, nil, err | |||||
} | |||||
return stmt, rows, nil | |||||
} | |||||
func (session *Session) innerQuery2(sqlStr string, params ...interface{}) ([]map[string][]byte, error) { | |||||
_, rows, err := session.innerQuery(sqlStr, params...) | |||||
if rows != nil { | |||||
defer rows.Close() | |||||
} | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
return rows2maps(rows) | |||||
} | |||||
// Query a raw sql and return records as []map[string][]byte | |||||
func (session *Session) Query(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
return session.query(sqlStr, paramStr...) | |||||
} | |||||
// ============================= | |||||
// for string | |||||
// ============================= | |||||
func (session *Session) query2(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]string, err error) { | |||||
session.queryPreprocess(&sqlStr, paramStr...) | |||||
if session.IsAutoCommit { | |||||
return query2(session.DB(), sqlStr, paramStr...) | |||||
} | |||||
return txQuery2(session.Tx, sqlStr, paramStr...) | |||||
} | |||||
// Execute sql | |||||
func (session *Session) innerExec(sqlStr string, args ...interface{}) (sql.Result, error) { | |||||
if session.prepareStmt { | |||||
stmt, err := session.doPrepare(sqlStr) | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
res, err := stmt.Exec(args...) | |||||
if err != nil { | |||||
return nil, err | |||||
} | |||||
return res, nil | |||||
} | |||||
return session.DB().Exec(sqlStr, args...) | |||||
} | |||||
func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, error) { | |||||
for _, filter := range session.Engine.dialect.Filters() { | |||||
// TODO: for table name, it's no need to RefTable | |||||
sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable) | |||||
} | |||||
session.saveLastSQL(sqlStr, args...) | |||||
return session.Engine.logSQLExecutionTime(sqlStr, args, func() (sql.Result, error) { | |||||
if session.IsAutoCommit { | |||||
// FIXME: oci8 can not auto commit (github.com/mattn/go-oci8) | |||||
if session.Engine.dialect.DBType() == core.ORACLE { | |||||
session.Begin() | |||||
r, err := session.Tx.Exec(sqlStr, args...) | |||||
session.Commit() | |||||
return r, err | |||||
} | |||||
return session.innerExec(sqlStr, args...) | |||||
} | |||||
return session.Tx.Exec(sqlStr, args...) | |||||
}) | |||||
} | |||||
// Exec raw sql | |||||
func (session *Session) Exec(sqlStr string, args ...interface{}) (sql.Result, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
return session.exec(sqlStr, args...) | |||||
} |
@@ -0,0 +1,486 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"database/sql" | |||||
"errors" | |||||
"fmt" | |||||
"reflect" | |||||
"strings" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
// Ping test if database is ok | |||||
func (session *Session) Ping() error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
return session.DB().Ping() | |||||
} | |||||
// CreateTable create a table according a bean | |||||
func (session *Session) CreateTable(bean interface{}) error { | |||||
v := rValue(bean) | |||||
session.Statement.setRefValue(v) | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
return session.createOneTable() | |||||
} | |||||
// CreateIndexes create indexes | |||||
func (session *Session) CreateIndexes(bean interface{}) error { | |||||
v := rValue(bean) | |||||
session.Statement.setRefValue(v) | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sqls := session.Statement.genIndexSQL() | |||||
for _, sqlStr := range sqls { | |||||
_, err := session.exec(sqlStr) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
// CreateUniques create uniques | |||||
func (session *Session) CreateUniques(bean interface{}) error { | |||||
v := rValue(bean) | |||||
session.Statement.setRefValue(v) | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sqls := session.Statement.genUniqueSQL() | |||||
for _, sqlStr := range sqls { | |||||
_, err := session.exec(sqlStr) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
func (session *Session) createOneTable() error { | |||||
sqlStr := session.Statement.genCreateTableSQL() | |||||
_, err := session.exec(sqlStr) | |||||
return err | |||||
} | |||||
// to be deleted | |||||
func (session *Session) createAll() error { | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
for _, table := range session.Engine.Tables { | |||||
session.Statement.RefTable = table | |||||
session.Statement.tableName = table.Name | |||||
err := session.createOneTable() | |||||
session.resetStatement() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
// DropIndexes drop indexes | |||||
func (session *Session) DropIndexes(bean interface{}) error { | |||||
v := rValue(bean) | |||||
session.Statement.setRefValue(v) | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sqls := session.Statement.genDelIndexSQL() | |||||
for _, sqlStr := range sqls { | |||||
_, err := session.exec(sqlStr) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
// DropTable drop table will drop table if exist, if drop failed, it will return error | |||||
func (session *Session) DropTable(beanOrTableName interface{}) error { | |||||
tableName, err := session.Engine.tableName(beanOrTableName) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var needDrop = true | |||||
if !session.Engine.dialect.SupportDropIfExists() { | |||||
sqlStr, args := session.Engine.dialect.TableCheckSql(tableName) | |||||
results, err := session.query(sqlStr, args...) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
needDrop = len(results) > 0 | |||||
} | |||||
if needDrop { | |||||
sqlStr := session.Engine.Dialect().DropTableSql(tableName) | |||||
_, err = session.exec(sqlStr) | |||||
return err | |||||
} | |||||
return nil | |||||
} | |||||
// IsTableExist if a table is exist | |||||
func (session *Session) IsTableExist(beanOrTableName interface{}) (bool, error) { | |||||
tableName, err := session.Engine.tableName(beanOrTableName) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
return session.isTableExist(tableName) | |||||
} | |||||
func (session *Session) isTableExist(tableName string) (bool, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
sqlStr, args := session.Engine.dialect.TableCheckSql(tableName) | |||||
results, err := session.query(sqlStr, args...) | |||||
return len(results) > 0, err | |||||
} | |||||
// IsTableEmpty if table have any records | |||||
func (session *Session) IsTableEmpty(bean interface{}) (bool, error) { | |||||
v := rValue(bean) | |||||
t := v.Type() | |||||
if t.Kind() == reflect.String { | |||||
return session.isTableEmpty(bean.(string)) | |||||
} else if t.Kind() == reflect.Struct { | |||||
rows, err := session.Count(bean) | |||||
return rows == 0, err | |||||
} | |||||
return false, errors.New("bean should be a struct or struct's point") | |||||
} | |||||
func (session *Session) isTableEmpty(tableName string) (bool, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var total int64 | |||||
sqlStr := fmt.Sprintf("select count(*) from %s", session.Engine.Quote(tableName)) | |||||
err := session.DB().QueryRow(sqlStr).Scan(&total) | |||||
session.saveLastSQL(sqlStr) | |||||
if err != nil { | |||||
if err == sql.ErrNoRows { | |||||
err = nil | |||||
} | |||||
return true, err | |||||
} | |||||
return total == 0, nil | |||||
} | |||||
func (session *Session) isIndexExist(tableName, idxName string, unique bool) (bool, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var idx string | |||||
if unique { | |||||
idx = uniqueName(tableName, idxName) | |||||
} else { | |||||
idx = indexName(tableName, idxName) | |||||
} | |||||
sqlStr, args := session.Engine.dialect.IndexCheckSql(tableName, idx) | |||||
results, err := session.query(sqlStr, args...) | |||||
return len(results) > 0, err | |||||
} | |||||
// find if index is exist according cols | |||||
func (session *Session) isIndexExist2(tableName string, cols []string, unique bool) (bool, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
indexes, err := session.Engine.dialect.GetIndexes(tableName) | |||||
if err != nil { | |||||
return false, err | |||||
} | |||||
for _, index := range indexes { | |||||
if sliceEq(index.Cols, cols) { | |||||
if unique { | |||||
return index.Type == core.UniqueType, nil | |||||
} | |||||
return index.Type == core.IndexType, nil | |||||
} | |||||
} | |||||
return false, nil | |||||
} | |||||
func (session *Session) addColumn(colName string) error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
col := session.Statement.RefTable.GetColumn(colName) | |||||
sql, args := session.Statement.genAddColumnStr(col) | |||||
_, err := session.exec(sql, args...) | |||||
return err | |||||
} | |||||
func (session *Session) addIndex(tableName, idxName string) error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
index := session.Statement.RefTable.Indexes[idxName] | |||||
sqlStr := session.Engine.dialect.CreateIndexSql(tableName, index) | |||||
_, err := session.exec(sqlStr) | |||||
return err | |||||
} | |||||
func (session *Session) addUnique(tableName, uqeName string) error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
index := session.Statement.RefTable.Indexes[uqeName] | |||||
sqlStr := session.Engine.dialect.CreateIndexSql(tableName, index) | |||||
_, err := session.exec(sqlStr) | |||||
return err | |||||
} | |||||
// To be deleted | |||||
func (session *Session) dropAll() error { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
for _, table := range session.Engine.Tables { | |||||
session.Statement.Init() | |||||
session.Statement.RefTable = table | |||||
sqlStr := session.Engine.Dialect().DropTableSql(session.Statement.TableName()) | |||||
_, err := session.exec(sqlStr) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
return nil | |||||
} | |||||
// Sync2 synchronize structs to database tables | |||||
func (session *Session) Sync2(beans ...interface{}) error { | |||||
engine := session.Engine | |||||
tables, err := engine.DBMetas() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var structTables []*core.Table | |||||
for _, bean := range beans { | |||||
v := rValue(bean) | |||||
table := engine.mapType(v) | |||||
structTables = append(structTables, table) | |||||
var tbName = session.tbNameNoSchema(table) | |||||
var oriTable *core.Table | |||||
for _, tb := range tables { | |||||
if strings.EqualFold(tb.Name, tbName) { | |||||
oriTable = tb | |||||
break | |||||
} | |||||
} | |||||
if oriTable == nil { | |||||
err = session.StoreEngine(session.Statement.StoreEngine).CreateTable(bean) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
err = session.CreateUniques(bean) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
err = session.CreateIndexes(bean) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} else { | |||||
for _, col := range table.Columns() { | |||||
var oriCol *core.Column | |||||
for _, col2 := range oriTable.Columns() { | |||||
if strings.EqualFold(col.Name, col2.Name) { | |||||
oriCol = col2 | |||||
break | |||||
} | |||||
} | |||||
if oriCol != nil { | |||||
expectedType := engine.dialect.SqlType(col) | |||||
curType := engine.dialect.SqlType(oriCol) | |||||
if expectedType != curType { | |||||
if expectedType == core.Text && | |||||
strings.HasPrefix(curType, core.Varchar) { | |||||
// currently only support mysql & postgres | |||||
if engine.dialect.DBType() == core.MYSQL || | |||||
engine.dialect.DBType() == core.POSTGRES { | |||||
engine.logger.Infof("Table %s column %s change type from %s to %s\n", | |||||
tbName, col.Name, curType, expectedType) | |||||
_, err = engine.Exec(engine.dialect.ModifyColumnSql(table.Name, col)) | |||||
} else { | |||||
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s\n", | |||||
tbName, col.Name, curType, expectedType) | |||||
} | |||||
} else if strings.HasPrefix(curType, core.Varchar) && strings.HasPrefix(expectedType, core.Varchar) { | |||||
if engine.dialect.DBType() == core.MYSQL { | |||||
if oriCol.Length < col.Length { | |||||
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n", | |||||
tbName, col.Name, oriCol.Length, col.Length) | |||||
_, err = engine.Exec(engine.dialect.ModifyColumnSql(table.Name, col)) | |||||
} | |||||
} | |||||
} else { | |||||
if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') { | |||||
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s", | |||||
tbName, col.Name, curType, expectedType) | |||||
} | |||||
} | |||||
} else if expectedType == core.Varchar { | |||||
if engine.dialect.DBType() == core.MYSQL { | |||||
if oriCol.Length < col.Length { | |||||
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n", | |||||
tbName, col.Name, oriCol.Length, col.Length) | |||||
_, err = engine.Exec(engine.dialect.ModifyColumnSql(table.Name, col)) | |||||
} | |||||
} | |||||
} | |||||
if col.Default != oriCol.Default { | |||||
engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s", | |||||
tbName, col.Name, oriCol.Default, col.Default) | |||||
} | |||||
if col.Nullable != oriCol.Nullable { | |||||
engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v", | |||||
tbName, col.Name, oriCol.Nullable, col.Nullable) | |||||
} | |||||
} else { | |||||
session := engine.NewSession() | |||||
session.Statement.RefTable = table | |||||
session.Statement.tableName = tbName | |||||
defer session.Close() | |||||
err = session.addColumn(col.Name) | |||||
} | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
var foundIndexNames = make(map[string]bool) | |||||
var addedNames = make(map[string]*core.Index) | |||||
for name, index := range table.Indexes { | |||||
var oriIndex *core.Index | |||||
for name2, index2 := range oriTable.Indexes { | |||||
if index.Equal(index2) { | |||||
oriIndex = index2 | |||||
foundIndexNames[name2] = true | |||||
break | |||||
} | |||||
} | |||||
if oriIndex != nil { | |||||
if oriIndex.Type != index.Type { | |||||
sql := engine.dialect.DropIndexSql(tbName, oriIndex) | |||||
_, err = engine.Exec(sql) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
oriIndex = nil | |||||
} | |||||
} | |||||
if oriIndex == nil { | |||||
addedNames[name] = index | |||||
} | |||||
} | |||||
for name2, index2 := range oriTable.Indexes { | |||||
if _, ok := foundIndexNames[name2]; !ok { | |||||
sql := engine.dialect.DropIndexSql(tbName, index2) | |||||
_, err = engine.Exec(sql) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
} | |||||
for name, index := range addedNames { | |||||
if index.Type == core.UniqueType { | |||||
session := engine.NewSession() | |||||
session.Statement.RefTable = table | |||||
session.Statement.tableName = tbName | |||||
defer session.Close() | |||||
err = session.addUnique(tbName, name) | |||||
} else if index.Type == core.IndexType { | |||||
session := engine.NewSession() | |||||
session.Statement.RefTable = table | |||||
session.Statement.tableName = tbName | |||||
defer session.Close() | |||||
err = session.addIndex(tbName, name) | |||||
} | |||||
if err != nil { | |||||
return err | |||||
} | |||||
} | |||||
} | |||||
} | |||||
for _, table := range tables { | |||||
var oriTable *core.Table | |||||
for _, structTable := range structTables { | |||||
if strings.EqualFold(table.Name, session.tbNameNoSchema(structTable)) { | |||||
oriTable = structTable | |||||
break | |||||
} | |||||
} | |||||
if oriTable == nil { | |||||
//engine.LogWarnf("Table %s has no struct to mapping it", table.Name) | |||||
continue | |||||
} | |||||
for _, colName := range table.ColumnsSeq() { | |||||
if oriTable.GetColumn(colName) == nil { | |||||
engine.logger.Warnf("Table %s has column %s but struct has not related field", table.Name, colName) | |||||
} | |||||
} | |||||
} | |||||
return nil | |||||
} |
@@ -0,0 +1,137 @@ | |||||
// 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 xorm | |||||
import "database/sql" | |||||
// Count counts the records. bean's non-empty fields | |||||
// are conditions. | |||||
func (session *Session) Count(bean interface{}) (int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if session.Statement.RawSQL == "" { | |||||
sqlStr, args = session.Statement.genCountSQL(bean) | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
var err error | |||||
var total int64 | |||||
if session.IsAutoCommit { | |||||
err = session.DB().QueryRow(sqlStr, args...).Scan(&total) | |||||
} else { | |||||
err = session.Tx.QueryRow(sqlStr, args...).Scan(&total) | |||||
} | |||||
if err == sql.ErrNoRows || err == nil { | |||||
return total, nil | |||||
} | |||||
return 0, err | |||||
} | |||||
// Sum call sum some column. bean's non-empty fields are conditions. | |||||
func (session *Session) Sum(bean interface{}, columnName string) (float64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if len(session.Statement.RawSQL) == 0 { | |||||
sqlStr, args = session.Statement.genSumSQL(bean, columnName) | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
var err error | |||||
var res float64 | |||||
if session.IsAutoCommit { | |||||
err = session.DB().QueryRow(sqlStr, args...).Scan(&res) | |||||
} else { | |||||
err = session.Tx.QueryRow(sqlStr, args...).Scan(&res) | |||||
} | |||||
if err == sql.ErrNoRows || err == nil { | |||||
return res, nil | |||||
} | |||||
return 0, err | |||||
} | |||||
// Sums call sum some columns. bean's non-empty fields are conditions. | |||||
func (session *Session) Sums(bean interface{}, columnNames ...string) ([]float64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if len(session.Statement.RawSQL) == 0 { | |||||
sqlStr, args = session.Statement.genSumSQL(bean, columnNames...) | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
var err error | |||||
var res = make([]float64, len(columnNames), len(columnNames)) | |||||
if session.IsAutoCommit { | |||||
err = session.DB().QueryRow(sqlStr, args...).ScanSlice(&res) | |||||
} else { | |||||
err = session.Tx.QueryRow(sqlStr, args...).ScanSlice(&res) | |||||
} | |||||
if err == sql.ErrNoRows || err == nil { | |||||
return res, nil | |||||
} | |||||
return nil, err | |||||
} | |||||
// SumsInt sum specify columns and return as []int64 instead of []float64 | |||||
func (session *Session) SumsInt(bean interface{}, columnNames ...string) ([]int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
var sqlStr string | |||||
var args []interface{} | |||||
if len(session.Statement.RawSQL) == 0 { | |||||
sqlStr, args = session.Statement.genSumSQL(bean, columnNames...) | |||||
} else { | |||||
sqlStr = session.Statement.RawSQL | |||||
args = session.Statement.RawParams | |||||
} | |||||
session.queryPreprocess(&sqlStr, args...) | |||||
var err error | |||||
var res = make([]int64, 0, len(columnNames)) | |||||
if session.IsAutoCommit { | |||||
err = session.DB().QueryRow(sqlStr, args...).ScanSlice(&res) | |||||
} else { | |||||
err = session.Tx.QueryRow(sqlStr, args...).ScanSlice(&res) | |||||
} | |||||
if err == sql.ErrNoRows || err == nil { | |||||
return res, nil | |||||
} | |||||
return nil, err | |||||
} |
@@ -0,0 +1,83 @@ | |||||
// 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 xorm | |||||
// Begin a transaction | |||||
func (session *Session) Begin() error { | |||||
if session.IsAutoCommit { | |||||
tx, err := session.DB().Begin() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
session.IsAutoCommit = false | |||||
session.IsCommitedOrRollbacked = false | |||||
session.Tx = tx | |||||
session.saveLastSQL("BEGIN TRANSACTION") | |||||
} | |||||
return nil | |||||
} | |||||
// Rollback When using transaction, you can rollback if any error | |||||
func (session *Session) Rollback() error { | |||||
if !session.IsAutoCommit && !session.IsCommitedOrRollbacked { | |||||
session.saveLastSQL(session.Engine.dialect.RollBackStr()) | |||||
session.IsCommitedOrRollbacked = true | |||||
return session.Tx.Rollback() | |||||
} | |||||
return nil | |||||
} | |||||
// Commit When using transaction, Commit will commit all operations. | |||||
func (session *Session) Commit() error { | |||||
if !session.IsAutoCommit && !session.IsCommitedOrRollbacked { | |||||
session.saveLastSQL("COMMIT") | |||||
session.IsCommitedOrRollbacked = true | |||||
var err error | |||||
if err = session.Tx.Commit(); err == nil { | |||||
// handle processors after tx committed | |||||
closureCallFunc := func(closuresPtr *[]func(interface{}), bean interface{}) { | |||||
if closuresPtr != nil { | |||||
for _, closure := range *closuresPtr { | |||||
closure(bean) | |||||
} | |||||
} | |||||
} | |||||
for bean, closuresPtr := range session.afterInsertBeans { | |||||
closureCallFunc(closuresPtr, bean) | |||||
if processor, ok := interface{}(bean).(AfterInsertProcessor); ok { | |||||
processor.AfterInsert() | |||||
} | |||||
} | |||||
for bean, closuresPtr := range session.afterUpdateBeans { | |||||
closureCallFunc(closuresPtr, bean) | |||||
if processor, ok := interface{}(bean).(AfterUpdateProcessor); ok { | |||||
processor.AfterUpdate() | |||||
} | |||||
} | |||||
for bean, closuresPtr := range session.afterDeleteBeans { | |||||
closureCallFunc(closuresPtr, bean) | |||||
if processor, ok := interface{}(bean).(AfterDeleteProcessor); ok { | |||||
processor.AfterDelete() | |||||
} | |||||
} | |||||
cleanUpFunc := func(slices *map[interface{}]*[]func(interface{})) { | |||||
if len(*slices) > 0 { | |||||
*slices = make(map[interface{}]*[]func(interface{}), 0) | |||||
} | |||||
} | |||||
cleanUpFunc(&session.afterInsertBeans) | |||||
cleanUpFunc(&session.afterUpdateBeans) | |||||
cleanUpFunc(&session.afterDeleteBeans) | |||||
} | |||||
return err | |||||
} | |||||
return nil | |||||
} |
@@ -0,0 +1,345 @@ | |||||
// 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 xorm | |||||
import ( | |||||
"errors" | |||||
"fmt" | |||||
"reflect" | |||||
"strconv" | |||||
"strings" | |||||
"github.com/go-xorm/builder" | |||||
"github.com/go-xorm/core" | |||||
) | |||||
func (session *Session) cacheUpdate(sqlStr string, args ...interface{}) error { | |||||
if session.Statement.RefTable == nil || | |||||
session.Tx != nil { | |||||
return ErrCacheFailed | |||||
} | |||||
oldhead, newsql := session.Statement.convertUpdateSQL(sqlStr) | |||||
if newsql == "" { | |||||
return ErrCacheFailed | |||||
} | |||||
for _, filter := range session.Engine.dialect.Filters() { | |||||
newsql = filter.Do(newsql, session.Engine.dialect, session.Statement.RefTable) | |||||
} | |||||
session.Engine.logger.Debug("[cacheUpdate] new sql", oldhead, newsql) | |||||
var nStart int | |||||
if len(args) > 0 { | |||||
if strings.Index(sqlStr, "?") > -1 { | |||||
nStart = strings.Count(oldhead, "?") | |||||
} else { | |||||
// only for pq, TODO: if any other databse? | |||||
nStart = strings.Count(oldhead, "$") | |||||
} | |||||
} | |||||
table := session.Statement.RefTable | |||||
cacher := session.Engine.getCacher2(table) | |||||
tableName := session.Statement.TableName() | |||||
session.Engine.logger.Debug("[cacheUpdate] get cache sql", newsql, args[nStart:]) | |||||
ids, err := core.GetCacheSql(cacher, tableName, newsql, args[nStart:]) | |||||
if err != nil { | |||||
rows, err := session.DB().Query(newsql, args[nStart:]...) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
defer rows.Close() | |||||
ids = make([]core.PK, 0) | |||||
for rows.Next() { | |||||
var res = make([]string, len(table.PrimaryKeys)) | |||||
err = rows.ScanSlice(&res) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
var pk core.PK = make([]interface{}, len(table.PrimaryKeys)) | |||||
for i, col := range table.PKColumns() { | |||||
if col.SQLType.IsNumeric() { | |||||
n, err := strconv.ParseInt(res[i], 10, 64) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
pk[i] = n | |||||
} else if col.SQLType.IsText() { | |||||
pk[i] = res[i] | |||||
} else { | |||||
return errors.New("not supported") | |||||
} | |||||
} | |||||
ids = append(ids, pk) | |||||
} | |||||
session.Engine.logger.Debug("[cacheUpdate] find updated id", ids) | |||||
} /*else { | |||||
session.Engine.LogDebug("[xorm:cacheUpdate] del cached sql:", tableName, newsql, args) | |||||
cacher.DelIds(tableName, genSqlKey(newsql, args)) | |||||
}*/ | |||||
for _, id := range ids { | |||||
sid, err := id.ToString() | |||||
if err != nil { | |||||
return err | |||||
} | |||||
if bean := cacher.GetBean(tableName, sid); bean != nil { | |||||
sqls := splitNNoCase(sqlStr, "where", 2) | |||||
if len(sqls) == 0 || len(sqls) > 2 { | |||||
return ErrCacheFailed | |||||
} | |||||
sqls = splitNNoCase(sqls[0], "set", 2) | |||||
if len(sqls) != 2 { | |||||
return ErrCacheFailed | |||||
} | |||||
kvs := strings.Split(strings.TrimSpace(sqls[1]), ",") | |||||
for idx, kv := range kvs { | |||||
sps := strings.SplitN(kv, "=", 2) | |||||
sps2 := strings.Split(sps[0], ".") | |||||
colName := sps2[len(sps2)-1] | |||||
if strings.Contains(colName, "`") { | |||||
colName = strings.TrimSpace(strings.Replace(colName, "`", "", -1)) | |||||
} else if strings.Contains(colName, session.Engine.QuoteStr()) { | |||||
colName = strings.TrimSpace(strings.Replace(colName, session.Engine.QuoteStr(), "", -1)) | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheUpdate] cannot find column", tableName, colName) | |||||
return ErrCacheFailed | |||||
} | |||||
if col := table.GetColumn(colName); col != nil { | |||||
fieldValue, err := col.ValueOf(bean) | |||||
if err != nil { | |||||
session.Engine.logger.Error(err) | |||||
} else { | |||||
session.Engine.logger.Debug("[cacheUpdate] set bean field", bean, colName, fieldValue.Interface()) | |||||
if col.IsVersion && session.Statement.checkVersion { | |||||
fieldValue.SetInt(fieldValue.Int() + 1) | |||||
} else { | |||||
fieldValue.Set(reflect.ValueOf(args[idx])) | |||||
} | |||||
} | |||||
} else { | |||||
session.Engine.logger.Errorf("[cacheUpdate] ERROR: column %v is not table %v's", | |||||
colName, table.Name) | |||||
} | |||||
} | |||||
session.Engine.logger.Debug("[cacheUpdate] update cache", tableName, id, bean) | |||||
cacher.PutBean(tableName, sid, bean) | |||||
} | |||||
} | |||||
session.Engine.logger.Debug("[cacheUpdate] clear cached table sql:", tableName) | |||||
cacher.ClearIds(tableName) | |||||
return nil | |||||
} | |||||
// Update records, bean's non-empty fields are updated contents, | |||||
// condiBean' non-empty filds are conditions | |||||
// CAUTION: | |||||
// 1.bool will defaultly be updated content nor conditions | |||||
// You should call UseBool if you have bool to use. | |||||
// 2.float32 & float64 may be not inexact as conditions | |||||
func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int64, error) { | |||||
defer session.resetStatement() | |||||
if session.IsAutoClose { | |||||
defer session.Close() | |||||
} | |||||
v := rValue(bean) | |||||
t := v.Type() | |||||
var colNames []string | |||||
var args []interface{} | |||||
// handle before update processors | |||||
for _, closure := range session.beforeClosures { | |||||
closure(bean) | |||||
} | |||||
cleanupProcessorsClosures(&session.beforeClosures) // cleanup after used | |||||
if processor, ok := interface{}(bean).(BeforeUpdateProcessor); ok { | |||||
processor.BeforeUpdate() | |||||
} | |||||
// -- | |||||
var err error | |||||
var isMap = t.Kind() == reflect.Map | |||||
var isStruct = t.Kind() == reflect.Struct | |||||
if isStruct { | |||||
session.Statement.setRefValue(v) | |||||
if len(session.Statement.TableName()) <= 0 { | |||||
return 0, ErrTableNotFound | |||||
} | |||||
if session.Statement.ColumnStr == "" { | |||||
colNames, args = buildUpdates(session.Engine, session.Statement.RefTable, bean, false, false, | |||||
false, false, session.Statement.allUseBool, session.Statement.useAllCols, | |||||
session.Statement.mustColumnMap, session.Statement.nullableMap, | |||||
session.Statement.columnMap, true, session.Statement.unscoped) | |||||
} else { | |||||
colNames, args, err = genCols(session.Statement.RefTable, session, bean, true, true) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
} | |||||
} else if isMap { | |||||
colNames = make([]string, 0) | |||||
args = make([]interface{}, 0) | |||||
bValue := reflect.Indirect(reflect.ValueOf(bean)) | |||||
for _, v := range bValue.MapKeys() { | |||||
colNames = append(colNames, session.Engine.Quote(v.String())+" = ?") | |||||
args = append(args, bValue.MapIndex(v).Interface()) | |||||
} | |||||
} else { | |||||
return 0, ErrParamsType | |||||
} | |||||
table := session.Statement.RefTable | |||||
if session.Statement.UseAutoTime && table != nil && table.Updated != "" { | |||||
colNames = append(colNames, session.Engine.Quote(table.Updated)+" = ?") | |||||
col := table.UpdatedColumn() | |||||
val, t := session.Engine.NowTime2(col.SQLType.Name) | |||||
args = append(args, val) | |||||
var colName = col.Name | |||||
if isStruct { | |||||
session.afterClosures = append(session.afterClosures, func(bean interface{}) { | |||||
col := table.GetColumn(colName) | |||||
setColumnTime(bean, col, t) | |||||
}) | |||||
} | |||||
} | |||||
//for update action to like "column = column + ?" | |||||
incColumns := session.Statement.getInc() | |||||
for _, v := range incColumns { | |||||
colNames = append(colNames, session.Engine.Quote(v.colName)+" = "+session.Engine.Quote(v.colName)+" + ?") | |||||
args = append(args, v.arg) | |||||
} | |||||
//for update action to like "column = column - ?" | |||||
decColumns := session.Statement.getDec() | |||||
for _, v := range decColumns { | |||||
colNames = append(colNames, session.Engine.Quote(v.colName)+" = "+session.Engine.Quote(v.colName)+" - ?") | |||||
args = append(args, v.arg) | |||||
} | |||||
//for update action to like "column = expression" | |||||
exprColumns := session.Statement.getExpr() | |||||
for _, v := range exprColumns { | |||||
colNames = append(colNames, session.Engine.Quote(v.colName)+" = "+v.expr) | |||||
} | |||||
session.Statement.processIDParam() | |||||
var autoCond builder.Cond | |||||
if !session.Statement.noAutoCondition && len(condiBean) > 0 { | |||||
var err error | |||||
autoCond, err = session.Statement.buildConds(session.Statement.RefTable, condiBean[0], true, true, false, true, false) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
} | |||||
st := session.Statement | |||||
defer session.resetStatement() | |||||
var sqlStr string | |||||
var condArgs []interface{} | |||||
var condSQL string | |||||
cond := session.Statement.cond.And(autoCond) | |||||
doIncVer := false | |||||
var verValue *reflect.Value | |||||
if table != nil && table.Version != "" && session.Statement.checkVersion { | |||||
verValue, err = table.VersionColumn().ValueOf(bean) | |||||
if err != nil { | |||||
return 0, err | |||||
} | |||||
cond = cond.And(builder.Eq{session.Engine.Quote(table.Version): verValue.Interface()}) | |||||
condSQL, condArgs, _ = builder.ToSQL(cond) | |||||
if len(condSQL) > 0 { | |||||
condSQL = "WHERE " + condSQL | |||||
} | |||||
if st.LimitN > 0 { | |||||
condSQL = condSQL + fmt.Sprintf(" LIMIT %d", st.LimitN) | |||||
} | |||||
sqlStr = fmt.Sprintf("UPDATE %v SET %v, %v %v", | |||||
session.Engine.Quote(session.Statement.TableName()), | |||||
strings.Join(colNames, ", "), | |||||
session.Engine.Quote(table.Version)+" = "+session.Engine.Quote(table.Version)+" + 1", | |||||
condSQL) | |||||
doIncVer = true | |||||
} else { | |||||
condSQL, condArgs, _ = builder.ToSQL(cond) | |||||
if len(condSQL) > 0 { | |||||
condSQL = "WHERE " + condSQL | |||||
} | |||||
if st.LimitN > 0 { | |||||
condSQL = condSQL + fmt.Sprintf(" LIMIT %d", st.LimitN) | |||||
} | |||||
sqlStr = fmt.Sprintf("UPDATE %v SET %v %v", | |||||
session.Engine.Quote(session.Statement.TableName()), | |||||
strings.Join(colNames, ", "), | |||||
condSQL) | |||||
} | |||||
res, err := session.exec(sqlStr, append(args, condArgs...)...) | |||||
if err != nil { | |||||
return 0, err | |||||
} else if doIncVer { | |||||
if verValue != nil && verValue.IsValid() && verValue.CanSet() { | |||||
verValue.SetInt(verValue.Int() + 1) | |||||
} | |||||
} | |||||
if table != nil { | |||||
if cacher := session.Engine.getCacher2(table); cacher != nil && session.Statement.UseCache { | |||||
cacher.ClearIds(session.Statement.TableName()) | |||||
cacher.ClearBeans(session.Statement.TableName()) | |||||
} | |||||
} | |||||
// handle after update processors | |||||
if session.IsAutoCommit { | |||||
for _, closure := range session.afterClosures { | |||||
closure(bean) | |||||
} | |||||
if processor, ok := interface{}(bean).(AfterUpdateProcessor); ok { | |||||
session.Engine.logger.Debug("[event]", session.Statement.TableName(), " has after update processor") | |||||
processor.AfterUpdate() | |||||
} | |||||
} else { | |||||
lenAfterClosures := len(session.afterClosures) | |||||
if lenAfterClosures > 0 { | |||||
if value, has := session.afterUpdateBeans[bean]; has && value != nil { | |||||
*value = append(*value, session.afterClosures...) | |||||
} else { | |||||
afterClosures := make([]func(interface{}), lenAfterClosures) | |||||
copy(afterClosures, session.afterClosures) | |||||
// FIXME: if bean is a map type, it will panic because map cannot be as map key | |||||
session.afterUpdateBeans[bean] = &afterClosures | |||||
} | |||||
} else { | |||||
if _, ok := interface{}(bean).(AfterInsertProcessor); ok { | |||||
session.afterUpdateBeans[bean] = nil | |||||
} | |||||
} | |||||
} | |||||
cleanupProcessorsClosures(&session.afterClosures) // cleanup after used | |||||
// -- | |||||
return res.RowsAffected() | |||||
} |
@@ -386,16 +386,16 @@ func (db *sqlite3) GetIndexes(tableName string) (map[string]*core.Index, error) | |||||
indexes := make(map[string]*core.Index, 0) | indexes := make(map[string]*core.Index, 0) | ||||
for rows.Next() { | for rows.Next() { | ||||
var tmpSql sql.NullString | |||||
err = rows.Scan(&tmpSql) | |||||
var tmpSQL sql.NullString | |||||
err = rows.Scan(&tmpSQL) | |||||
if err != nil { | if err != nil { | ||||
return nil, err | return nil, err | ||||
} | } | ||||
if !tmpSql.Valid { | |||||
if !tmpSQL.Valid { | |||||
continue | continue | ||||
} | } | ||||
sql := tmpSql.String | |||||
sql := tmpSQL.String | |||||
index := new(core.Index) | index := new(core.Index) | ||||
nNStart := strings.Index(sql, "INDEX") | nNStart := strings.Index(sql, "INDEX") | ||||
@@ -258,7 +258,7 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{}, | |||||
if col.IsDeleted && !unscoped { | if col.IsDeleted && !unscoped { | ||||
continue | continue | ||||
} | } | ||||
if use, ok := columnMap[col.Name]; ok && !use { | |||||
if use, ok := columnMap[strings.ToLower(col.Name)]; ok && !use { | |||||
continue | continue | ||||
} | } | ||||
@@ -273,9 +273,8 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{}, | |||||
requiredField := useAllCols | requiredField := useAllCols | ||||
includeNil := useAllCols | includeNil := useAllCols | ||||
lColName := strings.ToLower(col.Name) | |||||
if b, ok := mustColumnMap[lColName]; ok { | |||||
if b, ok := getFlagForColumn(mustColumnMap, col); ok { | |||||
if b { | if b { | ||||
requiredField = true | requiredField = true | ||||
} else { | } else { | ||||
@@ -284,7 +283,7 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{}, | |||||
} | } | ||||
// !evalphobia! set fieldValue as nil when column is nullable and zero-value | // !evalphobia! set fieldValue as nil when column is nullable and zero-value | ||||
if b, ok := nullableMap[lColName]; ok { | |||||
if b, ok := getFlagForColumn(nullableMap, col); ok { | |||||
if b && col.Nullable && isZero(fieldValue.Interface()) { | if b && col.Nullable && isZero(fieldValue.Interface()) { | ||||
var nilValue *int | var nilValue *int | ||||
fieldValue = reflect.ValueOf(nilValue) | fieldValue = reflect.ValueOf(nilValue) | ||||
@@ -498,7 +497,7 @@ func buildConds(engine *Engine, table *core.Table, bean interface{}, | |||||
continue | continue | ||||
} | } | ||||
if engine.dialect.DBType() == core.MSSQL && col.SQLType.Name == core.Text { | |||||
if engine.dialect.DBType() == core.MSSQL && (col.SQLType.Name == core.Text || col.SQLType.IsBlob() || col.SQLType.Name == core.TimeStampz) { | |||||
continue | continue | ||||
} | } | ||||
if col.SQLType.IsJson() { | if col.SQLType.IsJson() { | ||||
@@ -523,7 +522,11 @@ func buildConds(engine *Engine, table *core.Table, bean interface{}, | |||||
} | } | ||||
if col.IsDeleted && !unscoped { // tag "deleted" is enabled | if col.IsDeleted && !unscoped { // tag "deleted" is enabled | ||||
conds = append(conds, builder.IsNull{colName}.Or(builder.Eq{colName: "0001-01-01 00:00:00"})) | |||||
if engine.dialect.DBType() == core.MSSQL { | |||||
conds = append(conds, builder.IsNull{colName}) | |||||
} else { | |||||
conds = append(conds, builder.IsNull{colName}.Or(builder.Eq{colName: "0001-01-01 00:00:00"})) | |||||
} | |||||
} | } | ||||
fieldValue := *fieldValuePtr | fieldValue := *fieldValuePtr | ||||
@@ -533,7 +536,8 @@ func buildConds(engine *Engine, table *core.Table, bean interface{}, | |||||
fieldType := reflect.TypeOf(fieldValue.Interface()) | fieldType := reflect.TypeOf(fieldValue.Interface()) | ||||
requiredField := useAllCols | requiredField := useAllCols | ||||
if b, ok := mustColumnMap[strings.ToLower(col.Name)]; ok { | |||||
if b, ok := getFlagForColumn(mustColumnMap, col); ok { | |||||
if b { | if b { | ||||
requiredField = true | requiredField = true | ||||
} else { | } else { | ||||
@@ -703,7 +707,14 @@ func (statement *Statement) TableName() string { | |||||
} | } | ||||
// Id generate "where id = ? " statment or for composite key "where key1 = ? and key2 = ?" | // Id generate "where id = ? " statment or for composite key "where key1 = ? and key2 = ?" | ||||
// | |||||
// Deprecated: use ID instead | |||||
func (statement *Statement) Id(id interface{}) *Statement { | func (statement *Statement) Id(id interface{}) *Statement { | ||||
return statement.ID(id) | |||||
} | |||||
// ID generate "where id = ? " statment or for composite key "where key1 = ? and key2 = ?" | |||||
func (statement *Statement) ID(id interface{}) *Statement { | |||||
idValue := reflect.ValueOf(id) | idValue := reflect.ValueOf(id) | ||||
idType := reflect.TypeOf(idValue.Interface()) | idType := reflect.TypeOf(idValue.Interface()) | ||||
@@ -985,15 +996,16 @@ func (statement *Statement) Unscoped() *Statement { | |||||
} | } | ||||
func (statement *Statement) genColumnStr() string { | func (statement *Statement) genColumnStr() string { | ||||
var buf bytes.Buffer | var buf bytes.Buffer | ||||
if statement.RefTable == nil { | |||||
return "" | |||||
} | |||||
columns := statement.RefTable.Columns() | columns := statement.RefTable.Columns() | ||||
for _, col := range columns { | for _, col := range columns { | ||||
if statement.OmitStr != "" { | if statement.OmitStr != "" { | ||||
if _, ok := statement.columnMap[strings.ToLower(col.Name)]; ok { | |||||
if _, ok := getFlagForColumn(statement.columnMap, col); ok { | |||||
continue | continue | ||||
} | } | ||||
} | } | ||||
@@ -1102,7 +1114,7 @@ func (statement *Statement) genConds(bean interface{}) (string, []interface{}, e | |||||
statement.cond = statement.cond.And(autoCond) | statement.cond = statement.cond.And(autoCond) | ||||
} | } | ||||
statement.processIdParam() | |||||
statement.processIDParam() | |||||
return builder.ToSQL(statement.cond) | return builder.ToSQL(statement.cond) | ||||
} | } | ||||
@@ -1144,14 +1156,15 @@ func (statement *Statement) genCountSQL(bean interface{}) (string, []interface{} | |||||
condSQL, condArgs, _ := statement.genConds(bean) | condSQL, condArgs, _ := statement.genConds(bean) | ||||
var selectSql = statement.selectStr | |||||
if len(selectSql) <= 0 { | |||||
var selectSQL = statement.selectStr | |||||
if len(selectSQL) <= 0 { | |||||
if statement.IsDistinct { | if statement.IsDistinct { | ||||
selectSql = fmt.Sprintf("count(DISTINCT %s)", statement.ColumnStr) | |||||
selectSQL = fmt.Sprintf("count(DISTINCT %s)", statement.ColumnStr) | |||||
} else { | |||||
selectSQL = "count(*)" | |||||
} | } | ||||
selectSql = "count(*)" | |||||
} | } | ||||
return statement.genSelectSQL(selectSql, condSQL), append(statement.joinArgs, condArgs...) | |||||
return statement.genSelectSQL(selectSQL, condSQL), append(statement.joinArgs, condArgs...) | |||||
} | } | ||||
func (statement *Statement) genSumSQL(bean interface{}, columns ...string) (string, []interface{}) { | func (statement *Statement) genSumSQL(bean interface{}, columns ...string) (string, []interface{}) { | ||||
@@ -1178,7 +1191,7 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { | |||||
var top string | var top string | ||||
var mssqlCondi string | var mssqlCondi string | ||||
statement.processIdParam() | |||||
statement.processIDParam() | |||||
var buf bytes.Buffer | var buf bytes.Buffer | ||||
if len(condSQL) > 0 { | if len(condSQL) > 0 { | ||||
@@ -1275,7 +1288,7 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { | |||||
return | return | ||||
} | } | ||||
func (statement *Statement) processIdParam() { | |||||
func (statement *Statement) processIDParam() { | |||||
if statement.IdParam == nil { | if statement.IdParam == nil { | ||||
return | return | ||||
} | } | ||||
@@ -1316,7 +1329,12 @@ func (statement *Statement) convertIDSQL(sqlStr string) string { | |||||
return "" | return "" | ||||
} | } | ||||
return fmt.Sprintf("SELECT %s FROM %v", colstrs, sqls[1]) | |||||
var top string | |||||
if statement.LimitN > 0 && statement.Engine.dialect.DBType() == core.MSSQL { | |||||
top = fmt.Sprintf("TOP %d ", statement.LimitN) | |||||
} | |||||
return fmt.Sprintf("SELECT %s%s FROM %v", top, colstrs, sqls[1]) | |||||
} | } | ||||
return "" | return "" | ||||
} | } | ||||
@@ -21,42 +21,52 @@ type SyslogLogger struct { | |||||
showSQL bool | showSQL bool | ||||
} | } | ||||
// NewSyslogLogger implements core.ILogger | |||||
func NewSyslogLogger(w *syslog.Writer) *SyslogLogger { | func NewSyslogLogger(w *syslog.Writer) *SyslogLogger { | ||||
return &SyslogLogger{w: w} | return &SyslogLogger{w: w} | ||||
} | } | ||||
// Debug log content as Debug | |||||
func (s *SyslogLogger) Debug(v ...interface{}) { | func (s *SyslogLogger) Debug(v ...interface{}) { | ||||
s.w.Debug(fmt.Sprint(v...)) | s.w.Debug(fmt.Sprint(v...)) | ||||
} | } | ||||
// Debugf log content as Debug and format | |||||
func (s *SyslogLogger) Debugf(format string, v ...interface{}) { | func (s *SyslogLogger) Debugf(format string, v ...interface{}) { | ||||
s.w.Debug(fmt.Sprintf(format, v...)) | s.w.Debug(fmt.Sprintf(format, v...)) | ||||
} | } | ||||
// Error log content as Error | |||||
func (s *SyslogLogger) Error(v ...interface{}) { | func (s *SyslogLogger) Error(v ...interface{}) { | ||||
s.w.Err(fmt.Sprint(v...)) | s.w.Err(fmt.Sprint(v...)) | ||||
} | } | ||||
// Errorf log content as Errorf and format | |||||
func (s *SyslogLogger) Errorf(format string, v ...interface{}) { | func (s *SyslogLogger) Errorf(format string, v ...interface{}) { | ||||
s.w.Err(fmt.Sprintf(format, v...)) | s.w.Err(fmt.Sprintf(format, v...)) | ||||
} | } | ||||
// Info log content as Info | |||||
func (s *SyslogLogger) Info(v ...interface{}) { | func (s *SyslogLogger) Info(v ...interface{}) { | ||||
s.w.Info(fmt.Sprint(v...)) | s.w.Info(fmt.Sprint(v...)) | ||||
} | } | ||||
// Infof log content as Infof and format | |||||
func (s *SyslogLogger) Infof(format string, v ...interface{}) { | func (s *SyslogLogger) Infof(format string, v ...interface{}) { | ||||
s.w.Info(fmt.Sprintf(format, v...)) | s.w.Info(fmt.Sprintf(format, v...)) | ||||
} | } | ||||
// Warn log content as Warn | |||||
func (s *SyslogLogger) Warn(v ...interface{}) { | func (s *SyslogLogger) Warn(v ...interface{}) { | ||||
s.w.Warning(fmt.Sprint(v...)) | s.w.Warning(fmt.Sprint(v...)) | ||||
} | } | ||||
// Warnf log content as Warnf and format | |||||
func (s *SyslogLogger) Warnf(format string, v ...interface{}) { | func (s *SyslogLogger) Warnf(format string, v ...interface{}) { | ||||
s.w.Warning(fmt.Sprintf(format, v...)) | s.w.Warning(fmt.Sprintf(format, v...)) | ||||
} | } | ||||
// Level shows log level | |||||
func (s *SyslogLogger) Level() core.LogLevel { | func (s *SyslogLogger) Level() core.LogLevel { | ||||
return core.LOG_UNKNOWN | return core.LOG_UNKNOWN | ||||
} | } | ||||
@@ -64,6 +74,7 @@ func (s *SyslogLogger) Level() core.LogLevel { | |||||
// SetLevel always return error, as current log/syslog package doesn't allow to set priority level after syslog.Writer created | // SetLevel always return error, as current log/syslog package doesn't allow to set priority level after syslog.Writer created | ||||
func (s *SyslogLogger) SetLevel(l core.LogLevel) {} | func (s *SyslogLogger) SetLevel(l core.LogLevel) {} | ||||
// ShowSQL set if logging SQL | |||||
func (s *SyslogLogger) ShowSQL(show ...bool) { | func (s *SyslogLogger) ShowSQL(show ...bool) { | ||||
if len(show) == 0 { | if len(show) == 0 { | ||||
s.showSQL = true | s.showSQL = true | ||||
@@ -72,6 +83,7 @@ func (s *SyslogLogger) ShowSQL(show ...bool) { | |||||
s.showSQL = show[0] | s.showSQL = show[0] | ||||
} | } | ||||
// IsShowSQL if logging SQL | |||||
func (s *SyslogLogger) IsShowSQL() bool { | func (s *SyslogLogger) IsShowSQL() bool { | ||||
return s.showSQL | return s.showSQL | ||||
} | } |
@@ -207,16 +207,16 @@ | |||||
"revisionTime": "2016-11-01T11:13:14Z" | "revisionTime": "2016-11-01T11:13:14Z" | ||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "PPOvZWzZLvyb0lB4efMAHW9qkd8=", | |||||
"checksumSHA1": "sDRC697KuCbpI+1i2VPhyqgAvjs=", | |||||
"path": "github.com/go-xorm/builder", | "path": "github.com/go-xorm/builder", | ||||
"revision": "cd42e8337f3031e737c3f415b6354793cf30f1c9", | |||||
"revisionTime": "2016-10-21T06:05:34Z" | |||||
"revision": "db75972580de4a7c6c20fff5b16a924c3de3fa12", | |||||
"revisionTime": "2016-12-14T02:05:24Z" | |||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "ex5USc7tJNNS0nW/O+/69/kMHtM=", | |||||
"checksumSHA1": "T1DSQqU9e7oW0up0W55TkG4Cb7M=", | |||||
"path": "github.com/go-xorm/core", | "path": "github.com/go-xorm/core", | ||||
"revision": "2ec3936f8a8a3fb6397c6c10185acffa87488534", | |||||
"revisionTime": "2016-11-01T01:36:51Z" | |||||
"revision": "60b1704516c3af6ff969d81f359cf310ad43a2e0", | |||||
"revisionTime": "2017-01-03T06:17:17Z" | |||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "k52lEKLp8j5M+jFpe+3u+bIFpxQ=", | "checksumSHA1": "k52lEKLp8j5M+jFpe+3u+bIFpxQ=", | ||||
@@ -225,10 +225,10 @@ | |||||
"revisionTime": "2016-08-11T02:11:45Z" | "revisionTime": "2016-08-11T02:11:45Z" | ||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "eOdqyQnmqdF0VZpBgYoOaYQDaiw=", | |||||
"checksumSHA1": "eEVm8NprkjOX2HZVxIJwbOLD5Hg=", | |||||
"path": "github.com/go-xorm/xorm", | "path": "github.com/go-xorm/xorm", | ||||
"revision": "f2610e02a1a1240d663ebe5bcde6c9ad4f1372cb", | |||||
"revisionTime": "2016-11-11T16:13:12Z" | |||||
"revision": "44b70cccf417e3d4a565aaa3128853b5cd553767", | |||||
"revisionTime": "2017-01-03T05:31:47Z" | |||||
}, | }, | ||||
{ | { | ||||
"checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=", | "checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=", | ||||