Browse Source

move depends package from github.com to customize domain (#1327)

tags/v0.7.4
Lunny Xiao GitHub 5 months ago
parent
commit
c9b14f9487
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 74 additions and 73 deletions
  1. +2
    -2
      .circleci/config.yml
  2. +2
    -2
      .drone.yml
  3. +1
    -1
      README.md
  4. +1
    -1
      cache_lru.go
  5. +1
    -1
      cache_lru_test.go
  6. +1
    -1
      cache_memory_store.go
  7. +1
    -1
      dialect_mssql.go
  8. +1
    -1
      dialect_mssql_test.go
  9. +1
    -1
      dialect_mysql.go
  10. +1
    -1
      dialect_oracle.go
  11. +1
    -1
      dialect_postgres.go
  12. +1
    -1
      dialect_postgres_test.go
  13. +1
    -1
      dialect_sqlite3.go
  14. +2
    -2
      engine.go
  15. +2
    -2
      engine_cond.go
  16. +1
    -1
      engine_group.go
  17. +1
    -1
      engine_table.go
  18. +2
    -3
      go.mod
  19. +6
    -4
      go.sum
  20. +1
    -1
      helpers.go
  21. +1
    -1
      interface.go
  22. +1
    -1
      logger.go
  23. +1
    -1
      rows.go
  24. +1
    -1
      session.go
  25. +1
    -1
      session_cols.go
  26. +1
    -1
      session_cols_test.go
  27. +1
    -1
      session_cond.go
  28. +1
    -1
      session_cond_test.go
  29. +1
    -1
      session_convert.go
  30. +1
    -1
      session_delete.go
  31. +1
    -1
      session_delete_test.go
  32. +2
    -2
      session_exist.go
  33. +2
    -2
      session_find.go
  34. +1
    -1
      session_find_test.go
  35. +1
    -1
      session_get.go
  36. +1
    -1
      session_get_test.go
  37. +1
    -1
      session_insert.go
  38. +1
    -1
      session_pk_test.go
  39. +2
    -2
      session_query.go
  40. +2
    -2
      session_query_test.go
  41. +2
    -2
      session_raw.go
  42. +1
    -1
      session_schema.go
  43. +1
    -1
      session_stats_test.go
  44. +1
    -1
      session_tx_test.go
  45. +2
    -2
      session_update.go
  46. +1
    -1
      session_update_test.go
  47. +2
    -2
      statement.go
  48. +1
    -1
      statement_test.go
  49. +1
    -1
      syslogger.go
  50. +1
    -1
      tag.go
  51. +1
    -1
      tag_extends_test.go
  52. +1
    -1
      tag_id_test.go
  53. +1
    -1
      tag_test.go
  54. +1
    -1
      types.go
  55. +1
    -1
      types_test.go
  56. +1
    -1
      xorm.go
  57. +1
    -1
      xorm_test.go

+ 2
- 2
.circleci/config.yml View File

@@ -35,8 +35,8 @@ jobs:
- checkout

- run: go get -t -d -v ./...
- run: go get -u github.com/go-xorm/core
- run: go get -u github.com/go-xorm/builder
- run: go get -u xorm.io/core
- run: go get -u xorm.io/builder
- run: GO111MODULE=off go build -v
- run: GO111MODULE=on go build -v



+ 2
- 2
.drone.yml View File

@@ -59,8 +59,8 @@ pipeline:
image: golang:${GO_VERSION}
commands:
- go get -t -d -v ./...
- go get -u github.com/go-xorm/core
- go get -u github.com/go-xorm/builder
- go get -u xorm.io/core
- go get -u xorm.io/builder
- go build -v
when:
event: [ push, pull_request ]


+ 1
- 1
README.md View File

@@ -28,7 +28,7 @@ Xorm is a simple and powerful ORM for Go.

* Optimistic Locking support

* SQL Builder support via [github.com/go-xorm/builder](https://github.com/go-xorm/builder)
* SQL Builder support via [xorm.io/builder](https://xorm.io/builder)

* Automatical Read/Write seperatelly



+ 1
- 1
cache_lru.go View File

@@ -10,7 +10,7 @@ import (
"sync"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

// LRUCacher implments cache object facilities


+ 1
- 1
cache_lru_test.go View File

@@ -7,7 +7,7 @@ package xorm
import (
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
cache_memory_store.go View File

@@ -7,7 +7,7 @@ package xorm
import (
"sync"

"github.com/go-xorm/core"
"xorm.io/core"
)

var _ core.CacheStore = NewMemoryStore()


+ 1
- 1
dialect_mssql.go View File

@@ -11,7 +11,7 @@ import (
"strconv"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

var (


+ 1
- 1
dialect_mssql_test.go View File

@@ -8,7 +8,7 @@ import (
"reflect"
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
)

func TestParseMSSQL(t *testing.T) {


+ 1
- 1
dialect_mysql.go View File

@@ -13,7 +13,7 @@ import (
"strings"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

var (


+ 1
- 1
dialect_oracle.go View File

@@ -11,7 +11,7 @@ import (
"strconv"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

var (


+ 1
- 1
dialect_postgres.go View File

@@ -11,7 +11,7 @@ import (
"strconv"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

// from http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html


+ 1
- 1
dialect_postgres_test.go View File

@@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/jackc/pgx/stdlib"
"github.com/stretchr/testify/assert"
)


+ 1
- 1
dialect_sqlite3.go View File

@@ -11,7 +11,7 @@ import (
"regexp"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

var (


+ 2
- 2
engine.go View File

@@ -20,8 +20,8 @@ import (
"sync"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

// Engine is the major struct of xorm, it means a database manager.


+ 2
- 2
engine_cond.go View File

@@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

func (engine *Engine) buildConds(table *core.Table, bean interface{},


+ 1
- 1
engine_group.go View File

@@ -8,7 +8,7 @@ import (
"context"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

// EngineGroup defines an engine group


+ 1
- 1
engine_table.go View File

@@ -9,7 +9,7 @@ import (
"reflect"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

// tbNameWithSchema will automatically add schema prefix on table name


+ 2
- 3
go.mod View File

@@ -6,9 +6,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952
github.com/go-sql-driver/mysql v1.4.1
github.com/go-xorm/builder v0.3.3
github.com/go-xorm/core v0.6.2
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a // indirect
github.com/google/go-cmp v0.2.0 // indirect
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
github.com/jackc/pgx v3.3.0+incompatible
@@ -22,4 +19,6 @@ require (
github.com/ziutek/mymysql v1.5.4
golang.org/x/crypto v0.0.0-20190122013713-64072686203f // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
xorm.io/builder v0.3.5
xorm.io/core v0.6.3
)

+ 6
- 4
go.sum View File

@@ -10,10 +10,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 h1:b5OnbZD49
github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-xorm/builder v0.3.3 h1:v8grgrwOGv/iHXIEhIvOwHZIPLrpxRKSX8yWSMLFn/4=
github.com/go-xorm/builder v0.3.3/go.mod h1:v8mE3MFBgtL+RGFNfUnAMUqqfk/Y4W5KuwCFQIEpQLk=
github.com/go-xorm/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
github.com/go-xorm/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -53,3 +49,9 @@ google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO50
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A=
xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8=
xorm.io/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
xorm.io/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
xorm.io/core v0.6.3 h1:n1NhVZt1s2oLw1BZfX2ocIJsHyso259uPgg63BGr37M=
xorm.io/core v0.6.3/go.mod h1:8kz/C6arVW/O9vk3PgCiMJO2hIAm1UcuOL3dSPyZ2qo=

+ 1
- 1
helpers.go View File

@@ -12,7 +12,7 @@ import (
"strconv"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

// str2PK convert string value to primary key value according to tp


+ 1
- 1
interface.go View File

@@ -10,7 +10,7 @@ import (
"reflect"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

// Interface defines the interface which Engine, EngineGroup and Session will implementate.


+ 1
- 1
logger.go View File

@@ -9,7 +9,7 @@ import (
"io"
"log"

"github.com/go-xorm/core"
"xorm.io/core"
)

// default log options


+ 1
- 1
rows.go View File

@@ -9,7 +9,7 @@ import (
"fmt"
"reflect"

"github.com/go-xorm/core"
"xorm.io/core"
)

// Rows rows wrapper a rows to


+ 1
- 1
session.go View File

@@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

type sessionType int


+ 1
- 1
session_cols.go View File

@@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

type incrParam struct {


+ 1
- 1
session_cols_test.go View File

@@ -7,7 +7,7 @@ package xorm
import (
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
session_cond.go View File

@@ -4,7 +4,7 @@

package xorm

import "github.com/go-xorm/builder"
import "xorm.io/builder"

// 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.


+ 1
- 1
session_cond_test.go View File

@@ -9,7 +9,7 @@ import (
"fmt"
"testing"

"github.com/go-xorm/builder"
"xorm.io/builder"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
session_convert.go View File

@@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

func (session *Session) str2Time(col *core.Column, data string) (outTime time.Time, outErr error) {


+ 1
- 1
session_delete.go View File

@@ -9,7 +9,7 @@ import (
"fmt"
"strconv"

"github.com/go-xorm/core"
"xorm.io/core"
)

func (session *Session) cacheDelete(table *core.Table, tableName, sqlStr string, args ...interface{}) error {


+ 1
- 1
session_delete_test.go View File

@@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 2
- 2
session_exist.go View File

@@ -9,8 +9,8 @@ import (
"fmt"
"reflect"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

// Exist returns true if the record exist otherwise return false


+ 2
- 2
session_find.go View File

@@ -10,8 +10,8 @@ import (
"reflect"
"strings"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

const (


+ 1
- 1
session_find_test.go View File

@@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
session_get.go View File

@@ -11,7 +11,7 @@ import (
"reflect"
"strconv"

"github.com/go-xorm/core"
"xorm.io/core"
)

// Get retrieve one record from database, bean's non-empty fields


+ 1
- 1
session_get_test.go View File

@@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
session_insert.go View File

@@ -12,7 +12,7 @@ import (
"strconv"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

// Insert insert one or more beans


+ 1
- 1
session_pk_test.go View File

@@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 2
- 2
session_query.go View File

@@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

func (session *Session) genQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {


+ 2
- 2
session_query_test.go View File

@@ -10,8 +10,8 @@ import (
"testing"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"

"github.com/stretchr/testify/assert"
)


+ 2
- 2
session_raw.go View File

@@ -9,8 +9,8 @@ import (
"reflect"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) {


+ 1
- 1
session_schema.go View File

@@ -9,7 +9,7 @@ import (
"fmt"
"strings"

"github.com/go-xorm/core"
"xorm.io/core"
)

// Ping test if database is ok


+ 1
- 1
session_stats_test.go View File

@@ -9,7 +9,7 @@ import (
"strconv"
"testing"

"github.com/go-xorm/builder"
"xorm.io/builder"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
session_tx_test.go View File

@@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 2
- 2
session_update.go View File

@@ -11,8 +11,8 @@ import (
"strconv"
"strings"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

func (session *Session) cacheUpdate(table *core.Table, tableName, sqlStr string, args ...interface{}) error {


+ 1
- 1
session_update_test.go View File

@@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 2
- 2
statement.go View File

@@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/go-xorm/builder"
"github.com/go-xorm/core"
"xorm.io/builder"
"xorm.io/core"
)

// Statement save all the sql info for executing SQL


+ 1
- 1
statement_test.go View File

@@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
syslogger.go View File

@@ -10,7 +10,7 @@ import (
"fmt"
"log/syslog"

"github.com/go-xorm/core"
"xorm.io/core"
)

var _ core.ILogger = &SyslogLogger{}


+ 1
- 1
tag.go View File

@@ -11,7 +11,7 @@ import (
"strings"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

type tagContext struct {


+ 1
- 1
tag_extends_test.go View File

@@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
tag_id_test.go View File

@@ -7,7 +7,7 @@ package xorm
import (
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
tag_test.go View File

@@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
types.go View File

@@ -7,7 +7,7 @@ package xorm
import (
"reflect"

"github.com/go-xorm/core"
"xorm.io/core"
)

var (


+ 1
- 1
types_test.go View File

@@ -9,7 +9,7 @@ import (
"fmt"
"testing"

"github.com/go-xorm/core"
"xorm.io/core"
"github.com/stretchr/testify/assert"
)



+ 1
- 1
xorm.go View File

@@ -15,7 +15,7 @@ import (
"sync"
"time"

"github.com/go-xorm/core"
"xorm.io/core"
)

const (


+ 1
- 1
xorm_test.go View File

@@ -15,7 +15,7 @@ import (

_ "github.com/denisenkom/go-mssqldb"
_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/core"
"xorm.io/core"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
_ "github.com/ziutek/mymysql/godrv"


Loading…
Cancel
Save