Chore: Update the xorm dependency (#22376)

* Upgrade xorm

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/services/sqlstore/datasource.go

@@ -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

@@ -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,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

@@ -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

@@ -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

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 type Dialect interface {

pkg/services/sqlstore/migrator/migrator.go

@@ -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

@@ -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

@@ -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

@@ -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

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 const (

pkg/services/sqlstore/session.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 type DBSession struct {

pkg/services/sqlstore/sqlstore.go

@@ -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

@@ -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