arel_extensions 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99e78c300658b7506cbdf8969ed28c8556e37c0
-  data.tar.gz: 116346eed66e6d9cc920f4b21116db9f8d4f95b0
+  metadata.gz: dcccab4309b1eb71b208b052216c353ce6e1257c
+  data.tar.gz: 9d338f67a997f0d580df1802d271be8c35969305
 SHA512:
-  metadata.gz: b16119b4bc898a852af9e7db829ca34bb4afca30779a651b4302847ea515d7d406378d01470535c91f6315c473ee0c59d52f20a5d324f8c9932de84f97a1ec86
-  data.tar.gz: 5973956e3049621ea31c4f981fd6fc5dce8b9a1ba20ba33e4e9eee88d454ca6956375447a9681359ecdc5a3c49c89a9476b983122c5688e02a094fee7cb57274
+  metadata.gz: c1ae31c4de5716f431b0619b2067d9d94b3f7daa2c73ef41b9d534a7da8448e148d9f3f28ab56fd5f580feb1722aa1b5e4b11545c71ea9ee22ed557f62b984b1
+  data.tar.gz: 73358836832cb8fac27fab5220530da5c3379430098bf7325900748d926f3c6de6fe9248f6c69a105c1fdbd20d08e682b76c77a86e9169192df00a465d5ba1e6

data/SQL_Challenges.md

@@ -24,5 +24,4 @@ A good way could be to create user defined functions to ensure a total transpare
 - REGEXP
 - Maths Operators on string ('a' <= 'b')
 - GROUP_CONCAT
-- FIND_IN_SET
 - any date format (YYYY/MM/DD HH:MM:SS:MMM for example)

data/lib/arel_extensions/boolean_functions.rb

@@ -1,3 +1,5 @@
+require 'arel_extensions/nodes/then'
+
 module ArelExtensions
 	module BooleanFunctions
 
@@ -9,6 +11,9 @@ module ArelExtensions
 			self.or(other)
 		end
 
+		def then(t, f = nil)
+        	ArelExtensions::Nodes::Then.new [self, t, f]
+		end
 	end
 end
 

data/lib/arel_extensions/nodes/then.rb

@@ -0,0 +1,12 @@
+module ArelExtensions
+  module Nodes
+    class Then < Function
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
+      end
+    end
+  end
+end

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -189,17 +189,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-        collector << 'CASE WHEN LEN(LTRIM(RTRIM(ISNULL('
-        collector = visit o.left, collector
-        collector << ", '')))) = 0 THEN 1 ELSE 0 END"
-        collector
+        visit o.left.trim.length.eq(0), collector
       end
 
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        collector << 'CASE WHEN LEN(LTRIM(RTRIM(ISNULL('
-        collector = visit o.left, collector
-        collector << ", '')))) = 0 THEN 0 ELSE 1 END"
-        collector
+        visit o.left.trim.length.gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -174,12 +174,12 @@ module ArelExtensions
         collector << ' FROM '
         collector << '(' if o.left.is_a? ArelExtensions::Nodes::Trim
         if o.type_of_attribute(o.left) == :text
-          collector << 'dbms_lob.substr('
+          collector << 'dbms_lob.SUBSTR('
           collector = visit o.left, collector
           collector << Arel::Visitors::Oracle::COMMA
-          collector << 'dbms_lob.getlength('
+          collector << 'COALESCE(dbms_lob.GETLENGTH('
           collector = visit o.left, collector
-          collector << ')'
+          collector << "), 0)"
           collector << Arel::Visitors::Oracle::COMMA
           collector << '1)'
         else
@@ -216,23 +216,12 @@ module ArelExtensions
         collector
       end
 
-      # blank ? <param> : NULL
       def visit_ArelExtensions_Nodes_Blank o, collector
-        collector << '(CASE WHEN ('
-        collector = visit o.left.trim, collector
-        collector << " IS NULL) THEN 'blank'"
-        collector << " ELSE NULL END)"
-        collector
+        visit o.left.trim.length.coalesce(0).eq(0), collector
       end
 
-      # not blank ? <param> : NULL
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        collector << '(CASE WHEN ('
-        collector = visit o.left.trim, collector
-        collector << " IS NOT NULL) THEN "
-        collector = visit o.left.trim, collector
-        collector << " ELSE NULL END)"
-        collector
+        visit o.left.trim.length.coalesce(0).gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector

data/lib/arel_extensions/visitors/to_sql.rb

@@ -282,6 +282,19 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Then o, collector
+        collector << "CASE WHEN ("
+        collector = visit o.left, collector
+        collector << ") THEN "
+        collector = visit o.right, collector
+        if o.expressions[2]          
+          collector << " ELSE "
+          collector = visit o.expressions[2], collector
+        end
+        collector << " END"
+        collector
+      end
+
       # Date operations
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "DATE_ADD("

data/test/with_ar/all_agnostic_test.rb

@@ -247,23 +247,19 @@ module ArelExtensions
           assert_includes [true, 't'], t(@myung, @name.not_blank) # depends of adapter
           assert_includes [true, 't'], t(@myung, @comments.blank)
           assert_includes [false, 'f'], t(@myung, @comments.not_blank)
-        elsif @env_db == 'oracle'
-          assert_equal '42', t(@myung, @name.blank.coalesce('42'))
-          assert_equal 'Myung', t(@myung, @name.not_blank.coalesce('42'))
-          assert_equal 'blank', t(@myung, @comments.blank.coalesce('42'))
-          assert_equal '42', t(@myung, @comments.not_blank.coalesce('42'))
-        else
-          assert_equal 0, t(@myung, @name.blank)
-          assert_equal 1, t(@myung, @name.not_blank)
-          assert_equal 1, t(@myung, @comments.blank)
-          assert_equal 0, t(@myung, @comments.not_blank)
-        end
-        skip "Oracle requires cast for CLOB" if @env_db == 'oracle' # comments is CLOB, CHAR expected
-        if @env_db == 'postgresql'
-          assert_includes [true, 't'], t(@myung, @comments.blank) # depends of adapter
-        else
-          assert_equal 1, t(@myung, @comments.blank)
         end
+        assert_equal 0, @myung.where(@name.blank).count
+        assert_equal 1, @myung.where(@name.not_blank).count
+        assert_equal 1, @myung.where(@comments.blank).count
+        assert_equal 0, @neg.where(@comments.blank).count
+        assert_equal 1, @neg.where(@comments.not_blank).count
+        assert_equal 0, @myung.where(@comments.not_blank).count
+        assert_equal 'false', t(@myung, @name.blank.then('true', 'false'))
+        assert_equal 'true', t(@myung, @name.not_blank.then('true', 'false'))
+        assert_equal 'true', t(@myung, @comments.blank.then('true', 'false'))
+        assert_equal 'false', t(@myung, @comments.not_blank.then('true', 'false'))
+        assert_equal 'false', t(@neg, @comments.blank.then('true', 'false'))
+        assert_equal 'true', t(@neg, @comments.not_blank.then('true', 'false'))
       end
 
       def test_format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -132,6 +132,7 @@ files:
 - lib/arel_extensions/nodes/replace.rb
 - lib/arel_extensions/nodes/round.rb
 - lib/arel_extensions/nodes/soundex.rb
+- lib/arel_extensions/nodes/then.rb
 - lib/arel_extensions/nodes/trim.rb
 - lib/arel_extensions/nodes/wday.rb
 - lib/arel_extensions/null_functions.rb