bmg 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f3bf703312e48ca61bb2dbc88711be1dde8a89
-  data.tar.gz: 4f5029df9dc203d7ec82c0da066771ed61fe6182
+  metadata.gz: 611ca787e8f1fa6fc240f245bb27a606be9ff9a2
+  data.tar.gz: 6b573c0c20c2224595bdc00af3c9892de6ce7483
 SHA512:
-  metadata.gz: e9ac87e62f17250706eefb5ce091e3e77f0b91268910ae0a9fa1446eda6adaeed4ef852d022ecab8c9869b5b5da34db678bf7af811c93de08aad1bec28a39b37
-  data.tar.gz: 7c4117b376c5a406612729c9dfb27b5e22e76ec96e269652bf3a99b53d5c890dfc38c3d269558d08267ca8d4aeaad1c60bad89bc4d24e3b0079a10fc49bff73d
+  metadata.gz: 4ac0ab63a95c91e9cdaa8b6774d3cc5d576017b42807fd6ecef2918d2efedec7a16c67f4089fc288a1b9e9a61edbab78db4da1d87cfae039242d079068ee476a
+  data.tar.gz: 688d057048b65194aafb7ce42b58f8b0b4e7cb6f99e5816f404fcb2d1946d70d68a92a5982fafe5046e73affa4999113111b5b75b4a2bd09e42bc19d720256ce

data/README.md

@@ -1,7 +1,5 @@
 # Bmg, a relational algebra (Alf's successor)!
 
-[![Build Status](https://travis-ci.com/enspirit/bmg.svg?branch=master)](https://travis-ci.com/enspirit/bmg)
-
 Bmg is a relational algebra implemented as a ruby library. It implements the
 [Relation as First-Class Citizen](http://www.try-alf.org/blog/2013-10-21-relations-as-first-class-citizen)
 paradigm contributed with [Alf](http://www.try-alf.org/) a few years ago.
@@ -210,6 +208,7 @@ r.autowrap(split: '_')                       # structure a flat relation, split:
 r.autosummarize([:a, :b, ...], x: :sum)      # (experimental) usual summarizers supported
 r.constants(x: 12, ...)                      # add constant attributes (sometimes useful in unions)
 r.extend(x: ->(t){ ... }, ...)               # add computed attributes
+r.extend(x: :y)                              # shortcut for r.extend(x: ->(t){ t[:y] })
 r.exclude(predicate)                         # shortcut for restrict(!predicate)
 r.group([:a, :b, ...], :x)                   # relation-valued attribute from attributes
 r.image(right, :x, [:a, :b, ...])            # relation-valued attribute from another relation

data/lib/bmg/operator/extend.rb

@@ -160,7 +160,12 @@ module Bmg
 
       def extend_it(tuple)
         @extension.each_with_object(tuple.dup) { |(k,v), memo|
-          memo[k] = v.call(tuple)
+          memo[k] = case v
+          when Symbol
+            tuple[v]
+          else
+            v.call(tuple)
+          end
           memo
         }
       end

data/lib/bmg/sequel/translator.rb

@@ -81,6 +81,7 @@ module Bmg
         case sexpr.func_name
         when :cast
           to_cast = apply(sexpr.func_args.first)
+          to_cast = ::Sequel.expr(nil) if to_cast.nil?
           type = sexpr.func_args.last.last
           to_cast.cast(type)
         else

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

@@ -0,0 +1,33 @@
+module Bmg
+  module Sql
+    class Processor
+      class Extend < Processor
+
+        def initialize(extension, builder)
+          super(builder)
+          @extension = extension
+        end
+        attr_reader :extension
+
+        def on_set_operator(sexpr)
+          apply(builder.from_self(sexpr))
+        end
+        alias :on_union     :on_set_operator
+        alias :on_except    :on_set_operator
+        alias :on_intersect :on_set_operator
+
+        def on_select_star(sexpr)
+          raise NotImplementedError, "Extend on * is not supported"
+        end
+
+        def on_select_list(sexpr)
+          sexpr + extension.each_pair.map{|(k,v)|
+            desaliased = sexpr.desaliaser[v]
+            [:select_item, desaliased, [:column_name, k] ]
+          }
+        end
+
+      end # class Extend
+    end # class Processor
+  end # module Sql
+end # module Bmg

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

@@ -10,7 +10,7 @@ module Bmg
 
         def on_select_list(sexpr)
           reordered = sexpr.sexpr_body.sort{|i1,i2|
-            @indexes[i1.as_name] <=> @indexes[i2.as_name]
+            @indexes[i1.as_name.to_s] <=> @indexes[i2.as_name.to_s]
           }
           reordered.unshift(:select_list)
         end

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

@@ -39,9 +39,10 @@ module Bmg
         def falsy?(sexpr)
           return false unless sexpr.respond_to?(:predicate)
           return false if sexpr.predicate.nil?
+
           left  = Predicate.new(Predicate::Grammar.sexpr(sexpr.predicate)).unqualify
           right = Predicate.new(Predicate::Grammar.sexpr(@predicate.sexpr)).unqualify
-          return (left & right).contradiction?
+          (left & right).contradiction?
         end
 
       end # class Where

data/lib/bmg/sql/processor.rb

@@ -71,6 +71,7 @@ require_relative 'processor/distinct'
 require_relative 'processor/all'
 require_relative 'processor/clip'
 require_relative 'processor/constants'
+require_relative 'processor/extend'
 require_relative 'processor/star'
 require_relative 'processor/rename'
 require_relative 'processor/order_by'

data/lib/bmg/sql/relation.rb

@@ -57,6 +57,23 @@ module Bmg
         _instance(type, builder, expr)
       end
 
+      def _extend(type, extension)
+        supported, unsupported = {}, {}
+        extension.each_pair do |k,v|
+          (v.is_a?(Symbol) ? supported : unsupported)[k] = v
+        end
+        if supported.empty?
+          Operator::Extend.new(type, self, extension)
+        elsif unsupported.empty?
+          expr = Processor::Extend.new(supported, builder).call(self.expr)
+          _instance(type, builder, expr)
+        else
+          expr = Processor::Extend.new(supported, builder).call(self.expr)
+          operand = _instance(type.allbut(unsupported.keys), builder, expr)
+          Operator::Extend.new(type, operand, unsupported)
+        end
+      end
+
       def _join(type, right, on)
         if right_expr = extract_compatible_sexpr(right)
           right_expr = Processor::Requalify.new(builder).call(right_expr)

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 19
-    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.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -248,6 +248,7 @@ files:
 - lib/bmg/sql/processor/clip.rb
 - lib/bmg/sql/processor/constants.rb
 - lib/bmg/sql/processor/distinct.rb
+- lib/bmg/sql/processor/extend.rb
 - lib/bmg/sql/processor/flatten.rb
 - lib/bmg/sql/processor/from_self.rb
 - lib/bmg/sql/processor/join.rb