arel_extensions 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e5c240fc0fe59c0b14a9709b6c065276475334
-  data.tar.gz: f5caf5d24a636b49f39132e3817ed867dd803374
+  metadata.gz: 7d0b1c534a245cecea4ec121f0ab0744a8f2efdb
+  data.tar.gz: d1ee62f0e19d702485656fd16ec3ed99b8608fc2
 SHA512:
-  metadata.gz: 2c1ffca0a92fb3d704b2f2ed2649cf6a8df2fb90e46602680aa5c894c9ffef0d6af726736da6de97b12d7ce09f88d4d087e4bf0f1e3d64ab4dec89c8a0c03f93
-  data.tar.gz: 617784403ff3999277c8c60430294feaacba648366635d768f14347f2373fab2209c7dd097c72b1bb7ad0a9dcc9e7d9aad1c21976495943a20d317a2cee70467
+  metadata.gz: 152b5eafbeea38f4216436656d6e02a099bdeeed44b7f217ea9369ecf412ea32bcf130f577c1f0fcb5d37b6c267877a33b23963a1b9479c2faf2c4b67c7e5504
+  data.tar.gz: d7d5ce6cffcd349cfd6033fc2b2d11d349f5081cdde32b514e884e900a1a0dc25cd89373f42baefa9a7cf1a1d3a91d6573b13153af2804847f2a5b9d3c269179

data/.travis.yml

@@ -20,7 +20,6 @@ services:
 before_script:
 - mysql -e 'create database arext_test;'
 - psql -c 'create database arext_test;' -U postgres
-# - $ORACLE_HOME/bin/sqlplus CREATE DB
 script:
 - gem build arel_extensions.gemspec
 - bundle exec rake test

data/Gemfile

@@ -3,12 +3,12 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
-	gem "jdbc-sqlite3", :platform => :jruby
-	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
+	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
+	gem "jdbc-sqlite3", :platforms => :jruby
+	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+	gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
 
 	gem 'activesupport', '~> 4.0'
   	gem 'activemodel', '~> 4.0'

data/README.md

@@ -1,5 +1,8 @@
 # Arel Extensions
 
+[![Build Status](https://secure.travis-ci.org/Faveod/arel-extensions.svg)](http://travis-ci.org/Faveod/arel-extensions)
+
+
 Arel Extensions adds shortcuts, fixes and new ORM mappings (ruby to SQL) to Arel.
 It aims to ensure pure ruby syntax for the biggest number of usual cases.
 It allows to use more advanced SQL functions for any supported RDBMS.
@@ -17,13 +20,13 @@ t is an Arel::Table for table my_table
 ## Comparators
 
 ```ruby
-(t[:nb] > 42).to_sql # (same as (t[:nb].gt(42)).to_sql)
-# => my_table.nb > 42
+(t[:date1] > t[:date2]).to_sql # (same as (t[:date1].gt(t[:date2])).to_sql)
+# => my_table.date1 > my_table.date2
 ```
 
 ```ruby
-(t[:date1] > t[:date2]).to_sql # (same as (t[:date1].gt(t[:date2])).to_sql)
-# => my_table.date1 > my_table.date2
+(t[:nb] > 42).to_sql # (same as (t[:nb].gt(42)).to_sql)
+# => my_table.nb > 42
 ```
 
 ## Maths

data/arel_extensions.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "arel_extensions"
-  s.version     = '0.8.5'
+  s.version     = '0.8.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Yann Azoury", "Mathilde Pechdimaldjian", "Félix Bellanger"]
   s.email       = ["yann.azoury@faveod.com", "mathilde.pechdimaldjian@gmail.com", "felix.bellanger@faveod.com"]

data/functions.html

@@ -332,7 +332,7 @@
   </tr>
   <tr>
     <th class="tg-9hbo" rowspan="2">Boolean <br>functions</th>
-    <td class="tg-yw4l">OR ( ⋁ )<br>column.eq(var) ⋁ column.eq(var)</td>
+    <td class="tg-yw4l">OR ( ⋁ )<br>column.eq(var).⋁(column.eq(var))</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -341,7 +341,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">AND ( ⋀ )<br>column.eq(var) ⋀ column.eq(var)</td>
+    <td class="tg-yw4l">AND ( ⋀ )<br>column.eq(var).⋀(column.eq(var))</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>

data/gemfiles/rails4.gemfile

@@ -7,20 +7,20 @@ group :development, :test do
 	gem 'activemodel', '~> 4.0'
 	gem 'activerecord', '~> 4.0'
 
-	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
-	gem "pg", :platform => [:ruby, :mswin, :mingw]
+	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
+	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
+	gem "pg", :platforms => [:ruby, :mswin, :mingw]
 
-	gem 'ruby-oci8', :platform => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'ruby-oci8', :platforms => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
-	gem 'activerecord-jdbc-adapter', platform: :jruby
-	gem "jdbc-sqlite3", :platform => :jruby
-	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-	gem "activerecord-jdbcmssql-adapter", :platform => :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/gemfiles/rails5.gemfile

@@ -7,20 +7,20 @@ group :development, :test do
 	gem 'activemodel', '~> 5'
 	gem 'activerecord', '~> 5'
 
-	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
-	gem "pg", :platform => [:ruby, :mswin, :mingw]
+	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
+	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
+	gem "pg", :platforms => [:ruby, :mswin, :mingw]
 
-	gem 'ruby-oci8', :platform => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'ruby-oci8', :platforms => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
-	gem 'activerecord-jdbc-adapter', platform: :jruby
-	gem "jdbc-sqlite3", :platform => :jruby
-	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-	gem "activerecord-jdbcmssql-adapter", :platform => :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/lib/arel_extensions/attributes.rb

@@ -7,12 +7,12 @@ require 'arel_extensions/string_functions'
 
 module ArelExtensions
   module Attributes
-	include ArelExtensions::Comparators
-	include ArelExtensions::DateDuration
-	include ArelExtensions::Math
-	include ArelExtensions::MathFunctions
-	include ArelExtensions::NullFunctions
-	include ArelExtensions::StringFunctions
+  	include ArelExtensions::Comparators
+  	include ArelExtensions::DateDuration
+  	include ArelExtensions::Math
+  	include ArelExtensions::MathFunctions
+  	include ArelExtensions::NullFunctions
+  	include ArelExtensions::StringFunctions
 
   	def ==(other)
       Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)

data/lib/arel_extensions/boolean_functions.rb

@@ -0,0 +1,21 @@
+module ArelExtensions
+	module BooleanFunctions
+
+		def ⋀(other)
+			self.and(other)
+		end
+
+		def ⋁(other)
+			self.or(other)
+		end
+
+	end
+end
+
+Arel::Nodes::And.class_eval do
+  include ArelExtensions::BooleanFunctions
+end
+
+Arel::Nodes::Or.class_eval do
+  include ArelExtensions::BooleanFunctions
+end

data/lib/arel_extensions/date_duration.rb

@@ -1,32 +1,35 @@
-module ArelExtensions
-    module DateDuration
-      #function returns the year (as a number) given a date value.
-      def year
-        ArelExtensions::Nodes::Duration.new "y", self
-      end
+require 'arel_extensions/nodes/duration'
+require 'arel_extensions/nodes/wday'
 
-    #function returns the month (as a number) given a date value.
-      def month
-        ArelExtensions::Nodes::Duration.new "m", self
-      end
+module ArelExtensions
+  module DateDuration
+    #function returns the year (as a number) given a date value.
+    def year
+      ArelExtensions::Nodes::Duration.new "y", self
+    end
 
-      #function returns the  week (as a number) given a date value.
-      def week
-        ArelExtensions::Nodes::Duration.new "w", self
-      end
+  #function returns the month (as a number) given a date value.
+    def month
+      ArelExtensions::Nodes::Duration.new "m", self
+    end
 
-      #function returns the month (as a number) given a date value.
-      def day
-        ArelExtensions::Nodes::Duration.new "d", self
-      end
+    #function returns the  week (as a number) given a date value.
+    def week
+      ArelExtensions::Nodes::Duration.new "w", self
+    end
 
-      def wday
-        ArelExtensions::Nodes::Duration.new 'wd', self
-      end
+    #function returns the month (as a number) given a date value.
+    def day
+      ArelExtensions::Nodes::Duration.new "d", self
+    end
 
-      def format(tpl)
-        ArelExtensions::Nodes::Format.new [self, tpl]
-      end
+    def wday
+      ArelExtensions::Nodes::Duration.new 'wd', self
+    end
 
+    def format(tpl)
+      ArelExtensions::Nodes::Format.new [self, tpl]
     end
-end
+
+  end
+end

data/lib/arel_extensions/math.rb

@@ -1,50 +1,53 @@
 require 'arel_extensions/nodes'
 require 'arel_extensions/nodes/concat'
 
+require 'arel_extensions/nodes/date_diff'
+require 'arel_extensions/nodes/duration'
+require 'arel_extensions/nodes/wday'
+
 module ArelExtensions
-    module Math
-      #function + between
-     #String and others (convert in string)  allows you to concatenate 2 or more strings together.
-     #Date and integer adds or subtracts a specified time interval from a date.
-      def +(other)
-        arg = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
-        if arg == :integer || arg == :decimal || arg == :float
-          if other.is_a?(String)
-            other = other.to_i
-          end
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-        elsif arg == :datetime || arg == :date
-          ArelExtensions::Nodes::DateAdd.new [self, other]
-        elsif arg == :string || arg == :text
-          ArelExtensions::Nodes::Concat.new [self, other]
-        end        
-      end
+  module Math
+    #function + between
+    #String and others (convert in string)  allows you to concatenate 2 or more strings together.
+    #Date and integer adds or subtracts a specified time interval from a date.
+    def +(other)
+      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)
+        Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+      elsif arg == :decimal || arg == :float
+        other = Arel.sql(other) if other.is_a?(String)  # Arel should accept Float & BigDecimal!
+        Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+      elsif arg == :datetime || arg == :date
+        ArelExtensions::Nodes::DateAdd.new [self, other]
+      elsif arg == :string || arg == :text
+        ArelExtensions::Nodes::Concat.new [self, other]
+      end        
+    end
 
-      #function returns the time between two dates
-      #function returns the susbration between two int
-      def -(other)
-        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
-          when Arel::Attributes::Attribute
-            arg2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s].type
-            if arg2 == :date || arg2 == :datetime
-              ArelExtensions::Nodes::DateDiff.new [self, other]
-            else
-              ArelExtensions::Nodes::DateSub.new self, other
-            end
-          when Arel::Nodes::Node, DateTime, Time, String, Date
+    #function returns the time between two dates
+    #function returns the susbration between two int
+    def -(other)
+      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
+        when Arel::Attributes::Attribute
+          arg2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s].type
+          if arg2 == :date || arg2 == :datetime
             ArelExtensions::Nodes::DateDiff.new [self, other]
-          when Fixnum
-            ArelExtensions::Nodes::DateSub.new self, other
+          else
+            ArelExtensions::Nodes::DateSub.new [self, other]
           end
-        else
-          if other.is_a?(String)
-            other = other.to_i
-          end
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+        when Arel::Nodes::Node, DateTime, Time, String, Date
+          ArelExtensions::Nodes::DateDiff.new [self, other]
+        when Fixnum
+          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))
       end
-
     end
+
+  end
 end

data/lib/arel_extensions/math_functions.rb

@@ -1,3 +1,9 @@
+require 'arel_extensions/nodes/abs'
+require 'arel_extensions/nodes/ceil'
+require 'arel_extensions/nodes/floor'
+require 'arel_extensions/nodes/round'
+require 'arel_extensions/nodes/rand'
+
 module ArelExtensions
   module MathFunctions
 

data/lib/arel_extensions/nodes/ceil.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Nodes
     class Ceil < Function
+    	@@return_type = :number
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -1,7 +1,8 @@
 module ArelExtensions
   module Nodes
     class Concat < Function
-
+      @@return_type = :string
+      
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -16,6 +17,7 @@ module ArelExtensions
     end
 
     class GroupConcat < Function
+      @@return_type = :string
 
       def initialize expr
         tab = expr.map { |arg|

data/lib/arel_extensions/nodes/date_diff.rb

@@ -3,7 +3,8 @@ require 'date'
 module ArelExtensions
   module Nodes
     class DateDiff < Function #difference entre colonne date et date string/date
-      attr_accessor :date_type
+      attr_accessor :left_node_type
+      attr_accessor :right_node_type
 
       @@return_type = :integer # by default...
 
@@ -11,22 +12,31 @@ module ArelExtensions
         col = expr.first
         case col
         when Arel::Nodes::Node
-          @date_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
+          @left_node_type = type_of_attribute(col)
         when Date
-          @date_type = :date
+          @left_node_type = :ruby_date
         when DateTime, Time
-          @date_type = :datetime
+          @left_node_type = :ruby_time
+        end
+        case expr[1]
+        when Arel::Nodes::Node
+          @right_node_type = type_of_attribute(col)
+        when Date
+          @right_node_type = :ruby_date
+        when DateTime, Time
+          @right_node_type = :ruby_time
         end
         super [convert_to_date_node(col), convert_to_date_node(expr[1])]
       end
     end
 
     class DateAdd < Function
+      @@return_type = :date
       attr_accessor :date_type
 
       def initialize expr
         col = expr.first
-        @date_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
+        @date_type = type_of_attribute(col)
         tab = expr.map do |arg|
           convert(arg)
         end
@@ -104,18 +114,11 @@ module ArelExtensions
       end
     end
 
-    class DateSub < Arel::Nodes::Node #difference entre colonne date et date string/date
-      include Arel::Predications
-      include Arel::WindowPredications
-      include Arel::OrderPredications
-      include Arel::AliasPredication
-
-      attr_accessor :left, :right
+    class DateSub < Function #difference entre colonne date et date string/date
+      @@return_type = :integer
 
-      def initialize(left, right, aliaz = nil)
-        super()
-        @left = left
-        @right = convert_number(right)
+      def initialize(expr)
+        super [expr.first, convert_number(expr[1])]
       end
 
       def convert_number(object)

data/lib/arel_extensions/nodes/duration.rb

@@ -2,7 +2,6 @@ module ArelExtensions
   module Nodes
     class Duration < Arel::Nodes::Function
 
-
       def initialize left, right, aliaz = nil
         tab = Array.new
         tab << left
@@ -22,7 +21,7 @@ module ArelExtensions
 
 
       def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other.to_s)
       end
 
     end

data/lib/arel_extensions/nodes/floor.rb

@@ -1,6 +1,8 @@
 module ArelExtensions
   module Nodes
     class Floor < Function
+    	@@return_type = :number
+
     end
   end
 end

data/lib/arel_extensions/nodes/format.rb

@@ -1,11 +1,14 @@
 module ArelExtensions
   module Nodes
     class Format < Function
-    	attr_accessor :col_type
+      @@return_type = :string
+
+    	attr_accessor :col_type, :iso_format
     	def initialize expr
 	        col = expr.first
-	        @col_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
-        	super [expr.first, convert_to_string_node(expr[1])]
+          @iso_format = expr[1]
+	        @col_type = type_of_attribute(col)
+        	super [col, convert_to_string_node(@iso_format)]
     	end
     end
   end

data/lib/arel_extensions/nodes/function.rb

@@ -25,6 +25,10 @@ module ArelExtensions
         @expressions[1]
       end
 
+      def type_of_attribute(att)
+        Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+      end
+
       def convert_to_node(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum, Integer
@@ -51,7 +55,7 @@ module ArelExtensions
         when Fixnum, Integer
           Arel::Nodes.build_quoted(object.to_s)
         when Arel::Attributes::Attribute
-          case Arel::Table.engine.connection.schema_cache.columns_hash(object.relation.table_name)[object.name.to_s].type
+          case self.type_of_attribute(object)
           when :date
             ArelExtensions::Nodes::Format.new [object, 'yyyy-mm-dd']
           else

data/lib/arel_extensions/nodes/replace.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Nodes
     class Replace < Function
+      @@return_type = :string
 
       def initialize expr
         tab = expr.map { |arg|

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Nodes
     class Soundex < Function
+    	@@return_type = :string
     end
   end
 end

data/lib/arel_extensions/nodes/trim.rb

@@ -1,7 +1,8 @@
 module ArelExtensions
   module Nodes
     class Trim < Function
-
+      @@return_type = :string
+      
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)

data/lib/arel_extensions/nodes.rb

@@ -1,29 +1 @@
-require 'arel_extensions/nodes/function'
-# Math functions
-require 'arel_extensions/nodes/abs'
-require 'arel_extensions/nodes/ceil'
-require 'arel_extensions/nodes/floor'
-require 'arel_extensions/nodes/round'
-require 'arel_extensions/nodes/rand'
-require 'arel_extensions/nodes/sum'
-
-# String functions
-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/matches'
-require 'arel_extensions/nodes/find_in_set'
-require 'arel_extensions/nodes/replace'
-require 'arel_extensions/nodes/soundex'
-require 'arel_extensions/nodes/trim'
-require 'arel_extensions/nodes/ltrim'
-require 'arel_extensions/nodes/rtrim'
-require 'arel_extensions/nodes/format'
-
-# Date functions 
-require 'arel_extensions/nodes/date_diff'
-require 'arel_extensions/nodes/duration'
-
-require 'arel_extensions/nodes/coalesce'
-require 'arel_extensions/nodes/is_null'
-require 'arel_extensions/nodes/wday'
+require 'arel_extensions/nodes/function'

data/lib/arel_extensions/null_functions.rb

@@ -1,3 +1,6 @@
+require 'arel_extensions/nodes/coalesce'
+require 'arel_extensions/nodes/is_null'
+
 module ArelExtensions
   module NullFunctions
 

data/lib/arel_extensions/string_functions.rb

@@ -1,3 +1,15 @@
+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/matches'
+require 'arel_extensions/nodes/find_in_set'
+require 'arel_extensions/nodes/replace'
+require 'arel_extensions/nodes/soundex'
+require 'arel_extensions/nodes/trim'
+require 'arel_extensions/nodes/ltrim'
+require 'arel_extensions/nodes/rtrim'
+require 'arel_extensions/nodes/format'
+
 module ArelExtensions
   module StringFunctions
 

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -1,6 +1,12 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::MSSQL.class_eval do
+      Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES = {
+        '%Y' => 'yy', '%C' => '', '%y' => 'yy', '%m' => 'mm', '%B' =>   '', '%b' => '', '%^b' => '',      # year, month
+        '%d' => 'dd', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '',                               # day, weekday
+        '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '',                 # hours
+        '%M' => 'mi', '%S' => 'ss', '%L' => 'ms', '%N' => 'ns', '%z' => 'tz'
+      }
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
@@ -73,24 +79,38 @@ module ArelExtensions
      end
 
 
-     def visit_ArelExtensions_Nodes_Locate o, collector
-       collector << "CHARINDEX("
-      collector = visit o.val, collector
+      def visit_ArelExtensions_Nodes_Locate o, collector
+        collector << "CHARINDEX("
+        collector = visit o.val, collector
        collector << ","
        collector = visit o.expr, collector
        collector << ")"
        collector
-     end
+      end
+
+      def visit_ArelExtensions_Nodes_Format o, collector
+        collector << "CONCAT("
+
+        t = o.iso_format.split('%')
+        t.each_with_index {|str, i|
+          if i == 0 && f[0] != '%'
+            collector = visit Arel::Nodes.build_quoted(str), collector
+          elsif str.length > 0
+            if !Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]].blank?
+              collector << 'DATEPART('
+              collector << Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]]
+              collector << Arel::Visitors::MSSQL::COMMA
+              collector = visit o.left, collector
+              collector << ')'
+              if str.length > 1
+                collector << Arel::Visitors::MSSQL::COMMA
+                collector = visit Arel::Nodes.build_quoted(str.sub(/\A./, '')), collector
+              end
+            end
+          end
+          collector << Arel::Visitors::MSSQL::COMMA unless i < (t.length - 1)
+        }
 
-      def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector << "ISNULL("
-        collector = visit o.left, collector
-        collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-        collector = visit o.right, collector
-        else
-        collector << "'#{o.right}'"
-        end
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/mysql.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::MySQL.class_eval do
       Arel::Visitors::MySQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY'}
+      Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
+        '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
+        '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
+        '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p',                 # hours
+        '%M' => '%i', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''
+      }
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
@@ -75,6 +81,29 @@ module ArelExtensions
         collector << ")"
         collector
       end
+
+      def visit_ArelExtensions_Nodes_Format o, collector
+        case o.col_type
+        when :date, :datetime
+          collector << "DATE_FORMAT("
+          collector = visit o.left, collector
+          collector << Arel::Visitors::MySQL::COMMA
+          f = o.iso_format.dup
+          Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
+          collector = visit Arel::Nodes.build_quoted(f), collector
+          collector << ")"
+        when :integer, :float, :decimal
+          collector << "FORMAT("
+          collector = visit o.left, collector
+          collector << Arel::Visitors::ToSql::COMMA
+          collector = visit o.right, collector
+          collector << ")"
+        else
+          collector = visit o.left, collector
+        end
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << "DATEDIFF("
         collector = visit o.left, collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::Oracle.class_eval do
       Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D'}
+      Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES = {
+        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
+        '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
+        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
+      }
 
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << '('
@@ -62,9 +68,13 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << '('
+        collector << 'TO_DATE(' unless o.left_node_type == :date || o.left_node_type == :datetime
         collector = visit o.left, collector
+        collector << ')' unless o.left_node_type == :date || o.left_node_type == :datetime
         collector << " - "
+        collector << 'TO_DATE(' unless o.right_node_type == :date || o.right_node_type == :datetime
         collector = visit o.right, collector
+        collector << ')' unless o.right_node_type == :date || o.right_node_type == :datetime
         collector << ')'
         collector
       end
@@ -182,22 +192,15 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
-        case o.col_type
-        when :date, :datetime
-          collector << "TO_CHAR("
-          collector = visit o.left, collector
-          collector << Arel::Visitors::Oracle::COMMA unless i == 0
-          collector = visit o.right, collector
-          collector << ")"
-        when :integer, :float, :decimal
-          collector << "FORMAT("
-          collector = visit o.left, collector
-          collector << Arel::Visitors::Oracle::COMMA unless i == 0
-          collector = visit o.right, collector
-          collector << ")"
-        else
-          collector = visit o.left, collector
-        end
+        collector << "TO_CHAR("
+        collector = visit o.left, collector
+        collector << Arel::Visitors::Oracle::COMMA
+
+        f = o.iso_format.dup
+        Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
+        collector = visit Arel::Nodes.build_quoted(f), collector
+
+        collector << ")"
         collector
       end
 

data/lib/arel_extensions/visitors/postgresql.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::PostgreSQL.class_eval do
       Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW'}
+      Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES = {
+        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
+        '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
+        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                              # seconds, subseconds
+      }
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RANDOM("
@@ -72,6 +78,19 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Format o, collector
+        collector << "TO_CHAR("
+        collector = visit o.left, collector
+        collector << Arel::Visitors::PostgreSQL::COMMA
+
+        f = o.iso_format.dup
+        Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
+        collector = visit Arel::Nodes.build_quoted(f), collector
+
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector = visit o.left, collector
         collector << (o.right.value >= 0 ? ' + ' : ' - ')
@@ -83,10 +102,10 @@ module ArelExtensions
         collector << "DATE_PART('day'"
         collector << Arel::Visitors::PostgreSQL::COMMA
         collector = visit o.left, collector
-        collector << (o.date_type == :date ? '::date' : '::timestamp')
+        collector << (o.left_node_type == :date ? '::date' : '::timestamp')
         collector << " - "
         collector = visit o.right, collector
-        collector << (o.date_type == :date ? '::date' : '::timestamp')
+        collector << (o.right_node_type == :date ? '::date' : '::timestamp')
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::SQLite.class_eval do
       Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M'}
+      Arel::Visitors::SQLite::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
+        '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
+        '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
+        '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p',                 # hours
+        '%M' => '%M', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''                                # seconds, subseconds
+      }
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII

data/lib/arel_extensions.rb

@@ -33,6 +33,7 @@ require 'arel_extensions/nodes'
 require 'arel_extensions/comparators'
 require 'arel_extensions/date_duration'
 require 'arel_extensions/null_functions'
+require 'arel_extensions/boolean_functions'
 require 'arel_extensions/math'
 require 'arel_extensions/math_functions'
 require 'arel_extensions/string_functions'
@@ -55,6 +56,7 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::DateDuration
   include ArelExtensions::MathFunctions
   include ArelExtensions::StringFunctions
+  include ArelExtensions::BooleanFunctions
 end
 
 Arel::Nodes::Unary.class_eval do
@@ -69,6 +71,7 @@ Arel::Nodes::Binary.class_eval do
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
+  include ArelExtensions::BooleanFunctions
 end
 
 Arel::Nodes::Equality.class_eval do

data/test/visitors/test_oracle.rb

@@ -57,38 +57,36 @@ module ArelExtensions
         compile(c.idoes_not_match('%test%')).must_be_like %{LOWER("users"."name") NOT LIKE LOWER('%test%')}
       end
 
-
       # Maths
       # DateDiff
       it "should diff date col and date" do
-        compile(@table[:created_at] - Date.new(2016, 3, 31)).must_match %{"users"."created_at" - '2016-03-31'}
+        compile(@table[:created_at] - Date.new(2016, 3, 31)).must_match %{TO_DATE("users"."created_at") - TO_DATE('2016-03-31')}
       end
 
       it "should diff date col and datetime col" do
-        compile(@table[:created_at] - @table[:updated_at]).must_match %{"users"."created_at" - "users"."updated_at"}
+        compile(@table[:created_at] - @table[:updated_at]).must_match %{TO_DATE("users"."created_at") - TO_DATE("users"."updated_at")}
       end
 
       it "should diff date col and datetime col with AS" do
         sql = compile((@table[:updated_at] - @table[:created_at]).as('new_name'))
-        sql.must_be_like %{("users"."updated_at" - "users"."created_at") AS new_name}
+        sql.must_be_like %{(TO_DATE("users"."updated_at") - TO_DATE("users"."created_at")) AS new_name}
       end
 
       it "should diff between time values" do
         d2 = Time.new(2015,6,1)
         d1 = DateTime.new(2015,6,2)
         sql = compile(ArelExtensions::Nodes::DateDiff.new([d1,d2]))
-        sql.must_match("'2015-06-02' - '2015-06-01'")
+        sql.must_match("TO_DATE('2015-06-02') - TO_DATE('2015-06-01')")
       end
 
       it "should diff between time values and time col" do
         d1 = DateTime.new(2015,6,2)
         sql = compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]]))
-        sql.must_match %{'2015-06-02' - "users"."updated_at"}
+        sql.must_match %{TO_DATE('2015-06-02') - TO_DATE("users"."updated_at")}
       end
 
       it "should accept operators on dates with numbers" do
         c = @table[:created_at]
-#        u = @table[:updated_at]
         compile(c - 42).must_be_like %{DATE_SUB("users"."created_at", 42)}
         compile(c - @table[:id]).must_be_like %{DATE_SUB("users"."created_at", "users"."id")}
       end

data/test/visitors/test_to_sql.rb

@@ -144,6 +144,13 @@ module ArelExtensions
         compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
         compile(c =~ /\Atest\Z/).must_be_like %{"users"."name" REGEXP '^test$'}
         compile(c !~ /\Ate\Dst\Z/).must_be_like %{"users"."name" NOT REGEXP '^te[^0-9]st$'}
+      end      
+
+      it "should manage complex formulas" do
+        c = @table[:name]
+        compile(
+          (c.length / 42).round(2).floor > (@table[:updated_at] - Date.new(2000, 3, 31)).abs.ceil
+        ).must_be_like %{FLOOR(ROUND(LENGTH("users"."name") / 42, 2)) > CEIL(ABS(DATEDIFF("users"."updated_at", '2000-03-31')))}
       end
 
     end

data/test/with_ar/all_agnostic_test.rb

@@ -64,9 +64,9 @@ module ArelExtensions
       end
 
       def setup
-        d = Date.new(2016,05,23)
+        d = Date.new(2016, 5, 23)
         setup_db
-        u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16
+        u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16, :updated_at => Time.utc(2014, 3, 3, 12, 42)
         @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)
@@ -87,6 +87,7 @@ module ArelExtensions
         @name = User.arel_table[:name]
         @score = User.arel_table[:score]
         @created_at = User.arel_table[:created_at]
+        @updated_at = User.arel_table[:updated_at]
         @comments = User.arel_table[:comments]
         @price = Product.arel_table[:price]
       end
@@ -174,7 +175,7 @@ module ArelExtensions
       end
 
       def test_string_comparators
-        skip "Oracle can't use math operators to compare strings, any function to do that?" if @env_db == 'oracle'
+        skip "Oracle can't use math operators to compare strings" if @env_db == 'oracle' # use GREATEST ?
         if @env_db == 'postgresql' # may return real boolean
           assert t(@neg, @name >= 'Mest') == true || t(@neg, @name >= 'Mest') == 't' # depends of ar version
           assert t(@neg, @name <= (@name + 'Z')) == true || t(@neg, @name <= (@name + 'Z')) == 't'
@@ -218,6 +219,11 @@ module ArelExtensions
         assert_equal "", t(@myung, @name.rtrim(@name))
       end
 
+      def test_format
+        assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
+        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
+      end
+
       def test_coalesce
         if @env_db == 'postgresql'
           assert_equal 100, t(@test, @age.coalesce(100))
@@ -241,7 +247,7 @@ module ArelExtensions
       end
 
       def test_date_comparator
-        d = Date.new(2016,05,23)
+        d = Date.new(2016, 5, 23)
         assert_equal 0, User.where(@created_at < d).count
         assert_equal 8, User.where(@created_at >= d).count
       end
@@ -261,6 +267,11 @@ module ArelExtensions
         assert_equal 0, User.where(@created_at.day.eq("05")).count
       end
 
+      def test_cast_types
+        skip "not implemented yet"
+        assert_equal true, t(@arthur, @score =~ /22/)
+      end
+
       def test_is_null
         assert_equal "Test", User.where(@age.is_null).select(@name).first.name
       end
@@ -286,14 +297,16 @@ module ArelExtensions
       end
 
 
-      def test_math_moins
-        d = Date.new(2016,05,20)
+      def test_math_minus
+        d = Date.new(2016, 5, 20)
         #Datediff
-        assert_equal 8, User.where((@created_at - User.arel_table[:created_at]).eq(0)).count
-        assert_equal 3, @laure.select((User.arel_table[:created_at] - d).as("res")).first.res.abs.to_i
+        assert_equal 8, User.where((@created_at - @created_at).eq(0)).count
+        assert_equal 3, @laure.select((@created_at - d).as("res")).first.res.abs.to_i
         #Substraction
         assert_equal 0, User.where((@age - 10).eq(50)).count
         assert_equal 0, User.where((@age - "10").eq(50)).count
+        # assert_equal 0, User.where((@age - 9.5).eq(50.5)).count # should work: TODO
+        assert_equal 0, User.where((@age - "9.5").eq(50.5)).count
       end
 
       def test_wday
@@ -302,6 +315,14 @@ module ArelExtensions
         assert_equal 0, User.select(d.wday).as("res").first.to_i
       end
 
+      # Boolean functions
+      def test_boolean_functions
+        assert_equal 1, @laure.where(
+          (@score.round > 19).⋀(@score.round < 21).⋁(@score.round(1) >= 20.1)
+        ).count
+      end
+
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -102,6 +102,7 @@ files:
 - init/sqlite.sql
 - lib/arel_extensions.rb
 - lib/arel_extensions/attributes.rb
+- lib/arel_extensions/boolean_functions.rb
 - lib/arel_extensions/comparators.rb
 - lib/arel_extensions/date_duration.rb
 - lib/arel_extensions/insert_manager.rb
@@ -128,7 +129,6 @@ files:
 - lib/arel_extensions/nodes/round.rb
 - lib/arel_extensions/nodes/rtrim.rb
 - lib/arel_extensions/nodes/soundex.rb
-- lib/arel_extensions/nodes/sum.rb
 - lib/arel_extensions/nodes/trim.rb
 - lib/arel_extensions/nodes/wday.rb
 - lib/arel_extensions/null_functions.rb

data/lib/arel_extensions/nodes/sum.rb

@@ -1,23 +0,0 @@
-module ArelExtensions
-  module Nodes
-    class Sum < Arel::Nodes::Function
-
-
-      def initialize other, aliaz = nil
-        tab = Array.new
-        tab << other
-        super(tab, aliaz)
-      end
-
-      def expr
-        @expressions.first
-      end
-
-
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-      end
-
-    end
-  end
-end