arel_extensions 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e8a31276fb8b6bba831c0934378f6e45150e86
-  data.tar.gz: 36aa4b3a0792e618cc2fce1ea7afd0736b2229f6
+  metadata.gz: 708dfbc3e662298b3d0cb782b5555182ea9758a3
+  data.tar.gz: 71bb77c55986474cf7a55b4687a2eca93517df47
 SHA512:
-  metadata.gz: 0ea1d6ad9ee4b4417edee7773cc86982e8dc844e5e6d907fbf859c806b152a7b0dd96832fa452d760157e26a5774282544761aa045633ad19592dc6fea377585
-  data.tar.gz: 1ee956c003f1d2edcae2d57c38b3e66205091c66323e9dda0c0c46138b9b0fe11679a7ad5c92aecda65e6cd9f0f03f4a1d59fb30f68a8c0cedbf6d8e39c39062
+  metadata.gz: b98769af5db36a1ad6bc978e5ca5787ef423ad4be3c8708024e199825809fb75fa6a34b7a92468842a55679dd11e4cfb3fcc5dc1105fca6bf7d289f0a120dca0
+  data.tar.gz: ff10289ae7c04a4849bddcdcf5046e9adc7dd20913ab37914d0a81e4825597ce9bff4273608ea524607086191df016d4e6719bf5e3d06258c9135a1756723a65

data/lib/arel_extensions.rb

@@ -61,7 +61,6 @@ require 'arel_extensions/common_sql_functions'
 
 require 'arel_extensions/nodes/union'
 require 'arel_extensions/nodes/union_all'
-require 'arel_extensions/nodes/as'
 require 'arel_extensions/nodes/case'
 require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/cast'
@@ -75,8 +74,16 @@ module Arel
   end
   
   def self.shorten s
-	Base64.urlsafe_encode64(Digest::MD5.new.digest(s)).tr('=', '').tr('-', '_')
-  end  
+    Base64.urlsafe_encode64(Digest::MD5.new.digest(s)).tr('=', '').tr('-', '_')
+  end
+
+  def self.json *expr
+    if expr.length == 1
+      ArelExtensions::Nodes::Json.new(expr.first)
+    else
+      ArelExtensions::Nodes::Json.new(expr)
+    end
+  end
 end
 
 Arel::Attributes::Attribute.class_eval do
@@ -129,7 +136,7 @@ Arel::SelectManager.class_eval do
   include ArelExtensions::Nodes
 end
 
-Arel::Nodes::As.class_eval do	
+Arel::Nodes::As.class_eval do
   include ArelExtensions::Nodes
 end
 

data/lib/arel_extensions/nodes/case.rb

@@ -1,106 +1,106 @@
 module ArelExtensions
-	module Nodes    
-		if Arel::VERSION < "7.1.0"
-			class Case < Arel::Nodes::Node
-				attr_accessor :case, :conditions, :default
+  module Nodes
+    if Arel::VERSION < "7.1.0"
+      class Case < Arel::Nodes::Node
+        attr_accessor :case, :conditions, :default
 
-				def initialize expression = nil, default = nil
-					@case = expression
-					@conditions = []
-					@default = default
-				end
+        def initialize expression = nil, default = nil
+          @case = expression
+          @conditions = []
+          @default = default
+        end
 
-				class When < Arel::Nodes::Binary # :nodoc:
-				end
+        class When < Arel::Nodes::Binary # :nodoc:
+        end
 
-				class Else < Arel::Nodes::Unary # :nodoc:
-				end
+        class Else < Arel::Nodes::Unary # :nodoc:
+        end
 
-			end
-		else
-			class Case < Arel::Nodes::Case
-				class When < Arel::Nodes::When # :nodoc:
-				end
-				class Else < Arel::Nodes::Else # :nodoc:
-				end
-			end
-		end
+      end
+    else
+      class Case < Arel::Nodes::Case
+        class When < Arel::Nodes::When # :nodoc:
+        end
+        class Else < Arel::Nodes::Else # :nodoc:
+        end
+      end
+    end
 
-		ArelExtensions::Nodes::Case.class_eval do
-			include Arel::Expressions
-			include Arel::OrderPredications
-			include ArelExtensions::Math
-			include ArelExtensions::Comparators
-			include ArelExtensions::Predications
-			include ArelExtensions::MathFunctions
-			include ArelExtensions::StringFunctions
-			include ArelExtensions::NullFunctions
+    ArelExtensions::Nodes::Case.class_eval do
+      include Arel::Expressions
+      include Arel::OrderPredications
+      include ArelExtensions::Math
+      include ArelExtensions::Comparators
+      include ArelExtensions::Predications
+      include ArelExtensions::MathFunctions
+      include ArelExtensions::StringFunctions
+      include ArelExtensions::NullFunctions
 
-			def return_type
-				obj = if @conditions.length > 0
-						@conditions.last.right
-					elsif @default
-						@default.expr
-					else
-						nil
-					end
-				if obj.respond_to?(:return_type)
-					obj.return_type
-				else
-					case obj
-					when Integer, Float
-						:number
-					when Date, DateTime,Time
-						:datetime
-					when Arel::Attributes::Attribute
-						begin
-							Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].type
-						rescue Exception
-							:string
-						end
-					else
-						:string
-					end
-				end
-			end
+      def return_type
+        obj = if @conditions.length > 0
+            @conditions.last.right
+          elsif @default
+            @default.expr
+          else
+            nil
+          end
+        if obj.respond_to?(:return_type)
+          obj.return_type
+        else
+          case obj
+          when Integer, Float
+            :number
+          when Date, DateTime,Time
+            :datetime
+          when Arel::Attributes::Attribute
+            begin
+              Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].type
+            rescue Exception
+              :string
+            end
+          else
+            :string
+          end
+        end
+      end
 
-			def when condition, expression = nil
-				@conditions << Case::When.new(condition, expression)
-				self
-			end
+      def when condition, expression = nil
+        @conditions << Case::When.new(condition, expression)
+        self
+      end
 
-			def then expression
-				@conditions.last.right = expression
-				self
-			end
+      def then expression
+        @conditions.last.right = expression
+        self
+      end
 
-			def else expression
-				@default = Case::Else.new expression
-				self
-			end
+      def else expression
+        @default = Case::Else.new expression
+        self
+      end
 
-			def initialize_copy other
-				super
-				@case = @case.clone if @case
-				@conditions = @conditions.map { |x| x.clone }
-				@default = @default.clone if @default
-			end
+      def initialize_copy other
+        super
+        @case = @case.clone if @case
+        @conditions = @conditions.map { |x| x.clone }
+        @default = @default.clone if @default
+      end
 
-			def hash
-				[@case, @conditions, @default].hash
-			end
+      def hash
+        [@case, @conditions, @default].hash
+      end
 
-			def eql? other
-				self.class == other.class &&
-				self.case == other.case &&
-				self.conditions == other.conditions &&
-				self.default == other.default
-			end
-			alias :== :eql?
+      def eql? other
+        self.class == other.class &&
+        self.case == other.case &&
+        self.conditions == other.conditions &&
+        self.default == other.default
+      end
+      alias :== :eql?
 
-			def as other
-				ArelExtensions::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-			end
-		end
-	end
+      def as other
+        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+      end
+    end
+  end
 end

data/lib/arel_extensions/nodes/duration.rb

@@ -20,11 +20,6 @@ module ArelExtensions
         @expressions[1]
       end
 
-
-      #def as other
-      #  Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other.to_s)
-      #end
-
     end
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -17,7 +17,7 @@ module ArelExtensions
       end
 
       def as other
-        ArelExtensions::Nodes::As.new(self, Arel.sql(other))
+        Arel::Nodes::As.new(self, Arel.sql(other))
       end
 
       def expr

data/lib/arel_extensions/nodes/json.rb

@@ -17,8 +17,13 @@ module ArelExtensions
       def set key, value
         JsonSet.new(self,key,value)
       end
+
+      def group as_array = true, orders= nil
+        JsonGroup.new(self,as_array, orders)
+      end
+
     end
-    
+
     class Json < JsonNode
 
       def initialize *expr
@@ -56,6 +61,22 @@ module ArelExtensions
     class JsonMerge < JsonNode
     end
 
+    class JsonGroup < JsonNode
+      attr_accessor :as_array, :orders
+
+      def initialize json, as_array = true, orders = nil
+        @hash = as_array ? json : json.hash
+        @as_array = as_array
+        if orders
+          if orders.is_a?(Array)
+            @orders = orders
+          else
+            @orders = [orders]
+          end
+        end
+      end
+    end
+
     class JsonGet < JsonNode
       attr_accessor :key
 

data/lib/arel_extensions/nodes/wday.rb

@@ -14,10 +14,6 @@ module ArelExtensions
         @expressions.first
       end
 
-      #def as other
-      #  Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-      #end
-
     end
   end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.9".freeze
+  VERSION = "1.1.10".freeze
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -386,7 +386,16 @@ module ArelExtensions
         collector
       end
 
+      # JSON if implemented only after 10.2.3 in MariaDb and 5.7 in MySql
+      def json_supported?
+        Arel::Table.engine.connection.send(:mariadb?) &&
+        Arel::Table.engine.connection.send(:version) >= '10.2.3' ||
+        !Arel::Table.engine.connection.send(:mariadb?) &&
+        Arel::Table.engine.connection.send(:version) >= '5.7.0'
+      end
+
       def visit_ArelExtensions_Nodes_Json o,collector
+        return super if !json_supported?
         case o.hash
         when Array
           collector << 'JSON_ARRAY('
@@ -454,6 +463,35 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_JsonGroup o, collector
+        if o.as_array
+          collector << 'JSON_ARRAYAGG('
+          collector = visit o.hash, collector
+          collector << ')'
+        else
+          case o.hash
+          when Hash
+            collector << 'JSON_MERGE_PATCH(' if o.hash.length > 1
+            o.hash.each.with_index do |(k,v),i|
+              if i != 0
+                collector << Arel::Visitors::MySQL::COMMA
+              end
+              collector << 'JSON_OBJECTAGG('
+              collector = visit k, collector
+              collector << Arel::Visitors::MySQL::COMMA
+              collector = visit v, collector
+              collector << ')'
+            end
+            collector << ')' if o.hash.length > 1
+          else
+            collector << 'JSON_OBJECTAGG('
+            collector = visit o.hash, collector
+            collector << ')'
+          end
+        end
+        collector
+      end
+
     end
   end
 end

data/lib/arel_extensions/visitors/oracle.rb

@@ -536,6 +536,10 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_As o, collector
+        visit_Arel_Nodes_As o, collector
+      end
+
       alias_method :old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name

data/lib/arel_extensions/visitors/postgresql.rb

@@ -464,6 +464,33 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_JsonGroup o, collector
+        if o.as_array
+          collector << 'jsonb_agg('
+          collector = visit o.hash, collector
+          collector << ')'
+        else
+          case o.hash
+          when Hash
+            o.hash.each.with_index do |(k,v),i|
+              if i != 0
+                collector << ' || '
+              end
+              collector << 'jsonb_object_agg('
+              collector = visit k, collector
+              collector << Arel::Visitors::MySQL::COMMA
+              collector = visit v, collector
+              collector << ')'
+            end
+          else
+            collector << 'jsonb_object_agg('
+            collector = visit o.hash, collector
+            collector << ')'
+          end
+        end
+        collector
+      end
+
     end
   end
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -459,20 +459,7 @@ module ArelExtensions
         collector = visit o.right, collector
         collector
       end
-  
-      def visit_ArelExtensions_Nodes_As o, collector
-        if o.left.is_a?(ArelExtensions::Nodes::Union) || o.left.is_a?(ArelExtensions::Nodes::UnionAll)
-          collector << "("
-          collector = visit o.left, collector
-          collector << ") "
-          visit o.right, collector
-        else
-          collector = visit o.left, collector
-          collector << " AS "
-          visit o.right, collector
-        end
-      end
-  
+
       def visit_ArelExtensions_Nodes_Case o, collector
         collector << "CASE "
         if o.case
@@ -591,7 +578,7 @@ module ArelExtensions
               res += ', '
             end
             res += Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.try(:return_type) == :string) # TODO : remove the try
+            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
               res = res + '"' + v + '"'
             else
               res += v
@@ -605,6 +592,31 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_JsonGroup o, collector
+        if o.as_array
+          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.hash.group_concat(', ',o.orders) : o.hash.group_concat(', ')) + ']'
+          collector = visit res, collector
+        else
+          res = Arel::Nodes.build_quoted('{')
+          orders = o.orders || o.hash.keys
+          o.hash.each.with_index do |(k,v),i|
+            if i != 0
+              res = res + ', '
+            end
+            kv = Arel::Nodes.build_quoted('"')+k + '": '
+            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
+              kv = kv + '"' + v + '"'
+            else
+              kv += v
+            end
+            res = res + kv.group_concat(', ',orders)
+          end
+          res = res + '}'
+          collector = visit res, collector
+        end
+        collector
+      end
+
     end
   end
 end

data/test/with_ar/all_agnostic_test.rb

@@ -694,18 +694,25 @@ module ArelExtensions
       def test_json
         skip "Can't be tested on travis"
         #creation
-        assert_equal 'Arthur', t(@arthur,ArelExtensions::Nodes::Json.new(@name))
-        assert_equal ["Arthur","Arthur"], parse_json(t(@arthur,ArelExtensions::Nodes::Json.new(@name,@name)))
-        assert_equal ({"Arthur" => "Arthur", "Arthur2" => "ArthurArthur"}), parse_json(t(@arthur,ArelExtensions::Nodes::Json.new({@name => @name,@name+"2" => @name+@name})))
-        assert_equal ({"Arthur" => "Arthur","Arthur2" => 1}), parse_json(t(@arthur,ArelExtensions::Nodes::Json.new({@name => @name,@name+"2" => 1})))
-        assert_equal ([{"age" => 21},{"name" => "Arthur","score" => 65.62}]), parse_json(t(@arthur,ArelExtensions::Nodes::Json.new([{age: @age},{name: @name,score: @score}])))
-
+        assert_equal 'Arthur', t(@arthur,Arel.json(@name))
+        assert_equal ["Arthur","Arthur"], parse_json(t(@arthur,Arel.json(@name,@name)))
+        assert_equal ({"Arthur" => "Arthur", "Arthur2" => "ArthurArthur"}), parse_json(t(@arthur,Arel.json({@name => @name,@name+"2" => @name+@name})))
+        assert_equal ({"Arthur" => "Arthur","Arthur2" => 1}), parse_json(t(@arthur,Arel.json({@name => @name,@name+"2" => 1})))
+        assert_equal ([{"age" => 21},{"name" => "Arthur","score" => 65.62}]), parse_json(t(@arthur,Arel.json([{age: @age},{name: @name,score: @score}])))
+
+        # aggregate
+        assert_equal ({"5" => "Lucas", "15" => "Sophie", "23" => "Myung", "25" => "Laure"}),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name}).group(false)))
+        assert_equal ({"5" => "Lucas", "15" => "Sophie", "23" => "Myung", "25" => "Laure", "Laure"=>25, "Lucas"=>5, "Myung"=>23, "Sophie"=>15}),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name,@name => @age}).group(false)))
+        assert_equal ([{"5" => "Lucas"},{ "15" => "Sophie"},{ "23" => "Myung"},{ "25" => "Laure"}]),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name}).group(true,[@age])))
+              
         skip "Not Yet Implemented" if $sqlite || ['oracle','mssql'].include?(@env_db)
-
         #get
-        h1 = ArelExtensions::Nodes::Json.new({@name => @name+@name,@name+"2" => 1})
+        h1 = Arel.json({@name => @name+@name,@name+"2" => 1})
         assert_equal "ArthurArthur", parse_json(t(@arthur,h1.get(@name)))
-        h2 = ArelExtensions::Nodes::Json.new([{age: @age},{name: @name,score: @score}])
+        h2 = Arel.json([{age: @age},{name: @name,score: @score}])
         assert_equal ({"age" => 21}), parse_json(t(@arthur,h2.get(0)))
         assert_equal 21, parse_json(t(@arthur,h2.get(0).get('age')))
         assert_nil t(@arthur,h2.get('age'))
@@ -724,7 +731,7 @@ module ArelExtensions
         name = @arthur.select(@name.as('NaMe')).first.attributes
         assert_equal 'Arthur', name["NaMe"] || name["name"] #because of Oracle
         assert_equal 'Arthur', @arthur.select(@name.as('Na Me')).first.attributes["Na Me"]
-        assert_equal 'Arthur', @arthur.select(@name.as('Na-Me')).first.attributes["Na-Me"]
+        assert_equal 'ArthurArthur', @arthur.select((@name+@name).as('Na-Me')).first.attributes["Na-Me"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -120,7 +120,6 @@ files:
 - lib/arel_extensions/math_functions.rb
 - lib/arel_extensions/nodes.rb
 - lib/arel_extensions/nodes/abs.rb
-- lib/arel_extensions/nodes/as.rb
 - lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/case.rb
 - lib/arel_extensions/nodes/cast.rb

data/lib/arel_extensions/nodes/as.rb

@@ -1,12 +0,0 @@
-module ArelExtensions
-  module Nodes
-    class As < Arel::Nodes::As
-    
-      def initialize left,right
-        return super(left,right)
-      end
-    end
-  end
-end
-
-