Cast sql limit to bigint to force sqlc to generate NullInt64 (#2490)

Signed-off-by: Vyom-Yadav <[email protected]>
mindersec · Mar 7, 2024 · 04a8002 · 04a8002
1 parent f0c2571
commit 04a8002
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/database/query/repositories.sql b/database/query/repositories.sql
@@ -32,7 +32,7 @@ SELECT * FROM repositories
 WHERE provider = $1 AND project_id = $2
   AND (repo_id >= sqlc.narg('repo_id') OR sqlc.narg('repo_id') IS NULL)
 ORDER BY project_id, provider, repo_id
-LIMIT sqlc.narg('limit');
+LIMIT sqlc.narg('limit')::bigint;
 
 -- name: ListRegisteredRepositoriesByProjectIDAndProvider :many
 SELECT * FROM repositories

diff --git a/docs/docs/ref/proto.md b/docs/docs/ref/proto.md
diff --git a/internal/controlplane/handlers_repositories.go b/internal/controlplane/handlers_repositories.go
@@ -169,13 +169,13 @@ func (s *Server) ListRepositories(ctx context.Context,
 		repoId = sql.NullInt64{Valid: true, Int64: reqRepoCursor.RepoId}
 	}
 
-	limit := sql.NullInt32{Valid: false, Int32: 0}
+	limit := sql.NullInt64{Valid: false, Int64: 0}
 	reqLimit := in.GetLimit()
 	if reqLimit > 0 {
 		if reqLimit > maxFetchLimit {
 			return nil, util.UserVisibleError(codes.InvalidArgument, "limit too high, max is %d", maxFetchLimit)
 		}
-		limit = sql.NullInt32{Valid: true, Int32: reqLimit + 1}
+		limit = sql.NullInt64{Valid: true, Int64: reqLimit + 1}
 	}
 
 	repos, err := s.store.ListRepositoriesByProjectID(ctx, db.ListRepositoriesByProjectIDParams{
@@ -205,7 +205,7 @@ func (s *Server) ListRepositories(ctx context.Context,
 	}
 
 	var respRepoCursor *cursorutil.RepoCursor
-	if limit.Valid && len(repos) == int(limit.Int32) {
+	if limit.Valid && int64(len(repos)) == limit.Int64 {
 		lastRepo := repos[len(repos)-1]
 		respRepoCursor = &cursorutil.RepoCursor{
 			ProjectId: projectID.String(),

diff --git a/internal/db/repositories.sql.go b/internal/db/repositories.sql.go
diff --git a/pkg/api/openapi/minder/v1/minder.swagger.json b/pkg/api/openapi/minder/v1/minder.swagger.json
diff --git a/pkg/api/protobuf/go/minder/v1/minder.pb.go b/pkg/api/protobuf/go/minder/v1/minder.pb.go
diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -22,7 +22,7 @@ breaking:
     - WIRE_JSON
   except:
     # Upgrading an int32 to an int64; still accept int32 input, output shape changes
-    # Undo after #2415
+    # Undo after #2490
     - FIELD_WIRE_JSON_COMPATIBLE_TYPE
 lint:
   use:

diff --git a/proto/minder/v1/minder.proto b/proto/minder/v1/minder.proto
@@ -825,7 +825,7 @@ message DeleteRepositoryByNameResponse {
 
 message ListRepositoriesRequest {
     string provider = 1 [deprecated=true];
-    int32 limit = 3;
+    int64 limit = 3;
     Context context = 5;
     string cursor = 6;