arel_extensions 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58bd1c5b91bc632c7697a918369ea19c99ed026b
-  data.tar.gz: d52eae92a11823a94d51eda6de44187199d0e738
+  metadata.gz: cc58508a314b8bc3f5f4eb4aa704c4cba75783f6
+  data.tar.gz: a347453b0960efb17862dbb15e7433efa81cdc05
 SHA512:
-  metadata.gz: 29438df3218c96066e2d1a76f1ccd00b315c0d0957c6cd321cb9db09fe19d12c966d3d825f536337d87a3bafc547e77e221b871fcf407b01831080d99d872eaf
-  data.tar.gz: b56534f4ff7e7cde0a7dc64756075cf8a5ed892c1fc35e1913adabba3bc3f1afc430fb3c07e9bfb461523077feb65b78df25ae75e98373cdaac4fe29d0ea06cc
+  metadata.gz: 9aab7c24f6cd74293a52b5064764a9cbbffcc5d208140ddfab546ddc985f1435fb6ccbe7418e86e32c03c844670567dc03d16474077d52cd3acea1d5169bcc63
+  data.tar.gz: c74789a394dabfd3a8061a174a270312a7eacd3e46e0decd8089b2b4043eda970c65406adc22a60f9278345c4a063c58d1e1ef3450113ebac506ecbddac99dc9

data/.travis.yml

@@ -2,13 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 before_install:
+  - gem install bundler
 # - sudo apt-get update -qq
 # - sudo apt-get install -qq sqlite3
 #addons:
 #  mariadb: '10.0'
 gemfile:
-  - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+#  - gemfiles/rails3.gemfile
   - gemfiles/rails5.gemfile
 services:
   - mysql
@@ -20,18 +21,18 @@ script:
   - "bundle exec rake test"
 #  - "bundle exec rake test:sqlite3"
   - "gem build arel_extensions.gemspec"
-#  - "ruby test/real_db_test.rb"
+  - "bundle exec ruby test/real_db_test.rb"
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 rvm:
-  - rbx-2
-  - jruby-9.0.5.0
-  - jruby-head
   - 2.0.0
   - 2.1
   - 2.2.5
   - 2.3.1
+  - rbx-2
+  - jruby-9.0.5.0
+  - jruby-head
   - ruby-head
 jdk:
   - openjdk7
@@ -65,14 +66,20 @@ matrix:
       jdk: openjdk7
     - rvm: ruby-head
       jdk: oraclejdk7
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: rbx-2
+      gemfile: gemfiles/rails5.gemfile
   allow_failures:
 #    - rvm: jruby-9.0.5.0
 #    - rvm: jruby-head
     - rvm: ruby-head
       gemfile: gemfiles/rails4.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails3.gemfile
+#    - rvm: ruby-head
+#      gemfile: gemfiles/rails3.gemfile
 #    - rvm: jruby-head
-bundler_args: --jobs 2 --retry 2
+bundler_args: --jobs 3 --retry 2
 notifications:
   email: false

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.2'
+  s.version     = '0.8.3'
   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"]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('arel')
+  s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')

data/functions.html

@@ -5,8 +5,9 @@
     <title>Arel Extensions Features</title>
     <style type="text/css">
     .tg  {border-collapse:collapse;border-spacing:0;}
+    .tg th { font-weight:bold; }
     .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
-    .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
+    .tg th{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;}
     .tg .tg-baqh{text-align:center;vertical-align:top}
     .tg .tg-3oug{background-color:#fd6864;text-align:center;vertical-align:top}
     .tg .tg-by3v{font-weight:bold;font-size:14px;text-align:center}
@@ -36,8 +37,9 @@
     <th class="tg-pjz5">DB2</th>
   </tr>
   </thead>
+  <tbody>
   <tr>
-    <td class="tg-82sq" rowspan="6"><br><br><br><br><br><br><br>Math<br>functions<br></td>
+    <th class="tg-82sq" rowspan="6"><br><br><br><br><br><br><br>Math<br>functions</th>
     <td class="tg-yw4l">ABS<br>column.abs<br></td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -92,7 +94,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-ffjm" rowspan="11"><br><br><br><br><br><br><br><br><br>String <br>functions <br></td>
+    <th class="tg-ffjm" rowspan="11"><br><br><br><br><br><br><br><br><br>String <br>functions</th>
     <td class="tg-yw4l">CONCAT<br>column + "string"</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -192,7 +194,7 @@
     <td class="tg-j6lv">TRIM()</td>
   </tr>
   <tr>
-    <td class="tg-4rp9" rowspan="6"><br><br><br><br><br><br><br>Date <br>functions<br></td>
+    <th class="tg-4rp9" rowspan="6"><br><br><br><br><br><br><br>Date <br>functions<br></th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>
     <td class="tg-j6lv">DATE_ADD()<br></td>
     <td class="tg-baqh">✔</td>
@@ -247,7 +249,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-72dn" rowspan="8"><br><br><br><br><br><br>Comparators<br>functions<br></td>
+    <th class="tg-72dn" rowspan="8"><br><br><br><br><br><br>Comparators<br>functions<br></th>
     <td class="tg-yw4l">COALESCE<br>column.coalesce(var)</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -320,7 +322,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-9hbo" rowspan="2"><br><br>Boolean <br>functions<br></td>
+    <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-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -338,7 +340,18 @@
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
   </tr>
+  <tr>
+    <th class="bulk_insert">Bulk Insert</th>
+    <td class="tg-yw4l">insert_manager.bulk_insert(@cols, @data)</td>
+    <td class="tg-baqh">✔</td>
+    <td class="tg-baqh">✔</td>
+    <td class="tg-baqh">✔</td>
+    <td class="tg-baqh">✔</td>
+    <td class="tg-baqh">✔</td>
+    <td class="tg-baqh">✔</td>
+  </tr>
+  </tbody>
 </table>
-</table>
+
 </body>
-</html>
+</html>

data/gemfiles/rails3.gemfile

@@ -1,10 +1,12 @@
 source "https://rubygems.org"
 
-gem 'arel', '~> 3.0'
+gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
+	gem "activerecord-mysql2-adapter", :platform => [:ruby, :mswin, :mingw]
+	gem "pg", :platform => [:ruby, :mswin, :mingw]
 	# for JRuby
 	gem "jdbc-sqlite3", :platform => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -13,8 +15,6 @@ group :development, :test do
 	gem 'activesupport', '~> 3.2'
 	gem 'activemodel', '~> 3.2'
 	gem 'activerecord', '~> 3.2'
-	gem 'rdoc'
-	gem 'rake'
 end
 
 gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -5,6 +5,7 @@ gem 'arel', '~> 6.0'
 group :development, :test do
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
+	gem "pg", :platform => [:ruby, :mswin, :mingw]
 	# for JRuby
 	gem "jdbc-sqlite3", :platform => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -13,8 +14,6 @@ group :development, :test do
 	gem 'activesupport', '~> 4.0'
 	gem 'activemodel', '~> 4.0'
 	gem 'activerecord', '~> 4.0'
-	gem 'rdoc'
-	gem 'rake', '~> 11'
 end
 
 gemspec :path => "../"

data/gemfiles/rails5.gemfile

@@ -5,6 +5,8 @@ gem 'arel', '~> 7.0'
 group :development, :test do
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
+	gem "pg", :platform => [:ruby, :mswin, :mingw]
+
 	# for JRuby
 	gem "jdbc-sqlite3", :platform => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
@@ -14,8 +16,6 @@ group :development, :test do
 	gem 'activesupport', '~> 5'
 	gem 'activemodel', '~> 5'
 	gem 'activerecord', '~> 5'
-	gem 'rdoc'
-	gem 'rake'
 end
 
 gemspec :path => "../"

data/lib/arel_extensions/math.rb

@@ -1,11 +1,13 @@
+require 'arel_extensions/nodes'
+require 'arel_extensions/nodes/concat'
+
 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)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) if self.is_a?(ArelExtensions::Nodes::Concat)
-        arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+        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
@@ -21,11 +23,11 @@ module ArelExtensions
       #function returns the time between two dates
       #function returns the susbration between two int
       def -(other)
-        arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+        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 = other.relation.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s].type
+            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

data/lib/arel_extensions/nodes/coalesce.rb

@@ -1,22 +1,14 @@
 module ArelExtensions
   module Nodes
-    class Coalesce < Arel::Nodes::Function
-      include Arel::AliasPredication
+    class Coalesce < Function
 
-      def initialize arg , aliaz = nil
-
-        super(arg, aliaz)
-      end
-
-      def left
-        @expressions.first
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       end
-
-      def other
-        @expressions.delete_at(0)
-        @expressions
-      end
-
+      
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -1,31 +1,16 @@
 module ArelExtensions
   module Nodes
     class Concat < Function
-      include ArelExtensions::Math
 
       def initialize expr
-        tab = expr.map do |arg|
-          convert(arg)
-        end
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
         return super(tab)
       end
 
-      private
-      def convert(object)
-        case object
-        when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum
-          object
-        when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-        when String
-          Arel::Nodes.build_quoted(object)
-        when Date
-          Arel::Nodes.build_quoted(object, self)
-        when ActiveSupport::Duration
-          object.to_i
-        else
-          raise(ArgumentError, "#{object.class} can not be converted to Date")
-        end
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
 
     end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -38,7 +38,7 @@ module ArelExtensions
 
       def initialize expr
         col = expr.first
-        @date_type = col.relation.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
+        @date_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
         tab = expr.map do |arg|
           convert(arg)
         end

data/lib/arel_extensions/nodes/function.rb

@@ -18,7 +18,27 @@ module ArelExtensions
       end
 
       def right
-        @expressions.last
+        @expressions[1]
+      end
+
+      protected
+      def convert_to_node(object)
+        case object
+        when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum, Integer
+          object
+        when DateTime, Time
+          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+        when String
+          Arel::Nodes.build_quoted(object)
+        when Date
+          Arel::Nodes.build_quoted(object, self)
+        when NilClass
+          Arel.sql('NULL')
+        when ActiveSupport::Duration
+          object.to_i
+        else
+          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+        end
       end
 
     end

data/lib/arel_extensions/nodes/locate.rb

@@ -1,31 +1,16 @@
 module ArelExtensions
   module Nodes
     class Locate < Function
-		include ArelExtensions::Math
 
 		def initialize expr
 			tab = expr.map do |arg|
-			  convert(arg)
+			  convert_to_node(arg)
 			end
 			return super(tab)
 		end
 
-		private
-		def convert(object)
-			case object
-			when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum
-			  object
-			when DateTime, Time
-			  Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-			when String
-			  Arel::Nodes.build_quoted(object)
-			when Date
-			  Arel::Nodes.build_quoted(object, self)
-			when ActiveSupport::Duration
-			  object.to_i
-			else
-			  raise(ArgumentError, "#{object.class} can not be converted to Date")
-			end
+		def +(other)
+	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
 		end
 
     end

data/lib/arel_extensions/nodes/ltrim.rb

@@ -1,26 +1,16 @@
 module ArelExtensions
   module Nodes
-    class Ltrim < Arel::Nodes::Function
+    class Ltrim < Function
 
-      def initialize  left,right,aliaz = nil
-        tab = Array.new
-        tab << left
-        tab << right
-
-        super(tab, aliaz)
-      end
-
-      def left
-        @expressions.first
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       end
 
-      def right
-        @expressions[1]
-      end
-
-
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
 
     end

data/lib/arel_extensions/nodes/rtrim.rb

@@ -1,29 +1,18 @@
 module ArelExtensions
   module Nodes
-    class Rtrim < Arel::Nodes::Function
+    class Rtrim < Function
 
-      def initialize  left,right,aliaz = nil
-        tab = Array.new
-        tab << left
-        tab << right
-
-        super(tab, aliaz)
-      end
-
-      def left
-        @expressions.first
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       end
 
-      def right
-        @expressions[1]
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
 
-
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-      end
-
-
     end
   end
 end

data/lib/arel_extensions/nodes/trim.rb

@@ -1,26 +1,18 @@
 module ArelExtensions
   module Nodes
-    class Trim < Arel::Nodes::Function
+    class Trim < Function
 
-      def initialize  left,right, aliaz = nil
-        tab = Array.new
-        tab << left
-        tab << right
-        super(tab, aliaz)
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       end
 
-      def left
-        @expressions.first
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
 
-      def right
-        @expressions[1]
-      end
-
-
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-      end
     end
   end
 end

data/lib/arel_extensions/nodes.rb

@@ -19,9 +19,10 @@ require 'arel_extensions/nodes/trim'
 require 'arel_extensions/nodes/ltrim'
 require 'arel_extensions/nodes/rtrim'
 
-
-require 'arel_extensions/nodes/coalesce'
+# Date functions 
 require 'arel_extensions/nodes/date_diff'
 require 'arel_extensions/nodes/duration'
+
+require 'arel_extensions/nodes/coalesce'
 require 'arel_extensions/nodes/isnull'
 require 'arel_extensions/nodes/wday'

data/lib/arel_extensions/null_functions.rb

@@ -7,10 +7,10 @@ module ArelExtensions
     end
     # returns the first non-null expr in the expression list. You must specify at least two expressions.
     #If all occurrences of expr evaluate to null, then the function returns null.
-    def coalesce (*args)
+    def coalesce *args
       args.unshift(self)
       ArelExtensions::Nodes::Coalesce.new args
     end
 
   end
-end
+end

data/lib/arel_extensions/string_functions.rb

@@ -53,15 +53,15 @@ module ArelExtensions
 
     #Function returns a string after removing left, right or the both prefixes or suffixes int argument
     def trim other
-      ArelExtensions::Nodes::Trim.new self,other
+      ArelExtensions::Nodes::Trim.new [self, other]
     end
 
     def ltrim other
-      ArelExtensions::Nodes::Ltrim.new self,other
+      ArelExtensions::Nodes::Ltrim.new [self, other]
     end
 
     def rtrim other
-      ArelExtensions::Nodes::Rtrim.new self, other
+      ArelExtensions::Nodes::Rtrim.new [self, other]
     end
 
   end

data/lib/arel_extensions/version.rb

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