public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Update the xorm dependency (#22376)

Browse Source 
* Upgrade xorm

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Noval Agung Prayogo
2020-04-01 15:57:21 +02:00
committed by GitHub
co-authored by Arve Knudsen
parent d7d94d13a0
commit ea35ae4d1f
166 changed files with 4435 additions and 2954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/datasource.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/securejsondata"
pkg/services/sqlstore/logger.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
glog "github.com/grafana/grafana/pkg/infra/log"
"github.com/go-xorm/core"
"xorm.io/core"
)
type XormLogger struct {
pkg/services/sqlstore/migrations/annotation_mig.go
+1 -1
View File
@@ -1,8 +1,8 @@
package migrations
import (
"github.com/go-xorm/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"xorm.io/xorm"
)
func addAnnotationMig(mg *Migrator) {
pkg/services/sqlstore/migrations/migrations_test.go
+1 -1
View File
@@ -3,9 +3,9 @@ package migrations
import (
"testing"
"github.com/go-xorm/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"xorm.io/xorm"
. "github.com/smartystreets/goconvey/convey"
)
pkg/services/sqlstore/migrations/user_mig.go
+1 -1
View File
@@ -3,9 +3,9 @@ package migrations
import (
"fmt"
"github.com/go-xorm/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/util"
"xorm.io/xorm"
)
func addUserMigrations(mg *Migrator) {
pkg/services/sqlstore/migrator/dialect.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
)
type Dialect interface {
pkg/services/sqlstore/migrator/migrator.go
+1 -1
View File
@@ -4,11 +4,11 @@ import (
"time"
_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/util/errutil"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
"xorm.io/xorm"
)
type Migrator struct {
pkg/services/sqlstore/migrator/mysql_dialect.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/VividCortex/mysqlerr"
"github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
)
type Mysql struct {
pkg/services/sqlstore/migrator/postgres_dialect.go
+1 -1
View File
@@ -5,9 +5,9 @@ import (
"strconv"
"strings"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/util/errutil"
"github.com/lib/pq"
"xorm.io/xorm"
)
type Postgres struct {
pkg/services/sqlstore/migrator/sqlite_dialect.go
+1 -1
View File
@@ -3,8 +3,8 @@ package migrator
import (
"fmt"
"github.com/go-xorm/xorm"
"github.com/mattn/go-sqlite3"
"xorm.io/xorm"
)
type Sqlite3 struct {
pkg/services/sqlstore/migrator/types.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
)
const (
pkg/services/sqlstore/session.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"reflect"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
)
type DBSession struct {
pkg/services/sqlstore/sqlstore.go
+1 -1
View File
@@ -11,7 +11,6 @@ import (
"time"
"github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/localcache"
"github.com/grafana/grafana/pkg/infra/log"
@@ -26,6 +25,7 @@ import (
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/errutil"
_ "github.com/lib/pq"
"xorm.io/xorm"
)
var (
pkg/services/sqlstore/transactions.go
+1 -1
View File
@@ -4,11 +4,11 @@ import (
"context"
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/util/errutil"
"github.com/mattn/go-sqlite3"
"xorm.io/xorm"
)
// WithTransactionalDbSession calls the callback with an session within a transaction
pkg/tsdb/mssql/mssql.go
+1 -1
View File
@@ -8,13 +8,13 @@ import (
"github.com/grafana/grafana/pkg/setting"
_ "github.com/denisenkom/go-mssqldb"
"github.com/go-xorm/core"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/errutil"
"xorm.io/core"
)
func init() {
pkg/tsdb/mssql/mssql_test.go
+1 -1
View File
@@ -8,7 +8,6 @@ import (
"testing"
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/components/securejsondata"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
@@ -16,6 +15,7 @@ import (
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
. "github.com/smartystreets/goconvey/convey"
"xorm.io/xorm"
)
// To run this test, remove the Skip from SkipConvey
pkg/tsdb/mysql/mysql.go
+1 -1
View File
@@ -13,11 +13,11 @@ import (
"github.com/grafana/grafana/pkg/setting"
"github.com/go-sql-driver/mysql"
"github.com/go-xorm/core"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
"xorm.io/core"
)
func init() {
pkg/tsdb/mysql/mysql_test.go
+1 -1
View File
@@ -8,7 +8,6 @@ import (
"testing"
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/components/securejsondata"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
@@ -16,6 +15,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
"xorm.io/xorm"
. "github.com/smartystreets/goconvey/convey"
)
pkg/tsdb/postgres/postgres.go
+1 -1
View File
@@ -7,11 +7,11 @@ import (
"github.com/grafana/grafana/pkg/setting"
"github.com/go-xorm/core"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
"xorm.io/core"
)
func init() {
pkg/tsdb/postgres/postgres_test.go
+1 -1
View File
@@ -8,7 +8,6 @@ import (
"testing"
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/components/securejsondata"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
@@ -16,6 +15,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/tsdb"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
"xorm.io/xorm"
_ "github.com/lib/pq"
. "github.com/smartystreets/goconvey/convey"
pkg/tsdb/sqleng/sql_engine.go
+2 -2
View File
@@ -19,10 +19,10 @@ import (
"github.com/grafana/grafana/pkg/components/null"
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
"xorm.io/core"
"xorm.io/xorm"
)
// SqlMacroEngine interpolates macros into sql. It takes in the Query to have access to query context and