feat: use keysetpagination planner for keto read queries

DavudSafarli · ory-bot · commit 5ca4c858cb84 · 2026-02-13T08:44:38.000Z
GitOrigin-RevId: e2ed9c3eecc60fd26eaedb3f8cca4f222fd1cb1e
diff --git a/oryx/pagination/keysetpagination_v2/.snapshots/TestPageToken-Marshal_snapshot.json b/oryx/pagination/keysetpagination_v2/.snapshots/TestPageToken-Marshal_snapshot.json
@@ -31,6 +31,14 @@
       "n": "int64",
       "vi": 64
     },
+    {
+      "n": "int64-zero",
+      "vi": 0
+    },
+    {
+      "n": "empty-nullint64",
+      "vi": 0
+    },
     {
       "n": "nullint64",
       "vi": 64
diff --git a/oryx/pagination/keysetpagination_v2/page_token.go b/oryx/pagination/keysetpagination_v2/page_token.go
@@ -130,18 +130,11 @@ func (t *PageToken) UnmarshalJSON(data []byte) error {
 			t.cols[i].Value = nil
 		case col.ValueAny != nil:
 			t.cols[i].Value = col.ValueAny
-
-		// zero-value checks needed for backward compatibility.
-		// Old format: {"vt": "2023-01-01...", "vu": "00000...", "vi": 0} - all fields are present.
-		// To avoid breaking existing tokens, we need to check for zero value as old logic did.
-		// The next release can drop the 2nd part of the case conditions.
-		case col.ValueTime != nil && !col.ValueTime.IsZero():
-			t.cols[i].Value = *col.ValueTime
-		case col.ValueUUID != nil && *col.ValueUUID != uuid.Nil:
+		case col.ValueUUID != nil:
 			t.cols[i].Value = *col.ValueUUID
-		case col.ValueAny != nil:
-			t.cols[i].Value = col.ValueAny
-		case col.ValueInt64 != nil && *col.ValueInt64 != 0:
+		case col.ValueTime != nil:
+			t.cols[i].Value = *col.ValueTime
+		case col.ValueInt64 != nil:
 			t.cols[i].Value = *col.ValueInt64
 		}
 	}
diff --git a/oryx/pagination/paginationplanner/planner.go b/oryx/pagination/paginationplanner/planner.go
@@ -141,6 +141,10 @@ type Column struct {
 	name string
 }
 
+func (c Column) Name() string {
+	return c.name
+}
+
 type ColumnConstraint uint8
 
 const (
@@ -163,15 +167,16 @@ type Query map[Column]ColumnConstraint
 func NewQuery() Query { return make(Query) }
 
 func (qc Query) SetEq(cols ...Column) Query {
-	for _, col := range cols {
-		qc[col] = colConstraintEq
-	}
-	return qc
+	return qc.set(colConstraintEq, cols...)
 }
 
 func (qc Query) SetIsNull(cols ...Column) Query {
+	return qc.set(colConstraintIsNull, cols...)
+}
+
+func (qc Query) set(c ColumnConstraint, cols ...Column) Query {
 	for _, col := range cols {
-		qc[col] = colConstraintIsNull
+		qc[col] = c
 	}
 	return qc
 }
