arel_extensions 1.2.5 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac00bb2f717979e8af539923ba6ebca5ed3ef500d5df1499be613b83cd912eb
-  data.tar.gz: f6ec1b377391db2da2510eec4bf967a945be8b5327e8f4a176756a6aab3147bf
+  metadata.gz: 02ad8f52ee6bfa8b08e534df4aeae8298ee4a6153461940cf7d94f46b6d45209
+  data.tar.gz: 802365368c4b00f04a7fa553272cdd72de06b7eedd02263df8385a68d85554ac
 SHA512:
-  metadata.gz: ee2f1a2884d3c4f3618ee2a83a887cb9d8d59dae790d216c27a8a1c75b79a9d2b777467a730d2723addb5593d31a23d8673affa5190487a341cd0bfd5509d91d
-  data.tar.gz: 92f615201dfd33112b4ddbc4ede753c946163b591233b6da7525af97940c951944094d19743f3fa151c563086a752bc92d38649686ef2dcafafb58f766fc0041
+  metadata.gz: bf6eef122b124e6720323ed44fa0e77e2d253c90b80dacd163ba56bbc11390f124b88cb42f57efb36745d6679c1709cb5ed1d7f38109d42502c6d50bfd321912
+  data.tar.gz: bac8c5ad02b5d8ea867c27be0593ddc61f1631c34a4c3dfc6dd63949aff91a8163a90dcd25a0f12faec12115c3a980cdb2a39edcc8e4adb5408720b5ed9445d8

data/.rubocop.yml

@@ -12,7 +12,10 @@ Layout/ExtraSpacing:
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+Naming/FileName:
   Enabled: true
 
 Style/CollectionMethods:
@@ -33,12 +36,12 @@ Style/EmptyElse:
 Style/Encoding:
   Enabled: true
 
-Style/FileName:
-  Enabled: true
-
 Style/MethodCallWithArgsParentheses:
   Enabled: false
 
+# Performance cops have been transferred to rubocop-performance gem.
+require: rubocop-performance
+
 Performance/DoubleStartEndWith:
   Enabled: true
 

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

@@ -19,6 +19,11 @@ It allows to use more advanced SQL functions for any supported RDBMS.
 Arel 6 (Rails 4) or Arel 7+ (Rails 5).
 [Arel Repository](http://github.com/rails/arel)
 
+or
+
+Rails 6
+[Rails Repository](http://github.com/rails/rails)
+
 ## Usage
 
 Most of the features will work just by adding the gem to your Gemfiles. To make sure to get all the features for any dbms, you should execute the next line as soon as you get your connection to your DB:
@@ -209,7 +214,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">CEIL<br>column.ceil</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CEILING()</td>
     <td class="tg-j6lv">CEILING()</td>
@@ -218,7 +223,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">FLOOR<br>column.floor</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>

data/Rakefile

@@ -7,33 +7,44 @@ desc "Default Task"
 task default: [ :test ]
 
 Rake::TestTask.new(:test) do |t|
- 	t.libs << 'lib'
-  	t.libs << 'test'
-  	t.pattern = 'test/**/test_*.rb'
-	t.warning = true
-  	t.verbose = true
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/test_*.rb'
+  t.warning = true
+  t.verbose = true
 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.verbose = true
-		  	t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
-		}
-	end
-
-	namespace adapter do
-	    task :test => "test_#{adapter}"
-	    task :isolated_test => "isolated_test_#{adapter}"
-
-	    # Set the connection environment for the adapter
-	    task(:env) { ENV['DB'] = adapter }
-	end
-
-	  # Make sure the adapter test evaluates the env setting task
-	task "test_#{adapter}" => ["#{adapter}:env", "test:#{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 = false
+      t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
+    }
+  end
+
+  namespace adapter do
+    task :test => "test_#{adapter}"
+    task :isolated_test => "isolated_test_#{adapter}"
+
+    # Set the connection environment for the adapter
+    task(:env) { ENV['DB'] = adapter }
+  end
+
+  # Make sure the adapter test evaluates the env setting task
+  task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
 end

data/arel_extensions.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')
-  s.add_development_dependency('rake', '~> 11')
+  s.add_development_dependency('rake', '~> 12.3.3')
 end

data/functions.html

@@ -55,7 +55,7 @@
     <td class="tg-yw4l">CEIL<br>column.ceil</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CEILING()</td>
     <td class="tg-j6lv">CEILING()</td>
@@ -64,7 +64,7 @@
     <td class="tg-yw4l">FLOOR<br>column.floor</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>

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

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 6.0.0'
+
+
+group :development, :test do
+  gem 'activesupport', '~> 6.0.0'
+  gem 'activemodel', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.0'
+
+  gem "sqlite3", '~> 1.4', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.5.2', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :platforms => :jruby
+  gem "jdbc-sqlite3", :platforms => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
+end
+
+gemspec :path => "../gemspec_v2/"

data/gemspec_v2/arel_extensions-v2.gemspec

@@ -0,0 +1,28 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "arel_extensions/version"
+
+Gem::Specification.new do |s|
+  s.name        = "arel_extensions"
+  s.version     = ArelExtensions::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
+  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
+  s.homepage    = "https://github.com/Faveod/arel-extensions"
+  s.description = "Adds new features to Arel"
+  s.summary     = "Extending Arel"
+  s.license     = 'MIT'
+
+  s.rdoc_options = ["--main", "README.md"]
+  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency('activerecord', '>= 6.0')
+
+  s.add_development_dependency('minitest', '~> 5.9')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rake', '~> 12.3.3')
+end