active_record-cursor_paginator 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a00cae4602011f6cf01aed6e09c6956d7eab352ec7b97c2d6ce712cfba972f
-  data.tar.gz: c8164ed441e5ed69dfe1874dcdea8337855b2a2cfc128cb481d013e3bb125a7c
+  metadata.gz: 0e6079364fab39f26c9d63199730cc44ae0138c5c3d8452aa1b73219e0afa0e1
+  data.tar.gz: 36d9c3020d18dafe2905b18a6a50bebee06ab17caff4ff4abd4eb9bb965aa851
 SHA512:
-  metadata.gz: 0df15ecf4719f1ac64b922193042511a03aa2fc642e0fb98d5f9154043c3c388347646e8e6e566a7418e33b650bfd8017dd55fe9fa276c43c42f7af8b148b1fe
-  data.tar.gz: 9fe08024a3cb033d6e32b07187f803e379b2c57735b27f4dfeb75621cc4da9672a36d23885038d79291773ce9eff90771591242477e26304b0e276a70372d00a
+  metadata.gz: db459de8e2b52873f5ccb95e9bb7b957af9381a30fcfca97786189874bfacc8808f80fb939ea86d54c8f50cb5983b263089df16f4e7f2294387d41757cf723d1
+  data.tar.gz: a344ab46f80d38a5c43d890793031a31194d3f3b7dfe6b53258c94a77a08386470c7201e46f5d6833cd2f9e77c0f3fa940afb0306c951648193b1f04f0530ce9

data/.rubocop.yml

@@ -8,7 +8,7 @@ inherit_mode:
 
 # 自動生成されるものはチェック対象から除外する
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   SuggestExtensions: false
   NewCops: enable
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-ruby-3.3.0
+ruby-3.4.4

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.3.1] - 2026-03-06
+
+- Add support for Rails enum columns
+
+## [0.3.0] - 2025-12-10
+
+- Fix ambiguous column error
+- Drop ruby v2.x support
+
 ## [0.2.0] - 2024-03-27
 
 - Support aliases

data/lib/active_record/cursor_paginator/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   class CursorPaginator
-    VERSION = '0.2.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/active_record/cursor_paginator.rb

@@ -160,10 +160,23 @@ module ActiveRecord
       # value from this other field as well as the records ID to resolve the order
       # of duplicates in the non-ID field.
       #
+      # For enum columns, we store the raw integer value instead of the string
+      # representation to ensure proper SQL comparison in WHERE clauses.
+      #
       # @param record [ActiveRecord] Model instance for which we want the cursor
       # @return [String]
       def cursor_for_record(record)
-        unencoded_cursor = @fields.map {|field| { field.keys.first => record[field.keys.first] } }
+        unencoded_cursor = @fields.map do |field|
+          field_name = field.keys.first
+          value = if record.class.defined_enums.key?(field_name.to_s)
+                    # For enum columns, get the raw integer value from the database
+                    record.read_attribute_before_type_cast(field_name)
+                  else
+                    # For regular columns, get the typed value
+                    record[field_name]
+                  end
+          { field_name => value }
+        end
         Base64.strict_encode64(unencoded_cursor.to_json)
       end
 
@@ -256,10 +269,12 @@ module ActiveRecord
         relation = sorted_relation
         prev_fields.each do |col, val|
           col = @aliases[col] if @aliases.has_key? col
+          col = qualify_field_if_needed(col)
           relation = relation.where("#{col} = ?", val)
         end
         col, val = current_field
         col = @aliases[col] if @aliases.has_key? col
+        col = qualify_field_if_needed(col)
         relation.where("#{col} #{op} ?", val)
       end
 
@@ -276,7 +291,7 @@ module ActiveRecord
             # "value [AS|as] alias" という形式に対応する
             # value: spaceがあってもOK. 最小マッチングのため '?' をつける
             # 'as' は使わないのでキャプチャしない
-            match = expr.match(/^(?<value>.+?)\s+(?:as\s+)?(?<alias>\S+)$/i)
+            match = expr.match(/\A(?<value>.+?)\s+(?:as\s+)?(?<alias>\S+)\z/i)
             next if match.nil? || match.length < 3
 
             key = trim_quote(match[:alias])
@@ -287,7 +302,25 @@ module ActiveRecord
       end
 
       def trim_quote(field)
-        field.gsub(/^[`\"]/, '').gsub(/[`\"]$/, '')
+        field.gsub(/^[`"]/, '').gsub(/[`"]$/, '')
+      end
+
+      # Qualifies a field name with the table name unless it is already qualified or is a SQL function.
+      #
+      # If the field name contains a dot (.) or an opening parenthesis, it is assumed to be
+      # already qualified or a SQL function and is returned as-is. Otherwise, the field name
+      # is trimmed of quotes and prefixed with the table name.
+      #
+      # @param field [String] The field name to qualify.
+      # @return [String] The qualified field name or the original field if already qualified or a function.
+      def qualify_field_if_needed(field)
+        # qualified なフィールド名とSQL関数を簡易的に判定します
+        if field.include?('.') || field.include?('(')
+          field
+        else
+          field = trim_quote(field)
+          "#{@relation.table_name}.#{field}"
+        end
       end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record-cursor_paginator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shinichi Sugiyama
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,7 +52,6 @@ metadata:
   source_code_uri: https://github.com/ssugiyama/active_record-cursor_paginator
   changelog_uri: https://github.com/ssugiyama/active_record-cursor_paginator/Changelog.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,15 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: cursor pagination for ActiveRecord
 test_files: []