arel_extensions 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aee321fcafb1aa18404760b6ea01de96837b0bf
-  data.tar.gz: 008c6af57efc1775384616d797c96eb2895481b2
+  metadata.gz: c99e78c300658b7506cbdf8969ed28c8556e37c0
+  data.tar.gz: 116346eed66e6d9cc920f4b21116db9f8d4f95b0
 SHA512:
-  metadata.gz: daa6d2206846f0eb7d28de5a4392888630d3120a2913b572cb4250609617574983cb708dfc38b1e8a28c39e72aaeaddb18826e379e4b9bc3098c2904d1ad48e6
-  data.tar.gz: 09080c3f2ae5800ee9722804630450274b61887c5816a52bf42d2580e94e332843607958e6830f35cf30724bf36ca5680dce5cdc6b91a7a91b081e2329e2a02e
+  metadata.gz: b16119b4bc898a852af9e7db829ca34bb4afca30779a651b4302847ea515d7d406378d01470535c91f6315c473ee0c59d52f20a5d324f8c9932de84f97a1ec86
+  data.tar.gz: 5973956e3049621ea31c4f981fd6fc5dce8b9a1ba20ba33e4e9eee88d454ca6956375447a9681359ecdc5a3c49c89a9476b983122c5688e02a094fee7cb57274

data/SQL_Challenges.md

@@ -22,7 +22,6 @@ A good way could be to create user defined functions to ensure a total transpare
 
 ## SQL Server (any version > 2005, without extension)
 - REGEXP
-- (L/R)TRIM(str, 'x') -> TRIM with arguments
 - Maths Operators on string ('a' <= 'b')
 - GROUP_CONCAT
 - FIND_IN_SET

data/TODO

@@ -19,8 +19,9 @@ Code quality:
 New features:
 - POSIX format numbers (%.2f)
 - easy unions
-- cast
+- cast, to_char
 
 Tests improvements:
 - SQL Server
-- DB2
+- DB2
+- Informix

data/init/mssql.sql

@@ -22,22 +22,39 @@ BEGIN
 
 	RETURN @value
 END;
-
 GO
 
------------------------------
--- GO
+IF OBJECT_ID (N'dbo.SplitStringWithDelim', N'IF') IS NOT NULL
+    DROP FUNCTION dbo.SplitStringWithDelim;
+GO
+CREATE FUNCTION dbo.SplitStringWithDelim(@List NVARCHAR(4000), @Delimiter NCHAR(1))
+RETURNS TABLE AS
+RETURN
+(
+    WITH SplitStringCte(stpos,endpos)
+    AS(
+        SELECT 0 AS stpos, CHARINDEX(@Delimiter, @List) AS endpos
+        UNION ALL
+        SELECT endpos + 1, CHARINDEX(@Delimiter, @List, endpos + 1)
+            FROM SplitStringCte
+            WHERE endpos > 0
+    )
+    SELECT 'Id' = ROW_NUMBER() OVER (ORDER BY (SELECT 1)),
+        'Data' = SUBSTRING(@List, stpos, COALESCE(NULLIF(endpos, 0), LEN(@List) + 1) - stpos)
+    FROM SplitStringCte
+)
+GO
 
 IF OBJECT_ID (N'dbo.FIND_IN_SET', N'FN') IS NOT NULL
     DROP FUNCTION dbo.FIND_IN_SET;
 GO
--- CREATE FUNCTION dbo.FIND_IN_SET(@value VARCHAR(MAX), @list VARCHAR(MAX), @delim VARCHAR(MAX))
---	RETURNS VARCHAR(MAX)
---	AS BEGIN
---		RETURN LTRIM(RTRIM(@value));
---	END;
-
--- GO
+CREATE FUNCTION dbo.FIND_IN_SET(@Value VARCHAR(MAX), @List VARCHAR(MAX), @Delimiter VARCHAR(MAX))
+RETURNS BIGINT
+AS
+BEGIN
+    RETURN COALESCE((SELECT MIN(Id) FROM dbo.SplitStringWithDelim(@List, COALESCE(@Delimiter, ',')) WHERE Data = @Value), 0)
+END
+GO
 
 --IF OBJECT_ID (N'dbo.SplitString', N'FN') IS NOT NULL
 --    DROP FUNCTION dbo.SplitString;

data/lib/arel_extensions.rb

@@ -57,6 +57,7 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::MathFunctions
   include ArelExtensions::StringFunctions
   include ArelExtensions::BooleanFunctions
+  include ArelExtensions::NullFunctions
 end
 
 Arel::Nodes::Unary.class_eval do

data/lib/arel_extensions/nodes/function.rb

@@ -26,7 +26,14 @@ module ArelExtensions
       end
 
       def type_of_attribute(att)
-        Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+        case att
+        when Arel::Attributes::Attribute
+          Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+        when ArelExtensions::Nodes::Function
+          att.class.return_type
+        else
+          nil
+        end
       end
 
       def convert_to_node(object)

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -9,24 +9,13 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Concat o, collector
-        arg = o.left.relation.engine.columns.find{|c| c.name == o.left.name.to_s}.type
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector << "CONCAT("
-          collector = visit o.left, collector
-          collector<< ","
-          collector = visit o.right, collector
-          collector << ")"
-        elsif ( arg == :date || arg == :datetime)
-          collector = visit o.left, collector
-          collector<< "+"
-          collector << "#{o.right} days"
-        else
-          collector << "CONCAT("
-          collector = visit o.left, collector
-          collector<< ","
-          collector <<"#{o.right})"
-        end
+      def visit_ArelExtensions_Nodes_Trim o, collector
+        collector << "LTRIM(RTRIM("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << "))"
         collector
       end
 

data/lib/arel_extensions/visitors/mssql.rb

@@ -137,27 +137,54 @@ module ArelExtensions
         collector
       end
 
-      # TODO manage 2nd argument
       def visit_ArelExtensions_Nodes_Trim o, collector
-        collector << "LTRIM(RTRIM("
-        collector = visit o.left, collector
-        collector << "))"
+        if o.right
+          collector << "REPLACE(REPLACE(LTRIM(RTRIM(REPLACE(REPLACE("
+          collector = visit o.left, collector
+          collector << ", ' ', '~'), "
+          collector = visit o.right, collector
+          collector << ", ' '))), ' ', "
+          collector = visit o.right, collector
+          collector << "), '~', ' ')"
+        else
+          collector << "LTRIM(RTRIM("
+          collector = visit o.left, collector
+          collector << "))"
+        end
         collector
       end
 
-      # TODO manage 2nd argument
       def visit_ArelExtensions_Nodes_Ltrim o, collector
-        collector << "LTRIM("
-        collector = visit o.left, collector
-        collector << ")"
+        if o.right
+          collector << "REPLACE(REPLACE(LTRIM(REPLACE(REPLACE("
+          collector = visit o.left, collector
+          collector << ", ' ', '~'), "
+          collector = visit o.right, collector
+          collector << ", ' ')), ' ', "
+          collector = visit o.right, collector
+          collector << "), '~', ' ')"
+        else
+          collector << "LTRIM("
+          collector = visit o.left, collector
+          collector << ")"
+        end
         collector
       end
 
-      # TODO manage 2nd argument
       def visit_ArelExtensions_Nodes_Rtrim o, collector
-        collector << "RTRIM("
-        collector = visit o.left, collector
-        collector << ")"
+        if o.right
+          collector << "REPLACE(REPLACE(RTRIM(REPLACE(REPLACE("
+          collector = visit o.left, collector
+          collector << ", ' ', '~'), "
+          collector = visit o.right, collector
+          collector << ", ' ')), ' ', "
+          collector = visit o.right, collector
+          collector << "), '~', ' ')"
+        else
+          collector << "RTRIM("
+          collector = visit o.left, collector
+          collector << ")"
+        end
         collector
       end
 
@@ -227,6 +254,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_FindInSet o, collector
+        collector << "dbo.FIND_IN_SET("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
 
       # TODO manage case insensitivity
       def visit_ArelExtensions_Nodes_IMatches o, collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::Oracle.class_eval do
+      SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
@@ -165,19 +166,25 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << 'TRIM(' # BOTH
-        case o.right.expr
-        when "\t"
-          collector << 'CHR(9)'
-        when "\n"
-          collector << 'CHR(10)'
-        when "\r"
-          collector << 'CHR(13)'
+        if o.right.expr && SPECIAL_CHARS[o.right.expr]
+          collector << SPECIAL_CHARS[o.right.expr]
         else
           collector = visit o.right, collector
         end
         collector << ' FROM '
         collector << '(' if o.left.is_a? ArelExtensions::Nodes::Trim
-        collector = visit o.left, collector
+        if o.type_of_attribute(o.left) == :text
+          collector << 'dbms_lob.substr('
+          collector = visit o.left, collector
+          collector << Arel::Visitors::Oracle::COMMA
+          collector << 'dbms_lob.getlength('
+          collector = visit o.left, collector
+          collector << ')'
+          collector << Arel::Visitors::Oracle::COMMA
+          collector << '1)'
+        else
+          collector = visit o.left, collector
+        end
         collector << ')' if o.left.is_a? ArelExtensions::Nodes::Trim
         collector << ")"
         collector
@@ -185,7 +192,11 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Ltrim o, collector
         collector << 'TRIM(LEADING '
-        collector = visit o.right, collector
+        if o.right.expr && SPECIAL_CHARS[o.right.expr]
+          collector << SPECIAL_CHARS[o.right.expr]
+        else
+          collector = visit o.right, collector
+        end
         collector << ' FROM '
         collector = visit o.left, collector
         collector << ")"
@@ -194,24 +205,33 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Rtrim o, collector
         collector << 'TRIM(TRAILING '
-        collector = visit o.right, collector
+        if o.right.expr && SPECIAL_CHARS[o.right.expr]
+          collector << SPECIAL_CHARS[o.right.expr]
+        else
+          collector = visit o.right, collector
+        end
         collector << ' FROM '
         collector = visit o.left, collector
         collector << ")"
         collector
       end
 
+      # blank ? <param> : NULL
       def visit_ArelExtensions_Nodes_Blank o, collector
         collector << '(CASE WHEN ('
-        collector = visit o.left, collector
-        collector << " = '') THEN 1 ELSE 0 END)"
+        collector = visit o.left.trim, collector
+        collector << " IS NULL) THEN 'blank'"
+        collector << " ELSE NULL END)"
         collector
       end
 
+      # not blank ? <param> : NULL
       def visit_ArelExtensions_Nodes_NotBlank o, collector
         collector << '(CASE WHEN ('
-        collector = visit o.left, collector
-        collector << " = '') THEN 0 ELSE 1 END)"
+        collector = visit o.left.trim, collector
+        collector << " IS NOT NULL) THEN "
+        collector = visit o.left.trim, collector
+        collector << " ELSE NULL END)"
         collector
       end
 

data/test/with_ar/all_agnostic_test.rb

@@ -81,7 +81,7 @@ module ArelExtensions
         @camille = User.where(:id => u.id)
         u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
         @arthur = User.where(:id => u.id)
-        u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16
+        u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16, :comments => ' '
         @myung = User.where(:id => u.id)
         u = User.create :age => 25, :name => "Laure", :created_at => d, :score => 20.16
         @laure = User.where(:id => u.id)
@@ -234,7 +234,6 @@ module ArelExtensions
       def test_trim
         assert_equal "Myung", t(@myung, @name.trim)
         assert_equal "Myung", t(@myung, @name.trim.ltrim.rtrim)
-        skip "SQL Server does not manage argument for (L/R)TRIM" if @env_db == 'mssql'
         assert_equal "Myun", t(@myung, @name.rtrim("g"))
         assert_equal "yung", t(@myung, @name.ltrim("M"))
         assert_equal "yung", t(@myung, (@name + "M").trim("M"))
@@ -246,9 +245,18 @@ module ArelExtensions
         if @env_db == 'postgresql'
           assert_includes [false, 'f'], t(@myung, @name.blank) # depends of adapter
           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'
@@ -260,7 +268,7 @@ module ArelExtensions
 
       def test_format
         assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
-        skip "SQL Server does  not accept any format" if @env_db == 'mssql'
+        skip "SQL Server does not accept any format" if @env_db == 'mssql'
         assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
       end
 
@@ -318,11 +326,15 @@ module ArelExtensions
 
       def test_datetime_diff
         assert_equal 0, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 42)).to_i
-        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)
+        if @env_db == 'oracle' && Arel::VERSION.to_i > 6 # in rails 5, result is multiplied by 24*60*60 = 86400...
+          assert_equal 42 * 86400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
+          assert_equal(-3600 * 86400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)          
+        else
+          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)
+        end
       end
 
-
       def test_cast_types
         skip "not implemented yet"
         assert_equal true, t(@arthur, @score =~ /22/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel