Commit067f912

committed

Fix created_at edge case for pagination cursor in queries

1 parent66af4ec commit067f912Copy full SHA for 067f912

File tree

+50

-62

lines changed

+50

-62

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,10 @@ func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams`
`186`	`186`	`returna.CreatedAt.Before(b.CreatedAt)`
`187`	`187`	`})`
`188`	`188`
`189`		`-ifparams.AfterUser!=uuid.Nil {`
	`189`	`+ifparams.AfterID!=uuid.Nil {`
`190`	`190`	`found:=false`
`191`	`191`	`fori,v:=rangeusers {`
`192`		`-ifv.ID==params.AfterUser {`
	`192`	`+ifv.ID==params.AfterID {`
`193`	`193`	`// We want to return all users after index i.`
`194`	`194`	`users=users[i+1:]`
`195`	`195`	`found=true`

Lines changed: 24 additions & 30 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 10 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,17 @@ WHERE`
`12`	`12`	`WHEN @after_id :: uuid!='00000000-00000000-00000000-00000000' THEN (`
`13`	`13`	`-- The pagination cursor is the last ID of the previous page.`
`14`	`14`	`-- The query is ordered by the created_at field, so select all`
`15`		`--- rows after the cursor. We also want to include any rows`
`16`		`--- that share the created_at (super rare).`
`17`		`-created_at>= (`
`18`		`-SELECT`
`19`		`-created_at`
`20`		`-FROM`
`21`		`-template_versions`
`22`		`-WHERE`
`23`		`-id= @after_id`
`24`		`-)`
`25`		`--- Omit the cursor from the final.`
`26`		`-AND id!= @after_id`
	`15`	`+-- rows after the cursor.`
	`16`	`+(created_at, id)> (`
	`17`	`+SELECT`
	`18`	`+created_at, id`
	`19`	`+FROM`
	`20`	`+template_versions`
	`21`	`+WHERE`
	`22`	`+id= @after_id`
`27`	`23`	`)`
`28`		`-ELSE true`
	`24`	`+)`
	`25`	`+ELSE true`
`29`	`26`	`END`
`30`	`27`	`ORDER BY`
`31`	`28`	`-- Deterministic and consistent ordering of all rows, even if they share`

Lines changed: 13 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,23 +77,20 @@ WHERE`
`77`	`77`	`-- This allows using the last element on a page as effectively a cursor.`
`78`	`78`	`-- This is an important option for scripts that need to paginate without`
`79`	`79`	`-- duplicating or missing data.`
`80`		`-WHEN @after_user :: uuid!='00000000-00000000-00000000-00000000' THEN (`
`81`		`--- The pagination cursor is the last user of the previous page.`
`82`		`--- The query is ordered by the created_at field, so select all`
`83`		`--- users after the cursor. We also want to include any users`
`84`		`--- that share the created_at (super rare).`
`85`		`-created_at>= (`
`86`		`-SELECT`
`87`		`-created_at`
`88`		`-FROM`
`89`		`-users`
`90`		`-WHERE`
`91`		`-id= @after_user`
`92`		`-)`
`93`		`--- Omit the cursor from the final.`
`94`		`-AND id!= @after_user`
	`80`	`+WHEN @after_id :: uuid!='00000000-00000000-00000000-00000000' THEN (`
	`81`	`+-- The pagination cursor is the last ID of the previous page.`
	`82`	`+-- The query is ordered by the created_at field, so select all`
	`83`	`+-- rows after the cursor.`
	`84`	`+(created_at, id)> (`
	`85`	`+SELECT`
	`86`	`+created_at, id`
	`87`	`+FROM`
	`88`	`+template_versions`
	`89`	`+WHERE`
	`90`	`+id= @after_id`
`95`	`91`	`)`
`96`		`-ELSE true`
	`92`	`+)`
	`93`	`+ELSE true`
`97`	`94`	`END`
`98`	`95`	`-- Start filters`
`99`	`96`	`-- Filter by name, email or username`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func (api api) users(rw http.ResponseWriter, r http.Request) {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`users,err:=api.Database.GetUsers(r.Context(), database.GetUsersParams{`
`118`		`-AfterUser:paginationParams.AfterID,`
	`118`	`+AfterID:paginationParams.AfterID,`
`119`	`119`	`OffsetOpt:int32(paginationParams.Offset),`
`120`	`120`	`LimitOpt:int32(paginationParams.Limit),`
`121`	`121`	`Search:searchName,`

Comments

(0)