bmg 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35789fefdd2032b4e807b730fb2fc6f5abe163e1
-  data.tar.gz: 2f20b907d1f66560cbe802c6b3fe3e4064b7bfd0
+  metadata.gz: 45a80b1a3fd00fc27f88f37b41816dd11324aa70
+  data.tar.gz: 9d600dd0619e0d814a07db94c95dc093b61584b9
 SHA512:
-  metadata.gz: 8c1182190f70a94825505f358701e3ba728eadcfe7026da40f10b7b7dc9b2ff21d8f2f9ec2ccf24baa880b81728e9ef530830e168a33a2742a196c135445d0e5
-  data.tar.gz: b2e7ef1f3bf5983cfd3ff6fbaff820a04f9f118e39df88728ad6c87fec7261269b9fe22f60d44f9d141ce47c78db5e91399345475835f5c88c7b44b16a1c5873
+  metadata.gz: 38fefe80ca45ddce14d3310621b82b389db5a7c11ab22bb17563c2c6f7dc769f9a54f9a3bebde6c40a2bbecbae215969857a8cf875a7363ad10261fd5b32b75f
+  data.tar.gz: 91492014f31ff3c540df388cac9e362e16555e373ca59ed178bdf32f7098d176947f7e6432df804a8bb3f34210d8a3762b92ce39d37455ff2ee2e55346bf9bce

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/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 1
+    TINY  = 2
   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.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate