opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 16:02:31 +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
go.mod
View File

@ -203,7 +203,6 @@ require (
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // @grafana/partner-datasources
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // @grafana-app-platform-squad
xorm.io/builder v0.3.6 // @grafana/grafana-backend-group
xorm.io/core v0.7.3 // @grafana/grafana-backend-group
xorm.io/xorm v0.8.2 // @grafana/alerting-backend
)
@ -580,6 +579,7 @@ require (
require (
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
github.com/onsi/gomega v1.36.2 // indirect
xorm.io/core v0.7.3 // indirect
)
// Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream

2
pkg/infra/db/db.go
View File

@ -4,7 +4,7 @@ import (
"context"
"os"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"

2
pkg/infra/db/dbtest/dbtest.go
View File

@ -3,7 +3,7 @@ package dbtest
import (
"context"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/services/sqlstore"

2
pkg/services/correlations/database.go
View File

@ -3,7 +3,7 @@ package correlations
import (
"context"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/datasources"

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"

2407
pkg/util/xorm/core/core.go Normal file
View File

File diff suppressed because it is too large Load Diff

2
pkg/util/xorm/dialect_mysql.go
View File

@ -12,7 +12,7 @@ import (
"strings"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
var (

2
pkg/util/xorm/dialect_postgres.go
View File

@ -11,7 +11,7 @@ import (
"strconv"
"strings"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// from http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html

2
pkg/util/xorm/dialect_spanner.go
View File

@ -12,7 +12,7 @@ import (
_ "github.com/googleapis/go-sql-spanner"
spannerdriver "github.com/googleapis/go-sql-spanner"
"google.golang.org/grpc/codes"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func init() {

2
pkg/util/xorm/dialect_sqlite3.go
View File

@ -12,7 +12,7 @@ import (
"strings"
sqlite "github.com/mattn/go-sqlite3"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
var (

2
pkg/util/xorm/engine.go
View File

@ -16,7 +16,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Engine is the major struct of xorm, it means a database manager.

2
pkg/util/xorm/engine_cond.go
View File

@ -12,7 +12,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func (engine *Engine) buildConds(table *core.Table, bean any,

2
pkg/util/xorm/engine_table.go
View File

@ -9,7 +9,7 @@ import (
"reflect"
"strings"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// tbNameWithSchema will automatically add schema prefix on table name

2
pkg/util/xorm/go.mod
View File

@ -9,7 +9,6 @@ require (
github.com/stretchr/testify v1.10.0
google.golang.org/grpc v1.71.1
xorm.io/builder v0.3.6
xorm.io/core v0.7.3
)
require (
@ -31,7 +30,6 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-sql-driver/mysql v1.9.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect

9
pkg/util/xorm/go.sum
View File

@ -611,8 +611,6 @@ cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vf
cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@ -713,9 +711,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=
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/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@ -864,7 +859,6 @@ github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuz
github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
@ -1382,7 +1376,6 @@ google.golang.org/api v0.223.0/go.mod h1:C+RS7Z+dDwds2b+zoAk5hN/eSfsiCn0UDrYof/M
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@ -1646,5 +1639,3 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
xorm.io/core v0.7.3 h1:W8ws1PlrnkS1CZU1YWaYLMQcQilwAmQXU0BJDJon+H0=
xorm.io/core v0.7.3/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=

2
pkg/util/xorm/logger.go
View File

@ -9,7 +9,7 @@ import (
"io"
"log"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// default log options

2
pkg/util/xorm/rows.go
View File

@ -9,7 +9,7 @@ import (
"fmt"
"reflect"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Rows rows wrapper a rows to

2
pkg/util/xorm/session.go
View File

@ -13,7 +13,7 @@ import (
"strings"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Session keep a pointer to sql.DB and provides all execution of all

2
pkg/util/xorm/session_cols.go
View File

@ -9,7 +9,7 @@ import (
"strings"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func setColumnInt(bean any, col *core.Column, t int64) {

2
pkg/util/xorm/session_convert.go
View File

@ -13,7 +13,7 @@ import (
"strings"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
const (

2
pkg/util/xorm/session_delete.go
View File

@ -7,7 +7,7 @@ package xorm
import (
"fmt"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Delete records, bean's non-empty fields are conditions

2
pkg/util/xorm/session_exist.go
View File

@ -10,7 +10,7 @@ import (
"reflect"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Exist returns true if the record exist otherwise return false

2
pkg/util/xorm/session_find.go
View File

@ -10,7 +10,7 @@ import (
"strings"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
const (

2
pkg/util/xorm/session_get.go
View File

@ -9,7 +9,7 @@ import (
"errors"
"reflect"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Get retrieve one record from database, bean's non-empty fields

2
pkg/util/xorm/session_insert.go
View File

@ -13,7 +13,7 @@ import (
"strings"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// ErrNoElementsOnSlice represents an error there is no element when insert

2
pkg/util/xorm/session_query.go
View File

@ -12,7 +12,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func (session *Session) genQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {

2
pkg/util/xorm/session_raw.go
View File

@ -10,7 +10,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func (session *Session) queryPreprocess(sqlStr *string, paramStr ...any) {

2
pkg/util/xorm/session_schema.go
View File

@ -9,7 +9,7 @@ import (
"fmt"
"strings"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Ping test if database is ok

2
pkg/util/xorm/session_update.go
View File

@ -11,7 +11,7 @@ import (
"strings"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Update records, bean's non-empty fields are updated contents,

2
pkg/util/xorm/statement.go
View File

@ -12,7 +12,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
// Statement save all the sql info for executing SQL

2
pkg/util/xorm/statement_args.go
View File

@ -11,7 +11,7 @@ import (
"time"
"xorm.io/builder"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func quoteNeeded(a any) bool {

2
pkg/util/xorm/syslogger.go
View File

@ -11,7 +11,7 @@ import (
"fmt"
"log/syslog"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
var _ core.ILogger = &SyslogLogger{}

2
pkg/util/xorm/table_name.go
View File

@ -7,7 +7,7 @@ package xorm
import (
"reflect"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
func getTableName(mapper core.IMapper, v reflect.Value) string {

2
pkg/util/xorm/tag.go
View File

@ -11,7 +11,7 @@ import (
"strings"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
type tagContext struct {

2
pkg/util/xorm/xorm.go
View File

@ -17,7 +17,7 @@ import (
"sync"
"time"
"xorm.io/core"
"github.com/grafana/grafana/pkg/util/xorm/core"
)
const (