arel-extensions 6.1.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576ed17dde483e58188e1f7124bf77f4a479486b31166af59b1779ce955cf022
-  data.tar.gz: a5253c48854f0b13604867cb36877b03ac6a3166724d11d25fa968b2f7654757
+  metadata.gz: 25d31b82bda12cbddc9ff7110b040e74d827a97d430259c7c4be9c1c50071f38
+  data.tar.gz: 727762032b716e7c8c4cde9d9867702e717a7bad8e772aca649cd200fcd292a1
 SHA512:
-  metadata.gz: 3ea0ba57874c4abfb39fb448c60d8fe6a3829ba4a59d220ba348ad30fb04bea583928c1df4735a71c97a3d1a46d79ad990449cd82d66df5d73a5d947ad169952
-  data.tar.gz: 1d970867a870fbb319bd4ccbb5bc9cd110fe3b889b539da3069abc72a68e899b09f02d3f650d2a3a30b6d5defd65f8fd1c7fcf7ee3208ddc9e8eaa8524eb18c9
+  metadata.gz: fa40b55d8bd479d4947594d2d56e9a0ff6c8cbb045d2dfd7ab8b64ef987bfada7658a5f1bad2432e3db889d48cfc89f628cb5b06109960148478f59c260ce147
+  data.tar.gz: aafe42cbb6f0e1739457c19f3c9de60d76e5879b973dd7125a23bd8dc1aa9beb0aeb2a734fd5bef30f8200f50951a6948f46b17a847e974d89f3b95be8a86ef7

data/.github/workflows/ci.yml

@@ -0,0 +1,166 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  sunstone:
+    name: Arel::Extensions Test
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Install Postgresql
+        run: |
+          sudo pg_dropcluster 13 main && echo 'okay'
+          sudo pg_dropcluster 14 main && echo 'okay'
+          sudo rm -rf /etc/postgresql-common
+          sudo apt-get -y --purge remove $(sudo apt list --installed | grep postgresql | awk '{print $1}')
+          sudo apt-get install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo apt-get update
+          sudo apt-get -y install postgresql-15
+          sudo systemctl start postgresql@15-main.service
+          sudo systemctl status postgresql@15-main.service
+          sudo pg_lsclusters
+          sudo -u postgres createuser runner --superuser
+          
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+
+      - uses: actions/checkout@v2
+
+      - run: bundle
+
+      - run: bundle exec rake test
+
+  ar-postgresql:
+    name: ActiveRecord PostgresQL Test
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        rails:
+          - v7.0.4
+
+    steps:
+      - name: Install Postgresql
+        run: |
+          sudo pg_dropcluster 13 main && echo 'okay'
+          sudo pg_dropcluster 14 main && echo 'okay'
+          sudo rm -rf /etc/postgresql-common
+          sudo apt-get -y --purge remove $(sudo apt list --installed | grep postgresql | awk '{print $1}')
+          sudo apt-get install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo apt-get update
+          sudo apt-get -y install postgresql-15
+          sudo systemctl start postgresql@15-main.service
+          sudo systemctl status postgresql@15-main.service
+          sudo pg_lsclusters
+          sudo -u postgres createuser runner --superuser
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+          
+      - uses: actions/checkout@v2
+    
+      - name: Download Rails
+        run: |
+          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          pushd ~/rails
+          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
+          rm ~/rails/Gemfile.lock
+          sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
+          cat ~/rails/Gemfile
+          bundle update --jobs=3 --retry=3
+
+      - run: |
+          pushd ~/rails/activerecord
+          bundle exec rake db:postgresql:rebuild postgresql:test
+          bundle exec rake db:postgresql:rebuild postgresql:isolated_test
+          
+  ar-sqlite:
+    name: ActiveRecord SQLite Test
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        rails:
+          - v7.0.4
+
+    steps:
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          
+      - uses: actions/checkout@v2
+    
+      - name: Download Rails
+        run: |
+          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          pushd ~/rails
+          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
+          rm ~/rails/Gemfile.lock
+          sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
+          cat ~/rails/Gemfile
+          bundle update --jobs=3 --retry=3
+
+      - run: |
+          pushd ~/rails/activerecord
+          bundle exec rake sqlite3:test
+          rm test/db/*.sqlite3 test/fixtures/*.sqlite3
+          bundle exec rake sqlite3:isolated_test
+          rm test/db/*.sqlite3 test/fixtures/*.sqlite3
+          bundle exec rake sqlite3_mem:test
+        
+  ar-mysql:
+    name: ActiveRecord MySQL Test
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        rails:
+          - v7.0.4
+
+    steps:
+      - name: Install MySQL
+        run: |
+          sudo /etc/init.d/mysql start
+          mysql -uroot -proot -e "CREATE USER 'rails'@'%';"
+          mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON *.* TO 'rails'@'%' WITH GRANT OPTION;"
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          
+      - uses: actions/checkout@v2
+    
+      - name: Download Rails
+        run: |
+          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          pushd ~/rails
+          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
+          rm ~/rails/Gemfile.lock
+          sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
+          cat ~/rails/Gemfile
+          bundle update --jobs=3 --retry=3
+
+      - run: |
+          pushd ~/rails/activerecord
+          bundle exec rake db:mysql:rebuild mysql2:test
+          bundle exec rake db:mysql:rebuild mysql2:isolated_test

data/arel-extensions.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 6.1.0'
+  gem.add_dependency 'activerecord', '>= 7.0.0'
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "byebug"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
-  gem.add_development_dependency "sunstone", '>= 6.1.0'
+  gem.add_development_dependency "sunstone", '>= 7.0.0'
   gem.add_development_dependency "webmock"
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'rgeo'

data/ext/arel/nodes/ascending.rb

@@ -9,6 +9,18 @@ module Arel
         @nulls = nulls
       end
 
+      def reverse
+        reverse_nulls = if nulls == :nulls_first
+          :nulls_last
+        elsif nulls
+          :nulls_first
+        else
+          nil
+        end
+        
+        Descending.new(expr, reverse_nulls)
+      end
+      
     end
   end
 end

data/ext/arel/nodes/descending.rb

@@ -9,6 +9,18 @@ module Arel
         @nulls = nulls
       end
 
+      def reverse
+        reverse_nulls = if nulls == :nulls_first
+          :nulls_last
+        elsif nulls
+          :nulls_first
+        else
+          nil
+        end
+        
+        Ascending.new(expr, reverse_nulls)
+      end
+      
     end
 
   end

data/lib/active_record/query_methods.rb

@@ -24,7 +24,7 @@ module ActiveRecord::QueryMethods
   end
   alias uniq_on! distinct_on!
 
-  def build_arel_with_distinct_on(aliases)
+  def build_arel_with_distinct_on(aliases = nil)
     arel = build_arel_without_distinct_on(aliases)
     arel.distinct_on(self.distinct_on_values) if !self.distinct_on_values.empty?
     arel

data/lib/arel/extensions/version.rb

@@ -1,5 +1,5 @@
 module Arel
   module Extensions
-    VERSION = '6.1.0'
+    VERSION = '7.0.1'
   end
 end

data/lib/arel/extensions.rb

@@ -1,5 +1,6 @@
 require "arel"
-require File.expand_path('../nodes/hex_encoded_binary', __FILE__)
+require File.expand_path('../nodes/binary_value', __FILE__)
+require File.expand_path('../nodes/hex_encoded_binary_value', __FILE__)
 
 require File.expand_path('../nodes/within', __FILE__)
 require File.expand_path('../nodes/excludes', __FILE__)

data/lib/arel/nodes/binary_value.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class BinaryValue < Arel::Nodes::Unary
+      
+    end
+  end
+end

data/lib/arel/nodes/hex_encoded_binary_value.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class HexEncodedBinaryValue < Arel::Nodes::Unary
+      
+    end
+  end
+end

data/lib/arel/visitors/postgresql_extensions.rb

@@ -139,11 +139,14 @@ module Arel
         collector << ')'
         collector
       end
-      
-      def visit_Arel_Nodes_HexEncodedBinary(o, collector)
-        collector << "E'\\\\x"
-        collector << o.expr
-        collector << "'"
+
+      def visit_Arel_Nodes_BinaryValue(o, collector)
+        collector << quote(@connection.escape_bytea(o.expr))
+        collector
+      end
+            
+      def visit_Arel_Nodes_HexEncodedBinaryValue(o, collector)
+        collector << quote("\\x" + o.expr)
         collector
       end
 

data/lib/arel/visitors/sunstone_extensions.rb

@@ -91,7 +91,7 @@ module Arel
 
       def visit_Arel_Nodes_Excludes o, collector
         key = visit(o.left, collector)
-        value = { excludes: o.left.type_cast_for_database(o.right) }
+        value = { excludes: visit(o.right, collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash(key, value)
@@ -102,7 +102,7 @@ module Arel
       
       def visit_Arel_Nodes_Overlaps o, collector
         key = visit(o.left, collector)
-        value = { overlaps: o.left.type_cast_for_database(o.right) }
+        value = { overlaps: visit(o.right, collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash_or_array(key, value)
@@ -114,13 +114,13 @@ module Arel
 
       def visit_Arel_Nodes_NotOverlaps o, collector
         key = visit(o.left, collector)
-        value = { not_overlaps: o.left.type_cast_for_database(o.right) }
+        value = { not_overlaps: visit(o.right, collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash_or_array(key, value)
           key
         else
-          {key => value}
+          { key => value }
         end
       end
       

data/test/binary_value_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class BinaryValueTest < ActiveSupport::TestCase
+
+  test 'binary value' do
+    query = Property.where( Arel::Nodes::BinaryValue.new("\x01\x01\x00\x00\x00\xC0K\x9B\x84\xD0.<@\b\x96\xA2n\x84%&@") )
+
+    assert_equal(<<~SQL.gsub(/( +|\n)/, ' ').strip, query.to_sql)
+      SELECT "properties".* FROM "properties"
+      WHERE '\\x0101000000c04b9b84d02e3c400896a26e84252640'
+    SQL
+  end
+
+  test 'hex encoded binary value' do
+    query = Property.where( Arel::Nodes::HexEncodedBinaryValue.new("0101000000c04b9b84d02e3c400896a26e84252640") )
+
+    assert_equal(<<~SQL.gsub(/( +|\n)/, ' ').strip, query.to_sql)
+      SELECT "properties".* FROM "properties"
+      WHERE '\\x0101000000c04b9b84d02e3c400896a26e84252640'
+    SQL
+  end
+
+end

data/test/database.rb

@@ -46,4 +46,4 @@ class SunstoneProperty < SunstoneRecord
   has_many :addresses, class_name: 'SunstoneAddress'
 end
 
-SunstoneRecord.establish_connection(adapter: 'sunstone', endpoint: 'http://example.com')
+SunstoneRecord.establish_connection(adapter: 'sunstone', url: 'http://example.com')

data/test/order_test.rb

@@ -44,4 +44,40 @@ class OrderTest < ActiveSupport::TestCase
     SQL
   end
 
+  # Test reversing orders
+  test '::order(column.asc.reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc.reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC
+    SQL
+  end
+
+  test '::order(column.desc.reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc.reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC
+    SQL
+  end
+
+  test '::order(column.asc(:nulls_first).reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc(:nulls_first).reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC NULLS LAST
+    SQL
+  end
+  
+  test '::order(column.asc(:nulls_last).reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc(:nulls_last).reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC NULLS FIRST
+    SQL
+  end
+
+  test '::order(column.desc(:nulls_first).reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc(:nulls_first).reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC NULLS LAST
+    SQL
+  end
+  
+  test '::order(column.desc(:nulls_last).reverse)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc(:nulls_last).reverse))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC NULLS FIRST
+    SQL
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -175,12 +175,13 @@ files:
 - lib/arel/extensions/version.rb
 - lib/arel/gis_predications.rb
 - lib/arel/json_predications.rb
+- lib/arel/nodes/binary_value.rb
 - lib/arel/nodes/contained_by.rb
 - lib/arel/nodes/excludes.rb
 - lib/arel/nodes/has_any_key.rb
 - lib/arel/nodes/has_key.rb
 - lib/arel/nodes/has_keys.rb
-- lib/arel/nodes/hex_encoded_binary.rb
+- lib/arel/nodes/hex_encoded_binary_value.rb
 - lib/arel/nodes/random.rb
 - lib/arel/nodes/relation.rb
 - lib/arel/nodes/ts_match.rb
@@ -193,6 +194,7 @@ files:
 - lib/arel/visitors/postgresql_extensions.rb
 - lib/arel/visitors/sunstone_extensions.rb
 - lib/arel/visitors/to_sql_extensions.rb
+- test/binary_value_test.rb
 - test/database.rb
 - test/order_test.rb
 - test/sunstone_test.rb
@@ -217,11 +219,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel
 test_files:
+- test/binary_value_test.rb
 - test/database.rb
 - test/order_test.rb
 - test/sunstone_test.rb

data/.travis.yml

@@ -1,68 +0,0 @@
-dist: bionic
-language: ruby
-sudo: false
-
-cache:
-  bundler: true
-  directories:
-    - /home/travis/.rvm/gems
-
-rvm:
-  - 2.7
-  - 3.0
-
-env:
-  matrix:
-    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:test'
-    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:isolated_test'
-    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:test'
-    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:isolated_test'
-    - RAILS_VERSION=v6.1.0 TASK='sqlite3:test'
-    - RAILS_VERSION=v6.1.0 TASK='sqlite3:isolated_test'
-    - RAILS_VERSION=v6.1.0 TASK='sqlite3_mem:test'
-
-services:
-  - mysql
-addons:
-  postgresql: "13"
-  apt:
-    packages:
-    - postgresql-13
-    - postgresql-client-13
-
-before_install:
-  - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/13/main/postgresql.conf
-  - sudo cp /etc/postgresql/{9.3,13}/main/pg_hba.conf
-  - sudo pg_ctlcluster 13 main restart
-  - unset BUNDLE_GEMFILE
-  - gem update --system
-  - gem update bundler
-  - gem install bundler --version 1.17.3
-  - mysql -e "create user rails@localhost;"
-  - mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;"
-  - mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;"
-  - mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;"
-  - mysql -e "create database activerecord_unittest default character set utf8mb4;"
-  - mysql -e "create database activerecord_unittest2 default character set utf8mb4;"
-
-install:
-  - git clone --branch $RAILS_VERSION https://github.com/rails/rails.git ~/build/rails
-
-before_script:
-  - sed -i "s/t.warning = true/t.warning = false/g" Rakefile
-  - pushd ~/build/rails
-  - git status
-  - sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/build/rails/activerecord/Rakefile
-  - sed -i "s/t.warning = true/t.warning = false/g" ~/build/rails/activerecord/Rakefile
-  - sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\('~\/build\/malomalo\/arel-extensions\/lib'\)\)\nrequire 'arel/extensions'" ~/build/rails/activerecord/test/cases/helper.rb
-  - "sed -i \"/group :db do/a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\\('~\\/build\\/malomalo\\/arel-extensions'\\)\" ~/build/rails/Gemfile"
-  - sed -i "/rb-inotify/d" ~/build/rails/Gemfile
-  - cat ~/build/rails/Gemfile
-  - rm ~/build/rails/Gemfile.lock
-  - bundle update --jobs=3 --retry=3
-  - popd
-  - bundle install --jobs=3 --retry=3
-
-script:
-  - bundle exec rake test
-  - cd ~/build/rails/activerecord && bundle exec rake $TASK

data/lib/arel/nodes/hex_encoded_binary.rb

@@ -1,7 +0,0 @@
-module Arel
-  module Nodes
-    class HexEncodedBinary < Arel::Nodes::Unary
-      
-    end
-  end
-end