arel_extensions 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5080e8422006270a6c69337931908b043c1c494679d453a8ea89328390e84174
-  data.tar.gz: 9189ce88f62c39a385dc5b5fa55a021d8c7c2967d7025eb4710d1403ac9dc078
+  metadata.gz: 72685b8ade2abd10db2d50ecc780270dc78719a3de6d6c3f8557327156fe547f
+  data.tar.gz: cc3b63b40337dadd04db2cd6e4db0499998a4ac0b2fd66e0b725436023727b78
 SHA512:
-  metadata.gz: f477cee1a8ce18be9346c1b10fc10b90e0cf28921f2dc518a67e49aba8dba771b73a0c2d822b2fd6336b4596c0684526f044b0d02d0b4c77792c765174d7d350
-  data.tar.gz: 45da36b498e8c905e2d6793234fa2a094947e450a9a58e52d272ade8d63f474008d2bfc2ec674305224bc8650a9e55d3446211fb5f0258ad7a2bcada2a38e991
+  metadata.gz: 7b3deec07810ebb8d6b49da83b2c79066e1aeb298a868007ce8aba509767ca21fb9c9b4634407fa0dd5b97c58755096a208ffade5b3057847e89b61fbc68f94a
+  data.tar.gz: eb1908f418374e4cd5631e6d07116ec2f1bc8936dd7f113871985abe5e198ebc6b4955eb37b694e36c1c7991153444d7107b6a333c53fb1d1269ffa960dade91

data/lib/arel_extensions.rb

@@ -36,7 +36,7 @@ class Arel::Nodes::Function
   include Arel::Expressions
 end
 
-if Arel::VERSION >= "7.1.0"
+if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("7.1.0")
   class Arel::Nodes::Case
     include Arel::Math
     include Arel::Expressions
@@ -183,3 +183,14 @@ class Arel::Table
     name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
   end
 end
+
+class Arel::Nodes::TableAlias
+  def method_missing(*args)
+    met = args.shift.to_sym
+    if self.relation.respond_to?(met)
+      self.relation.send(met,args)
+    else
+      super
+    end
+  end
+end

data/lib/arel_extensions/nodes/case.rb

@@ -1,7 +1,11 @@
 module ArelExtensions
   module Nodes
-    if Arel::VERSION < "7.1.0"
+    if Gem::Version.new(Arel::VERSION) < Gem::Version.new("7.1.0")
       class Case < Arel::Nodes::Node
+        include Arel::Expressions
+        include Arel::Math
+        include Arel::Predications
+        include Arel::OrderPredications
         attr_accessor :case, :conditions, :default
 
         def initialize expression = nil, default = nil
@@ -28,6 +32,8 @@ module ArelExtensions
 
     class ArelExtensions::Nodes::Case
       include Arel::Expressions
+      include Arel::Math
+      include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Math
       include ArelExtensions::Comparators

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.8".freeze
+  VERSION = "2.0.9".freeze
 end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -364,16 +364,6 @@ module ArelExtensions
         collector
       end
 
-
-      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-      def visit_Arel_Nodes_SelectStatement o, collector
-        if !collector.value.blank? && o.limit.blank?
-          o = o.dup
-          o.orders = []
-        end
-        old_visit_Arel_Nodes_SelectStatement(o,collector)
-      end
-
       alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
       def visit_Arel_Nodes_As o, collector
         if o.left.is_a?(Arel::Nodes::Binary)

data/lib/arel_extensions/visitors/to_sql.rb

@@ -624,7 +624,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         if o.as_array
-          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ',o.orders) : o.dict.group_concat(', ')) + ']'
+          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') + ']'
           collector = visit res, collector
         else
           res = Arel::Nodes.build_quoted('{')
@@ -639,7 +639,7 @@ module ArelExtensions
             else
               kv += v
             end
-            res = res + kv.group_concat(', ',orders)
+            res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'
           collector = visit res, collector

data/test/visitors/test_to_sql.rb

@@ -463,6 +463,13 @@ module ArelExtensions
           .must_be_like %{(LOCATE('test', "users"."name") + 1) ASC}
       end
 
+      it "should be possible to call Table function on TableAlias" do
+        t = @table
+        a = t.alias("aliased_users")
+        _(compile(a.join(t).join_sources))
+            .must_be_like %{INNER JOIN \"users\"}
+      end
+
       describe "logical functions" do
 
         it "should know about truth" do

data/test/with_ar/all_agnostic_test.rb

@@ -581,6 +581,7 @@ module ArelExtensions
       # Case clause
       def test_case
         assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
+        assert_equal 4, User.where(@score.when(20.16).then(1).else(0).eq(1)).count
         assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)
         assert_equal 0, t(@arthur, @score.when(65.62,1).else(0)-1)
         assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1")

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.12".freeze
+  VERSION = "1.2.13".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.8".freeze
+  VERSION = "2.0.9".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord