bmg 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67347fd77660f79d3e4d4bfa09199881b03e94ae
-  data.tar.gz: c3f52c0219760d8382738106e78bf997633abf93
+  metadata.gz: b7cf04c07c2f88598d086c9eb174c857995a3646
+  data.tar.gz: 368fdda422f043d57c7da57f5019b4682e9d37eb
 SHA512:
-  metadata.gz: b4e91ccd011024741b24b84d31e6b4e23feda9a9b6e7398cf4ad2f534b05205f1f4fef6003635fe31232d9dfabc8852d81642b76535a046aa1f309132b770a61
-  data.tar.gz: c9ed01a662aec36ba2b77ca315051d512950fa008c09fd9b3abc8f30dba1d2bb4d881856d0d39919084461141756bbced69afe7a58c365382b34626fc35ec4fe
+  metadata.gz: 9ef7574e4dfe6e30619310daf922e16ca20f5721f2d4f339a13fd8077520316215d8306f6b7150a3df5648944163fc5bb9329d40663b6ccf4be1eeba7d26af4c
+  data.tar.gz: a5c71d8cfb1b9e52ab360b3deaffc6c9986b7388154b78141256a83b949300b329c433f7a265cf97d6ab1ba7433ebd08f15e0a549fb39f2b02f19cb2d5cd5a7b

data/lib/bmg/algebra.rb

@@ -2,6 +2,7 @@ module Bmg
   module Algebra
 
     def allbut(butlist = [])
+      return self if butlist.empty?
       _allbut self.type.allbut(butlist), butlist
     end
 
@@ -142,6 +143,7 @@ module Bmg
     protected :_restrict
 
     def union(other, options = {})
+      return self if other.is_a?(Relation::Empty)
       _union self.type.union(other.type), other, options
     end
 

data/lib/bmg/relation/empty.rb

@@ -44,6 +44,10 @@ module Bmg
         Empty.new(type)
       end
 
+      def _constants(type, cs)
+        Empty.new(type)
+      end
+
       def _extend(type, *args)
         Empty.new(type)
       end

data/lib/bmg/sequel.rb

@@ -7,9 +7,13 @@ module Bmg
 
     def sequel(*args, &bl)
       source, sequel_db, type = sequel_params(*args, &bl)
-      builder = Sql::Builder.new
-      sexpr = builder.select_all(type.to_attrlist, source)
-      Sequel::Relation.new(type, builder, sexpr, sequel_db).spied(Bmg.main_spy)
+      if type
+        builder = Sql::Builder.new
+        sexpr = builder.select_all(type.to_attrlist, source)
+        Sequel::Relation.new(type, builder, sexpr, sequel_db).spied(Bmg.main_spy)
+      else
+        Bmg::Relation.new(source)
+      end
     end
     module_function :sequel
 
@@ -18,16 +22,15 @@ module Bmg
       sequel_db = source.db if sequel_db.nil? and source.is_a?(::Sequel::Dataset)
       raise ArgumentError, "A Sequel::Database object is required" if sequel_db.nil?
       raise ArgumentError, "Type's attrlist must be known (#{type})" if type && !type.knows_attrlist?
-      type = infer_type!(sequel_db, source) if type.nil?
+      type = infer_type(sequel_db, source) if type.nil?
       [source, sequel_db, type]
     end
     module_function :sequel_params
 
-    def infer_type!(sequel_db, source)
-      raise "Sequel::Relation requires a type for `#{source}`" unless source.is_a?(Symbol)
-      TypeInference.new(sequel_db).call(source)
+    def infer_type(sequel_db, source)
+      TypeInference.new(sequel_db).call(source) if source.is_a?(Symbol)
     end
-    module_function :infer_type!
+    module_function :infer_type
 
   end
 

data/lib/bmg/sequel/translator.rb

@@ -28,9 +28,9 @@ module Bmg
       end
 
       def on_set_operator(sexpr)
-        left, right = apply(sexpr.left), apply(sexpr.right)
-        left = left.from_self if sexpr.left.set_operator?
-        left.send(sexpr.first, right, all: sexpr.all?, from_self: false)
+        sexpr.tail_exprs.inject(apply(sexpr.head_expr)) do |left,right|
+          left.send(sexpr.first, apply(right), all: sexpr.all?, from_self: false)
+        end
       end
       alias :on_union     :on_set_operator
       alias :on_intersect :on_set_operator
@@ -65,10 +65,13 @@ module Bmg
       def on_select_item(sexpr)
         left  = apply(sexpr.left)
         right = apply(sexpr.right)
-        if left.column == right.value
-          left
-        else
+        case kind = sexpr.left.first
+        when :qualified_name
+          left.column == right.value ? left : ::Sequel.as(left, right)
+        when :literal
           ::Sequel.as(left, right)
+        else
+          raise NotImplementedError, "Unexpected select item `#{kind}`"
         end
       end
 
@@ -85,7 +88,7 @@ module Bmg
       end
 
       def on_table_name(sexpr)
-        ::Sequel.identifier(sexpr.last)
+        ::Sequel.expr(sexpr.last.to_sym)
       end
 
       def on_cross_join(sexpr)
@@ -102,7 +105,7 @@ module Bmg
       end
 
       def on_table_as(sexpr)
-        ::Sequel.as(::Sequel.identifier(sexpr.table_name), ::Sequel.identifier(sexpr.as_name))
+        ::Sequel.as(::Sequel.expr(sexpr.table_name.to_sym), ::Sequel.identifier(sexpr.as_name))
       end
 
       def on_subquery_as(sexpr)

data/lib/bmg/sql/builder.rb

@@ -67,6 +67,13 @@ module Bmg
       end
       builder :select_list
 
+      def select_literal_item(literal, as)
+        [:select_item,
+          literal(literal),
+          column_name(as.to_s)]
+      end
+      builder :select_literal_item
+
       def select_item(qualifier, name, as = name)
         [:select_item,
           qualified_name(qualifier, name.to_s),
@@ -158,6 +165,11 @@ module Bmg
       end
       builder :offset_clause
 
+      def literal(lit)
+        [:literal, lit]
+      end
+      builder :literal
+
       def from_self(sexpr)
         Processor::FromSelf.new(self).call(sexpr)
       end

data/lib/bmg/sql/grammar.sexp.yml

@@ -14,13 +14,13 @@ rules:
     - intersect
     - select_exp
   union:
-    - [ all, nonjoin_exp, nonjoin_exp ]
+    - [ all, nonjoin_exp+ ]
   all:
     - truth_value
   except:
-    - [ set_quantifier, nonjoin_exp, nonjoin_exp ]
+    - [ set_quantifier, nonjoin_exp+ ]
   intersect:
-    - [ set_quantifier, nonjoin_exp, nonjoin_exp ]
+    - [ set_quantifier, nonjoin_exp+ ]
   join_exp:
     - cross_join
     - inner_join

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

@@ -79,8 +79,8 @@ module Bmg
         find_child(:offset_clause)
       end
 
-      def desaliaser
-        select_list.desaliaser
+      def desaliaser(*args, &bl)
+        select_list.desaliaser(*args, &bl)
       end
 
     ### to_xxx

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

@@ -3,10 +3,19 @@ module Bmg
     module SelectList
       include Expr
 
-      def desaliaser
+      def desaliaser(for_predicate = false)
         ->(a){
           item = sexpr_body.find{|item| item.as_name.to_s == a.to_s }
-          item && item.left
+          return nil unless left = item && item.left
+          return left unless for_predicate
+          case left.first
+          when :literal
+            Predicate::Grammar.sexpr([:literal, left.last])
+          when :qualified_name
+            Predicate::Grammar.sexpr([:qualified_identifier, left.qualifier.to_sym, left.as_name.to_sym])
+          else
+            raise "Unexpected select_item `#{left}`"
+          end
         }
       end
 

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

@@ -5,7 +5,7 @@ module Bmg
 
       STAR = "*".freeze
 
-      def desaliaser
+      def desaliaser(*args, &bl)
         ->(a){
           Predicate::Grammar.sexpr [ :qualified_identifier, last[1], a.to_s ]
         }

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

@@ -3,12 +3,12 @@ module Bmg
     module SetOperator
       include Expr
 
-      def left
+      def head_expr
         self[2]
       end
 
-      def right
-        self[3]
+      def tail_exprs
+        self[3..-1]
       end
 
       def set_quantifier

data/lib/bmg/sql/processor.rb

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

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

@@ -0,0 +1,32 @@
+module Bmg
+  module Sql
+    class Processor
+      class Constants < Processor
+
+        def initialize(constants, builder)
+          super(builder)
+          @constants = constants
+        end
+        attr_reader :constants
+
+        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, "Constants on * is not supported"
+        end
+
+        def on_select_list(sexpr)
+          sexpr + constants.each_pair.map{|(k,v)|
+            builder.select_literal_item(v, k)
+          }
+        end
+
+      end # class Constants
+    end # class Processor
+  end # module Sql
+end # module Bmg

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

@@ -13,12 +13,10 @@ module Bmg
       private
 
         def join_predicate(left, right, commons)
-          left_d, right_d = left.desaliaser, right.desaliaser
+          left_d, right_d = left.desaliaser(true), right.desaliaser(true)
           commons.to_a.inject(tautology){|cond, attr|
             left_attr, right_attr = left_d[attr], right_d[attr]
-            left_p  = Predicate::Factory.qualified_identifier(left_attr.qualifier, left_attr.as_name)
-            right_p = Predicate::Factory.qualified_identifier(right_attr.qualifier, right_attr.as_name)
-            cond &= Predicate::Factory.eq(left_p, right_p)
+            cond &= Predicate::Factory.eq(left_attr, right_attr)
           }
         end
 

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

@@ -23,11 +23,19 @@ module Bmg
         end
 
         def on_nonjoin_exp(sexpr)
+          left_attrs  = sexpr.to_attr_list.map(&:to_s).sort
+          right_attrs = @right.to_attr_list.map(&:to_s).sort
+          unless left_attrs == right_attrs
+            raise "Operands are not union compatible: #{left_attrs.inspect} vs. #{right_attrs.inspect}"
+          end
+
           reordered = Reorder.new(sexpr.to_attr_list, builder).call(@right)
           if @right.with_exp?
             [ :with_exp,
               reordered.with_spec,
               [ @kind, modifier, sexpr, reordered.select_exp ] ]
+          elsif sexpr.first == @kind && sexpr.set_quantifier == modifier
+            sexpr.dup + [ reordered ]
           else
             [ @kind, modifier, sexpr, reordered ]
           end

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

@@ -40,9 +40,8 @@ module Bmg
             if commons.size == 0
               builder.exists(subquery)
             elsif commons.size == 1
-              identifier = left.desaliaser[commons.to_a.first]
-              qualified  = Predicate::Factory.qualified_identifier(identifier.qualifier, identifier.as_name)
-              Predicate::Factory.in(qualified, subquery)
+              identifier = left.desaliaser(true)[commons.to_a.first]
+              Predicate::Factory.in(identifier, subquery)
             else
               join_pre  = join_predicate(left, subquery, commons)
               subquery  = expand_where_clause(subquery, join_pre)

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

@@ -8,17 +8,37 @@ module Bmg
           @predicate = predicate
         end
 
+        def on_union(sexpr)
+          non_falsy = sexpr[2..-1].reject{|expr| falsy?(expr) }
+          if non_falsy.empty?
+            apply(sexpr.head_expr)
+          elsif non_falsy.size == 1
+            apply(non_falsy.first)
+          else
+            [sexpr[0], sexpr[1]] + non_falsy.map{|nf| apply(nf) }
+          end
+        end
+
         def on_select_exp(sexpr)
-          pred = @predicate.rename(sexpr.desaliaser).sexpr
+          pred = @predicate.rename(sexpr.desaliaser(true))
           if sexpr.where_clause
-            anded = [:and, sexpr.where_clause.predicate, pred ]
-            anded = Predicate::Grammar.sexpr(anded)
-            sexpr.with_update(:where_clause, [ :where_clause, anded ])
+            sexpr_p = Predicate.new(sexpr.where_clause.predicate)
+            sexpr.with_update(:where_clause, [ :where_clause, (sexpr_p & pred).sexpr ])
           else
-            sexpr.with_insert(4, [ :where_clause, pred ])
+            sexpr.with_insert(4, [ :where_clause, pred.sexpr ])
           end
         end
 
+      private
+
+        def falsy?(sexpr)
+          return false unless sexpr.respond_to?(:predicate)
+          return false if sexpr.predicate.nil?
+          left  = Predicate.new(Predicate::Grammar.sexpr(sexpr.predicate))
+          right = Predicate.new(Predicate::Grammar.sexpr(@predicate.sexpr))
+          return (left & right).contradiction?
+        end
+
       end # class Where
     end # class Processor
   end # module Sql

data/lib/bmg/sql/relation.rb

@@ -44,6 +44,12 @@ module Bmg
         _instance(type, builder, expr)
       end
 
+      def _constants(type, cs)
+        expr = before_use(self.expr)
+        expr = Processor::Constants.new(cs, builder).call(expr)
+        _instance(type, builder, expr)
+      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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: roo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +195,7 @@ files:
 - lib/bmg/sql/processor.rb
 - lib/bmg/sql/processor/all.rb
 - lib/bmg/sql/processor/clip.rb
+- lib/bmg/sql/processor/constants.rb
 - lib/bmg/sql/processor/distinct.rb
 - lib/bmg/sql/processor/flatten.rb
 - lib/bmg/sql/processor/from_self.rb
@@ -252,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.