From 3d41b85812a02bb179907ccc1c52963cceca9c29 Mon Sep 17 00:00:00 2001 From: Masaaki Goshima Date: Fri, 2 Sep 2022 21:46:17 +0900 Subject: [PATCH 1/2] update go-zetasqlite to latest --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b1d21c031..82e9baeba 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-playground/validator/v10 v10.11.0 github.com/goccy/go-yaml v1.9.5 github.com/goccy/go-zetasql v0.3.3 - github.com/goccy/go-zetasqlite v0.6.4 + github.com/goccy/go-zetasqlite v0.6.5 github.com/google/go-cmp v0.5.8 github.com/gorilla/mux v1.8.0 github.com/jessevdk/go-flags v1.5.0 diff --git a/go.sum b/go.sum index 7bdd3cebe..92d4e3841 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/goccy/go-zetasql v0.3.3 h1:+Ar/GZ4k2vNgaljRPt5lpD8JSIiq0WSEG38Fbowj5fM= github.com/goccy/go-zetasql v0.3.3/go.mod h1:6W14CJVKh7crrSPyj6NPk4c49L2NWnxvyDLsRkOm4BI= -github.com/goccy/go-zetasqlite v0.6.4 h1:9/ZFuez4Y7Ab22EzWWjsOalRlpufuawPik0o7Xz9eys= -github.com/goccy/go-zetasqlite v0.6.4/go.mod h1:MtofKGFJKkFlxQ10QnJRq51axsbGWnLG06cx4nQVAoY= +github.com/goccy/go-zetasqlite v0.6.5 h1:rdPhsu0350Q1xyi299JRqZ8renUADqoRNBAheBGkKZM= +github.com/goccy/go-zetasqlite v0.6.5/go.mod h1:MtofKGFJKkFlxQ10QnJRq51axsbGWnLG06cx4nQVAoY= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= From cf7155df4e7a1e037b58980cc8d20ef49024a230 Mon Sep 17 00:00:00 2001 From: Masaaki Goshima Date: Fri, 2 Sep 2022 21:46:35 +0900 Subject: [PATCH 2/2] add error handling --- internal/contentdata/repository.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/contentdata/repository.go b/internal/contentdata/repository.go index 2d54e3537..50aa00023 100644 --- a/internal/contentdata/repository.go +++ b/internal/contentdata/repository.go @@ -204,6 +204,9 @@ func (r *Repository) Query(ctx context.Context, tx *connection.Tx, projectID, da F: cells, }) } + if err := rows.Err(); err != nil { + return nil, err + } logger.Logger(ctx).Debug("query result", zap.Any("rows", result)) return &internaltypes.QueryResponse{ Schema: &bigqueryv2.TableSchema{