arel_extensions 2.0.4 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808040009223c9a359d5e61e55f84a51dad939ee8b388ec04e52cfd6554f0ef9
-  data.tar.gz: 836a734a724fd5328a66483d8d433a93eef9cbbaf78cf5e4ea10877c283c9ddc
+  metadata.gz: 5080e8422006270a6c69337931908b043c1c494679d453a8ea89328390e84174
+  data.tar.gz: 9189ce88f62c39a385dc5b5fa55a021d8c7c2967d7025eb4710d1403ac9dc078
 SHA512:
-  metadata.gz: eb328d50ea6213bf785f0a03ebb1b23494fb66e8c60bf7a8873ffc84f3d78e5f9d2ec57367b7a5475872a899134edf5332e2b8dfe90128d22a7fe650e95c4f95
-  data.tar.gz: e9098b71c1fdb119c5a3e6a18409ce3096487eb8a5adffc827dde03fbf65139d37fe1bef525c4b261a1ddfbfb3cfa4f0ca079152519c6f3c5813975b5a9b3c5b
+  metadata.gz: f477cee1a8ce18be9346c1b10fc10b90e0cf28921f2dc518a67e49aba8dba771b73a0c2d822b2fd6336b4596c0684526f044b0d02d0b4c77792c765174d7d350
+  data.tar.gz: 45da36b498e8c905e2d6793234fa2a094947e450a9a58e52d272ade8d63f474008d2bfc2ec674305224bc8650a9e55d3446211fb5f0258ad7a2bcada2a38e991

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: required
+dist: trusty
 cache:
   bundler: true
   directories:
@@ -15,21 +16,23 @@ before_install:
 #  - sh -ex .travis/oracle/install.sh
 #  - .travis/setup_accounts.sh
 install:
-  - gem install bundler -v 1.17.3
   - bundle install
 gemfile:
 - gemfiles/rails4.gemfile
 - gemfiles/rails5_0.gemfile
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_2.gemfile
+- gemfiles/rails6.gemfile
 services:
 - mysql
 - postgresql
+addons:
+  postgresql: '9.4'
 before_script:
 - mysql -e 'create database arext_test;'
 - psql -c 'create database arext_test;' -U postgres
 script:
-- gem build arel_extensions.gemspec
+- ./generate_gems.sh
 - bundle exec rake test
 - bundle exec rake test:sqlite
 - bundle exec rake test:mysql
@@ -55,72 +58,33 @@ rvm:
 - 2.3.1
 - 2.4.0
 - 2.5.0
-- rbx-2
+- 2.7.1
 - jruby-9.0.5.0
-- jruby-9.2.0.0
+- jruby-9.2.11.1
 - jruby-head
-- ruby-head
 jdk:
-- openjdk7
 - oraclejdk8
 - oraclejdk9
 - openjdk10
-- oraclejdk10
 - openjdk11
 - oraclejdk11
 matrix:
   fast_finish: true
   exclude:
-  - rvm: rbx-2
-    jdk: openjdk7
   - rvm: 2.0.0
-    jdk: openjdk7
-  - rvm: 2.1
-    jdk: openjdk7
-  - rvm: 2.2.5
-    jdk: openjdk7
-  - rvm: 2.3.1
-    jdk: openjdk7
-  - rvm: 2.4.0
-    jdk: openjdk7
-  - rvm: 2.5.0
-    jdk: openjdk7
-  - rvm: ruby-head
-    jdk: openjdk7
-  - rvm: rbx-2
-    jdk: oraclejdk8
-  - rvm: 2.0.0
-    jdk: oraclejdk8
-  - rvm: 2.1
-    jdk: oraclejdk8
-  - rvm: 2.2.5
-    jdk: oraclejdk8
-  - rvm: 2.3.1
-    jdk: oraclejdk8
-  - rvm: 2.4.0
-    jdk: oraclejdk8
-  - rvm: 2.5.0
-    jdk: oraclejdk8
-  - rvm: ruby-head
-    jdk: oraclejdk8
-  - rvm: rbx-2
-    jdk: oraclejdk10
-  - rvm: 2.0.0
-    jdk: oraclejdk10
+    jdk: oraclejdk9
   - rvm: 2.1
-    jdk: oraclejdk10
+    jdk: oraclejdk9
   - rvm: 2.2.5
-    jdk: oraclejdk10
+    jdk: oraclejdk9
   - rvm: 2.3.1
-    jdk: oraclejdk10
+    jdk: oraclejdk9
   - rvm: 2.4.0
-    jdk: oraclejdk10
+    jdk: oraclejdk9
   - rvm: 2.5.0
-    jdk: oraclejdk10
-  - rvm: ruby-head
-    jdk: oraclejdk10
-  - rvm: rbx-2
-    jdk: openjdk10
+    jdk: oraclejdk9
+  - rvm: 2.7.1
+    jdk: oraclejdk9
   - rvm: 2.0.0
     jdk: openjdk10
   - rvm: 2.1
@@ -133,10 +97,8 @@ matrix:
     jdk: openjdk10
   - rvm: 2.5.0
     jdk: openjdk10
-  - rvm: ruby-head
+  - rvm: 2.7.1
     jdk: openjdk10
-  - rvm: rbx-2
-    jdk: oraclejdk11
   - rvm: 2.0.0
     jdk: oraclejdk11
   - rvm: 2.1
@@ -149,10 +111,8 @@ matrix:
     jdk: oraclejdk11
   - rvm: 2.5.0
     jdk: oraclejdk11
-  - rvm: ruby-head
+  - rvm: 2.7.1
     jdk: oraclejdk11
-  - rvm: rbx-2
-    jdk: openjdk11
   - rvm: 2.0.0
     jdk: openjdk11
   - rvm: 2.1
@@ -165,59 +125,67 @@ matrix:
     jdk: openjdk11
   - rvm: 2.5.0
     jdk: openjdk11
-  - rvm: ruby-head
+  - rvm: 2.7.1
     jdk: openjdk11
-  - rvm: jruby-9.2.0.0
-    jdk: openjdk7
-  - rvm: jruby-head
-    jdk: openjdk7
-  - rvm: 2.0.0
-    gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: 2.1
-    gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: 2.2.5
-    gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: ruby-head
+  - rvm: 2.7.1
+    gemfile: gemfiles/rails4.gemfile
+  - rvm : jruby-9.2.11.1
     gemfile: gemfiles/rails4.gemfile
   - rvm: 2.0.0
     gemfile: gemfiles/rails5_0.gemfile
   - rvm: 2.1
     gemfile: gemfiles/rails5_0.gemfile
-  - rvm: jruby-9.0.5.0
+  - rvm: 2.7.1
+    gemfile: gemfiles/rails5.0.gemfile
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails5_1_4.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/rails5_1_4.gemfile
+  - rvm: 2.2.5
     gemfile: gemfiles/rails5_1_4.gemfile
+  - rvm: 2.7.1
+    gemfile: gemfiles/rails5.1.4.gemfile
+  - rvm: 2.7.1
+    gemfile: gemfiles/rails5.1.4.gemfile
   - rvm: 2.0.0
     gemfile: gemfiles/rails5_2.gemfile
   - rvm: 2.1
     gemfile: gemfiles/rails5_2.gemfile
-  allow_failures:
-  - rvm: rbx-2
-    gemfile: gemfiles/rails4.gemfile
-  - rvm: rbx-2
-    gemfile: gemfiles/rails5_0.gemfile
-  - rvm: rbx-2
-    gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: rbx-2
+  - rvm: 2.2.5
     gemfile: gemfiles/rails5_2.gemfile
-  - rvm: rbx-2
+  - rvm: 2.7.1
+    gemfile: gemfiles/rails5.2.gemfile
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails6.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/rails6.gemfile
+  - rvm: 2.2.5
+    gemfile: gemfiles/rails6.gemfile
+  - rvm: 2.3.1
+    gemfile: gemfiles/rails6.gemfile
+  - rvm: 2.4.0
+    gemfile: gemfiles/rails6.gemfile
+  allow_failures:
+  - rvm: jruby-9.0.5.0
     gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: jruby-9.0.5.0
     gemfile: gemfiles/rails5_2.gemfile
-  - rvm: jruby-9.2.0.0
+  - rvm: jruby-9.2.11.1
     jdk: oraclejdk9
     gemfile: gemfiles/rails5_2.gemfile
+  - jdk: oraclejdk9
   - jdk: openjdk10
-  - jdk: oraclejdk10
   - jdk: openjdk11
   - jdk: oraclejdk11
-  - rvm: ruby-head
   - rvm: jruby-head
-  - rvm: jruby-9.2.0.0
+  - rvm: jruby-9.2.11.1
     jdk: oraclejdk9
   - rvm: jruby-9.0.5.0
     jdk: oraclejdk9
+  - rvm: 2.7.1
+  - gemfile: gemfiles/rails6.gemfile
 bundler_args: "--jobs 3 --retry 2"
 notifications:
   email:
-    notifications:
-      - julien.delporte@faveod.com
-      - yann.azoury@faveod.com
+    - julien.delporte@faveod.com
+    - yann.azoury@faveod.com

data/README.md

@@ -22,7 +22,7 @@ Arel 6 (Rails 4) or Arel 7+ (Rails 5).
 or
 
 Rails 6
-[Arel Repository](http://github.com/rails/rails)
+[Rails Repository](http://github.com/rails/rails)
 
 ## Usage
 

data/Rakefile

@@ -14,13 +14,24 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-%w(mysql postgresql sqlite ibm_db oracle mssql).each do |adapter|
+namespace :test do
+  Rake::TestTask.new('to_sql' => []) { |t|
+    t.libs << 'lib'
+    t.libs << 'test'
+    t.pattern = 'test/visitors/test_to_sql.rb'
+    t.warning = true
+    t.verbose = true
+    t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
+  }
+end
+
+%w[mysql postgresql sqlite ibm_db oracle mssql].each do |adapter|
   namespace :test do
     Rake::TestTask.new(adapter => "#{adapter}:env") { |t|
       t.libs << 'lib'
       t.libs << 'test'
       t.pattern = 'test/with_ar/*_agnostic_test.rb'
-      t.warning = true
+      t.warning = false
       t.verbose = true
       t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
     }

data/arel_extensions.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('arel', '>= 6.0')
+  s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')

data/gemfiles/rails4.gemfile

@@ -18,7 +18,7 @@ group :development, :test do
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', :platforms => :jruby
+  gem 'activerecord-jdbc-adapter', '~> 1.3' ,:platforms => :jruby
   gem "jdbc-sqlite3", :platforms => :jruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
   gem "activerecord-jdbcmysql-adapter", :platforms => :jruby

data/gemfiles/rails6.gemfile

@@ -27,4 +27,4 @@ group :development, :test do
   gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
 end
 
-gemspec :path => "../"
+gemspec :path => "../gemspec_v2/"

data/generate_gems.sh

@@ -7,7 +7,8 @@ gem build ./arel_extensions.gemspec
 
 # VERSION ~> 2
 cp ./version_v2.rb lib/arel_extensions/version.rb
-cp ./gemspec_v2/arel_extensions-v2.gemspec ./tmp.gemspec
-gem build ./tmp.gemspec
+mv ./arel_extensions.gemspec ./arel_extensions.gemspec.bck
+cp ./gemspec_v2/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
 cp ./version_v1.rb lib/arel_extensions/version.rb
-rm tmp.gemspec
+cp ./arel_extensions.gemspec.bck ./arel_extensions.gemspec

data/lib/arel_extensions.rb

@@ -7,35 +7,37 @@ require 'arel_extensions/railtie' if defined?(Rails::Railtie)
 # Count|NamedFunction < Function < Arel::Nodes::Node
 
 # pure Arel internals improvements
-Arel::Nodes::Binary.class_eval do
+class Arel::Nodes::Binary
   include Arel::AliasPredication
   include Arel::Expressions
 end
 
-Arel::Nodes::Casted.class_eval do
+class Arel::Nodes::Casted
   include Arel::AliasPredication
+
+  # They forget to define hash.
+  def hash
+    [self.class, self.val, self.attribute].hash
+  end
 end
 
-Arel::Nodes::Unary.class_eval do
+class Arel::Nodes::Unary
   include Arel::Math
   include Arel::AliasPredication
   include Arel::Expressions
 end
 
-Arel::Nodes::Grouping.class_eval do
-  include Arel::Math
-  include Arel::AliasPredication
+class Arel::Nodes::Grouping
   include Arel::OrderPredications
-  include Arel::Expressions
 end
 
-Arel::Nodes::Function.class_eval do
+class Arel::Nodes::Function
   include Arel::Math
   include Arel::Expressions
 end
 
 if Arel::VERSION >= "7.1.0"
-  Arel::Nodes::Case.class_eval do
+  class Arel::Nodes::Case
     include Arel::Math
     include Arel::Expressions
   end
@@ -101,14 +103,18 @@ module Arel
     Arel::Nodes::Equality.new(1,0)
   end
 
+  def self.tuple *v
+    tmp = Arel::Nodes::Grouping.new(nil)
+    Arel::Nodes::Grouping.new(v.map{|e| tmp.convert_to_node(e)})
+  end
 end
 
-Arel::Attributes::Attribute.class_eval do
+class Arel::Attributes::Attribute
   include Arel::Math
   include ArelExtensions::Attributes
 end
 
-Arel::Nodes::Function.class_eval do
+class Arel::Nodes::Function
   include ArelExtensions::Math
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
@@ -122,10 +128,19 @@ Arel::Nodes::Function.class_eval do
   def as other
     Arel::Nodes::As.new(self, Arel.sql(other))
   end
+end
 
+class Arel::Nodes::Grouping
+    include ArelExtensions::Math
+    include ArelExtensions::Comparators
+    include ArelExtensions::DateDuration
+    include ArelExtensions::MathFunctions
+    include ArelExtensions::NullFunctions
+    include ArelExtensions::StringFunctions
+    include ArelExtensions::Predications
 end
 
-Arel::Nodes::Unary.class_eval do
+class Arel::Nodes::Unary
   include ArelExtensions::Math
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
@@ -133,7 +148,7 @@ Arel::Nodes::Unary.class_eval do
   include ArelExtensions::Predications
 end
 
-Arel::Nodes::Binary.class_eval do
+class Arel::Nodes::Binary
   include ArelExtensions::Math
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
@@ -142,28 +157,27 @@ Arel::Nodes::Binary.class_eval do
   include ArelExtensions::Predications
 end
 
-Arel::Nodes::Equality.class_eval do
+class Arel::Nodes::Equality
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
   include ArelExtensions::MathFunctions
   include ArelExtensions::StringFunctions
 end
 
-
-Arel::InsertManager.class_eval do
+class Arel::InsertManager
   include ArelExtensions::InsertManager
 end
 
-Arel::SelectManager.class_eval do
+class Arel::SelectManager
   include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
 end
 
-Arel::Nodes::As.class_eval do
+class Arel::Nodes::As
   include ArelExtensions::Nodes
 end
 
-Arel::Table.class_eval do
+class Arel::Table
   alias_method :old_alias, :alias
   def alias(name = "#{self.name}_2")
     name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)