alf-sql 0.15.0 → 0.16.0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 0.15.0 / FIX ME
+# 0.16.0 / 2014-02-18
+
+* Fix SQL compilation of projections over set operators (union, intersect,
+  minus).
+
+# 0.15.0 / 2013-11-01
 
 * Enhancements
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../alf-core
   specs:
-    alf-core (0.15.0)
+    alf-core (0.16.0)
       domain (~> 1.0)
       myrrha (~> 3.0)
       path (~> 1.3)

data/lib/alf-sql.rb

@@ -1 +1 @@
-require_relative "alf/sql"
+require_relative "alf/sql"

data/lib/alf/sql/compiler.rb

@@ -56,7 +56,13 @@ module Alf
       end
 
       def on_join(plan, expr, left, right)
-        rewrite(plan, expr, left, Processor::Join, [right.sexpr])
+        if right.sexpr.is_table_dee?
+          rewrite(plan, expr, left, Processor::SemiJoin, [right.sexpr, false])
+        elsif left.sexpr.is_table_dee?
+          rewrite(plan, expr, right, Processor::SemiJoin, [left.sexpr, false])
+        else
+          rewrite(plan, expr, left, Processor::Join, [right.sexpr])
+        end
       end
 
       def on_matching(plan, expr, left, right)

data/lib/alf/sql/loader.rb

@@ -1,2 +1,2 @@
-require "alf-core"
 require "sexpr"
+require "alf-core"

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

@@ -15,6 +15,10 @@ module Alf
         false
       end
 
+      def is_table_dee?
+        from_clause.nil? && select_list.is_table_dee?
+      end
+
       def distinct?
         set_quantifier.distinct?
       end

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

@@ -10,6 +10,10 @@ module Alf
         }
       end
 
+      def is_table_dee?
+        Builder::IS_TABLE_DEE == self
+      end
+
       def knows?(as_name)
         find_child{|child| child.as_name == as_name }
       end

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

@@ -23,6 +23,10 @@ module Alf
         true
       end
 
+      def is_table_dee?
+        false
+      end
+
       def distinct?
         set_quantifier.distinct?
       end

data/lib/alf/sql/nodes/with_exp.rb

@@ -33,7 +33,8 @@ module Alf
                                   :set_operator?,
                                   :limit_or_offset?,
                                   :join?,
-                                  :should_be_reused?
+                                  :should_be_reused?,
+                                  :is_table_dee?
 
     # to_xxx
 

data/lib/alf/sql/processor/clip.rb

@@ -10,6 +10,13 @@ module Alf
         end
         attr_reader :attributes, :on_empty
 
+        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_exp(sexpr)
           catch(:empty){ return super(sexpr) }
           send("select_#{on_empty}", sexpr)

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

@@ -24,19 +24,27 @@ module Alf
       private
 
         def apply_join_strategy(left, right)
-          commons  = left.to_attr_list & right.to_attr_list
-          subquery = Clip.new(commons, :star, builder).call(right)
-          if commons.size == 0
-            predicate = builder.exists(subquery)
-          elsif commons.size == 1
-            identifier = left.desaliaser[commons.to_a.first]
-            predicate  = Predicate::Factory.in(identifier, subquery)
+          predicate = build_semijoin_predicate(left, right)
+          expand_where_clause(left, negate ? !predicate : predicate)
+        end
+
+        def build_semijoin_predicate(left, right)
+          if right.is_table_dee?
+            right.where_clause.predicate
           else
-            join_pre  = join_predicate(left, subquery, commons)
-            subquery  = expand_where_clause(subquery, join_pre)
-            predicate = builder.exists(subquery)
+            commons  = left.to_attr_list & right.to_attr_list
+            subquery = Clip.new(commons, :star, builder).call(right)
+            if commons.size == 0
+              builder.exists(subquery)
+            elsif commons.size == 1
+              identifier = left.desaliaser[commons.to_a.first]
+              Predicate::Factory.in(identifier, subquery)
+            else
+              join_pre  = join_predicate(left, subquery, commons)
+              subquery  = expand_where_clause(subquery, join_pre)
+              builder.exists(subquery)
+            end
           end
-          expand_where_clause(left, negate ? !predicate : predicate)
         end
 
         def expand_where_clause(sexpr, predicate)

data/lib/alf/sql/version.rb

@@ -3,7 +3,7 @@ module Alf
     module Version
 
       MAJOR = 0
-      MINOR = 15
+      MINOR = 16
       TINY  = 0
 
       def self.to_s
@@ -13,4 +13,4 @@ module Alf
     end
     VERSION = Version.to_s
   end
-end
+end

data/spec/helpers/ast.rb

@@ -28,7 +28,7 @@ module Helpers
       sexpr [:intersect, distinct, left, right]
     end
 
-    def select_is_table_dee(where)
+    def select_is_table_dee(where = nil)
       exists = Alf::Predicate::Grammar.sexpr([:exists, where])
       sexpr [:select_exp, all,
               [:select_list,

data/spec/nodes/select_exp/test_is_table_dee.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+module Alf
+  module Sql
+    describe SelectExp, "is_table_dee?" do
+
+      subject{ expr.is_table_dee? }
+
+      context 'when normal select' do
+        let(:expr){ select_all }
+
+        it{ should be_false }
+      end
+
+      context 'when a select is table dee' do
+        let(:expr){ select_is_table_dee }
+
+        it{ should be_true }
+      end
+
+    end
+  end
+end

data/spec/nodes/select_list/test_is_table_dee.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+module Alf
+  module Sql
+    describe SelectList, "is_table_dee" do
+
+      subject{ expr.is_table_dee? }
+
+      context 'on a normal select list' do
+        let(:expr){ select_list }
+
+        it{ should be_false }
+      end
+
+      context 'on a is_table_dee select list' do
+        let(:expr){ Builder::IS_TABLE_DEE.dup }
+
+        it{ should be_true }
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf-sql
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: alf-core
+  name: sexpr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: sexpr
+  name: alf-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.16.0
 description: This project implements an abstract SQL compiler for Alf expressions
 email:
 - blambeau at gmail.com
@@ -175,8 +175,10 @@ files:
 - spec/nodes/order_by_term/test_as_name.rb
 - spec/nodes/order_by_term/test_direction.rb
 - spec/nodes/order_by_term/test_qualifier.rb
+- spec/nodes/select_exp/test_is_table_dee.rb
 - spec/nodes/select_exp/test_order_by_clause.rb
 - spec/nodes/select_item/test_as_name.rb
+- spec/nodes/select_list/test_is_table_dee.rb
 - spec/predicate/nodes/exists/test_not.rb
 - spec/processor/clip/test_on_select_exp.rb
 - spec/processor/clip/test_on_select_list.rb
@@ -216,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3696231494975203070
+      hash: -2896068443355263749
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3696231494975203070
+      hash: -2896068443355263749
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25