arel-extensions 6.0.0.9 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235ef23ebc75b949c45a3f6e90c5dac1982d7d774ff45fe322e54e9f668e0e69
-  data.tar.gz: e89e29e164da71023324a734b33d54e647accdcbd27ba473d7a7c61ffd2f8122
+  metadata.gz: 6499ad3b57ef7119b545163cecc1972913c494d57bbfd19c81aecbbf74219880
+  data.tar.gz: 576fb2e56d087957430ff9e8cc5ee3dc968c2f17ba3d2c617a4eae2f6664f340
 SHA512:
-  metadata.gz: 53259990ba16f64376e9d16b4f7f49b7fe8332c0bc6d9cfa36d1bd9a41bbd52058e1cd8a76c0307bdb6a7b8e7d2d2dad8bab9d15e266cee882526b6662d00b21
-  data.tar.gz: a862717bae96433b5dd22b33e57f83858b318774db1c2148d8270333626ed6b1d19e51b6ac6098b27624b8165b5ca3dabf1e95719c70c9306dd1e2f8d1ef3b32
+  metadata.gz: df8347481c7c0d86903d7f0fe35850da0ac725325ab18f11191f6c04455d88515cd47306ab1fb972f5ca2e8a49e678cbfd242c12a0850575a5cdbde95bb41a9b
+  data.tar.gz: 52c2e805c1758594478b229c421ba301571c82d715be1904f8fd00359ab7b399919d2d6f74c8548078ad141c41a7bc687d7d311b33f79ac171ca38f95859623f

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: ruby
 sudo: false
 
@@ -8,37 +8,60 @@ cache:
     - /home/travis/.rvm/gems
 
 rvm:
-  - 2.6
+  - 2.7
 
 env:
   matrix:
-    - RAILS_VERSION=v6.0.3.1 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.3.1 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.3.1 GEM=activerecord:postgresql
+    - 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: "10"
+  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 -v 1.17.3
+  - 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 https://github.com/rails/rails.git ~/build/rails
+  - 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 checkout $RAILS_VERSION
+  - 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
-  - bundle install --jobs=3 --retry=3 --full-index
+  - rm ~/build/rails/Gemfile.lock
+  - bundle update --jobs=3 --retry=3
   - popd
+  - bundle install --jobs=3 --retry=3
 
 script:
-  - cd ~/build/rails && ci/travis.rb
+  - bundle exec rake test
+  - cd ~/build/rails/activerecord && bundle exec rake $TASK

data/arel-extensions.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path("../lib/arel/extensions/version", __FILE__)
+
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version       = '6.0.0.9'
+  gem.version       = Arel::Extensions::VERSION
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
   gem.summary       = %q{Adds support for missing SQL operators and functions to Arel}
@@ -11,15 +13,16 @@ 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.0.0'
+  gem.add_dependency 'activerecord', '>= 6.1.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"
+  gem.add_development_dependency "sunstone", '>= 6.1.0.rc1'
   gem.add_development_dependency "webmock"
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'rgeo'
-  
+
 end

data/lib/arel/array_predications.rb

@@ -1,24 +1,14 @@
 module Arel
   module ArrayPredications
-    
-    # Used by both JSON and ARRAY so it doesn't try to cast to array
-    def contains(value)
-      Arel::Nodes::Contains.new(self, value)
-    end
-    
+
     # Used by both JSON and ARRAY so it doesn't try to cast to array
     def contained_by(value)
       Arel::Nodes::ContainedBy.new(self, value)
     end
-    
+
     def excludes(value)
       Arel::Nodes::Excludes.new(self, value)
     end
-    
-    def overlaps(*values)
-      values = values[0] if values.size == 1 && values[0].is_a?(Array)
-      Arel::Nodes::Overlaps.new(self, values)
-    end
-    
+
   end
-end
+end

data/lib/arel/extensions.rb

@@ -1,8 +1,6 @@
 require "arel"
 require File.expand_path('../nodes/hex_encoded_binary', __FILE__)
 
-require File.expand_path('../nodes/overlaps', __FILE__)
-require File.expand_path('../nodes/contains', __FILE__)
 require File.expand_path('../nodes/within', __FILE__)
 require File.expand_path('../nodes/excludes', __FILE__)
 require File.expand_path('../nodes/contained_by', __FILE__)

data/lib/arel/extensions/version.rb

@@ -0,0 +1,5 @@
+module Arel
+  module Extensions
+    VERSION = '6.1.0.rc1'
+  end
+end

data/lib/arel/visitors/postgresql_extensions.rb

@@ -28,13 +28,6 @@ module Arel
         collector << "RANDOM()"
       end
       
-      def visit_Arel_Nodes_Contains o, collector
-        visit o.left, collector
-        collector << ' @> '
-        collector << quote(o.left.type_cast_for_database(o.right))
-        collector
-      end
-      
       def visit_Arel_Nodes_ContainedBy o, collector
         visit o.left, collector
         collector << ' <@ '
@@ -51,13 +44,6 @@ module Arel
         collector
       end
 
-      def visit_Arel_Nodes_Overlaps o, collector
-        visit o.left, collector
-        collector << ' && '
-        collector << quote(o.left.type_cast_for_database(o.right))
-        collector
-      end
-      
       def visit_Arel_Attributes_Key(o, collector, last_key = true)
         if o.relation.is_a?(Arel::Attributes::Key)
           visit_Arel_Attributes_Key(o.relation, collector, false)

data/test/database.rb

@@ -1,16 +1,14 @@
-task = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new({
-  'adapter' => 'postgresql',
-  'database' => "arel-extensions-test"
-})
-task.drop
-task.create
-
 ActiveRecord::Base.establish_connection({
   adapter:  "postgresql",
   database: "arel-extensions-test",
   encoding: "utf8"
 })
 
+db_config = ActiveRecord::Base.connection_db_config
+task = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(db_config)
+task.drop
+task.create
+
 ActiveRecord::Migration.suppress_messages do
   ActiveRecord::Schema.define do
 
@@ -18,7 +16,7 @@ ActiveRecord::Migration.suppress_messages do
       t.integer  "name"
       t.integer  "property_id"
     end
-    
+
     create_table "properties", force: :cascade do |t|
       t.string   "name",                 limit: 255
       t.tsvector 'vector_col'
@@ -48,4 +46,4 @@ class SunstoneProperty < SunstoneRecord
   has_many :addresses, class_name: 'SunstoneAddress'
 end
 
-SunstoneRecord.establish_connection(adapter: 'sunstone', url: 'http://example.com')
+SunstoneRecord.establish_connection(adapter: 'sunstone', endpoint: 'http://example.com')

data/test/sunstone_test.rb

@@ -27,7 +27,7 @@ class SunstoneTest < ActiveSupport::TestCase
   # end
   
   test "::filter json_column: {contains: JSON_HASH}" do
-    query = SunstoneProperty.where(SunstoneProperty.arel_attribute('metadata').contains({json: 'string'}))
+    query = SunstoneProperty.where(SunstoneProperty.arel_table['metadata'].contains({json: 'string'}))
     assert_sar(query, 'GET', '/sunstone_properties', {
       where: {metadata: {contains: { json: 'string' }}}
     })

data/test/test_helper.rb

@@ -30,7 +30,7 @@ $debugging = false
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
 class ActiveSupport::TestCase
   include WebMock::API
-  
+
   # File 'lib/active_support/testing/declarative.rb'
   def self.test(name, &block)
     test_name = "test_#{name.gsub(/\s+/, '_')}".to_sym
@@ -44,7 +44,7 @@ class ActiveSupport::TestCase
       end
     end
   end
-  
+
   def webmock(method, path, query=nil)
     query = deep_transform_query(query) if query
 
@@ -56,7 +56,7 @@ class ActiveSupport::TestCase
       end
     end
   end
-  
+
   def setup
     sunstone_schema = {
       addresses: {
@@ -74,7 +74,7 @@ class ActiveSupport::TestCase
         }
       }
     }
-    
+
     req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
       case req.uri.path
       when '/tables'
@@ -85,7 +85,7 @@ class ActiveSupport::TestCase
         false
       end
     end
-    
+
     req_stub.to_return do |req|
       case req.uri.path
       when '/tables'
@@ -151,7 +151,7 @@ class ActiveSupport::TestCase
       unless ignore =~ sql
         if $debugging
         puts caller.select { |l| l.starts_with?(File.expand_path('../../lib', __FILE__)) }
-        puts "\n\n" 
+        puts "\n\n"
         end
       end
       self.class.log << sql unless ignore =~ sql
@@ -173,7 +173,7 @@ class ActiveSupport::TestCase
       object
     end
   end
-  
+
   def assert_sar(query, method, path, query_params = {}, body = nil)
     sar = query.to_sar
 
@@ -186,7 +186,7 @@ class ActiveSupport::TestCase
       assert_equal body, sar.body
     end
   end
-  
+
   def assert_sql(expected, query)
     assert_equal expected.strip, query.to_sql.strip.gsub(/\s+/, ' ')
   end
@@ -205,5 +205,5 @@ class ActiveSupport::TestCase
   alias :assert_not_predicate :refute_predicate
   alias :assert_not_respond_to :refute_respond_to
   alias :assert_not_same :refute_same
-  
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.0.0.9
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -158,16 +172,15 @@ files:
 - lib/arel/attributes/cast.rb
 - lib/arel/attributes/key.rb
 - lib/arel/extensions.rb
+- lib/arel/extensions/version.rb
 - lib/arel/gis_predications.rb
 - lib/arel/json_predications.rb
 - lib/arel/nodes/contained_by.rb
-- lib/arel/nodes/contains.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/overlaps.rb
 - lib/arel/nodes/random.rb
 - lib/arel/nodes/relation.rb
 - lib/arel/nodes/ts_match.rb
@@ -200,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key:

data/lib/arel/nodes/contains.rb

@@ -1,6 +0,0 @@
-module Arel
-  module Nodes
-    class Contains < Binary
-    end
-  end
-end

data/lib/arel/nodes/overlaps.rb

@@ -1,6 +0,0 @@
-module Arel
-  module Nodes
-    class Overlaps < Binary
-    end
-  end
-end