bmg 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 189526b3a2d6324a3ac380a7d1eb14f7b1559fc56ca59b72c34abba57f160584
-  data.tar.gz: 62f44c0fe86139983cf4aecc3407e2d07ae19ebf3c23c5d4a65a39f53d7c6d9a
+  metadata.gz: 90ed0f35cc6ced83ada1d6aeb3162b7fb8c1bb3f6f20f870f030c589e991e97e
+  data.tar.gz: 959415999253759d072fae5e5280417cdbd5fd8774bbf90e541b74f2324d197c
 SHA512:
-  metadata.gz: 03aa4daed6097ba7a680b352bf1fa4eba97635c3830fa3e375b41dba05df71489dc40d22379bed397f7797f57992a0c1c240275ec8d16a828226b0d3e0c27b64
-  data.tar.gz: 3a025b7d36cf8316f01f54b73b76a5d74622124a88f0dd75160039a0e374966ca8d4021bc4dddebb3786ecb6add65742b69f7d1a0e8242816b58f993f37c9cb9
+  metadata.gz: fbb3cb7ea042873933e6c15f5ee73084980066cc3ee8c8c58c5169b3221a1aa4c2d97a1521618c456da0d34097df456ef34081a8a418429d1627ed2ada36c1ec
+  data.tar.gz: 687eed5fc05caa9c7dba8258aeb70b929877d6c56c45212ac04358df562acf4ffdc57f199c8d774d43631f82088fa70cac78b1754ae2bfbdd8eaa4d61b156014

data/lib/bmg/algebra.rb

@@ -80,6 +80,19 @@ module Bmg
     end
     protected :_joined_with
 
+    def left_join(right, on = [], default_right_tuple = {})
+      drt = default_right_tuple
+      _left_join self.type.left_join(right.type, on, drt), right, on, drt
+    end
+
+    def _left_join(type, right, on, default_right_tuple)
+      Operator::Join.new(type, self, right, on, {
+        variant: :left,
+        default_right_tuple: default_right_tuple
+      })
+    end
+    protected :_left_join
+
     def matching(right, on = [])
       _matching self.type.matching(right.type, on), right, on
     end

data/lib/bmg/operator/join.rb

@@ -8,16 +8,19 @@ module Bmg
     class Join
       include Operator::Binary
 
-      def initialize(type, left, right, on)
+      DEFAULT_OPTIONS = {}
+
+      def initialize(type, left, right, on, options = {})
         @type = type
         @left = left
         @right = right
         @on = on
+        @options = DEFAULT_OPTIONS.merge(options)
       end
 
     private
 
-      attr_reader :on
+      attr_reader :on, :options
 
     public
 
@@ -34,12 +37,24 @@ module Bmg
             to_join.each do |right|
               yield right.merge(tuple)
             end
+          elsif left_join?
+            yield(tuple.merge(default_right_tuple))
           end
         end
       end
 
       def to_ast
-        [ :join, left.to_ast, right.to_ast, on ]
+        [ :join, left.to_ast, right.to_ast, on, extra_opts ].compact
+      end
+
+    protected
+
+      def left_join?
+        options[:variant] == :left
+      end
+
+      def default_right_tuple
+        options[:default_right_tuple]
       end
 
     protected ### optimization
@@ -63,8 +78,13 @@ module Bmg
 
     protected ### inspect
 
+      def extra_opts
+        extra = options.dup.delete_if{|k,v| DEFAULT_OPTIONS[k] == v }
+        extra.empty? ? nil : extra
+      end
+
       def args
-        [ on ]
+        [ on, extra_opts ].compact
       end
 
     private

data/lib/bmg/sequel/translator.rb

@@ -70,13 +70,18 @@ module Bmg
         case kind = sexpr.left.first
         when :qualified_name
           left.column == right.value ? left : ::Sequel.as(left, right)
-        when :literal, :summarizer
+        when :literal, :summarizer, :func_call
           ::Sequel.as(left, right)
         else
           raise NotImplementedError, "Unexpected select item `#{kind}`"
         end
       end
 
+      def on_func_call(sexpr)
+        args = sexpr.func_args.map{|fa| apply(fa) }
+        ::Sequel.function(sexpr.func_name, *args)
+      end
+
       def on_summarizer(sexpr)
         if sexpr.summary_expr
           ::Sequel.function(sexpr.summary_func, apply(sexpr.summary_expr))
@@ -106,6 +111,13 @@ module Bmg
             ds.join_table(:inner, apply(table), nil, options){|*args|
               apply(on)
             }
+          elsif kind == :left_join
+            options = { qualify: false, table_alias: false }
+            ds.join_table(:left, apply(table), nil, options){|*args|
+              apply(on)
+            }
+          else
+            raise IllegalArgumentError, "Unrecognized from clause: `#{sexpr}`"
           end
         end
       end

data/lib/bmg/sql/grammar.rb

@@ -42,6 +42,9 @@ require_relative "nodes/with_exp"
 require_relative "nodes/with_spec"
 require_relative "nodes/name_intro"
 require_relative "nodes/where_clause"
+require_relative "nodes/join"
 require_relative "nodes/cross_join"
 require_relative "nodes/inner_join"
+require_relative "nodes/left_join"
 require_relative "nodes/summarizer"
+require_relative "nodes/func_call"

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

@@ -24,10 +24,13 @@ rules:
   join_exp:
     - cross_join
     - inner_join
+    - left_join
   cross_join:
     - [ table_spec, table_spec ]
   inner_join:
     - [ table_spec, table_spec, predicate ]
+  left_join:
+    - [ table_spec, table_spec, predicate ]
   using:
     - [ column_name+ ]
   select_exp:
@@ -76,6 +79,7 @@ rules:
     - qualified_name
     - column_name
     - summarizer
+    - func_call
     - literal
   a_name:
     - qualified_name
@@ -88,6 +92,10 @@ rules:
     - [ summary_func, qualified_name ]
   summary_func:
     - "::Symbol"
+  func_call:
+    - [ func_name, scalar_exp+ ]
+  func_name:
+    - "::Symbol"
   table_name:
     - [ name_rgx ]
   range_var_name:
@@ -96,6 +104,8 @@ rules:
     - [ integer ]
   offset_clause:
     - [ integer ]
+  default_right_tuple:
+    - "::Hash"
   integer:
     - "::Integer"
   literal:

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

@@ -2,18 +2,7 @@ module Bmg
   module Sql
     module CrossJoin
       include Expr
-
-      def join?
-        true
-      end
-
-      def left
-        self[1]
-      end
-
-      def right
-        self[2]
-      end
+      include Join
 
       def to_sql(buffer, dialect)
         each_child do |child, index|

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

@@ -0,0 +1,23 @@
+module Bmg
+  module Sql
+    module FuncCall
+      include Expr
+
+      def func_name
+        self[1]
+      end
+
+      def func_args
+        self[2..-1]
+      end
+
+      def to_sql(buffer, dialect)
+        buffer << summary_name.upcase << "("
+        buffer << func_args.map{|fa| fa.to_sql("", dialect) }.join(', ')
+        buffer << ")"
+        buffer
+      end
+
+    end # module FuncCall
+  end # module Sql
+end # module Bmg

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

@@ -2,34 +2,12 @@ module Bmg
   module Sql
     module InnerJoin
       include Expr
+      include Join
 
       INNER = "INNER".freeze
-      JOIN  = "JOIN".freeze
-      ON    = "ON".freeze
 
-      def join?
-        true
-      end
-
-      def left
-        self[1]
-      end
-
-      def right
-        self[2]
-      end
-
-      def predicate
-        last
-      end
-
-      def to_sql(buffer, dialect)
-        left.to_sql(buffer, dialect)
-        buffer << SPACE << JOIN << SPACE
-        right.to_sql(buffer, dialect)
-        buffer << SPACE << ON << SPACE
-        predicate.to_sql(buffer, dialect)
-        buffer
+      def type
+        INNER
       end
 
     end # module InnerJoin

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

@@ -0,0 +1,44 @@
+module Bmg
+  module Sql
+    module Join
+      include Expr
+
+      JOIN  = "JOIN".freeze
+      ON    = "ON".freeze
+
+      def type
+        nil
+      end
+
+      def join?
+        true
+      end
+
+      def left
+        self[1]
+      end
+
+      def right
+        self[2]
+      end
+
+      def predicate
+        last
+      end
+
+      def to_sql(buffer, dialect)
+        left.to_sql(buffer, dialect)
+        if type.nil?
+          buffer << SPACE << JOIN << SPACE
+        else
+          buffer << SPACE << TYPE << SPACE << JOIN << SPACE
+        end
+        right.to_sql(buffer, dialect)
+        buffer << SPACE << ON << SPACE
+        predicate.to_sql(buffer, dialect)
+        buffer
+      end
+
+    end # module Join
+  end # module Sql
+end # module Bmg

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

@@ -0,0 +1,15 @@
+module Bmg
+  module Sql
+    module LeftJoin
+      include Expr
+      include Join
+
+      LEFT = "LEFT".freeze
+
+      def type
+        LEFT
+      end
+
+    end # module LeftJoin
+  end # module Sql
+end # module Bmg

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

@@ -4,18 +4,19 @@ module Bmg
       class Join < Processor
         include JoinSupport
 
-        def initialize(right, on, builder)
+        def initialize(right, on, options, builder)
           super(builder)
           @right = right
           @on = on
+          @options = options
         end
-        attr_reader :right, :on
+        attr_reader :right, :on, :options
 
         def call(sexpr)
           if unjoinable?(sexpr)
             call(builder.from_self(sexpr))
           elsif unjoinable?(right)
-            Join.new(builder.from_self(right), on, builder).call(sexpr)
+            Join.new(builder.from_self(right), on, options, builder).call(sexpr)
           else
             super(sexpr)
           end
@@ -45,14 +46,21 @@ module Bmg
           left_list, right_list = left.select_list, right.select_list
           list = left_list.dup
           right_list.each_child do |child, index|
-            list << child unless left_list.knows?(child.as_name)
+            next if left_list.knows?(child.as_name)
+            if left_join?
+              list << coalesced(child)
+            else
+              list << child
+            end
           end
           list
         end
 
         def join_from_clauses(left, right)
           joincon = join_predicate(left, right, on)
-          join = if joincon.tautology?
+          join = if left_join?
+            [:left_join, left.table_spec, right.table_spec, joincon]
+          elsif joincon.tautology?
             [:cross_join, left.table_spec, right.table_spec]
           else
             [:inner_join, left.table_spec, right.table_spec, joincon]
@@ -75,6 +83,26 @@ module Bmg
           order_by.first + order_by.last.sexpr_body
         end
 
+      private
+
+        def left_join?
+          options[:kind] == :left
+        end
+
+        def coalesced(child)
+          drt, as_name = options[:default_right_tuple], child.as_name.to_sym
+          if drt && drt.has_key?(as_name)
+            child.with_update(1, [
+              :func_call,
+              :coalesce,
+              child.left,
+              [:literal, drt[as_name]]
+            ])
+          else
+            child
+          end
+        end
+
       end # class Join
     end # class Processor
   end # module Sql

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

@@ -39,8 +39,8 @@ 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))
-          right = Predicate.new(Predicate::Grammar.sexpr(@predicate.sexpr))
+          left  = Predicate.new(Predicate::Grammar.sexpr(sexpr.predicate)).unqualify
+          right = Predicate.new(Predicate::Grammar.sexpr(@predicate.sexpr)).unqualify
           return (left & right).contradiction?
         end
 

data/lib/bmg/sql/relation.rb

@@ -62,7 +62,21 @@ module Bmg
         if right_expr = extract_compatible_sexpr(right)
           right_expr = Processor::Requalify.new(builder).call(right_expr)
           expr = before_use(self.expr)
-          expr = Processor::Join.new(right_expr, on, builder).call(expr)
+          expr = Processor::Join.new(right_expr, on, {}, builder).call(expr)
+          _instance(type, builder, expr)
+        else
+          super
+        end
+      end
+
+      def _left_join(type, right, on, default_right_tuple)
+        if right_expr = extract_compatible_sexpr(right)
+          right_expr = Processor::Requalify.new(builder).call(right_expr)
+          expr = before_use(self.expr)
+          expr = Processor::Join.new(right_expr, on, {
+            kind: :left,
+            default_right_tuple: default_right_tuple
+          }, builder).call(expr)
           _instance(type, builder, expr)
         else
           super

data/lib/bmg/sql/support/from_clause_orderer.rb

@@ -23,14 +23,14 @@ module Bmg
         # Generates a relationally equivalent list of (type,table,predicate)
         # triplets, where:
         #
-        # - type is :base, :cross_join or :inner_join
+        # - type is :base, :cross_join, :inner_join, or :left_join
         # - table is table_as, native_table_as or subquery_as
         # - predicate is a join predicate `ti.attri = tj.attrj AND ...`
         #
         # So that
         #
         # 1) the types are observed in strict increasing order (one :base, zero
-        #    or more :cross_join, zero or more :inner_join)
+        #    or more :cross_join, zero or more :inner_join, zero or more :left_join)
         #
         # 2) the list is such that it can be safely written as an expression
         #    of the following SQL syntax:
@@ -40,6 +40,7 @@ module Bmg
         #       cross_join t3                 # [ :cross_join, t3, nil ]
         #       inner_join t4 ON p4           # [ :inner_join, t4, p4 ]
         #       inner_join t5 ON p5           # [ :inner_join, t5, p5 ]
+        #       left_join t6 ON p6            # [ :left_join, t6, p6 ]
         #
         #   that is, the linearization is correct only if each predicate `pi`
         #   only makes reference to tables introduced before it (no forward
@@ -87,13 +88,18 @@ module Bmg
         #    reference to tables not introduced yet)
         #
         def order_all(tables, joins)
-          # Our first strategy is simple: let sort the tables by moving the ones
-          # not referenced in join clauses at the beginning of the list => they
-          # will yield the base an cross join clauses first.
-          tables = tables.sort{|t1,t2|
-            t1js = joins.select{|j| uses?(j, t1) }.size
-            t2js = joins.select{|j| uses?(j, t2) }.size
-            t1js == 0 ? (t2js == 0 ? 0 : -1) : (t2js == 0 ? 1 : 0)
+          # Our first strategy is simple: let sort the tables by moving the
+          # all left joins at the end, and all not referenced in join clauses
+          # at the beginning of the list => they will yield the base an cross
+          # join clauses first.
+          tables = tables.sort{|(t1,k1),(t2,k2)|
+            if k1 == :left_join || k2 == :left_join
+              k1 == k2 ? 0 : (k1 == :left_join ? 1 : -1)
+            else
+              t1js = joins.select{|j| uses?(j, t1) }.size
+              t2js = joins.select{|j| uses?(j, t2) }.size
+              t1js == 0 ? (t2js == 0 ? 0 : -1) : (t2js == 0 ? 1 : 0)
+            end
           }
 
           # Then order all recursively in that order of tables, filling a result
@@ -119,7 +125,15 @@ module Bmg
 
             # Decide which kind of join it is, according to the result and
             # the number of join clauses that will be used
-            join_kind = result.empty? ? :base : (on.empty? ? :cross_join : :inner_join)
+            join_kind = if result.empty?
+              :base
+            elsif table.last == :left_join
+              :left_join
+            elsif on.empty?
+              :cross_join
+            else
+              :inner_join
+            end
 
             # Compute the AND([eq]) predicate on selected join clauses
             predicate = on.inject(nil){|p,clause|
@@ -127,7 +141,7 @@ module Bmg
             }
 
             # Recurse with that new clause in the result
-            clause = [ join_kind, table, predicate ]
+            clause = [ join_kind, table[0], predicate ]
             _order_all(tables_tail, joins_tail, result + [clause])
           end
         end
@@ -139,13 +153,13 @@ module Bmg
         # `ti` and making no reference to non introduced tables, and the others.
         def split_joins(joins, table, tables_tail)
           joins.partition{|j|
-            uses?(j, table) && !tables_tail.find{|t|
-              uses?(j, t)
+            uses?(j, table[0]) && !tables_tail.find{|t|
+              uses?(j, t[0])
             }
           }
         end
 
-        # Returns whether the join
+        # Returns whether the join conditions references the given table
         def uses?(condition, table)
           name = table.as_name.to_s
           left_name = var_name(condition[1])
@@ -172,23 +186,27 @@ module Bmg
         def collect(sexpr)
           tables = []
           joins  = []
-          _collect(sexpr, tables, joins)
+          _collect(sexpr, tables, joins, :base)
           [ tables, joins ]
         end
 
-        def _collect(sexpr, tables, joins)
+        def _collect(sexpr, tables, joins, kind)
           case sexpr.first
           when :from_clause
-            _collect(sexpr.table_spec, tables, joins)
+            _collect(sexpr.table_spec, tables, joins, kind)
           when :table_as, :native_table_as, :subquery_as
-            tables << sexpr
+            tables << [sexpr, kind]
+          when :cross_join
+            _collect(sexpr.left, tables, joins, :cross_join)
+            _collect(sexpr.right, tables, joins, :cross_join)
           when :inner_join
             _collect_joins(sexpr.predicate, joins)
-            _collect(sexpr.left, tables, joins)
-            _collect(sexpr.right, tables, joins)
-          when :cross_join
-            _collect(sexpr.left, tables, joins)
-            _collect(sexpr.right, tables, joins)
+            _collect(sexpr.left, tables, joins, :inner_join)
+            _collect(sexpr.right, tables, joins, :inner_join)
+          when :left_join
+            _collect_joins(sexpr.predicate, joins)
+            _collect(sexpr.left, tables, joins, kind)
+            _collect(sexpr.right, tables, joins, :left_join)
           end
         end
 

data/lib/bmg/type.rb

@@ -175,6 +175,15 @@ module Bmg
       }
     end
 
+    def left_join(right, on, default_right_tuple)
+      join_compatible!(right, on) if typechecked? && knows_attrlist?
+      dup.tap{|x|
+        x.attrlist  = (knows_attrlist? and right.knows_attrlist?) ? (self.attrlist + right.attrlist).uniq : nil
+        x.predicate = Predicate.tautology
+        x.keys      = nil
+      }
+    end
+
     def matching(right, on)
       join_compatible!(right, on) if typechecked? && knows_attrlist?
       self

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 17
-    TINY  = 2
+    TINY  = 3
   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.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -19,7 +19,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,9 +194,12 @@ files:
 - lib/bmg/sql/nodes/except.rb
 - lib/bmg/sql/nodes/expr.rb
 - lib/bmg/sql/nodes/from_clause.rb
+- lib/bmg/sql/nodes/func_call.rb
 - lib/bmg/sql/nodes/group_by_clause.rb
 - lib/bmg/sql/nodes/inner_join.rb
 - lib/bmg/sql/nodes/intersect.rb
+- lib/bmg/sql/nodes/join.rb
+- lib/bmg/sql/nodes/left_join.rb
 - lib/bmg/sql/nodes/limit_clause.rb
 - lib/bmg/sql/nodes/literal.rb
 - lib/bmg/sql/nodes/name_intro.rb