HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3960b20bf1 into 545f30f5cc

This commit is contained in:
RideWindX 2018-07-24 06:05:23 +00:00 committed by GitHub
parent 545f30f5cc 3960b20bf1
commit dca0d7c3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc.go
View File

@ -10,7 +10,7 @@ Installation
Make sure you have installed Go 1.6+ and then: Make sure you have installed Go 1.6+ and then:
go get github.com/go-xorm/xorm go get github.com/cochainio/xorm
Create Engine Create Engine

2
engine.go
View File

@ -1134,7 +1134,7 @@ func (engine *Engine) idTypeAssertion(col *core.Column, sid string) (interface{}
return nil, err return nil, err
} }
return n, nil return n, nil
} else if col.SQLType.IsText() { } else if col.SQLType.IsText() || col.SQLType.IsBlob() {
return sid, nil return sid, nil
} else { } else {
return nil, errors.New("not supported") return nil, errors.New("not supported")

2
examples/cache.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/cachegoroutine.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/conversion.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/derive.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/find.go
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"time" "time"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
) )
// User describes a user // User describes a user

2
examples/goroutine.go
View File

@ -6,7 +6,7 @@ import (
"runtime" "runtime"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/maxconnect.go
View File

@ -6,7 +6,7 @@ import (
"runtime" "runtime"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/singlemapping.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/sync.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/lib/pq" _ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
examples/tables.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )

2
migrate/migrate.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
) )
// MigrateFunc is the func signature for migrating. // MigrateFunc is the func signature for migrating.

2
migrate/migrate_test.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/go-xorm/xorm" "github.com/cochainio/xorm"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"gopkg.in/stretchr/testify.v1/assert" "gopkg.in/stretchr/testify.v1/assert"
) )

2
session_find.go
View File

@ -104,7 +104,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
} }
} else { } else {
// !oinume! Add "<col> IS NULL" to WHERE whatever condiBean is given. // !oinume! Add "<col> IS NULL" to WHERE whatever condiBean is given.
// See https://github.com/go-xorm/xorm/issues/179 // See https://github.com/cochainio/xorm/issues/179
if col := table.DeletedColumn(); col != nil && !session.statement.unscoped { // tag "deleted" is enabled if col := table.DeletedColumn(); col != nil && !session.statement.unscoped { // tag "deleted" is enabled
var colName = session.engine.Quote(col.Name) var colName = session.engine.Quote(col.Name)
if addedTableName { if addedTableName {