active_record-cursor_paginator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a00cae4602011f6cf01aed6e09c6956d7eab352ec7b97c2d6ce712cfba972f
-  data.tar.gz: c8164ed441e5ed69dfe1874dcdea8337855b2a2cfc128cb481d013e3bb125a7c
+  metadata.gz: 19564a0a0f62ea77cf5876fc9d125f27474aba8fec598a6a84e6b215b13edb22
+  data.tar.gz: e9856e7730229847a6d345c7b2cab49062b2351216fb02a775c1a4d3d8c19ca6
 SHA512:
-  metadata.gz: 0df15ecf4719f1ac64b922193042511a03aa2fc642e0fb98d5f9154043c3c388347646e8e6e566a7418e33b650bfd8017dd55fe9fa276c43c42f7af8b148b1fe
-  data.tar.gz: 9fe08024a3cb033d6e32b07187f803e379b2c57735b27f4dfeb75621cc4da9672a36d23885038d79291773ce9eff90771591242477e26304b0e276a70372d00a
+  metadata.gz: c899b2ea56ffd2a65edabbbd06421bc695263555488b8068cf0c753d4cf84e6ca1c57837b339ed7237d47ab8d200c6242d52ded55ffc991c3df784a0c0056ec6
+  data.tar.gz: 3f037675aa41403536d136e99faa7c08ec0184c5756fd91cabb88e6d72bdbec3f2be3cc1cbe83ab8efa2538218d35121e05c8c312e0683c26332ad16cbb8bc8c

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,8 @@
+## [0.3.0] - 2025-12-10
+
+- Fix ambiguous column error
+- Drop ruby v2.x support
+
 ## [0.2.0] - 2024-03-27
 
 - Support aliases

data/active_record-cursor_paginator.gemspec

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'lib/active_record/cursor_paginator/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'active_record-cursor_paginator'
+  spec.version = ActiveRecord::CursorPaginator::VERSION
+  spec.authors = ['Shinichi Sugiyama']
+  spec.email = ['sugiyama-shinichi@kayac.com']
+
+  spec.summary = 'cursor pagination for ActiveRecord'
+  spec.description =
+    'This library is an implementation of cursor pagination for ActiveRecord relations ' \
+    'based on "https://github.com/xing/rails_cursor_pagination". ' \
+    'Additional features are: ' \
+    '- receives a relation with orders, and it is unnecessary to specify orders to this library separately.' \
+    '- supports bidirectional pagination.'
+
+  spec.homepage = 'https://github.com/ssugiyama/active_record-cursor_paginator'
+  spec.license = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/Changelog.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
+    end
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) {|f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency 'activerecord', '>= 6.0'
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata['rubygems_mfa_required'] = 'true'
+end

data/lib/active_record/cursor_paginator/version.rb

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

data/lib/active_record/cursor_paginator.rb

@@ -256,10 +256,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 +278,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 +289,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.0
 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
@@ -43,6 +42,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- active_record-cursor_paginator.gemspec
 - lib/active_record/cursor_paginator.rb
 - lib/active_record/cursor_paginator/version.rb
 homepage: https://github.com/ssugiyama/active_record-cursor_paginator
@@ -53,7 +53,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 +60,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.6.7
 specification_version: 4
 summary: cursor pagination for ActiveRecord
 test_files: []