arel-extensions 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864929650ef61e3f9365767b052b403ec511d8102654e2890e9fd6b97492352a
-  data.tar.gz: e35c7b6b0a262623b3368f1517363d84c71fd7b91cc0327cc730b41d3f50dbe8
+  metadata.gz: f10fd80539653570d9ea7333fa9f9aef21e29ccdb9f9a976fa178e106c1f3c66
+  data.tar.gz: 02efc9b543b5325e61899a590982207378482592f13a91ccb121d94a621a1966
 SHA512:
-  metadata.gz: 7db5423c6f8ee72c58d6a351a6ac4c8e633c2358762aa797698cc6c3f7710acf520a08c8a1fff5645ab8dfe0f5cadb13edbb115e76cb9c7d394fde8ed0d987fa
-  data.tar.gz: 30230816dbd511c6631e63908a242792d88f793fc45e5678465f2f9b6f0ba670d563563e0402590e5805fcf5a5cd04d8ed0057a4f91d75df934cbc3a79a91398
+  metadata.gz: 4da172777f5c26a8eafcc82faef85510967381601e67c6d8259229be3097aaa483ad8f57bddb3d42733b95a805ace1f40f84aa2a89777a4fe33f9b2647669e85
+  data.tar.gz: 40873247a7c72bd997f424df0ebf1e421f158046967929ef4d11ae932e1d10422b26fe78feb56a86086b2eb261d20e118dbbe848f10a862d04fae8701bb4340f

data/.github/workflows/ci.yml

@@ -60,6 +60,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
         rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
@@ -94,7 +95,7 @@ jobs:
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
@@ -102,6 +103,10 @@ jobs:
           cat ~/rails/Gemfile
           bundle update --jobs=3 --retry=3
 
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
       - run: |
           pushd ~/rails/activerecord
           bundle exec rake db:postgresql:rebuild postgresql:test --trace
@@ -112,6 +117,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
         rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
@@ -132,7 +138,7 @@ jobs:
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
@@ -140,6 +146,14 @@ jobs:
           cat ~/rails/Gemfile
           bundle update --jobs=3 --retry=3
 
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
+      - name: Fix Weird Test Cases
+        run: |
+          cat ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
       - run: |
           pushd ~/rails/activerecord
           bundle exec rake sqlite3:test --trace
@@ -152,8 +166,8 @@ jobs:
     name: ActiveRecord MySQL Test
     runs-on: ubuntu-22.04
 
-
     strategy:
+      fail-fast: false
       matrix:
         rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
@@ -180,7 +194,7 @@ jobs:
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
@@ -188,6 +202,10 @@ jobs:
           cat ~/rails/Gemfile
           bundle update --jobs=3 --retry=3
 
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
       - run: |
           pushd ~/rails/activerecord
           bundle exec rake db:mysql:rebuild mysql2:test --trace

data/lib/active_record/query_methods.rb

@@ -24,6 +24,8 @@ module ActiveRecord::QueryMethods
   end
   alias uniq_on! distinct_on!
 
+  private
+  
   if ActiveRecord.version >= "7.2"
     def build_arel_with_distinct_on(connection, aliases = nil)
       arel = build_arel_without_distinct_on(connection, aliases)

data/lib/arel/extensions/version.rb

@@ -1,5 +1,5 @@
 module Arel
   module Extensions
-    VERSION = '8.0.1'
+    VERSION = '8.0.2'
   end
 end

data/lib/arel/nodes/random.rb

@@ -2,6 +2,15 @@ module Arel
   module Nodes
     class RandomOrdering < Arel::Nodes::Node
 
+      def hash
+        self.class.hash
+      end
+
+      def eql? other
+        self.class == other.class
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_query.rb

@@ -9,6 +9,17 @@ module Arel
         @language = Arel::Nodes.build_quoted(language) if language
       end
 
+      def hash
+        [@expression, @language].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.expression == other.expression &&
+        self.language == other.language
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_rank.rb

@@ -9,6 +9,17 @@ module Arel
         @tsquery = tsquery
       end
 
+      def hash
+        [@tsvector, @tsquery].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.tsvector == other.tsvector &&
+        self.tsquery == other.tsquery
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_rank_cd.rb

@@ -10,6 +10,18 @@ module Arel
         @normalization = normalization
       end
 
+      def hash
+        [@tsvector, @tsquery, @normalization].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.tsvector == other.tsvector &&
+        self.tsquery == other.tsquery &&
+        self.normalization == other.normalization
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_vector.rb

@@ -8,7 +8,17 @@ module Arel
         @attribute = attribute
         @language = Arel::Nodes.build_quoted(language) if language
       end
-      
+
+      def hash
+        [@attribute, @language].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.attribute == other.attribute &&
+        self.language == other.language
+      end
+      alias :== :eql?
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.2
 platform: ruby
 authors:
 - Jon Bracy