Merge pull request #8 from healthie/new-version

New version

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## master (unreleased)
 
+## 0.2.0 (2024-05-23)
+
+- Fix prefixing selected columns when iterating over joined tables
 - Change cursor encoding to url safe base64
 - Fix `next_cursor`/`previous_cursor` for empty pages
 - Fix iterating using only a timestamp column

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord_cursor_paginate (0.1.0)
+    activerecord_cursor_paginate (0.2.0)
       activerecord (>= 7.0)
 
 GEM

lib/activerecord_cursor_paginate/cursor.rb

@@ -8,7 +8,6 @@ module ActiveRecordCursorPaginate
   class Cursor
     class << self
       def from_record(record, columns:)
-        columns = columns.map { |column| column.to_s.split(".").last }
         values = columns.map { |column| record[column] }
         new(columns: columns, values: values)
       end

lib/activerecord_cursor_paginate/paginator.rb

@@ -77,11 +77,11 @@ def fetch
         arel_columns = @columns.map.with_index do |column, i|
           arel_column(column).as("cursor_column_#{i + 1}")
         end
-        cursor_column_names = 1.upto(@columns.size).map { |i| "cursor_column_#{i}" }
+        cursor_column_names = arel_columns.map { |column| column.right.to_s }
 
         relation =
           if relation.select_values.empty?
-            relation.select(Arel.star, arel_columns)
+            relation.select(relation.arel_table[Arel.star], arel_columns)
           else
             relation.select(arel_columns)
           end

lib/activerecord_cursor_paginate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordCursorPaginate
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

test/paginator_test.rb

@@ -214,6 +214,12 @@ def test_ordering_and_joins
     assert_equal([[2, 6], [3, 2]], page2.records.pluck(:id, :stars))
   end
 
+  def test_ordering_and_joins_correctly_selects_parent_record_attributes
+    p = User.joins(:projects).cursor_paginate(order: [:id, "projects.id"])
+    page = p.fetch
+    assert_equal([1, 1, 2, 2, 3], page.records.pluck(:id))
+  end
+
   def test_ordering_by_expression
     p = User.cursor_paginate(limit: 2, order: Arel.sql("id + 1"))
     page1 = p.fetch