arel 2.0.7 → 2.0.8.beta.20110131120940

data/Manifest.txt

@@ -26,6 +26,7 @@ lib/arel/nodes/count.rb
 lib/arel/nodes/delete_statement.rb
 lib/arel/nodes/does_not_match.rb
 lib/arel/nodes/equality.rb
+lib/arel/nodes/except.rb
 lib/arel/nodes/exists.rb
 lib/arel/nodes/function.rb
 lib/arel/nodes/greater_than.rb
@@ -36,6 +37,7 @@ lib/arel/nodes/having.rb
 lib/arel/nodes/in.rb
 lib/arel/nodes/inner_join.rb
 lib/arel/nodes/insert_statement.rb
+lib/arel/nodes/intersect.rb
 lib/arel/nodes/join.rb
 lib/arel/nodes/less_than.rb
 lib/arel/nodes/less_than_or_equal.rb
@@ -61,6 +63,8 @@ lib/arel/nodes/sum.rb
 lib/arel/nodes/table_alias.rb
 lib/arel/nodes/top.rb
 lib/arel/nodes/unary.rb
+lib/arel/nodes/union.rb
+lib/arel/nodes/union_all.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb
 lib/arel/nodes/values.rb

data/arel.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.7.20110114100952"
+  s.version = "2.0.8.beta.20110131120940"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-01-31}
   s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.}
   s.email = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com", "nick@example.org"]
   s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown"]
-  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/insert_manager.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/as.rb", "lib/arel/nodes/assignment.rb", "lib/arel/nodes/avg.rb", "lib/arel/nodes/between.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/does_not_match.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/exists.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/greater_than.rb", "lib/arel/nodes/greater_than_or_equal.rb", "lib/arel/nodes/group.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/having.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/limit.rb", "lib/arel/nodes/lock.rb", "lib/arel/nodes/matches.rb", "lib/arel/nodes/max.rb", "lib/arel/nodes/min.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/not.rb", "lib/arel/nodes/not_equal.rb", "lib/arel/nodes/not_in.rb", "lib/arel/nodes/offset.rb", "lib/arel/nodes/on.rb", "lib/arel/nodes/or.rb", "lib/arel/nodes/ordering.rb", "lib/arel/nodes/outer_join.rb", "lib/arel/nodes/select_core.rb", "lib/arel/nodes/select_statement.rb", "lib/arel/nodes/sql_literal.rb", "lib/arel/nodes/string_join.rb", "lib/arel/nodes/sum.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/top.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_as.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/insert_manager.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/as.rb", "lib/arel/nodes/assignment.rb", "lib/arel/nodes/avg.rb", "lib/arel/nodes/between.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/does_not_match.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/except.rb", "lib/arel/nodes/exists.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/greater_than.rb", "lib/arel/nodes/greater_than_or_equal.rb", "lib/arel/nodes/group.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/having.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/intersect.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/limit.rb", "lib/arel/nodes/lock.rb", "lib/arel/nodes/matches.rb", "lib/arel/nodes/max.rb", "lib/arel/nodes/min.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/not.rb", "lib/arel/nodes/not_equal.rb", "lib/arel/nodes/not_in.rb", "lib/arel/nodes/offset.rb", "lib/arel/nodes/on.rb", "lib/arel/nodes/or.rb", "lib/arel/nodes/ordering.rb", "lib/arel/nodes/outer_join.rb", "lib/arel/nodes/select_core.rb", "lib/arel/nodes/select_statement.rb", "lib/arel/nodes/sql_literal.rb", "lib/arel/nodes/string_join.rb", "lib/arel/nodes/sum.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/top.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/union.rb", "lib/arel/nodes/union_all.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_as.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
   s.homepage = %q{http://github.com/rails/arel}
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]

data/lib/arel.rb

@@ -29,7 +29,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.0.7'
+  VERSION = '2.0.8.beta'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/nodes.rb

@@ -47,3 +47,7 @@ require 'arel/nodes/inner_join'
 require 'arel/nodes/outer_join'
 require 'arel/nodes/string_join'
 require 'arel/nodes/on'
+require 'arel/nodes/except'
+require 'arel/nodes/intersect'
+require 'arel/nodes/union'
+require 'arel/nodes/union_all'

data/lib/arel/nodes/except.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class Except < Arel::Nodes::Binary
+    end
+  end
+end
+

data/lib/arel/nodes/intersect.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class Intersect < Arel::Nodes::Binary
+    end
+  end
+end
+

data/lib/arel/nodes/union.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class Union < Arel::Nodes::Binary
+    end
+  end
+end
+

data/lib/arel/nodes/union_all.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class UnionAll < Arel::Nodes::Binary
+    end
+  end
+end
+

data/lib/arel/select_manager.rb

@@ -130,6 +130,26 @@ module Arel
       Nodes::SqlLiteral.new viz.accept @ctx
     end
 
+    def union operation, other = nil
+      if other
+        node_class = Nodes.const_get("Union#{operation.to_s.capitalize}")
+      else
+        other = operation
+        node_class = Nodes::Union
+      end
+
+      node_class.new self.ast, other.ast
+    end
+
+    def intersect other
+      Nodes::Intersect.new ast, other.ast
+    end
+
+    def except other
+      Nodes::Except.new ast, other.ast
+    end
+    alias :minus :except
+
     def take limit
       @ast.limit = Nodes::Limit.new(limit)
       @ctx.top   = Nodes::Top.new(limit)

data/lib/arel/visitors/oracle.rb

@@ -61,6 +61,10 @@ module Arel
         "raw_rnum_ > #{visit o.value}"
       end
 
+      def visit_Arel_Nodes_Except o
+        "( #{visit o.left} MINUS #{visit o.right} )"
+      end
+
       ###
       # Hacks for the order clauses specific to Oracle
       def order_hacks o

data/lib/arel/visitors/to_sql.rb

@@ -206,6 +206,22 @@ module Arel
         "NOT (#{visit o.expr})"
       end
 
+      def visit_Arel_Nodes_Union o
+        "( #{visit o.left} UNION #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_UnionAll o
+        "( #{visit o.left} UNION ALL #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_Intersect o
+        "( #{visit o.left} INTERSECT #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_Except o
+        "( #{visit o.left} EXCEPT #{visit o.right} )"
+      end
+
       def visit_Arel_Table o
         if o.table_alias
           "#{quote_table_name o.name} #{quote_table_name o.table_alias}"

data/test/test_select_manager.rb

@@ -596,4 +596,46 @@ module Arel
       end
     end
   end
+
+  describe 'set operations' do
+    before do
+      @table = Table.new :users
+      @m1 = Arel::SelectManager.new Table.engine, @table
+      @m1.project Arel.sql('*')
+      @m2 = Arel::SelectManager.new Table.engine, @table
+      @m2.project Arel.sql('*')
+    end
+
+    it 'supports union' do
+      @m1.where(@table[:id].lt(18))
+      @m2.where(@table[:id].gt(99))
+      (@m1.union @m2).to_sql.must_be_like %{
+        ( SELECT * FROM "users"  WHERE "users"."id" < 18 UNION SELECT * FROM "users"  WHERE "users"."id" > 99 )
+      }
+    end
+
+    it 'supports union all' do
+      @m1.where(@table[:id].lt(18))
+      @m2.where(@table[:id].gt(99))
+      (@m1.union :all, @m2).to_sql.must_be_like %{
+        ( SELECT * FROM "users"  WHERE "users"."id" < 18 UNION ALL SELECT * FROM "users"  WHERE "users"."id" > 99 )
+      }
+    end
+
+    it 'supports intersect' do
+      @m1.where(@table[:id].gt(18))
+      @m2.where(@table[:id].lt(99))
+      (@m1.intersect @m2).to_sql.must_be_like %{
+        ( SELECT * FROM "users"  WHERE "users"."id" > 18 INTERSECT SELECT * FROM "users"  WHERE "users"."id" < 99 )
+      }
+    end
+
+    it 'supports except' do
+      @m1.where(@table[:id].in(18..60))
+      @m2.where(@table[:id].in(40..99))
+      (@m1.except @m2).to_sql.must_be_like %{
+        ( SELECT * FROM "users"  WHERE "users"."id" BETWEEN 18 AND 60 EXCEPT SELECT * FROM "users"  WHERE "users"."id" BETWEEN 40 AND 99 )
+      }
+    end
+  end
 end

data/test/visitors/test_oracle.rb

@@ -133,6 +133,14 @@ module Arel
           end
         end
 
+        it 'modified except to be minus' do
+          left = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 10")
+          right = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 20")
+          sql = @visitor.accept Nodes::Except.new(left, right)
+          sql.must_be_like %{
+            ( SELECT * FROM users WHERE age > 10 MINUS SELECT * FROM users WHERE age > 20 )
+          }
+        end
       end
     end
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 40220250905851
+  prerelease: true
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  - beta
+  - 20110131120940
+  version: 2.0.8.beta.20110131120940
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +131,7 @@ files:
 - lib/arel/nodes/delete_statement.rb
 - lib/arel/nodes/does_not_match.rb
 - lib/arel/nodes/equality.rb
+- lib/arel/nodes/except.rb
 - lib/arel/nodes/exists.rb
 - lib/arel/nodes/function.rb
 - lib/arel/nodes/greater_than.rb
@@ -139,6 +142,7 @@ files:
 - lib/arel/nodes/in.rb
 - lib/arel/nodes/inner_join.rb
 - lib/arel/nodes/insert_statement.rb
+- lib/arel/nodes/intersect.rb
 - lib/arel/nodes/join.rb
 - lib/arel/nodes/less_than.rb
 - lib/arel/nodes/less_than_or_equal.rb
@@ -164,6 +168,8 @@ files:
 - lib/arel/nodes/table_alias.rb
 - lib/arel/nodes/top.rb
 - lib/arel/nodes/unary.rb
+- lib/arel/nodes/union.rb
+- lib/arel/nodes/union_all.rb
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
 - lib/arel/nodes/values.rb
@@ -243,12 +249,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: arel