arel_extensions 1.2.23 → 1.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9036278df59b6ea574de919e8c2ad7a4326aa40466b00f84be093d8352e591
-  data.tar.gz: d3cca86041854d9d1dcc940782719d95f21c26d02f6afc8cb6442a4173bf40b8
+  metadata.gz: 006465d41dbb691f2048bd0ffc2aaf3d2f1f48f508955f50774ee9c0413ccfa5
+  data.tar.gz: 47c61ff636e5fd8c4eb0f470facd661406c4bdca590037a1af5ba87e02ca415e
 SHA512:
-  metadata.gz: 5594429c88e9ba8217fbd963a7555c7003c3417dad17ed3b394b92552fb6e2e7ff49073d197ef483aa108a06baf7a6b067fc18d7e4b18d331b8f4b0d3dad0568
-  data.tar.gz: 53888ec183dd96d146565d2814586155cbbc76a7b3c1e25a60c2d14b9d0d41bf10c581d2bb3b87fe577ae66451d3f2a2deb2dcc378a271faf2bb462252cba9ec
+  metadata.gz: f6fb93194f8d9841380ba59e1fd72e0afa8bc0c84809d44e6af6b1282ce04bf1933900aafa6715cbdbf074cd6ba0585698aadc1678c80c1cbfdacc85a04472c3
+  data.tar.gz: a4ac1afdba08edb577f182e9e7d7236a5f87ce741ef63979b95c24ac2562fee76576964dc3b58c54a052952046e51c2ae5a9225d2b91c830eecba3c3b372da52

data/lib/arel_extensions.rb

@@ -33,6 +33,12 @@ class Arel::Nodes::Grouping
   include Arel::OrderPredications
 end
 
+class Arel::Nodes::Ordering
+	def eql? other
+		self.hash.eql? other.hash
+	end
+end
+
 class Arel::Nodes::Function
   include Arel::Math
   include Arel::Expressions
@@ -152,6 +158,9 @@ class Arel::Nodes::Unary
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Binary
@@ -161,6 +170,9 @@ class Arel::Nodes::Binary
   include ArelExtensions::Comparators
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Equality

data/lib/arel_extensions/nodes/length.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Nodes
     class Length < Function
       RETURN_TYPE = :integer
+      attr_accessor :bytewise
+
+      def initialize(node, bytewise = true)
+        @bytewise = bytewise
+        super([node])
+      end
     end
   end
 end

data/lib/arel_extensions/string_functions.rb

@@ -24,9 +24,17 @@ module ArelExtensions
       ArelExtensions::Nodes::FindInSet.new [other, self]
     end
 
-    # LENGTH function returns the length of the value in a text field.
+    # LENGTH function returns the length (bytewise) of the value in a text field.
     def length
-      ArelExtensions::Nodes::Length.new [self]
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def byte_length
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def char_length
+      ArelExtensions::Nodes::Length.new self, false
     end
 
     # LOCATE function returns the first starting position of a string in another string.

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.23".freeze
+  VERSION = "1.2.25".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -155,7 +155,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LEN("
+        collector << "#{o.bytewise ? 'DATALENGTH' : 'LEN'}("
         collector = visit o.expr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -5,7 +5,7 @@ module ArelExtensions
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
@@ -308,7 +308,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "LENGTH#{o.bytewise ? 'B' : ''}("
         collector = visit o.expr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/postgresql.rb

@@ -7,7 +7,7 @@ module ArelExtensions
       }.freeze
 
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY',
+        '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY',
         '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day', # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours

data/lib/arel_extensions/visitors/to_sql.rb

@@ -117,7 +117,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "#{o.bytewise ? '' : 'CHAR_'}LENGTH("
         collector = visit o.left, collector
         collector << ")"
         collector

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.23".freeze
+  VERSION = "1.2.25".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.20".freeze
+  VERSION = "2.0.22".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.25
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel