bmg 0.20.1 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35789fefdd2032b4e807b730fb2fc6f5abe163e1
-  data.tar.gz: 2f20b907d1f66560cbe802c6b3fe3e4064b7bfd0
+  metadata.gz: bb2c9a67394ec85b7898ecf5c3d0b0dcf9532666
+  data.tar.gz: 6a8c8ed5c60392299225c7187e2d05ac95b59798
 SHA512:
-  metadata.gz: 8c1182190f70a94825505f358701e3ba728eadcfe7026da40f10b7b7dc9b2ff21d8f2f9ec2ccf24baa880b81728e9ef530830e168a33a2742a196c135445d0e5
-  data.tar.gz: b2e7ef1f3bf5983cfd3ff6fbaff820a04f9f118e39df88728ad6c87fec7261269b9fe22f60d44f9d141ce47c78db5e91399345475835f5c88c7b44b16a1c5873
+  metadata.gz: 633a62f541c6f2fe87d20de2809fd2dc3166d1118320623ea3c16edd54435a164ef45d11d8a8475f927203abb0e247083525d280393dc30c0ffc06ff485c70ba
+  data.tar.gz: c8b357936dc6511d3e955b80da8b48dee258adef5d2ad1cd1024fd45c3bd895ed31a382fcf27141c32afa9d0e7728c38866bd1f720830b29fdb941f98dec1411

data/lib/bmg/operator/autowrap.rb

@@ -68,6 +68,20 @@ module Bmg
 
     protected ### optimization
 
+      def _allbut(type, butlist)
+        new_roots = wrapped_roots!
+        separator = @options[:split]
+        down = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          butlist.include?(root)
+        }
+        r = operand.allbut(down)
+        r = r.autowrap(options) unless (butlist & new_roots == new_roots)
+        r
+      rescue UnknownAttributesError
+        super
+      end
+
       def _autowrap(type, opts)
         if same_options?(opts)
           self
@@ -122,11 +136,12 @@ module Bmg
       end
 
       def _project(type, attrlist)
-        if (wrapped_roots! & attrlist).empty?
-          operand.project(attrlist).autowrap(options)
-        else
-          super
-        end
+        separator = @options[:split]
+        to_keep = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          attrlist.include?(root)
+        }
+        operand.project(to_keep).autowrap(options)
       rescue UnknownAttributesError
         super
       end
@@ -169,6 +184,7 @@ module Bmg
 
       def wrapped_roots_of!(r, opts)
         raise UnknownAttributesError unless r.type.knows_attrlist?
+
         Support.wrapped_roots(r.type.to_attrlist, opts[:split])
       end
 

data/lib/bmg/operator/project.rb

@@ -67,6 +67,10 @@ module Bmg
         operand.restrict(predicate).project(attrlist)
       end
 
+      def _allbut(type, butlist)
+        Project.new(type, @operand, attrlist - butlist)
+      end
+
     protected ### inspect
 
       def args

data/lib/bmg/sequel/translator.rb

@@ -11,7 +11,7 @@ module Bmg
       def on_with_exp(sexpr)
         if sequel_db.select(1).supports_cte?
           dataset = apply(sexpr.select_exp)
-          apply(sexpr.with_spec).each_pair do |name,subquery|
+          apply(sexpr.with_spec).each_pair do |name, subquery|
             dataset = dataset.with(name, subquery)
           end
           dataset

data/lib/bmg/sql/nodes/expr.rb

@@ -39,6 +39,10 @@ module Bmg
         not(group_by_clause.nil?)
       end
 
+      def order_by?
+        not(order_by_clause.nil?)
+      end
+
       def ordering
         obc = order_by_clause
         obc && order_by_clause.to_ordering

data/lib/bmg/sql/processor/limit_offset.rb

@@ -18,12 +18,19 @@ module Bmg
         alias :on_intersect :on_set_operator
 
         def on_select_exp(sexpr)
-          sexpr  = builder.from_self(sexpr) if obc = sexpr.limit_or_offset?
+          sexpr = builder.from_self(sexpr) if must_from_self?(sexpr)
+
           limit_clause = builder.limit_clause(limit)
           offset_clause = builder.offset_clause(offset)
           sexpr.with_push(limit_clause, offset_clause)
         end
 
+      private
+
+        def must_from_self?(sexpr)
+          sexpr.limit_or_offset?
+        end
+
       end # class LimitOffset
     end # class Processor
   end # module Sql

data/lib/bmg/sql/processor/order_by.rb

@@ -17,7 +17,7 @@ module Bmg
         alias :on_intersect :on_set_operator
 
         def on_select_exp(sexpr)
-          if obc = sexpr.order_by_clause
+          if sexpr.order_by? || sexpr.group_by?
             sexpr = builder.from_self(sexpr)
             call(sexpr)
           else

data/lib/bmg/type.rb

@@ -46,6 +46,11 @@ module Bmg
     attr_accessor :attrlist
     protected :attrlist=
 
+    def attrlist!
+      knows_attrlist!
+      attrlist
+    end
+
     def with_attrlist(attrlist)
       dup.tap{|x|
         x.attrlist = attrlist

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 1
+    TINY  = 4
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.4
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate