Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(deps): update module github.com/gocql/gocql to v2 (#19062)

renovate[bot]1fab03b5e70d
diff --git a/backend/plugin/db/cassandra/cassandra.go b/backend/plugin/db/cassandra/cassandra.go
index 1e11b90242..1c0737c5a3 100644
--- a/backend/plugin/db/cassandra/cassandra.go
+++ b/backend/plugin/db/cassandra/cassandra.go
@@ -10,8 +10,8 @@ import (
"time"
"connectrpc.com/connect"
+ gocql "github.com/apache/cassandra-gocql-driver/v2"
"github.com/cockroachdb/cockroachdb-parser/pkg/util/timeofday"
- "github.com/gocql/gocql"
"github.com/pkg/errors"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/durationpb"
@@ -85,7 +85,7 @@ func (d *Driver) Close(context.Context) error {
func (d *Driver) Ping(ctx context.Context) error {
var version string
- err := d.session.Query("SELECT release_version FROM system.local").WithContext(ctx).Scan(&version)
+ err := d.session.Query("SELECT release_version FROM system.local").ScanContext(ctx, &version)
if err != nil {
return errors.Wrapf(err, "failed to ping")
}
@@ -103,7 +103,7 @@ func (d *Driver) Execute(ctx context.Context, rawStatement string, _ db.ExecuteO
}
for _, stmt := range stmts {
- if err := d.session.Query(stmt).WithContext(ctx).Exec(); err != nil {
+ if err := d.session.Query(stmt).ExecContext(ctx); err != nil {
return 0, errors.Wrapf(err, "failed to execute")
}
}
@@ -131,14 +131,14 @@ func (d *Driver) QueryConn(ctx context.Context, _ *sql.Conn, rawStatement string
var pageState []byte
for {
nextPageState, err := func() ([]byte, error) {
- iter := d.session.Query(stmt).WithContext(ctx).PageSize(pageSize).PageState(pageState).Iter()
+ iter := d.session.Query(stmt).PageSize(pageSize).PageState(pageState).IterContext(ctx)
defer iter.Close()
nextPageState := iter.PageState()
if len(result.ColumnNames) == 0 {
for _, c := range iter.Columns() {
result.ColumnNames = append(result.ColumnNames, c.Name)
- result.ColumnTypeNames = append(result.ColumnTypeNames, c.TypeInfo.Type().String())
+ result.ColumnTypeNames = append(result.ColumnTypeNames, typeToString(c.TypeInfo.Type()))
}
}
for {
@@ -378,3 +378,64 @@ func formatAddress(host, port string) string {
}
return host + ":" + port
}
+
+func typeToString(t gocql.Type) string {
+ switch t {
+ case gocql.TypeCustom:
+ return "custom"
+ case gocql.TypeAscii:
+ return "ascii"
+ case gocql.TypeBigInt:
+ return "bigint"
+ case gocql.TypeBlob:
+ return "blob"
+ case gocql.TypeBoolean:
+ return "boolean"
+ case gocql.TypeCounter:
+ return "counter"
+ case gocql.TypeDecimal:
+ return "decimal"
+ case gocql.TypeDouble:
+ return "double"
+ case gocql.TypeFloat:
+ return "float"
+ case gocql.TypeInt:
+ return "int"
+ case gocql.TypeText:
+ return "text"
+ case gocql.TypeTimestamp:
+ return "timestamp"
+ case gocql.TypeUUID:
+ return "uuid"
+ case gocql.TypeVarchar:
+ return "varchar"
+ case gocql.TypeVarint:
+ return "varint"
+ case gocql.TypeTimeUUID:
+ return "timeuuid"
+ case gocql.TypeInet:
+ return "inet"
+ case gocql.TypeDate:
+ return "date"
+ case gocql.TypeTime:
+ return "time"
+ case gocql.TypeSmallInt:
+ return "smallint"
+ case gocql.TypeTinyInt:
+ return "tinyint"
+ case gocql.TypeDuration:
+ return "duration"
+ case gocql.TypeList:
+ return "list"
+ case gocql.TypeMap:
+ return "map"
+ case gocql.TypeSet:
+ return "set"
+ case gocql.TypeUDT:
+ return "udt"
+ case gocql.TypeTuple:
+ return "tuple"
+ default:
+ return fmt.Sprintf("unknown(%d)", t)
+ }
+}
diff --git a/backend/plugin/db/cassandra/sync.go b/backend/plugin/db/cassandra/sync.go
index f9b6e7a607..de27526c1f 100644
--- a/backend/plugin/db/cassandra/sync.go
+++ b/backend/plugin/db/cassandra/sync.go
@@ -91,7 +91,7 @@ func (d *Driver) SyncDBSchema(ctx context.Context) (*storepb.DatabaseSchemaMetad
type
FROM system_schema.columns
WHERE keyspace_name = ?
- `, d.config.ConnectionContext.DatabaseName).WithContext(ctx).Iter().Scanner()
+ `, d.config.ConnectionContext.DatabaseName).IterContext(ctx).Scanner()
for columnScanner.Next() {
var tableName, columnName, kind, clusteringOrder, columnType string
var position int
@@ -183,7 +183,7 @@ func (d *Driver) SyncDBSchema(ctx context.Context) (*storepb.DatabaseSchemaMetad
FROM system_schema.indexes
WHERE keyspace_name = ?
ORDER BY table_name, index_name
- `, d.config.ConnectionContext.DatabaseName).WithContext(ctx).Iter().Scanner()
+ `, d.config.ConnectionContext.DatabaseName).IterContext(ctx).Scanner()
for indexScanner.Next() {
var tableName, indexName, kind, options string
if err := indexScanner.Scan(
@@ -213,7 +213,7 @@ func (d *Driver) SyncDBSchema(ctx context.Context) (*storepb.DatabaseSchemaMetad
FROM system_schema.tables
WHERE keyspace_name = ?
ORDER BY table_name
- `, d.config.ConnectionContext.DatabaseName).WithContext(ctx).Iter().Scanner()
+ `, d.config.ConnectionContext.DatabaseName).IterContext(ctx).Scanner()
for tableScanner.Next() {
var tableName, comment string
if err := tableScanner.Scan(
@@ -324,14 +324,14 @@ func getPKDefinition(pks []primaryKey) string {
func (d *Driver) getVersion(ctx context.Context) (string, error) {
var version string
- if err := d.session.Query("SELECT release_version FROM system.local").WithContext(ctx).Scan(&version); err != nil {
+ if err := d.session.Query("SELECT release_version FROM system.local").ScanContext(ctx, &version); err != nil {
return "", errors.Wrapf(err, "failed to query")
}
return version, nil
}
func (d *Driver) getDatabases(ctx context.Context) ([]*storepb.DatabaseSchemaMetadata, error) {
- scanner := d.session.Query("SELECT keyspace_name FROM system_schema.keyspaces").WithContext(ctx).Iter().Scanner()
+ scanner := d.session.Query("SELECT keyspace_name FROM system_schema.keyspaces").IterContext(ctx).Scanner()
var databases []*storepb.DatabaseSchemaMetadata
for scanner.Next() {
diff --git a/go.mod b/go.mod
index 99c13d23b4..9199885e6f 100644
--- a/go.mod
+++ b/go.mod
@@ -23,6 +23,7 @@ require (
github.com/ClickHouse/clickhouse-go/v2 v2.42.0
github.com/alexmullins/zip v0.0.0-20180717182244-4affb64b04d0
github.com/antlr4-go/antlr/v4 v4.13.1
+ github.com/apache/cassandra-gocql-driver/v2 v2.0.0
github.com/aws/aws-sdk-go-v2 v1.41.1
github.com/aws/aws-sdk-go-v2/config v1.32.7
github.com/aws/aws-sdk-go-v2/credentials v1.19.7
@@ -45,7 +46,6 @@ require (
github.com/go-jose/go-jose/v4 v4.1.3
github.com/go-ldap/ldap/v3 v3.4.12
github.com/go-sql-driver/mysql v1.9.3
- github.com/gocql/gocql v1.7.0
github.com/golang-jwt/jwt/v5 v5.3.0
github.com/golang-sql/sqlexp v0.1.0
github.com/google/cel-go v0.26.1
@@ -175,7 +175,6 @@ require (
github.com/google/s2a-go v0.1.9 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
- github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index ee878f78da..1b9c7773ba 100644
--- a/go.sum
+++ b/go.sum
@@ -756,6 +756,8 @@ github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0I
github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA=
+github.com/apache/cassandra-gocql-driver/v2 v2.0.0 h1:Omnzb1Z/P90Dr2TbVNu54ICQL7TKVIIsJO231w484HU=
+github.com/apache/cassandra-gocql-driver/v2 v2.0.0/go.mod h1:QH/asJjB3mHvY6Dot6ZKMMpTcOrWJ8i9GhsvG1g0PK4=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
@@ -826,16 +828,12 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/biogo/store v0.0.0-20201120204734-aad293a2328f h1:+6okTAeUsUrdQr/qN7fIODzowrjjCrnJDg/gkYqcSXY=
github.com/biogo/store v0.0.0-20201120204734-aad293a2328f/go.mod h1:z52shMwD6SGwRg2iYFjjDwX5Ene4ENTw6HfXraUy/08=
-github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
-github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s=
github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs=
github.com/bmatcuk/doublestar/v4 v4.9.2 h1:b0mc6WyRSYLjzofB2v/0cuDUZ+MqoGyH3r0dVij35GI=
github.com/bmatcuk/doublestar/v4 v4.9.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
@@ -1108,8 +1106,6 @@ github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd
github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/gocql/gocql v1.7.0 h1:O+7U7/1gSN7QTEAaMEsJc1Oq2QHXvCWoF3DFK9HDHus=
-github.com/gocql/gocql v1.7.0/go.mod h1:vnlvXyFZeLBF0Wy+RS8hrOdbn0UWsWtdg07XJnFxZ+4=
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
@@ -1287,8 +1283,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 h1:kEISI/Gx67NzH3nJxAmY/dGac80
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4/go.mod h1:6Nz966r3vQYCqIzWsuEl9d7cf7mRhtDmm++sOxlnfxI=
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1680,6 +1674,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=