Skip to content

Commit

Permalink
chore(deps): bump the go-dependencies group in /.sage with 1 update
Browse files Browse the repository at this point in the history 
Bumps the go-dependencies group in /.sage with 1 update: [go.einride.tech/sage](https://github.com/einride/sage).

Updates `go.einride.tech/sage` from 0.264.0 to 0.272.0
- [Release notes](https://github.com/einride/sage/releases)
- [Commits](einride/sage@v0.264.0...v0.272.0)

---
updated-dependencies:
- dependency-name: go.einride.tech/sage
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
@dependabot @thall
dependabot[bot] authored and thall committed Mar 1, 2024
1 parent e812c04 commit 136a866
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .sage/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module sage

go 1.17

require go.einride.tech/sage v0.264.0
require go.einride.tech/sage v0.272.0
4 changes: 2 additions & 2 deletions .sage/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
go.einride.tech/sage v0.264.0 h1:NuEefbHh89txKXhVLcn70y1M2dY+eJw9cjLeousZefs=
go.einride.tech/sage v0.264.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
go.einride.tech/sage v0.272.0 h1:NxK2zVtsYJn9Wwp//Tz5gmQsiVwT0uXLkau5WJnnXR8=
go.einride.tech/sage v0.272.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
2 changes: 1 addition & 1 deletion internal/codegen/descriptorcodegen/genericcolumn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestGenericColumnDescriptorCodeGenerator_GenerateCode(t *testing.T) {
t.Parallel()
runGoldenFileTest(t, "genericcolumn", func(db *spanddl.Database, f *codegen.File) {
runGoldenFileTest(t, "genericcolumn", func(_ *spanddl.Database, f *codegen.File) {
GenericColumnDescriptorCodeGenerator{}.GenerateCode(f)
})
}
72 changes: 36 additions & 36 deletions spanfiltering/transpiler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (t *Transpiler) Transpile() (spansql.BoolExpr, map[string]interface{}, erro
if t.filter.CheckedExpr == nil {
return spansql.True, nil, nil
}
resultExpr, err := t.transpileExpr(t.filter.CheckedExpr.Expr)
resultExpr, err := t.transpileExpr(t.filter.CheckedExpr.GetExpr())
if err != nil {
return nil, nil, err
}
Expand All @@ -45,7 +45,7 @@ func (t *Transpiler) Transpile() (spansql.BoolExpr, map[string]interface{}, erro
}

func (t *Transpiler) transpileExpr(e *expr.Expr) (spansql.Expr, error) {
switch e.ExprKind.(type) {
switch e.GetExprKind().(type) {
case *expr.Expr_CallExpr:
result, err := t.transpileCallExpr(e)
if err != nil {
Expand All @@ -64,7 +64,7 @@ func (t *Transpiler) transpileExpr(e *expr.Expr) (spansql.Expr, error) {
}

func (t *Transpiler) transpileConstExpr(e *expr.Expr) (spansql.Expr, error) {
switch kind := e.GetConstExpr().ConstantKind.(type) {
switch kind := e.GetConstExpr().GetConstantKind().(type) {
case *expr.Constant_BoolValue:
return t.param(kind.BoolValue), nil
case *expr.Constant_DoubleValue:
Expand All @@ -82,7 +82,7 @@ func (t *Transpiler) transpileConstExpr(e *expr.Expr) (spansql.Expr, error) {
}

func (t *Transpiler) transpileCallExpr(e *expr.Expr) (spansql.Expr, error) {
switch e.GetCallExpr().Function {
switch e.GetCallExpr().GetFunction() {
case filtering.FunctionHas:
return t.transpileHasCallExpr(e)
case filtering.FunctionEquals:
Expand All @@ -106,54 +106,54 @@ func (t *Transpiler) transpileCallExpr(e *expr.Expr) (spansql.Expr, error) {
case filtering.FunctionTimestamp:
return t.transpileTimestampCallExpr(e)
default:
return nil, fmt.Errorf("unsupported function call: %s", e.GetCallExpr().Function)
return nil, fmt.Errorf("unsupported function call: %s", e.GetCallExpr().GetFunction())
}
}

func (t *Transpiler) transpileIdentExpr(e *expr.Expr) (spansql.Expr, error) {
identExpr := e.GetIdentExpr()
identType, ok := t.filter.CheckedExpr.TypeMap[e.Id]
identType, ok := t.filter.CheckedExpr.GetTypeMap()[e.GetId()]
if !ok {
return nil, fmt.Errorf("unknown type of ident expr %d", e.Id)
return nil, fmt.Errorf("unknown type of ident expr %d", e.GetId())
}
if messageType := identType.GetMessageType(); messageType != "" {
if enumType, err := protoregistry.GlobalTypes.FindEnumByName(protoreflect.FullName(messageType)); err == nil {
if enumValue := enumType.Descriptor().Values().ByName(protoreflect.Name(identExpr.Name)); enumValue != nil {
if enumValue := enumType.Descriptor().Values().ByName(protoreflect.Name(identExpr.GetName())); enumValue != nil {
// TODO: Configurable support for string literals.
// spanner does not support int32
return t.param(int64(enumValue.Number())), nil
}
}
}
return spansql.ID(identExpr.Name), nil
return spansql.ID(identExpr.GetName()), nil
}

func (t *Transpiler) transpileSelectExpr(e *expr.Expr) (spansql.Expr, error) {
selectExpr := e.GetSelectExpr()
operand, err := t.transpileExpr(selectExpr.Operand)
operand, err := t.transpileExpr(selectExpr.GetOperand())
if err != nil {
return nil, err
}
switch operand := operand.(type) {
case spansql.PathExp:
return append(operand, spansql.ID(selectExpr.Field)), nil
return append(operand, spansql.ID(selectExpr.GetField())), nil
case spansql.ID:
return spansql.PathExp{operand, spansql.ID(selectExpr.Field)}, nil
return spansql.PathExp{operand, spansql.ID(selectExpr.GetField())}, nil
default:
return nil, fmt.Errorf("unsupported select expr operand")
}
}

func (t *Transpiler) transpileNotCallExpr(e *expr.Expr) (spansql.BoolExpr, error) {
callExpr := e.GetCallExpr()
if len(callExpr.Args) != 1 {
if len(callExpr.GetArgs()) != 1 {
return nil, fmt.Errorf(
"unexpected number of arguments to `%s` expression: %d",
filtering.FunctionNot,
len(callExpr.Args),
len(callExpr.GetArgs()),
)
}
rhsExpr, err := t.transpileExpr(callExpr.Args[0])
rhsExpr, err := t.transpileExpr(callExpr.GetArgs()[0])
if err != nil {
return nil, err
}
Expand All @@ -172,18 +172,18 @@ func (t *Transpiler) transpileComparisonCallExpr(
op spansql.ComparisonOperator,
) (spansql.BoolExpr, error) {
callExpr := e.GetCallExpr()
if len(callExpr.Args) != 2 {
if len(callExpr.GetArgs()) != 2 {
return nil, fmt.Errorf(
"unexpected number of arguments to `%s`: %d",
callExpr.GetFunction(),
len(callExpr.Args),
len(callExpr.GetArgs()),
)
}
lhsExpr, err := t.transpileExpr(callExpr.Args[0])
lhsExpr, err := t.transpileExpr(callExpr.GetArgs()[0])
if err != nil {
return nil, err
}
rhsExpr, err := t.transpileExpr(callExpr.Args[1])
rhsExpr, err := t.transpileExpr(callExpr.GetArgs()[1])
if err != nil {
return nil, err
}
Expand All @@ -199,18 +199,18 @@ func (t *Transpiler) transpileBinaryLogicalCallExpr(
op spansql.LogicalOperator,
) (spansql.BoolExpr, error) {
callExpr := e.GetCallExpr()
if len(callExpr.Args) != 2 {
if len(callExpr.GetArgs()) != 2 {
return nil, fmt.Errorf(
"unexpected number of arguments to `%s`: %d",
callExpr.GetFunction(),
len(callExpr.Args),
len(callExpr.GetArgs()),
)
}
lhsExpr, err := t.transpileExpr(callExpr.Args[0])
lhsExpr, err := t.transpileExpr(callExpr.GetArgs()[0])
if err != nil {
return nil, err
}
rhsExpr, err := t.transpileExpr(callExpr.Args[1])
rhsExpr, err := t.transpileExpr(callExpr.GetArgs()[1])
if err != nil {
return nil, err
}
Expand All @@ -231,20 +231,20 @@ func (t *Transpiler) transpileBinaryLogicalCallExpr(

func (t *Transpiler) transpileHasCallExpr(e *expr.Expr) (spansql.BoolExpr, error) {
callExpr := e.GetCallExpr()
if len(callExpr.Args) != 2 {
return nil, fmt.Errorf("unexpected number of arguments to `in` expression: %d", len(callExpr.Args))
if len(callExpr.GetArgs()) != 2 {
return nil, fmt.Errorf("unexpected number of arguments to `in` expression: %d", len(callExpr.GetArgs()))
}
identExpr := callExpr.Args[0]
constExpr := callExpr.Args[1]
identExpr := callExpr.GetArgs()[0]
constExpr := callExpr.GetArgs()[1]
if identExpr.GetIdentExpr() == nil {
return nil, fmt.Errorf("TODO: add support for transpiling `:` where LHS is other than Ident")
}
if constExpr.GetConstExpr() == nil {
return nil, fmt.Errorf("TODO: add support for transpiling `:` where RHS is other than Const")
}
identType, ok := t.filter.CheckedExpr.TypeMap[callExpr.Args[0].Id]
identType, ok := t.filter.CheckedExpr.GetTypeMap()[callExpr.GetArgs()[0].GetId()]
if !ok {
return nil, fmt.Errorf("unknown type of ident expr %d", e.Id)
return nil, fmt.Errorf("unknown type of ident expr %d", e.GetId())
}
switch {
// Repeated primitives:
Expand All @@ -270,22 +270,22 @@ func (t *Transpiler) transpileHasCallExpr(e *expr.Expr) (spansql.BoolExpr, error

func (t *Transpiler) transpileTimestampCallExpr(e *expr.Expr) (spansql.Expr, error) {
callExpr := e.GetCallExpr()
if len(callExpr.Args) != 1 {
if len(callExpr.GetArgs()) != 1 {
return nil, fmt.Errorf(
"unexpected number of arguments to `%s`: %d", callExpr.Function, len(callExpr.Args),
"unexpected number of arguments to `%s`: %d", callExpr.GetFunction(), len(callExpr.GetArgs()),
)
}
constArg, ok := callExpr.Args[0].ExprKind.(*expr.Expr_ConstExpr)
constArg, ok := callExpr.GetArgs()[0].GetExprKind().(*expr.Expr_ConstExpr)
if !ok {
return nil, fmt.Errorf("expected constant string arg to %s", callExpr.Function)
return nil, fmt.Errorf("expected constant string arg to %s", callExpr.GetFunction())
}
stringArg, ok := constArg.ConstExpr.ConstantKind.(*expr.Constant_StringValue)
stringArg, ok := constArg.ConstExpr.GetConstantKind().(*expr.Constant_StringValue)
if !ok {
return nil, fmt.Errorf("expected constant string arg to %s", callExpr.Function)
return nil, fmt.Errorf("expected constant string arg to %s", callExpr.GetFunction())
}
timeArg, err := time.Parse(time.RFC3339, stringArg.StringValue)
if err != nil {
return nil, fmt.Errorf("invalid string arg to %s: %w", callExpr.Function, err)
return nil, fmt.Errorf("invalid string arg to %s: %w", callExpr.GetFunction(), err)
}
return t.param(timeArg), nil
}
Expand Down
5 changes: 2 additions & 3 deletions spantest/emulator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ import (
// Cloud Spanner Emulator versions can be found here,
// https://console.cloud.google.com/gcr/images/cloud-spanner-emulator/global/emulator
const (
url = "gcr.io/cloud-spanner-emulator/emulator"
//nolint:gosec
url = "gcr.io/cloud-spanner-emulator/emulator"
version = "sha256:5d905e581977bd3d543742e74ddb75c0ba65517cf19742089ae1be45b7b8aa49" // 1.5.13
image = url + "@" + version
)
Expand Down Expand Up @@ -165,7 +164,7 @@ func (fx *EmulatorFixture) NewDatabaseFromStatements(t testing.TB, statements []
t.Log("database:", createdDatabase.String())
conn, err := grpc.Dial(fx.emulatorHost, grpc.WithTransportCredentials(insecure.NewCredentials()))
assert.NilError(t, err)
client, err := spanner.NewClient(fx.ctx, createdDatabase.Name, option.WithGRPCConn(conn))
client, err := spanner.NewClient(fx.ctx, createdDatabase.GetName(), option.WithGRPCConn(conn))
assert.NilError(t, err)
t.Cleanup(client.Close)
return client
Expand Down

0 comments on commit 136a866

Please sign in to comment.