arel_extensions 0.9.5 → 0.9.6

data/gemfiles/rails4.gemfile

@@ -7,12 +7,12 @@ group :development, :test do
 	gem 'activemodel', '~> 4.0'
 	gem 'activerecord', '~> 4.0'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
-	gem "mysql2", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
-    gem "pg", :platforms => [:mri, :mingw, :x64_mingw]
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
+    gem "pg", :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw, :x64_mingw]
-    gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :x64_mingw]
+    gem "tiny_tds", :platforms => [:mri, :mingw, :mswin]
+    gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :mswin]
 
 	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'

data/gemfiles/rails5.gemfile

@@ -7,12 +7,12 @@ group :development, :test do
 	gem 'activemodel', '~> 5'
 	gem 'activerecord', '~> 5'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
-	gem "mysql2", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
-    gem "pg", :platforms => [:mri, :mingw, :x64_mingw]
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
+    gem "pg", :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw, :x64_mingw]
-#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
+    gem "tiny_tds", :platforms => [:mri, :mingw]
+#    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', '~> 1.7.0' if ENV.has_key? 'ORACLE_HOME'

data/init/sqlite.sql

@@ -1 +0,0 @@
-

data/lib/arel_extensions.rb

@@ -1,5 +1,7 @@
 require 'arel'
 
+require 'arel_extensions/railtie' if defined?(Rails::Railtie)
+
 # UnaryOperation|Grouping|Extract < Unary < Arel::Nodes::Node
 # Equality|Regexp|Matches < Binary < Arel::Nodes::Node
 # Count|NamedFunction < Function < Arel::Nodes::Node

data/lib/arel_extensions/math.rb

@@ -12,6 +12,16 @@ module ArelExtensions
     #Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
       return ArelExtensions::Nodes::Concat.new [self, other] if self.is_a?(Arel::Nodes::Quoted)
+      return case self.class.return_type
+      when :string, :text
+        ArelExtensions::Nodes::Concat.new [self, other]
+      when :integer, :decimal, :float, :number
+        Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+      when :date, :datetime
+        ArelExtensions::Nodes::DateAdd.new [self, other]
+      else
+        ArelExtensions::Nodes::Concat.new [self, other]
+      end if self.is_a?(ArelExtensions::Nodes::Function)
       arg = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
       if arg == :integer
         other = other.to_i if other.is_a?(String)
@@ -29,6 +39,16 @@ module ArelExtensions
     #function returns the time between two dates
     #function returns the susbration between two int
     def -(other)
+      return case self.class.return_type
+      when :string, :text # ???
+        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
+      when :integer, :decimal, :float, :number
+        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+      when :date, :datetime
+        ArelExtensions::Nodes::DateSub.new [self, other]
+      else
+        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+      end if self.is_a?(ArelExtensions::Nodes::Function)
       arg = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
       if (arg == :date || arg == :datetime)
         case other
@@ -45,8 +65,14 @@ module ArelExtensions
           ArelExtensions::Nodes::DateSub.new [self, other]
         end
       else
-        other = Arel.sql(other) if other.is_a?(String)# Arel should accept Float & BigDecimal!
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+        case other
+        when Fixnum, Float, BigDecimal
+          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
+        when String
+          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
+        else
+          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+        end
       end
     end
 

data/lib/arel_extensions/nodes/coalesce.rb

@@ -1,11 +1,28 @@
 module ArelExtensions
   module Nodes
     class Coalesce < Function
+      include ArelExtensions::Math
+      attr_accessor :left_node_type
+
 
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
+        case expr.first
+        when String
+          @left_node_type = :string
+        when Integer, Fixnum, Float
+          @left_node_type = :number
+        when ArelExtensions::Nodes::Coalesce, ArelExtensions::Nodes::Function
+          @left_node_type = expr.first.try(:left_node_type)
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
+          @left_node_type = type_of_attribute(expr.first)
+        when Date
+          @left_node_type = :ruby_date
+        when DateTime, Time
+          @left_node_type = :ruby_time
+        end
         return super(tab)
       end
       

data/lib/arel_extensions/nodes/substring.rb

@@ -0,0 +1,21 @@
+module ArelExtensions
+  module Nodes
+    class Substring < Function
+
+		def initialize expr
+			tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
+			if expr[2]
+				tab << convert_to_node(expr[2])
+#			else
+#				tab << expr[0].length
+			end
+			return super(tab)
+		end
+
+		def +(other)
+	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+		end
+
+    end
+  end
+end

data/lib/arel_extensions/railtie.rb

@@ -0,0 +1,9 @@
+require 'rails'
+
+module ArelExtensions
+	class Railtie < Rails::Railtie
+		rake_tasks do
+    		load 'arel_extensions/tasks.rb'
+    	end
+	end
+end

data/lib/arel_extensions/string_functions.rb

@@ -1,6 +1,7 @@
 require 'arel_extensions/nodes/concat' if Arel::VERSION.to_i < 7
 require 'arel_extensions/nodes/length'
 require 'arel_extensions/nodes/locate'
+require 'arel_extensions/nodes/substring'
 require 'arel_extensions/nodes/matches'
 require 'arel_extensions/nodes/find_in_set'
 require 'arel_extensions/nodes/replace'
@@ -28,6 +29,20 @@ module ArelExtensions
       ArelExtensions::Nodes::Locate.new [self, val]
     end
 
+    def substring start, len = nil
+      ArelExtensions::Nodes::Substring.new [self, start, len]
+    end
+    def [](start, ind = nil)
+      start += 1 if start.is_a?(Integer)
+      if start.is_a?(Range)
+        ArelExtensions::Nodes::Substring.new [self, start.begin + 1, start.end - start.begin + 1]
+      elsif start.is_a?(Integer) && !ind
+        ArelExtensions::Nodes::Substring.new [self, start, 1]
+      else
+        ArelExtensions::Nodes::Substring.new [self, start, ind - start + 1]
+      end
+    end
+
     #SOUNDEX function returns a character string containing the phonetic representation of char.
     def soundex
       ArelExtensions::Nodes::Soundex.new [self]

data/lib/arel_extensions/tasks.rb

@@ -0,0 +1,18 @@
+namespace :arelextensions do
+	desc 'Install DB functions'
+	task :install_functions => :environment do
+        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+          @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+        else
+          @env_db = ENV['DB']
+        end
+        ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
+        @cnx = ActiveRecord::Base.connection
+        if File.exist?("init/#{@env_db}.sql")
+          sql = File.read("init/#{@env_db}.sql")
+          unless sql.blank?
+            @cnx.execute(sql) rescue $stderr << "can't create functions\n"
+          end
+        end
+	end
+end

data/lib/arel_extensions/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module ArelExtensions
-  VERSION = "0.9.5".freeze
+  VERSION = "0.9.6".freeze
 end

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -23,11 +23,11 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateDiff  o, collector
         collector << "DAY("
         collector = visit o.left, collector
-        collector<< ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
+        collector << ","
+        if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
-          collector<< "'#{o.right}'"
+          collector << "'#{o.right}'"
         end
         collector << ")"
         collector
@@ -36,17 +36,17 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Duration o , collector
         #visit left for period
-        if(o.left == "d")
+        if o.left == "d"
           collector << "DAY("
-        elsif(o.left == "m")
+        elsif o.left == "m"
           collector << "MONTH("
-        elsif (o.left == "w")
+        elsif o.left == "w"
           collector << "WEEK"
-        elsif (o.left == "y")
+        elsif o.left == "y"
           collector << "YEAR("
         end
         #visit right
-        if(o.right.is_a?(Arel::Attributes::Attribute))
+        if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"
@@ -56,7 +56,6 @@ module ArelExtensions
       end
 
 
-
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "COALESCE("
         collector = visit o.left, collector
@@ -66,10 +65,10 @@ module ArelExtensions
         else
           collector << "'#{o.right}'"
         end
-        collector <<")"
+        collector << ")"
         collector
       end
 
     end
   end
-end
+end

data/lib/arel_extensions/visitors/mssql.rb

@@ -137,6 +137,21 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Substring o, collector
+        collector << "SUBSTRING("
+        collector = visit o.expressions[0], collector
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.expressions[1], collector
+        collector << Arel::Visitors::MSSQL::COMMA
+        if !o.expressions[2]
+          collector = visit o.expressions[0].length, collector
+        else
+          collector = visit o.expressions[2], collector
+        end
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Trim o, collector
         if o.right
           collector << "REPLACE(REPLACE(LTRIM(RTRIM(REPLACE(REPLACE("

data/lib/arel_extensions/visitors/oracle.rb

@@ -61,7 +61,17 @@ module ArelExtensions
         collector << "COALESCE("
         o.expressions.each_with_index { |arg, i|
           collector << Arel::Visitors::Oracle::COMMA unless i == 0
-          collector = visit arg, collector
+          if i > 0 && o.left_node_type == :text
+            if arg == ''
+              collector << 'empty_clob()'
+            else
+              collector << 'TO_CLOB('
+              collector = visit arg, collector
+              collector << ')'
+            end
+          else
+            collector = visit arg, collector
+          end
         }
         collector << ")"
         collector
@@ -164,6 +174,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Substring o, collector
+        collector << "SUBSTR("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::Oracle::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << 'TRIM(' # BOTH
         if o.right.expr && SPECIAL_CHARS[o.right.expr]

data/lib/arel_extensions/visitors/postgresql.rb

@@ -129,6 +129,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Substring o, collector
+        collector << "SUBSTR("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::PostgreSQL::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector = visit o.left, collector
         collector << ' IS NULL'

data/lib/arel_extensions/visitors/sqlite.rb

@@ -77,6 +77,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Substring o, collector
+        collector << "SUBSTR("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector = visit o.left, collector
         collector << ' IS NULL'
@@ -109,12 +119,40 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Wday o, collector
-        collector << "strftime('%w',"
+        collector << "STRFTIME('%w',"
         collector = visit o.date, collector
         collector << ")"
         collector
       end
 
+      # CASE WHEN ROUND(3.42,1) > round(3.42) THEN round(3.42) ELSE round(3.42)-1 END
+      # OR CAST(3.14 AS INTEGER)
+      def visit_ArelExtensions_Nodes_Floor o, collector
+        collector << "CASE WHEN ROUND("
+        collector = visit o.left, collector
+        collector << ", 1) > ROUND("
+        collector = visit o.left, collector
+        collector << ") THEN ROUND("
+        collector = visit o.left, collector
+        collector << ") ELSE ROUND("
+        collector = visit o.left, collector
+        collector << ") - 1 END"
+        collector
+      end
+
+      def visit_ArelExtensions_Nodes_Ceil o, collector
+        collector << "CASE WHEN ROUND("
+        collector = visit o.left, collector
+        collector << ", 1) > ROUND("
+        collector = visit o.left, collector
+        collector << ") THEN ROUND("
+        collector = visit o.left, collector
+        collector << ") + 1 ELSE ROUND("
+        collector = visit o.left, collector
+        collector << ") END"
+        collector
+      end
+
       def visit_ArelExtensions_InsertManager_BulkValues o, collector
         o.left.each_with_index do |row, idx|
           collector << 'SELECT '

data/lib/arel_extensions/visitors/to_sql.rb

@@ -91,6 +91,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Substring o, collector
+        collector << "SUBSTRING("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Replace o, collector
         collector << "REPLACE("
         o.expressions.each_with_index { |arg, i|

data/test/with_ar/all_agnostic_test.rb

@@ -77,7 +77,7 @@ module ArelExtensions
         @lucas = User.where(:id => u.id)
         u = User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
         @sophie = User.where(:id => u.id)
-        u = User.create :age => 20, :name => "Camille", :created_at => d, :score => 20.16
+        u = User.create :age => 20, :name => "Camille", :created_at => d, :score => -20.16
         @camille = User.where(:id => u.id)
         u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
         @arthur = User.where(:id => u.id)
@@ -115,19 +115,24 @@ module ArelExtensions
 
       def test_abs
         assert_equal 42, t(@neg, @age.abs)
+        assert_equal 20.16, t(@camille, @score.abs)
         assert_equal 14, t(@laure, (@age - 39).abs)
         assert_equal 28, t(@laure, (@age - 39).abs + (@age - 39).abs)
       end
 
       def test_ceil
-        skip "Sqlite version can't load extension for ceil" if $sqlite && $load_extension_disabled
-        assert_equal 1, t(@neg, @score.ceil)
+#        skip "Sqlite version can't load extension for ceil" if $sqlite && $load_extension_disabled
+        assert_equal 2, t(@test, @score.ceil) # 1.62
+        assert_equal (-20), t(@camille, @score.ceil) # -20.16
+        assert_equal (-20), t(@camille, (@score - 0.5).ceil) # -20.16
         assert_equal 63, t(@arthur, @age.ceil + 42)
       end
 
       def test_floor
-        skip "Sqlite version can't load extension for floor" if $sqlite && $load_extension_disabled
+#        skip "Sqlite version can't load extension for floor" if $sqlite && $load_extension_disabled
         assert_equal 0, t(@neg, @score.floor)
+        assert_equal 1, t(@test, @score.floor) # 1.62
+        assert_equal (-9), t(@test, (@score - 10).floor) # 1.62
         assert_equal 42, t(@arthur, @score.floor - 23)
       end
 
@@ -185,6 +190,18 @@ module ArelExtensions
         assert_equal 5, t(@lucas, @name.locate("s"))
       end
 
+      def test_substring
+        assert_equal 'C', t(@camille, @name.substring(1, 1))
+        assert_equal (@env_db == 'oracle' ? nil : ''), t(@lucas, @name.substring(42))
+        assert_equal 'Lu', t(@lucas, @name.substring(1,2))
+
+        assert_equal 'C', t(@camille, @name[0, 1])
+        assert_equal 'C', t(@camille, @name[0])
+        assert_equal (@env_db == 'oracle' ? nil : ''), t(@lucas, @name[42])
+        assert_equal 'Lu', t(@lucas, @name[0,2])
+        assert_equal 'Lu', t(@lucas, @name[0..1])
+      end
+
       def test_find_in_set
         skip "Sqlite version can't load extension for find_in_set" if $sqlite && $load_extension_disabled
         skip "SQL Server does not know about FIND_IN_SET" if @env_db == 'mssql'
@@ -269,6 +286,12 @@ module ArelExtensions
       end
 
       def test_coalesce
+        assert_equal 'Camille concat', t(@camille, @name.coalesce(nil, "default") + ' concat')
+
+        assert_equal ' ', t(@myung, @comments.coalesce("Myung").coalesce('ignored'))
+        assert_equal 'Laure', t(@laure, @comments.coalesce("Laure"))
+        assert_equal '', t(@laure, @comments.coalesce(""))
+
         if @env_db == 'postgresql'
           assert_equal 100, t(@test, @age.coalesce(100))
           assert_equal "Camille", t(@camille, @name.coalesce(nil, "default"))