fix: update type of ListQuery.Limit to int32

To match the type (int32) of the AIP page size standard field.
einride · Jan 15, 2021 · 8f46165 · 8f46165
1 parent 09dbd5f
commit 8f46165
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/internal/codegen/databasecodegen/common.go b/internal/codegen/databasecodegen/common.go
@@ -25,7 +25,7 @@ func (g CommonCodeGenerator) generateListQueryStruct(f *codegen.File) {
 	f.P("type ", g.ListQueryType(), " struct {")
 	f.P("Where  ", spansqlPkg, ".BoolExpr")
 	f.P("Order  []", spansqlPkg, ".Order")
-	f.P("Limit  int64")
+	f.P("Limit  int32")
 	f.P("Offset int64")
 	f.P("}")
 }

diff --git a/internal/codegen/databasecodegen/interleavedreadtransaction.go b/internal/codegen/databasecodegen/interleavedreadtransaction.go
@@ -117,7 +117,7 @@ func (g InterleavedReadTransactionCodeGenerator) generateListRowsMethod(f *codeg
 	f.P("stmt := ", spannerPkg, ".Statement{")
 	f.P("SQL: q.String(),")
 	f.P("Params: map[string]interface{}{")
-	f.P(strconv.Quote(limitParam), ": query.Limit,")
+	f.P(strconv.Quote(limitParam), ": int64(query.Limit),")
 	f.P(strconv.Quote(offsetParam), ": query.Offset,")
 	f.P("},")
 	f.P("}")
@@ -181,7 +181,7 @@ func (g InterleavedReadTransactionCodeGenerator) generateBatchGetRowsMethod(f *c
 	f.P("foundRows := make(map[", primaryKey.Type(), "]*", interleavedRow.Type(), ", len(keys))")
 	f.P("if err := t.List(ctx, ", common.ListQueryType(), "{")
 	f.P("Where: ", spansqlPkg, ".Paren{Expr: where},")
-	f.P("Limit: int64(len(keys)),")
+	f.P("Limit: int32(len(keys)),")
 	f.P("}).Do(func(row *", interleavedRow.Type(), ") error {")
 	f.P("foundRows[row.", interleavedRow.KeyMethod(), "()] = row")
 	f.P("return nil")

diff --git a/internal/codegen/databasecodegen/readtransaction.go b/internal/codegen/databasecodegen/readtransaction.go
@@ -103,7 +103,7 @@ func (g ReadTransactionCodeGenerator) generateListRowsMethod(f *codegen.File) {
 	f.P("Offset: ", spansqlPkg, ".Param(", strconv.Quote(offsetParam), "),")
 	f.P("}.SQL(),")
 	f.P("Params: map[string]interface{}{")
-	f.P(strconv.Quote(limitParam), ": query.Limit,")
+	f.P(strconv.Quote(limitParam), ": int64(query.Limit),")
 	f.P(strconv.Quote(offsetParam), ": query.Offset,")
 	f.P("},")
 	f.P("}")

diff --git a/internal/codegen/databasecodegen/testdata/1.sql.database.go b/internal/codegen/databasecodegen/testdata/1.sql.database.go
diff --git a/internal/codegen/databasecodegen/testdata/2.sql.database.go b/internal/codegen/databasecodegen/testdata/2.sql.database.go
diff --git a/internal/examples/freightdb/database_gen.go b/internal/examples/freightdb/database_gen.go
diff --git a/internal/examples/musicdb/database_gen.go b/internal/examples/musicdb/database_gen.go