bmg 0.15.0 → 0.16.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9962e2754e1fc6f09c4f041e49ca8aa3d37281dd
-  data.tar.gz: 2533b9118e9cd1a5e5f79cabeb2570823b5c1c20
+  metadata.gz: d34f68bbc40a7dd25495cc9964074e20567c8d66
+  data.tar.gz: 9f6beb3a44b9da0a89e1bf523e9b02543e0ea136
 SHA512:
-  metadata.gz: '097cf9919f5cdef7d1475be3006410796025fa1ac93e009011531816d55d5c6366eeb00bdebdeeb53bf02a1224286d5fb83a46d0fe3985d39d518ab93f50b86d'
-  data.tar.gz: b8a2d75c371e620ca9784decaacf872c687748ca2c6d19dafbd19eccde242c7c1cafa8d8d4053e60faa7cad0cc9e988edf2144ead579257af50742330813f868
+  metadata.gz: cd37f8ad39cd7c05e7a725dfb305b8f8a3d74364d5abab1771f4a598c70d1b643b0b7046907f15fba7788645bfab5e302a4f48285b8ae1f6a7f3b7994a6f727b
+  data.tar.gz: ecd95510bde8bc27ed111a917a3e38add365db53faaf62df6f21d2ea2703f8e6d60ffb8428819af31862971cda7fa99112efbe04a610b61d590db1d8dca5c3ef

data/lib/bmg/sequel/translator.rb

@@ -38,7 +38,7 @@ module Bmg
 
       def on_select_exp(sexpr)
         dataset   = sequel_db.select(1)
-        dataset   = dataset(apply(sexpr.from_clause)) if sexpr.from_clause
+        dataset   = apply(sexpr.from_clause)     if sexpr.from_clause
         #
         selection = apply(sexpr.select_list)
         predicate = apply(sexpr.predicate)       if sexpr.predicate
@@ -84,24 +84,28 @@ module Bmg
       end
 
       def on_from_clause(sexpr)
-        apply(sexpr.table_spec)
+        orderer = Sql::Support::FromClauseOrderer.new
+        ordering = orderer.call(sexpr)
+        ordering.inject(nil) do |ds,(kind,table,on)|
+          if ds.nil?
+            dataset(apply(table))
+          elsif kind == :cross_join
+            ds.cross_join(apply(table))
+          elsif kind == :inner_join
+            options = { qualify: false, table_alias: false }
+            ds.join_table(:inner, apply(table), nil, options){|*args|
+              apply(on)
+            }
+          end
+        end
       end
 
       def on_table_name(sexpr)
         ::Sequel.expr(sexpr.last.to_sym)
       end
 
-      def on_cross_join(sexpr)
-        left, right = apply(sexpr.left), apply(sexpr.right)
-        dataset(left).cross_join(right)
-      end
-
-      def on_inner_join(sexpr)
-        left, right = apply(sexpr.left), apply(sexpr.right)
-        options = {qualify: false, table_alias: false}
-        dataset(left).join_table(:inner, right, nil, options){|*args|
-          apply(sexpr.predicate)
-        }
+      def on_native_table_as(sexpr)
+        sexpr[1].from_self(:alias => sexpr.as_name)
       end
 
       def on_table_as(sexpr)
@@ -112,10 +116,6 @@ module Bmg
         ::Sequel.as(apply(sexpr.subquery), ::Sequel.identifier(sexpr.as_name))
       end
 
-      def on_native_table_as(sexpr)
-        sexpr[1].from_self(:alias => sexpr.as_name)
-      end
-
       def on_order_by_clause(sexpr)
         sexpr.sexpr_body.map{|c| apply(c)}
       end

data/lib/bmg/sql.rb

@@ -18,3 +18,4 @@ require_relative 'sql/processor'
 require_relative 'sql/builder'
 require_relative 'sql/dialect'
 require_relative 'sql/relation'
+require_relative 'sql/support/from_clause_orderer'

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

@@ -14,7 +14,7 @@ module Bmg
         def call(sexpr)
           if unjoinable?(sexpr)
             call(builder.from_self(sexpr))
-          elsif unjoinable?(right) or right.join?
+          elsif unjoinable?(right)
             Join.new(builder.from_self(right), on, builder).call(sexpr)
           else
             super(sexpr)

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

@@ -0,0 +1,120 @@
+module Bmg
+  module Sql
+    module Support
+      class FromClauseOrderer
+
+        # Takes a from_clause AST as input and generates an relationally
+        # equivalent list of (type,table,predicate) triplets, where:
+        #
+        # - type is :base, :cross_join or :inner_join
+        # - table is table_as, native_table_as or subquery_as
+        # - predicate is a join predicate
+        #
+        # The types are observed in strict increasing order
+        # (one :base, zero or more :cross_join, zero or more
+        # :inner_join). The list is such that it can be safely
+        # written as an expression of the following SQL form:
+        #
+        #     t1                            # [ :base, t1, nil ]
+        #     cross_join t2                 # [ :cross_join, t2, nil ]
+        #     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 ]
+        #
+        # A NotImplementedError may be raised if no linearization can
+        # be found.
+        #
+        def call(sexpr)
+          tables, joins = collect(sexpr)
+          order_all(tables, joins)
+        end
+
+      protected
+
+        def order_all(tables, joins, result = [])
+          if tables.empty? and joins.empty?
+            result
+          elsif tables.empty?
+            raise NotImplementedError, "Orphan joins: `#{joins.inspect}`"
+          else
+            table, tables_tail = tables.first, tables[1..-1]
+            on, joins_tail = split_joins(joins, table, tables_tail)
+            join_kind = result.empty? ? :base : (on.empty? ? :cross_join : :inner_join)
+            predicate = on.inject(nil){|p,clause|
+              p.nil? ? clause : Predicate::Factory.and(p, clause)
+            }
+            clause = [ join_kind, table, predicate ]
+            order_all(tables_tail, joins_tail, result + [clause])
+          end
+        end
+
+        def split_joins(joins, table, tables_tail)
+          joins.partition{|j|
+            uses?(j, table) && !tables_tail.find{|t|
+              uses?(j, t)
+            }
+          }
+        end
+
+      protected
+
+        def collect(sexpr)
+          tables = []
+          joins  = []
+          _collect(sexpr, tables, joins)
+          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)
+          }
+          [ tables, joins ]
+        end
+
+        def _collect(sexpr, tables, joins)
+          case sexpr.first
+          when :from_clause
+            _collect(sexpr.table_spec, tables, joins)
+          when :table_as, :native_table_as, :subquery_as
+            tables << sexpr
+          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)
+          end
+        end
+
+        def _collect_joins(sexpr, joins)
+          case sexpr.first
+          when :and
+            _collect_joins(sexpr[1], joins)
+            _collect_joins(sexpr[2], joins)
+          when :eq
+            joins << sexpr
+          else
+            raise NotImplementedError, "Unexpected predicate `#{sexpr.inspect}`"
+          end
+        end
+
+        def uses?(join, table)
+          name = table.as_name.to_s
+          left_name = var_name(join[1])
+          right_name = var_name(join[2])
+          (left_name == name) or (right_name == name)
+        end
+
+        def var_name(qualified)
+          case qualified.first
+          when :qualified_identifier then qualified[1].to_s
+          when :qualified_name       then qualified[1][1].to_s
+          else
+            raise NotImplementedError, "Unexpected qualified name `#{qualified.inspect}`"
+          end
+        end
+
+      end # class FromClauseOrderer
+    end # module Support
+  end # module Sql
+end # module Bmg

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 15
-    TINY  = 0
+    MINOR = 16
+    TINY  = "0-rc1"
   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.15.0
+  version: 0.16.0.pre.rc1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -213,6 +213,7 @@ files:
 - lib/bmg/sql/processor/star.rb
 - lib/bmg/sql/processor/where.rb
 - lib/bmg/sql/relation.rb
+- lib/bmg/sql/support/from_clause_orderer.rb
 - lib/bmg/sql/version.rb
 - lib/bmg/support.rb
 - lib/bmg/support/keys.rb
@@ -236,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2