Chore: Replace xorm.io/xorm imports (#104458)

* replace xorm.io/xorm imports

* replace xorm from other go.mod files

* clean up workspace

* nolint does not make sense anymore as it is not a module

* try if nolint directive helps

* use nolint:all for xorm

* add more nolints

* try to skip xorm in linter config

* exclude xorm differently

* retrigger ci
This commit is contained in:
Serge Zaitsev
2025-05-02 17:13:01 +02:00
committed by GitHub
parent 847b07dee2
commit 694b9dfe50
65 changed files with 58 additions and 1780 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"golang.org/x/exp/slices"
"github.com/grafana/grafana/pkg/services/sqlstore/session"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
var (
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/atomic"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics/metricutil"
@@ -10,7 +10,7 @@ import (
"github.com/VividCortex/mysqlerr"
"github.com/go-sql-driver/mysql"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type MySQLDialect struct {
@@ -9,7 +9,7 @@ import (
"github.com/lib/pq"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type PostgresDialect struct {
@@ -16,8 +16,8 @@ import (
"cloud.google.com/go/spanner/admin/database/apiv1/databasepb"
"github.com/googleapis/gax-go/v2"
spannerdriver "github.com/googleapis/go-sql-spanner"
"github.com/grafana/grafana/pkg/util/xorm"
"google.golang.org/grpc/codes"
"xorm.io/xorm"
"github.com/grafana/dskit/concurrency"
utilspanner "github.com/grafana/grafana/pkg/util/spanner"
@@ -7,7 +7,7 @@ import (
"github.com/mattn/go-sqlite3"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
type SQLite3 struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/util/xorm"
)
const (