arel_extensions 1.2.5 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac00bb2f717979e8af539923ba6ebca5ed3ef500d5df1499be613b83cd912eb
-  data.tar.gz: f6ec1b377391db2da2510eec4bf967a945be8b5327e8f4a176756a6aab3147bf
+  metadata.gz: 5292bc7a2f6bf9741b33125c301936c2effcd0b964760d42f822ca3a58bb95cb
+  data.tar.gz: d90202ae9fdf6d124fad15d7413f0ff20fa6c286a15d0f74252e80e59e8a1e43
 SHA512:
-  metadata.gz: ee2f1a2884d3c4f3618ee2a83a887cb9d8d59dae790d216c27a8a1c75b79a9d2b777467a730d2723addb5593d31a23d8673affa5190487a341cd0bfd5509d91d
-  data.tar.gz: 92f615201dfd33112b4ddbc4ede753c946163b591233b6da7525af97940c951944094d19743f3fa151c563086a752bc92d38649686ef2dcafafb58f766fc0041
+  metadata.gz: 86be4d9f4e17498047f5325f74bc62873bbdc4937bbbf3f7e353b183b91741a06170028558d828c9d48115d4b4175e31dc3df67cea4d8e4408b17e9695f08cd8
+  data.tar.gz: 333e52c7aeebd773e1f05c6f0ef89c33152c62e126bcbdf112bd893a4238939eebfd909ca59f1d892f30e3553eb22ca41f556fb651c0e66c4434b7bf3096e14d

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/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
+[Arel 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,33 @@ 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 :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}"
+  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
+    # 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}"]
+  # 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/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 => "../"

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

data/generate_gems.sh

@@ -0,0 +1,13 @@
+
+gem uninstall arel_extensions
+
+# VERSION ~> 1
+cp ./version_v1.rb lib/arel_extensions/version.rb
+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
+cp ./version_v1.rb lib/arel_extensions/version.rb
+rm tmp.gemspec

data/lib/arel_extensions.rb

@@ -118,9 +118,11 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::NullFunctions
   include ArelExtensions::Predications
 
+  alias_method :old_as, :as
   def as other
     Arel::Nodes::As.new(self, Arel.sql(other))
   end
+
 end
 
 Arel::Nodes::Unary.class_eval do
@@ -162,7 +164,8 @@ Arel::Nodes::As.class_eval do
 end
 
 Arel::Table.class_eval do
+  alias_method :old_alias, :alias
   def alias(name = "#{self.name}_2")
-    name.blank? ? self :  Arel::Nodes::TableAlias.new(self,name)
+    name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -41,5 +41,3 @@ end
 ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
   include ArelExtensions::BooleanFunctions
 end
-
-

data/lib/arel_extensions/common_sql_functions.rb

@@ -39,6 +39,7 @@ module ArelExtensions
 
     def add_sql_functions(env_db = nil)
       env_db ||= @cnx.adapter_name
+      env_db = 'mysql' if env_db =~ /mysql/i
       if env_db =~ /sqlite/i
         begin
           add_sqlite_functions
@@ -52,10 +53,10 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
-        elsif env_db == 'mysql'
-			sql.split("$$")[1..-2].each { |str|
-				@cnx.execute(str.strip) unless str.strip.blank?
-			}
+        elsif env_db =='mysql'
+          sql.split("$$")[1..-2].each { |str|
+            @cnx.execute(str.strip) unless str.strip.blank?
+          }
         else
           @cnx.execute(sql) unless sql.blank?
         end

data/lib/arel_extensions/insert_manager.rb

@@ -3,31 +3,31 @@ require 'arel'
 module ArelExtensions
   module InsertManager
 
-	def bulk_insert(cols, data)
-		case cols.first
-		when String, Symbol
-			cols.each { |c|
-				@ast.columns << @ast.relation[c]
-			}
-		when Array
-			if String === cols.first.first
-				@ast.columns = cols.map {|c| [@ast.relation[c.first]] }
-			elsif Arel::Attributes::Attribute == cols.first.first
-				@ast.columns = cols
-			end
-		when NilClass
-			@ast.columns = @ast.relation.columns
-		end
-		self.values = BulkValues.new(@ast.columns, data)
-	end
+    def bulk_insert(cols, data)
+      case cols.first
+      when String, Symbol
+        cols.each { |c|
+          @ast.columns << @ast.relation[c]
+        }
+      when Array
+        if String === cols.first.first
+          @ast.columns = cols.map {|c| [@ast.relation[c.first]] }
+        elsif Arel::Attributes::Attribute == cols.first.first
+          @ast.columns = cols
+        end
+      when NilClass
+        @ast.columns = @ast.relation.columns
+      end
+      self.values = BulkValues.new(@ast.columns, data)
+    end
 
-	class BulkValues < Arel::Nodes::Node
-		attr_accessor :left, :cols
-		def initialize(cols, values)
-	  		@left = values
-	  		@cols = cols
-	  	end
-	end
+    class BulkValues < Arel::Nodes::Node
+      attr_accessor :left, :cols
+      def initialize(cols, values)
+        @left = values
+        @cols = cols
+      end
+    end
 
   end
 end

data/lib/arel_extensions/math.rb

@@ -24,7 +24,7 @@ module ArelExtensions
           else
             return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
           end
-        when  ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
+        when ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
           return case self.return_type
         when :string, :text
           self.concat(other)
@@ -35,7 +35,7 @@ module ArelExtensions
         else
           self.concat(other)
         end
-      when  Arel::Nodes::Function
+      when Arel::Nodes::Function
         Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
       else
         begin
@@ -115,7 +115,7 @@ module ArelExtensions
               end
             when Arel::Nodes::Node, DateTime, Time, String, Date
               ArelExtensions::Nodes::DateDiff.new [self, other]
-            when  ArelExtensions::Nodes::Duration, Integer
+            when ArelExtensions::Nodes::Duration, Integer
               ArelExtensions::Nodes::DateSub.new [self, other]
             else # ActiveSupport::Duration
               ArelExtensions::Nodes::DateAdd.new [self, -other]

data/lib/arel_extensions/math_functions.rb

@@ -63,15 +63,15 @@ module ArelExtensions
     end
 
     # Aggregate Functions
-    def std opts={unbiased: true}
+    def std opts = {unbiased: true}
       ArelExtensions::Nodes::Std.new self, opts
     end
 
-    def variance opts={unbiased: true}
+    def variance opts = {unbiased: true}
       ArelExtensions::Nodes::Variance.new self, opts
     end
 
-    def sum opts={unbiased: true}
+    def sum opts = {unbiased: true}
       ArelExtensions::Nodes::Sum.new self, opts
     end
 
@@ -91,7 +91,7 @@ module ArelExtensions
     end
 
     # function returning a number at a specific format
-    def format_number format_string, locale=nil
+    def format_number format_string, locale = nil
       begin
         sprintf(format_string,0) # this line is to get the right error message if the format_string is not correct
         m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)

data/lib/arel_extensions/nodes/case.rb

@@ -41,8 +41,6 @@ module ArelExtensions
             @conditions.last.right
           elsif @default
             @default.expr
-          else
-            nil
           end
         if obj.respond_to?(:return_type)
           obj.return_type

data/lib/arel_extensions/nodes/collate.rb

@@ -5,7 +5,7 @@ module ArelExtensions
 
     attr_accessor :ai, :ci, :option
 
-    def initialize left, option=nil, ai=false, ci=false
+    def initialize left, option = nil, ai = false, ci = false
       @ai = ai
       @ci = ci
       @option = option

data/lib/arel_extensions/nodes/date_diff.rb

@@ -136,7 +136,7 @@ module ArelExtensions
           if ArelExtensions::Nodes::Duration === v
             v.with_interval = true
             case v.left
-            when  'd','m','y'
+            when 'd','m','y'
               Arel.sql('day')
             when 'h','mn','s'
               Arel.sql('second')
@@ -145,8 +145,6 @@ module ArelExtensions
             else
               Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left])
             end
-          else
-            nil
           end
         end
       end

data/lib/arel_extensions/nodes/duration.rb

@@ -13,12 +13,10 @@ module ArelExtensions
         super(tab, aliaz)
       end
 
-
       def left
         @expressions.first
       end
 
-
       def right
         @expressions[1]
       end