arel_extensions 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a5a19e45f8b5b0a625cc277f2a99cbd5b4824d
-  data.tar.gz: 91a0b61f9d7804eb5c8f54a679f90fb25d1c8aaf
+  metadata.gz: f9a9fe5819def3759928d0cea4cdcda31f3a4dbd
+  data.tar.gz: 2f0585e04bbb88128e291061160db906baa15028
 SHA512:
-  metadata.gz: 68e49c3d6bf45935f491389bc15e9338b3ba981b42fac1db5619ef4b0a76cb74c239099207396814f2ffdf3c9af6cc0fb932779d163297ea2e099d5650912f68
-  data.tar.gz: da9a008e7e3d3b9c55e3db8eec18444a20608a93c9cadfeb84166c86adeea1a5a7285b80d02bffea407b2301c497c5b3efe7664a3e7aa156cbc8096381222c75
+  metadata.gz: 556c4302bdb962dc5a6aaa1f6cfd625b42ae30c4df3a24c0283dbb62f1f380c0feff557fe941fefe84021f9be4ccb40b92adc1ceac2aaabc0d96a1f9ad472da6
+  data.tar.gz: cf19efa4600c4b88dc061a28cc9c39b25452e159e9d871a896b1d25d0c8c3b8e4d6fa7578f55a44ea496c47b615e4b231dfdc6be9acc5434553c41119a2d6f02

data/.travis.yml

@@ -26,7 +26,7 @@ script:
 - bundle exec rake test:sqlite
 - bundle exec rake test:mysql
 - bundle exec rake test:postgresql
-- bundle exec rake test:oracle
+- bundle exec rake test:oracle # service unavailable
 env:
   global:
   - JRUBY_OPTS='--dev -J-Xmx1024M'

data/init/postgresql.sql

@@ -11,4 +11,57 @@ AS $function$
     UNION ALL 
       SELECT 0) z
     LIMIT 1
-$function$
+$function$
+;
+
+
+CREATE OR REPLACE FUNCTION public.DateDiff(units VARCHAR(30), start_t TIMESTAMP, end_t TIMESTAMP) 
+     RETURNS INT AS $$
+   DECLARE
+     diff_interval INTERVAL; 
+     diff INT = 0;
+     years_diff INT = 0;
+   BEGIN
+     IF units IN ('yy', 'yyyy', 'year', 'mm', 'm', 'month') THEN
+       years_diff = DATE_PART('year', end_t) - DATE_PART('year', start_t);
+ 
+       IF units IN ('yy', 'yyyy', 'year') THEN
+         -- SQL Server does not count full years passed (only difference between year parts)
+         RETURN years_diff;
+       ELSE
+         -- If end month is less than start month it will subtracted
+         RETURN years_diff * 12 + (DATE_PART('month', end_t) - DATE_PART('month', start_t)); 
+       END IF;
+     END IF;
+ 
+     -- Minus operator returns interval 'DDD days HH:MI:SS'  
+     diff_interval = end_t - start_t;
+ 
+     diff = diff + DATE_PART('day', diff_interval);
+ 
+     IF units IN ('wk', 'ww', 'week') THEN
+       diff = diff/7;
+       RETURN diff;
+     END IF;
+ 
+     IF units IN ('dd', 'd', 'day') THEN
+       RETURN diff;
+     END IF;
+ 
+     diff = diff * 24 + DATE_PART('hour', diff_interval); 
+ 
+     IF units IN ('hh', 'hour') THEN
+        RETURN diff;
+     END IF;
+ 
+     diff = diff * 60 + DATE_PART('minute', diff_interval);
+ 
+     IF units IN ('mi', 'n', 'minute') THEN
+        RETURN diff;
+     END IF;
+ 
+     diff = diff * 60 + DATE_PART('second', diff_interval);
+ 
+     RETURN diff;
+   END;
+$$ LANGUAGE plpgsql;

data/lib/arel_extensions/date_duration.rb

@@ -27,6 +27,18 @@ module ArelExtensions
       ArelExtensions::Nodes::Duration.new 'wd', self
     end
 
+    def hour
+      ArelExtensions::Nodes::Duration.new "h", self
+    end
+
+    def minute
+      ArelExtensions::Nodes::Duration.new "mn", self
+    end
+
+    def second
+      ArelExtensions::Nodes::Duration.new "s", self
+    end
+
     def format(tpl)
       ArelExtensions::Nodes::Format.new [self, tpl]
     end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -9,24 +9,27 @@ module ArelExtensions
       @@return_type = :integer # by default...
 
       def initialize(expr)
+        res = []
         col = expr.first
         case col
-        when Arel::Nodes::Node
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
           @left_node_type = type_of_attribute(col)
         when Date
           @left_node_type = :ruby_date
         when DateTime, Time
           @left_node_type = :ruby_time
         end
+        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
         case expr[1]
-        when Arel::Nodes::Node
-          @right_node_type = type_of_attribute(col)
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
+          @right_node_type = type_of_attribute(expr[1])
         when Date
           @right_node_type = :ruby_date
         when DateTime, Time
           @right_node_type = :ruby_time
         end
-        super [convert_to_date_node(col), convert_to_date_node(expr[1])]
+        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
+        super res
       end
     end
 

data/lib/arel_extensions/nodes/function.rb

@@ -91,6 +91,21 @@ module ArelExtensions
         end
       end
 
+      def convert_to_datetime_node(object)
+        case object
+        when Arel::Attributes::Attribute, Arel::Nodes::Node
+          object
+        when DateTime, Time
+          Arel::Nodes.build_quoted(object, self)
+        when String
+          Arel::Nodes.build_quoted(Time.parse(object), self)
+        when Date
+          Arel::Nodes.build_quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
+        else
+          raise(ArgumentError, "#{object.class} can not be converted to Datetime")
+        end
+      end
+
       def convert_to_number(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Visitors
     module MSSQL
-      Arel::Visitors::MSSQL::DATE_MAPPING = {'d' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week'}
+      Arel::Visitors::MSSQL::DATE_MAPPING = {'d' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week', 'h' => 'hour', 'mn' => 'minute', 's' => 'second'}
       Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' =>   '', '%b' => '', '%^b' => '',      # year, month
         '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '',                               # day, weekday
@@ -71,11 +71,15 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << "DATEDIFF(day"
-        collector << Arel::Visitors::MSSQL::COMMA
-        collector = visit o.left, collector
+        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          collector << "DATEDIFF(second"
+        else
+          collector << "DATEDIFF(day"
+        end
         collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.right, collector
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.left, collector
         collector << ")"
         collector
       end
@@ -92,10 +96,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Duration o, collector
+        conv = ['h', 'mn', 's'].include?(o.left)
         collector << 'DATEPART('
         collector << Arel::Visitors::MSSQL::DATE_MAPPING[o.left]
         collector << Arel::Visitors::MSSQL::COMMA
+        collector << 'CONVERT(datetime,' if conv
         collector = visit o.right, collector
+        collector << ')' if conv
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/mysql.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::MySQL.class_eval do
-      Arel::Visitors::MySQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY'}
+      Arel::Visitors::MySQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
         '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
@@ -105,10 +105,14 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << "DATEDIFF("
-        collector = visit o.left, collector
-        collector << Arel::Visitors::MySQL::COMMA
+        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          collector << 'TIMESTAMPDIFF(SECOND, '
+        else
+          collector << "DATEDIFF("
+        end
         collector = visit o.right, collector
+        collector << Arel::Visitors::MySQL::COMMA
+        collector = visit o.left, collector
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::Oracle.class_eval do
-      Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D'}
+      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',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
@@ -66,16 +66,31 @@ module ArelExtensions
         collector
       end
 
+      # :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
         collector << '('
-        collector << 'TO_DATE(' unless o.left_node_type == :date || o.left_node_type == :datetime
+        collector << 'TO_DATE(' if lc
         collector = visit o.left, collector
-        collector << ')' unless o.left_node_type == :date || o.left_node_type == :datetime
+        collector << ')' if lc
         collector << " - "
-        collector << 'TO_DATE(' unless o.right_node_type == :date || o.right_node_type == :datetime
+        collector << 'TO_DATE(' if rc
         collector = visit o.right, collector
-        collector << ')' unless o.right_node_type == :date || o.right_node_type == :datetime
+        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 = visit o.left, collector
+          collector << ')' if lc
+          collector << Arel::Visitors::Oracle::COMMA
+          collector << "'DDD') = "
+          collector << 'TO_DATE(' if lc
+          collector = visit o.left, collector
+          collector << ')' if lc
+          collector << ') THEN 1 ELSE 86400 END' # converts to seconds
+        end
         collector
       end
 

data/lib/arel_extensions/visitors/postgresql.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::PostgreSQL.class_eval do
-      Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW'}
+      Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'IYYY', '%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
@@ -99,13 +99,16 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << "DATE_PART('day'"
+        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          collector << "DATEDIFF('second', "
+        else
+          collector << "DATEDIFF('day', "
+        end
+        collector = visit o.right, collector
+        collector << (o.right_node_type == :date ? '::date' : '::timestamp')
         collector << Arel::Visitors::PostgreSQL::COMMA
         collector = visit o.left, collector
         collector << (o.left_node_type == :date ? '::date' : '::timestamp')
-        collector << " - "
-        collector = visit o.right, collector
-        collector << (o.right_node_type == :date ? '::date' : '::timestamp')
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Visitors
     Arel::Visitors::SQLite.class_eval do
-      Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M'}
+      Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M', 'h' => '%H', 'mn' => '%M', 's' => '%S'}
       Arel::Visitors::SQLite::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
         '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
@@ -45,10 +45,17 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << " julianday("
-        collector = visit o.left, collector
-        collector << ")- julianday("
-        collector = visit o.right, collector
+        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          collector << "strftime('%s', "
+          collector = visit o.left, collector
+          collector << ") - strftime('%s', "
+          collector = visit o.right, collector
+        else
+          collector << "julianday("
+          collector = visit o.left, collector
+          collector << ") - julianday("
+          collector = visit o.right, collector
+        end
         collector << ")"
         collector
       end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -194,7 +194,11 @@ module ArelExtensions
       end
 
   	  def visit_ArelExtensions_Nodes_DateDiff o, collector
-  	    collector << "DATEDIFF("
+        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          collector << 'TIMEDIFF('
+        else
+          collector << "DATEDIFF("
+        end
   	    collector = visit o.left, collector
   	    collector << Arel::Visitors::ToSql::COMMA
   	    collector = visit o.right, collector

data/test/visitors/test_oracle.rb

@@ -60,16 +60,17 @@ module ArelExtensions
       # Maths
       # DateDiff
       it "should diff date col and date" do
-        compile(@table[:created_at] - Date.new(2016, 3, 31)).must_match %{TO_DATE("users"."created_at") - TO_DATE('2016-03-31')}
+        compile(@table[:created_at] - Date.new(2016, 3, 31)).must_match %{"users"."created_at" - TO_DATE('2016-03-31')}
       end
 
       it "should diff date col and datetime col" do
-        compile(@table[:created_at] - @table[:updated_at]).must_match %{TO_DATE("users"."created_at") - TO_DATE("users"."updated_at")}
+        compile(@table[:created_at] - @table[:updated_at]).must_match %{"users"."created_at" - "users"."updated_at"}
       end
 
       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") - TO_DATE("users"."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}
       end
 
       it "should diff between time values" do
@@ -82,7 +83,7 @@ module ArelExtensions
       it "should diff between time values and time col" do
         d1 = DateTime.new(2015,6,2)
         sql = compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]]))
-        sql.must_match %{TO_DATE('2015-06-02') - TO_DATE("users"."updated_at")}
+        sql.must_match %{TO_DATE('2015-06-02') - "users"."updated_at"}
       end
 
       it "should accept operators on dates with numbers" do

data/test/visitors/test_to_sql.rb

@@ -111,7 +111,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_match %{DATEDIFF("users"."updated_at", "users"."created_at") AS new_name}
+        sql.must_match %{TIMEDIFF("users"."updated_at", "users"."created_at") AS new_name}
       end
 
       it "should diff between time values" do
@@ -150,7 +150,7 @@ module ArelExtensions
         c = @table[:name]
         compile(
           (c.length / 42).round(2).floor > (@table[:updated_at] - Date.new(2000, 3, 31)).abs.ceil
-        ).must_be_like %{FLOOR(ROUND(LENGTH("users"."name") / 42, 2)) > CEIL(ABS(DATEDIFF("users"."updated_at", '2000-03-31')))}
+        ).must_be_like %{FLOOR(ROUND(LENGTH("users"."name") / 42, 2)) > CEIL(ABS(TIMEDIFF("users"."updated_at", '2000-03-31 00:00:00 UTC')))}
       end
 
     end

data/test/with_ar/all_agnostic_test.rb

@@ -73,7 +73,7 @@ module ArelExtensions
       def setup
         d = Date.new(2016, 5, 23)
         setup_db
-        u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16, :updated_at => Time.utc(2014, 3, 3, 12, 42)
+        u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16, :updated_at => Time.utc(2014, 3, 3, 12, 42, 0)
         @lucas = User.where(:id => u.id)
         u = User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
         @sophie = User.where(:id => u.id)
@@ -273,8 +273,6 @@ module ArelExtensions
         end
       end
 
-
-
       # Comparators
       def test_number_comparator
         assert_equal 2, User.where(@age < 6).count
@@ -298,13 +296,31 @@ module ArelExtensions
         assert_equal 5, t(@camille, @created_at.month).to_i
         assert_equal 8, User.where(@created_at.month.eq("05")).count
         #Week
-        assert_equal (@env_db == 'mssql' ? 22 : 21), t(@arthur, @created_at.week).to_i
+        assert_equal(@env_db == 'mssql' ? 22 : 21, t(@arthur, @created_at.week).to_i)
         assert_equal 8, User.where(@created_at.month.eq("05")).count
         #Day
         assert_equal 23, t(@laure, @created_at.day).to_i
         assert_equal 0, User.where(@created_at.day.eq("05")).count
+
+        skip "manage DATE" if @env_db == 'oracle'
+        #Hour
+        assert_equal 0, t(@laure, @created_at.hour).to_i
+        assert_equal 12, t(@lucas, @updated_at.hour).to_i
+        #Minute
+        assert_equal 0, t(@laure, @created_at.minute).to_i
+        assert_equal 42, t(@lucas, @updated_at.minute).to_i
+        #Second
+        assert_equal 0, t(@laure, @created_at.second).to_i
+        assert_equal 0, t(@lucas, @updated_at.second).to_i
       end
 
+      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)
+      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.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel