opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 03:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Add xorm.io/core into xorm (#103700)

Browse Source 
* add xorm.io/core into xorm

* update workspace

* format imports

* update workspace
This commit is contained in:
Serge Zaitsev
2025-04-16 08:58:50 +02:00
committed by GitHub
parent 10eb8aeeee
commit 047f5edae9
39 changed files with 2443 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/database_wrapper.go
View File

@ -10,12 +10,12 @@ import (
"github.com/gchaincl/sqlhooks"
"github.com/go-sql-driver/mysql"
"github.com/grafana/grafana/pkg/util/xorm/core"
"github.com/lib/pq"
"github.com/mattn/go-sqlite3"
"github.com/prometheus/client_golang/prometheus"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"xorm.io/core"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"

2
pkg/services/sqlstore/logger.go
View File

@ -3,7 +3,7 @@ package sqlstore
import (
"fmt"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
glog "github.com/grafana/grafana/pkg/infra/log"
)

2
pkg/services/sqlstore/migrator/spanner_dialect.go
View File

@ -16,7 +16,7 @@ import (
spannerdriver "github.com/googleapis/go-sql-spanner"
"github.com/grafana/dskit/concurrency"
"google.golang.org/grpc/codes"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
utilspanner "github.com/grafana/grafana/pkg/util/spanner"
"xorm.io/xorm"

2
pkg/services/sqlstore/session.go
View File

@ -9,8 +9,8 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/apimachinery/errutil"

2
pkg/services/sqlstore/sqlstore.go
View File

@ -15,8 +15,8 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq"
"github.com/prometheus/client_golang/prometheus"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/bus"