arel_extensions 1.2.5 → 1.2.15

data/generate_gems.sh

@@ -0,0 +1,14 @@
+
+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
+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
+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
+if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("7.1.0")
+  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
@@ -118,12 +124,23 @@ 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
+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
+
+class Arel::Nodes::Unary
   include ArelExtensions::Math
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
@@ -131,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
@@ -140,29 +157,40 @@ 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)
+    name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
+  end
+end
+
+class Arel::Nodes::TableAlias
+  def method_missing(*args)
+    met = args.shift.to_sym
+    if self.relation.respond_to?(met)
+      self.relation.send(met,args)
+    else
+      super(met,*args)
+    end
   end
 end

data/lib/arel_extensions/attributes.rb

@@ -23,6 +23,5 @@ module ArelExtensions
     def !=(other)
       Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
-
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
@@ -8,7 +9,7 @@ module ArelExtensions
     end
 
     def and *others
-      Arel::Nodes::And.new([self]+ others.flatten)
+      Arel::Nodes::And.new self, others
     end
 
     def ⋁(other)
@@ -16,30 +17,54 @@ module ArelExtensions
     end
 
     def or *others
-      args = others.flatten
-      if args.length == 1
-        Arel::Nodes::Or.new(self, args.first)
-      else
-        ArelExtensions::Nodes::Or.new([self]+ args)
-      end
+      Arel::Nodes::Or.new self, others
     end
 
     def then(t, f = nil)
       ArelExtensions::Nodes::Then.new [self, t, f]
     end
+
   end
 end
 
-Arel::Nodes::And.class_eval do
+class Arel::Nodes::And
   include ArelExtensions::BooleanFunctions
-end
 
-Arel::Nodes::Or.class_eval do
-  include ArelExtensions::BooleanFunctions
+  def self.new *children
+    children =
+      children.flatten.map { |c|
+      c.is_a?(self) ? c.children : c
+    }.flatten
+    super(children)
+  end
+
 end
 
-ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+# For some reason, Arel's And is properly defined as variadic (it
+# stores @children, and hashes it all).  However Arel's Or is defined
+# as binary, with only @left and @right, and hashing only @left and @right.
+#
+# So reimplement its ctor and accessors.
+
+class Arel::Nodes::Or
   include ArelExtensions::BooleanFunctions
-end
 
+  attr_reader :children
 
+  def self.new *children
+    children =
+      children.flatten.map { |c|
+      c.is_a?(self) ? c.children : c
+    }.flatten
+    super(*children)
+  end
+
+  def initialize *children
+    @children = children
+  end
+
+  def hash
+    children.hash
+  end
+
+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,33 @@ 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)
+    res_columns = []
+      case cols.first
+      when String, Symbol
+        cols.each { |c|
+          res_columns << @ast.relation[c]
+        }
+      when Array
+        if String === cols.first.first
+          res_columns = cols.map {|c| [@ast.relation[c.first]] }
+        elsif Arel::Attributes::Attribute == cols.first.first
+          res_columns = cols
+        end
+      when NilClass
+        res_columns = @ast.relation.columns
+      end
+      self.values = BulkValues.new(res_columns, data)
+      @ast.columns = res_columns
+    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

@@ -1,7 +1,11 @@
 module ArelExtensions
   module Nodes
-    if Arel::VERSION < "7.1.0"
+    if Gem::Version.new(Arel::VERSION) < Gem::Version.new("7.1.0")
       class Case < Arel::Nodes::Node
+        include Arel::Expressions
+        include Arel::Math
+        include Arel::Predications
+        include Arel::OrderPredications
         attr_accessor :case, :conditions, :default
 
         def initialize expression = nil, default = nil
@@ -26,8 +30,10 @@ module ArelExtensions
       end
     end
 
-    ArelExtensions::Nodes::Case.class_eval do
+    class ArelExtensions::Nodes::Case
       include Arel::Expressions
+      include Arel::Math
+      include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Math
       include ArelExtensions::Comparators
@@ -41,8 +47,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