arel 2.1.4 → 2.2.0

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'hoe', '>= 2.1.0'
+gem 'minitest'

data/History.txt

@@ -1,3 +1,11 @@
+== 2.2.0 / 2011-08-09
+
+* Bug Fixes
+
+  * The database connection caches visitors for generating SQL.
+  * FALSE and TRUE nodes can be constructed.
+  * Fixed ORDER BY / LIMIT clauses for UPDATE statements in Oracle.
+
 == 2.1.4 / 2011-07-25
 
 * Bug Fixes

data/Manifest.txt

@@ -1,5 +1,6 @@
 .autotest
 .gemtest
+Gemfile
 History.txt
 MIT-LICENSE.txt
 Manifest.txt
@@ -27,6 +28,7 @@ lib/arel/nodes/count.rb
 lib/arel/nodes/delete_statement.rb
 lib/arel/nodes/descending.rb
 lib/arel/nodes/equality.rb
+lib/arel/nodes/false.rb
 lib/arel/nodes/function.rb
 lib/arel/nodes/in.rb
 lib/arel/nodes/infix_operation.rb
@@ -43,6 +45,7 @@ lib/arel/nodes/sql_literal.rb
 lib/arel/nodes/string_join.rb
 lib/arel/nodes/table_alias.rb
 lib/arel/nodes/terminal.rb
+lib/arel/nodes/true.rb
 lib/arel/nodes/unary.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.1.4.20110725155854"
+  s.version = "2.2.0.20110809140134"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2011-07-25}
+  s.authors = [%q{Aaron Patterson}, %q{Bryan Halmkamp}, %q{Emilio Tagua}, %q{Nick Kallen}]
+  s.date = %q{2011-08-09}
   s.description = %q{Arel is a SQL AST manager for Ruby. It
 
 1. Simplifies the generation complex of SQL queries
@@ -15,30 +15,26 @@ Gem::Specification.new do |s|
 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", ".gemtest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/alias_predication.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/factory_methods.rb", "lib/arel/insert_manager.rb", "lib/arel/math.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/ascending.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/descending.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/infix_operation.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join_source.rb", "lib/arel/nodes/named_function.rb", "lib/arel/nodes/node.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/table_alias.rb", "lib/arel/nodes/terminal.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/nodes/with.rb", "lib/arel/order_predications.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/ibm_db.rb", "lib/arel/visitors/informix.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_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_equality.rb", "test/nodes/test_infix_operation.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.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_factory_methods.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_ibm_db.rb", "test/visitors/test_informix.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.email = [%q{aaron@tenderlovemaking.com}, %q{bryan@brynary.com}, %q{miloops@gmail.com}, %q{nick@example.org}]
+  s.extra_rdoc_files = [%q{History.txt}, %q{MIT-LICENSE.txt}, %q{Manifest.txt}, %q{README.markdown}]
+  s.files = [%q{.autotest}, %q{.gemtest}, %q{Gemfile}, %q{History.txt}, %q{MIT-LICENSE.txt}, %q{Manifest.txt}, %q{README.markdown}, %q{Rakefile}, %q{arel.gemspec}, %q{lib/arel.rb}, %q{lib/arel/alias_predication.rb}, %q{lib/arel/attributes.rb}, %q{lib/arel/attributes/attribute.rb}, %q{lib/arel/compatibility/wheres.rb}, %q{lib/arel/crud.rb}, %q{lib/arel/delete_manager.rb}, %q{lib/arel/deprecated.rb}, %q{lib/arel/expression.rb}, %q{lib/arel/expressions.rb}, %q{lib/arel/factory_methods.rb}, %q{lib/arel/insert_manager.rb}, %q{lib/arel/math.rb}, %q{lib/arel/nodes.rb}, %q{lib/arel/nodes/and.rb}, %q{lib/arel/nodes/ascending.rb}, %q{lib/arel/nodes/binary.rb}, %q{lib/arel/nodes/count.rb}, %q{lib/arel/nodes/delete_statement.rb}, %q{lib/arel/nodes/descending.rb}, %q{lib/arel/nodes/equality.rb}, %q{lib/arel/nodes/false.rb}, %q{lib/arel/nodes/function.rb}, %q{lib/arel/nodes/in.rb}, %q{lib/arel/nodes/infix_operation.rb}, %q{lib/arel/nodes/inner_join.rb}, %q{lib/arel/nodes/insert_statement.rb}, %q{lib/arel/nodes/join_source.rb}, %q{lib/arel/nodes/named_function.rb}, %q{lib/arel/nodes/node.rb}, %q{lib/arel/nodes/ordering.rb}, %q{lib/arel/nodes/outer_join.rb}, %q{lib/arel/nodes/select_core.rb}, %q{lib/arel/nodes/select_statement.rb}, %q{lib/arel/nodes/sql_literal.rb}, %q{lib/arel/nodes/string_join.rb}, %q{lib/arel/nodes/table_alias.rb}, %q{lib/arel/nodes/terminal.rb}, %q{lib/arel/nodes/true.rb}, %q{lib/arel/nodes/unary.rb}, %q{lib/arel/nodes/unqualified_column.rb}, %q{lib/arel/nodes/update_statement.rb}, %q{lib/arel/nodes/values.rb}, %q{lib/arel/nodes/with.rb}, %q{lib/arel/order_predications.rb}, %q{lib/arel/predications.rb}, %q{lib/arel/relation.rb}, %q{lib/arel/select_manager.rb}, %q{lib/arel/sql/engine.rb}, %q{lib/arel/sql_literal.rb}, %q{lib/arel/table.rb}, %q{lib/arel/tree_manager.rb}, %q{lib/arel/update_manager.rb}, %q{lib/arel/visitors.rb}, %q{lib/arel/visitors/depth_first.rb}, %q{lib/arel/visitors/dot.rb}, %q{lib/arel/visitors/ibm_db.rb}, %q{lib/arel/visitors/informix.rb}, %q{lib/arel/visitors/join_sql.rb}, %q{lib/arel/visitors/mssql.rb}, %q{lib/arel/visitors/mysql.rb}, %q{lib/arel/visitors/oracle.rb}, %q{lib/arel/visitors/order_clauses.rb}, %q{lib/arel/visitors/postgresql.rb}, %q{lib/arel/visitors/sqlite.rb}, %q{lib/arel/visitors/to_sql.rb}, %q{lib/arel/visitors/visitor.rb}, %q{lib/arel/visitors/where_sql.rb}, %q{test/attributes/test_attribute.rb}, %q{test/helper.rb}, %q{test/nodes/test_as.rb}, %q{test/nodes/test_ascending.rb}, %q{test/nodes/test_bin.rb}, %q{test/nodes/test_count.rb}, %q{test/nodes/test_delete_statement.rb}, %q{test/nodes/test_descending.rb}, %q{test/nodes/test_equality.rb}, %q{test/nodes/test_infix_operation.rb}, %q{test/nodes/test_insert_statement.rb}, %q{test/nodes/test_named_function.rb}, %q{test/nodes/test_node.rb}, %q{test/nodes/test_not.rb}, %q{test/nodes/test_or.rb}, %q{test/nodes/test_select_core.rb}, %q{test/nodes/test_select_statement.rb}, %q{test/nodes/test_sql_literal.rb}, %q{test/nodes/test_sum.rb}, %q{test/nodes/test_update_statement.rb}, %q{test/support/fake_record.rb}, %q{test/test_activerecord_compat.rb}, %q{test/test_attributes.rb}, %q{test/test_crud.rb}, %q{test/test_delete_manager.rb}, %q{test/test_factory_methods.rb}, %q{test/test_insert_manager.rb}, %q{test/test_select_manager.rb}, %q{test/test_table.rb}, %q{test/test_update_manager.rb}, %q{test/visitors/test_depth_first.rb}, %q{test/visitors/test_dot.rb}, %q{test/visitors/test_ibm_db.rb}, %q{test/visitors/test_informix.rb}, %q{test/visitors/test_join_sql.rb}, %q{test/visitors/test_mssql.rb}, %q{test/visitors/test_mysql.rb}, %q{test/visitors/test_oracle.rb}, %q{test/visitors/test_postgres.rb}, %q{test/visitors/test_sqlite.rb}, %q{test/visitors/test_to_sql.rb}]
   s.homepage = %q{http://github.com/rails/arel}
-  s.rdoc_options = ["--main", "README.markdown"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--main}, %q{README.markdown}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{arel}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.8.6.1}
   s.summary = %q{Arel is a SQL AST manager for Ruby}
-  s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_equality.rb", "test/nodes/test_infix_operation.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.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/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.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_ibm_db.rb", "test/visitors/test_informix.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.test_files = [%q{test/attributes/test_attribute.rb}, %q{test/nodes/test_as.rb}, %q{test/nodes/test_ascending.rb}, %q{test/nodes/test_bin.rb}, %q{test/nodes/test_count.rb}, %q{test/nodes/test_delete_statement.rb}, %q{test/nodes/test_descending.rb}, %q{test/nodes/test_equality.rb}, %q{test/nodes/test_infix_operation.rb}, %q{test/nodes/test_insert_statement.rb}, %q{test/nodes/test_named_function.rb}, %q{test/nodes/test_node.rb}, %q{test/nodes/test_not.rb}, %q{test/nodes/test_or.rb}, %q{test/nodes/test_select_core.rb}, %q{test/nodes/test_select_statement.rb}, %q{test/nodes/test_sql_literal.rb}, %q{test/nodes/test_sum.rb}, %q{test/nodes/test_update_statement.rb}, %q{test/test_activerecord_compat.rb}, %q{test/test_attributes.rb}, %q{test/test_crud.rb}, %q{test/test_delete_manager.rb}, %q{test/test_factory_methods.rb}, %q{test/test_insert_manager.rb}, %q{test/test_select_manager.rb}, %q{test/test_table.rb}, %q{test/test_update_manager.rb}, %q{test/visitors/test_depth_first.rb}, %q{test/visitors/test_dot.rb}, %q{test/visitors/test_ibm_db.rb}, %q{test/visitors/test_informix.rb}, %q{test/visitors/test_join_sql.rb}, %q{test/visitors/test_mssql.rb}, %q{test/visitors/test_mysql.rb}, %q{test/visitors/test_oracle.rb}, %q{test/visitors/test_postgres.rb}, %q{test/visitors/test_sqlite.rb}, %q{test/visitors/test_to_sql.rb}]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 2.3"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.9"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<hoe>, ["~> 2.10"])
     else
-      s.add_dependency(%q<minitest>, ["~> 2.3"])
-      s.add_dependency(%q<hoe>, ["~> 2.9"])
+      s.add_dependency(%q<hoe>, ["~> 2.10"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 2.3"])
-    s.add_dependency(%q<hoe>, ["~> 2.9"])
+    s.add_dependency(%q<hoe>, ["~> 2.10"])
   end
 end

data/lib/arel.rb

@@ -33,7 +33,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.1.4'
+  VERSION = '2.2.0'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/factory_methods.rb

@@ -2,6 +2,14 @@ module Arel
   ###
   # Methods for creating various nodes
   module FactoryMethods
+    def create_true
+      Arel::Nodes::True.new
+    end
+
+    def create_false
+      Arel::Nodes::False.new
+    end
+
     def create_table_alias relation, name
       Nodes::TableAlias.new(relation, name)
     end

data/lib/arel/nodes.rb

@@ -8,6 +8,8 @@ require 'arel/nodes/update_statement'
 # terminal
 
 require 'arel/nodes/terminal'
+require 'arel/nodes/true'
+require 'arel/nodes/false'
 
 # unary
 require 'arel/nodes/unary'

data/lib/arel/nodes/false.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class False < Arel::Nodes::Node
+    end
+  end
+end

data/lib/arel/nodes/join_source.rb

@@ -9,6 +9,10 @@ module Arel
       def initialize single_source, joinop = []
         super
       end
+
+      def empty?
+        !left && right.empty?
+      end
     end
   end
 end

data/lib/arel/nodes/node.rb

@@ -32,8 +32,7 @@ module Arel
       #
       # Maybe we should just use `Table.engine`?  :'(
       def to_sql engine = Table.engine
-        viz = Visitors.for engine
-        viz.accept self
+        engine.connection.visitor.accept self
       end
 
       # Iterate through AST, nodes will be yielded depth-first

data/lib/arel/nodes/true.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class True < Arel::Nodes::Node
+    end
+  end
+end

data/lib/arel/predications.rb

@@ -1,6 +1,5 @@
 module Arel
   module Predications
-
     def not_eq other
       Nodes::NotEqual.new self, other
     end

data/lib/arel/select_manager.rb

@@ -149,13 +149,13 @@ module Arel
 
     def wheres
       warn "#{caller[0]}: SelectManager#wheres is deprecated and will be removed in ARel 3.0.0 with no replacement"
-      Compatibility::Wheres.new @engine, @ctx.wheres
+      Compatibility::Wheres.new @engine.connection_pool, @ctx.wheres
     end
 
     def where_sql
       return if @ctx.wheres.empty?
 
-      viz = Visitors::WhereSql.new @engine
+      viz = Visitors::WhereSql.new @engine.connection_pool
       Nodes::SqlLiteral.new viz.accept @ctx
     end
 
@@ -205,12 +205,13 @@ module Arel
     def join_sql
       return nil if @ctx.source.right.empty?
 
-      sql = @visitor.dup.extend(Visitors::JoinSql).accept @ctx
+      sql = visitor.dup.extend(Visitors::JoinSql).accept @ctx
       Nodes::SqlLiteral.new sql
     end
 
     def order_clauses
-      Visitors::OrderClauses.new(@engine).accept(@ast).map { |x|
+      visitor = Visitors::OrderClauses.new(@engine.connection_pool)
+      visitor.accept(@ast).map { |x|
         Nodes::SqlLiteral.new x
       }
     end

data/lib/arel/tree_manager.rb

@@ -4,21 +4,23 @@ module Arel
     include Arel::Relation
     include Arel::FactoryMethods
 
-    attr_accessor :visitor
     attr_reader :ast, :engine
 
     def initialize engine
-      @engine  = engine
-      @visitor = Visitors.visitor_for @engine
-      @ctx     = nil
+      @engine = engine
+      @ctx    = nil
     end
 
     def to_dot
       Visitors::Dot.new.accept @ast
     end
 
+    def visitor
+      engine.connection.visitor
+    end
+
     def to_sql
-      @visitor.accept @ast
+      visitor.accept @ast
     end
 
     def initialize_copy other

data/lib/arel/visitors/oracle.rb

@@ -65,6 +65,18 @@ module Arel
         "( #{visit o.left} MINUS #{visit o.right} )"
       end
 
+      def visit_Arel_Nodes_UpdateStatement o
+        # Oracle does not allow ORDER BY/LIMIT in UPDATEs. 
+        if o.orders.any? && o.limit.nil?
+          # However, there is no harm in silently eating the ORDER BY clause if no LIMIT has been provided,
+          # otherwise let the user deal with the error
+          o = o.dup
+          o.orders = []
+        end
+
+        super
+      end
+
       ###
       # Hacks for the order clauses specific to Oracle
       def order_hacks o

data/lib/arel/visitors/to_sql.rb

@@ -4,17 +4,15 @@ require 'date'
 module Arel
   module Visitors
     class ToSql < Arel::Visitors::Visitor
-      def initialize engine
-        @engine         = engine
+      def initialize pool
+        @pool           = pool
         @connection     = nil
-        @pool           = nil
         @quoted_tables  = {}
         @quoted_columns = {}
       end
 
       def accept object
         self.last_column = nil
-        @pool = @engine.connection_pool
         @pool.with_connection do |conn|
           @connection = conn
           super
@@ -90,6 +88,14 @@ key on UpdateManager using UpdateManager#key=
           o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
+      def visit_Arel_Nodes_True o
+        "TRUE"
+      end
+
+      def visit_Arel_Nodes_False o
+        "FALSE"
+      end
+
       def table_exists? name
         @pool.table_exists? name
       end
@@ -134,7 +140,7 @@ key on UpdateManager using UpdateManager#key=
           (visit(o.top) if o.top),
           (visit(o.set_quantifier) if o.set_quantifier),
           ("#{o.projections.map { |x| visit x }.join ', '}" unless o.projections.empty?),
-          (visit(o.source) if o.source),
+          ("FROM #{visit(o.source)}" if o.source && !o.source.empty?),
           ("WHERE #{o.wheres.map { |x| visit x }.join ' AND ' }" unless o.wheres.empty?),
           ("GROUP BY #{o.groups.map { |x| visit x }.join ', ' }" unless o.groups.empty?),
           (visit(o.having) if o.having),
@@ -280,10 +286,7 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def visit_Arel_Nodes_JoinSource o
-        return unless o.left || !o.right.empty?
-
         [
-          "FROM",
           (visit(o.left) if o.left),
           o.right.map { |j| visit j }.join(' ')
         ].compact.join ' '

data/test/nodes/test_bin.rb

@@ -8,13 +8,13 @@ module Arel
       end
 
       def test_default_to_sql
-        viz  = Arel::Visitors::ToSql.new Table.engine
+        viz  = Arel::Visitors::ToSql.new Table.engine.connection_pool
         node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
         assert_equal 'zomg', viz.accept(node)
       end
 
       def test_mysql_to_sql
-        viz  = Arel::Visitors::MySQL.new Table.engine
+        viz  = Arel::Visitors::MySQL.new Table.engine.connection_pool
         node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
         assert_equal 'BINARY zomg', viz.accept(node)
       end

data/test/nodes/test_select_core.rb

@@ -23,7 +23,7 @@ module Arel
       def test_set_quantifier
         core = Arel::Nodes::SelectCore.new
         core.set_quantifier = Arel::Nodes::Distinct.new
-        viz = Arel::Visitors::ToSql.new Table.engine
+        viz = Arel::Visitors::ToSql.new Table.engine.connection_pool
         assert_match 'DISTINCT', viz.accept(core)
       end
     end

data/test/nodes/test_sql_literal.rb

@@ -3,6 +3,10 @@ require 'helper'
 module Arel
   module Nodes
     describe 'sql literal' do
+      before do
+        @visitor = Visitors::ToSql.new Table.engine.connection_pool
+      end
+
       describe 'sql' do
         it 'makes a sql literal node' do
           sql = Arel.sql 'foo'
@@ -13,38 +17,33 @@ module Arel
       describe 'count' do
         it 'makes a count node' do
           node = SqlLiteral.new('*').count
-          viz = Visitors::ToSql.new Table.engine
-          viz.accept(node).must_be_like %{ COUNT(*) }
+          @visitor.accept(node).must_be_like %{ COUNT(*) }
         end
 
         it 'makes a distinct node' do
           node = SqlLiteral.new('*').count true
-          viz = Visitors::ToSql.new Table.engine
-          viz.accept(node).must_be_like %{ COUNT(DISTINCT *) }
+          @visitor.accept(node).must_be_like %{ COUNT(DISTINCT *) }
         end
       end
 
       describe 'equality' do
         it 'makes an equality node' do
           node = SqlLiteral.new('foo').eq(1)
-          viz = Visitors::ToSql.new Table.engine
-          viz.accept(node).must_be_like %{ foo = 1 }
+          @visitor.accept(node).must_be_like %{ foo = 1 }
         end
       end
 
       describe 'grouped "or" equality' do
         it 'makes a grouping node with an or node' do
           node = SqlLiteral.new('foo').eq_any([1,2])
-          viz = Visitors::ToSql.new Table.engine
-          viz.accept(node).must_be_like %{ (foo = 1 OR foo = 2) }
+          @visitor.accept(node).must_be_like %{ (foo = 1 OR foo = 2) }
         end
       end
 
       describe 'grouped "and" equality' do
         it 'makes a grouping node with an or node' do
           node = SqlLiteral.new('foo').eq_all([1,2])
-          viz = Visitors::ToSql.new Table.engine
-          viz.accept(node).must_be_like %{ (foo = 1 AND foo = 2) }
+          @visitor.accept(node).must_be_like %{ (foo = 1 AND foo = 2) }
         end
       end
     end

data/test/support/fake_record.rb

@@ -3,9 +3,9 @@ module FakeRecord
   end
 
   class Connection
-    attr_reader :tables, :columns_hash
+    attr_reader :tables, :columns_hash, :visitor
 
-    def initialize
+    def initialize(visitor)
       @tables = %w{ users photos developers products}
       @columns = {
         'users' => [
@@ -27,6 +27,7 @@ module FakeRecord
         'users' => 'id',
         'products' => 'id'
       }
+      @visitor = visitor
     end
 
     def primary_key name
@@ -78,7 +79,7 @@ module FakeRecord
 
     def initialize
       @spec = Spec.new(:adapter => 'america')
-      @connection = Connection.new
+      @connection = Connection.new(Arel::Visitors::ToSql.new(self))
     end
 
     def with_connection

data/test/test_factory_methods.rb

@@ -23,6 +23,16 @@ module Arel
         assert_equal :one, on.expr
       end
 
+      def test_create_true
+        true_node = @factory.create_true
+        assert_instance_of Nodes::True, true_node
+      end
+
+      def test_create_false
+        false_node = @factory.create_false
+        assert_instance_of Nodes::False, false_node
+      end
+
       def test_lower
         lower = @factory.lower :one
         assert_instance_of Nodes::NamedFunction, lower

data/test/test_select_manager.rb

@@ -42,6 +42,10 @@ module Arel
       @engine.connection.tables
     end
 
+    def visitor
+      @engine.connection.visitor
+    end
+
     def execute sql, name = nil, *args
       @executed << sql
     end

data/test/test_update_manager.rb

@@ -62,6 +62,19 @@ module Arel
         um = Arel::UpdateManager.new Table.engine
         um.table(Table.new(:users)).must_equal um
       end
+
+      it 'generates an update statement with joins' do
+        um = Arel::UpdateManager.new Table.engine
+
+        table = Table.new(:users)
+        join_source = Arel::Nodes::JoinSource.new(
+          table,
+          [table.create_join(Table.new(:posts))]
+        )
+
+        um.table join_source
+        um.to_sql.must_be_like %{ UPDATE "users" INNER JOIN "posts" }
+      end
     end
 
     describe 'where' do

data/test/visitors/test_ibm_db.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the ibm_db visitor' do
       before do
-        @visitor = IBM_DB.new Table.engine
+        @visitor = IBM_DB.new Table.engine.connection_pool
       end
 
       it 'uses FETCH FIRST n ROWS to limit results' do

data/test/visitors/test_informix.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the informix visitor' do
       before do
-        @visitor = Informix.new Table.engine
+        @visitor = Informix.new Table.engine.connection_pool
       end
 
       it 'uses LIMIT n to limit results' do

data/test/visitors/test_join_sql.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the join_sql visitor' do
       before do
-        @visitor = ToSql.new Table.engine
+        @visitor = ToSql.new Table.engine.connection_pool
         @visitor.extend(JoinSql)
       end
 

data/test/visitors/test_mssql.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the mssql visitor' do
       before do
-        @visitor = MSSQL.new Table.engine
+        @visitor = MSSQL.new Table.engine.connection_pool
         @table = Arel::Table.new "users"
       end
 

data/test/visitors/test_mysql.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the mysql visitor' do
       before do
-        @visitor = MySQL.new Table.engine
+        @visitor = MySQL.new Table.engine.connection_pool
       end
 
       it 'squashes parenthesis on multiple unions' do

data/test/visitors/test_oracle.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the oracle visitor' do
       before do
-        @visitor = Oracle.new Table.engine
+        @visitor = Oracle.new Table.engine.connection_pool
       end
 
       it 'modifies order when there is distinct and first value' do

data/test/visitors/test_postgres.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the postgres visitor' do
       before do
-        @visitor = PostgreSQL.new Table.engine
+        @visitor = PostgreSQL.new Table.engine.connection_pool
       end
 
       describe 'locking' do

data/test/visitors/test_sqlite.rb

@@ -4,7 +4,7 @@ module Arel
   module Visitors
     describe 'the sqlite visitor' do
       before do
-        @visitor = SQLite.new Table.engine
+        @visitor = SQLite.new Table.engine.connection_pool
       end
 
       it 'defaults limit to -1' do

data/test/visitors/test_to_sql.rb

@@ -8,7 +8,7 @@ module Arel
   module Visitors
     describe 'the to_sql visitor' do
       before do
-        @visitor = ToSql.new Table.engine
+        @visitor = ToSql.new Table.engine.connection_pool
         @table = Table.new(:users)
         @attr = @table[:id]
       end
@@ -220,7 +220,7 @@ module Arel
             end
           end
           in_node = Nodes::In.new @attr, %w{ a b c }
-          visitor = visitor.new(Table.engine)
+          visitor = visitor.new(Table.engine.connection_pool)
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }
@@ -308,7 +308,7 @@ module Arel
             end
           end
           in_node = Nodes::NotIn.new @attr, %w{ a b c }
-          visitor = visitor.new(Table.engine)
+          visitor = visitor.new(Table.engine.connection_pool)
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }
@@ -325,6 +325,22 @@ module Arel
         end
       end
 
+      describe 'Constants' do
+        it "should handle true" do
+          test = Table.new(:users).create_true
+          @visitor.accept(test).must_be_like %{
+            TRUE
+          }
+        end
+
+        it "should handle false" do
+          test = Table.new(:users).create_false
+          @visitor.accept(test).must_be_like %{
+            FALSE
+          }
+        end
+      end
+
       describe 'TableAlias' do
         it "should use the underlying table for checking columns" do
           test = Table.new(:users).alias('zomgusers')[:id].eq '3'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 4
-  version: 2.1.4
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -07:00
+date: 2011-08-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .gemtest
+- Gemfile
 - History.txt
 - MIT-LICENSE.txt
 - Manifest.txt
@@ -99,6 +100,7 @@ files:
 - lib/arel/nodes/delete_statement.rb
 - lib/arel/nodes/descending.rb
 - lib/arel/nodes/equality.rb
+- lib/arel/nodes/false.rb
 - lib/arel/nodes/function.rb
 - lib/arel/nodes/in.rb
 - lib/arel/nodes/infix_operation.rb
@@ -115,6 +117,7 @@ files:
 - lib/arel/nodes/string_join.rb
 - lib/arel/nodes/table_alias.rb
 - lib/arel/nodes/terminal.rb
+- lib/arel/nodes/true.rb
 - lib/arel/nodes/unary.rb
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb