arel_extensions 0.9.7.1 → 0.9.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be145c31813735ab972e8b497c6ceab5e06e291
-  data.tar.gz: 7c62d208758ff4ae6c0519736db22e67163b1084
+  metadata.gz: 1923df0add8a1b52266d494eeb0eaf76e422b7f5
+  data.tar.gz: 5be82144d6f2c8c1862bb4cec335d37a2cfd109e
 SHA512:
-  metadata.gz: 39ba0787983047a55a20012256533f4f22752e54e44e2f0504a86e26f912fa29662742b1d75588e6b35b051567754a74bc129b53c11ff1869146606480b64a43
-  data.tar.gz: 2b8ea0881447aa61d5bdad1b2c8e111059804abe4b6613adef9372f00d7d22ef6bcada95da7f2615be8a174c298ff3e1fca8345f7bb9dda28948ec58f1d934ca
+  metadata.gz: 738eb1d6e164f64625b06f91be03b8852be0f5e4c359ccab87b13342af03f4d79ce69371950ab6c52410394411aa22cb5e14a25d6a610de36eb5e28df92ac453
+  data.tar.gz: db4742a4ac307fc3e208deba698bfa9032e9b51d5eaa13b32f69860250211ed44f588f127a96d1ec431d03c8cfe94e190e2b4df10cf15aad952b842520fbd735

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/oracle.rb

@@ -79,28 +79,28 @@ module ArelExtensions
 
       # :date is not possible in Oracle since this type does not really exist
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-#        lc = o.left_node_type == :ruby_date || o.left_node_type == :ruby_time
-#        rc = o.right_node_type == :ruby_date || o.right_node_type == :ruby_time
+        lc = o.left_node_type == :ruby_date || o.left_node_type == :ruby_time
+        rc = o.right_node_type == :ruby_date || o.right_node_type == :ruby_time
         collector << '('
-#        collector << 'TO_DATE(' if lc
+        collector << 'TO_DATE(' if lc
         collector = visit o.left, collector
-#        collector << ')' if lc
+        collector << ')' if lc
         collector << " - "
-#        collector << 'TO_DATE(' if rc
+        collector << 'TO_DATE(' if rc
         collector = visit o.right, collector
-#        collector << ')' if rc
+        collector << ')' if rc
         collector << ')'
         if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
-          collector << ' * CASE WHEN (TRUNC('
-#          collector << 'TO_DATE(' if lc
+          collector << ' * (CASE WHEN (TRUNC('
+          collector << 'TO_DATE(' if lc
           collector = visit o.left, collector
-#          collector << ')' if lc
+          collector << ')' if lc
           collector << Arel::Visitors::Oracle::COMMA
           collector << "'DDD') = "
-#          collector << 'TO_DATE(' if lc
+          collector << 'TO_DATE(' if lc
           collector = visit o.left, collector
-#          collector << ')' if lc
-          collector << ') THEN 1 ELSE 86400 END' # converts to seconds
+          collector << ')' if lc
+          collector << ') THEN 1 ELSE 86400 END)' # converts to seconds
         end
         collector
       end

data/test/visitors/test_oracle.rb

@@ -70,7 +70,7 @@ module ArelExtensions
       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 %{(TO_DATE("users"."updated_at") - "users"."created_at") * 86400 AS new_name}
-        sql.must_be_like %{("users"."updated_at" - "users"."created_at") * CASE WHEN (TRUNC("users"."updated_at", 'DDD') = "users"."updated_at") THEN 1 ELSE 86400 END AS new_name}
+        sql.must_be_like %{("users"."updated_at" - "users"."created_at") * (CASE WHEN (TRUNC("users"."updated_at", 'DDD') = "users"."updated_at") THEN 1 ELSE 86400 END) AS new_name}
       end
 
       it "should diff between time values" do

data/test/with_ar/all_agnostic_test.rb

@@ -302,7 +302,11 @@ module ArelExtensions
 
         assert_equal ' ', t(@myung, @comments.coalesce("Myung").coalesce('ignored'))
         assert_equal 'Laure', t(@laure, @comments.coalesce("Laure"))
-        assert_equal(@env_db == 'oracle' ? nil : '', t(@laure, @comments.coalesce("")))
+        if @env_db == 'oracle'
+          assert_nil t(@laure, @comments.coalesce(""))
+        else
+          assert_equal('', t(@laure, @comments.coalesce("")))
+        end
 
         if @env_db == 'postgresql'
           assert_equal 100, t(@test, @age.coalesce(100))
@@ -364,7 +368,7 @@ module ArelExtensions
           assert_equal 42, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
           assert_equal(-3600, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)
 
-          assert_equal 0, t(@lucas, (@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1).to_i
+          assert_includes [nil, 0, 'f'], t(@lucas, (@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.7.1
+  version: 0.9.7.2
 platform: ruby
 authors:
 - Yann Azoury