arel 2.2.3 → 3.0.0.rc1

data/Manifest.txt

@@ -62,7 +62,6 @@ lib/arel/table.rb
 lib/arel/tree_manager.rb
 lib/arel/update_manager.rb
 lib/arel/visitors.rb
-lib/arel/visitors/bind_visitor.rb
 lib/arel/visitors/depth_first.rb
 lib/arel/visitors/dot.rb
 lib/arel/visitors/ibm_db.rb
@@ -107,7 +106,6 @@ test/test_insert_manager.rb
 test/test_select_manager.rb
 test/test_table.rb
 test/test_update_manager.rb
-test/visitors/test_bind_visitor.rb
 test/visitors/test_depth_first.rb
 test/visitors/test_dot.rb
 test/visitors/test_ibm_db.rb

data/arel.gemspec

@@ -2,38 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "2.2.3.20120221150435"
+  s.version = "3.0.0.pre.20111119204131"
 
-  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 = "2012-02-21"
+  s.date = "2011-11-20"
   s.description = "Arel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMS systems\n\nIt is intended to be a framework framework; that is, you can build your own ORM\nwith it, focusing on innovative object and collection modeling as opposed to\ndatabase 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", ".travis.yml", "Gemfile", "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/false.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/true.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/bind_visitor.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_bind_visitor.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.files = [".autotest", ".gemtest", ".travis.yml", "Gemfile", "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/false.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/true.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.homepage = "http://github.com/rails/arel"
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "arel"
   s.rubygems_version = "1.8.11"
   s.summary = "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_bind_visitor.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 = ["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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 2.11"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.13"])
+      s.add_development_dependency(%q<minitest>, ["~> 2.8"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
     else
-      s.add_dependency(%q<minitest>, ["~> 2.11"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.13"])
+      s.add_dependency(%q<minitest>, ["~> 2.8"])
+      s.add_dependency(%q<hoe>, ["~> 2.12"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 2.11"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.13"])
+    s.add_dependency(%q<minitest>, ["~> 2.8"])
+    s.add_dependency(%q<hoe>, ["~> 2.12"])
   end
 end

data/lib/arel.rb

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

data/lib/arel/nodes/node.rb

@@ -39,7 +39,7 @@ module Arel
       def each &block
         return enum_for(:each) unless block_given?
 
-        ::Arel::Visitors::DepthFirst.new(block).accept self
+        Visitors::DepthFirst.new(block).accept self
       end
     end
   end

data/lib/arel/nodes/sql_literal.rb

@@ -6,8 +6,5 @@ module Arel
       include Arel::AliasPredication
       include Arel::OrderPredications
     end
-
-    class BindParam < SqlLiteral
-    end
   end
 end

data/lib/arel/select_manager.rb

@@ -51,7 +51,7 @@ module Arel
       if $VERBOSE
         warn "(#{caller.first}) where_clauses is deprecated and will be removed in arel 3.0.0 with no replacement"
       end
-      to_sql = Visitors::ToSql.new @engine.connection_pool
+      to_sql = Visitors::ToSql.new @engine.connection
       @ctx.wheres.map { |c| to_sql.accept c }
     end
 
@@ -161,13 +161,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.connection_pool, @ctx.wheres
+      Compatibility::Wheres.new @engine.connection, @ctx.wheres
     end
 
     def where_sql
       return if @ctx.wheres.empty?
 
-      viz = Visitors::WhereSql.new @engine.connection_pool
+      viz = Visitors::WhereSql.new @engine.connection
       Nodes::SqlLiteral.new viz.accept @ctx
     end
 
@@ -222,7 +222,7 @@ module Arel
     end
 
     def order_clauses
-      visitor = Visitors::OrderClauses.new(@engine.connection_pool)
+      visitor = Visitors::OrderClauses.new(@engine.connection)
       visitor.accept(@ast).map { |x|
         Nodes::SqlLiteral.new x
       }

data/lib/arel/visitors/depth_first.rb

@@ -109,7 +109,6 @@ module Arel
       alias :visit_Arel_Nodes_Lock               :terminal
       alias :visit_Arel_Nodes_Node               :terminal
       alias :visit_Arel_Nodes_SqlLiteral         :terminal
-      alias :visit_Arel_Nodes_BindParam          :terminal
       alias :visit_Arel_SqlLiteral               :terminal
       alias :visit_BigDecimal                    :terminal
       alias :visit_Bignum                        :terminal

data/lib/arel/visitors/dot.rb

@@ -65,7 +65,6 @@ module Arel
         visit_edge o, "expr"
       end
       alias :visit_Arel_Nodes_Group             :unary
-      alias :visit_Arel_Nodes_BindParam         :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
       alias :visit_Arel_Nodes_Limit             :unary

data/lib/arel/visitors/to_sql.rb

@@ -4,30 +4,22 @@ require 'date'
 module Arel
   module Visitors
     class ToSql < Arel::Visitors::Visitor
-      def initialize pool
-        @pool           = pool
-        @connection     = nil
+      attr_accessor :last_column
+
+      def initialize connection
+        @connection     = connection
+        @schema_cache   = connection.schema_cache
         @quoted_tables  = {}
         @quoted_columns = {}
+        @last_column    = nil
       end
 
       def accept object
         self.last_column = nil
-        @pool.with_connection do |conn|
-          @connection = conn
-          super
-        end
+        super
       end
 
       private
-      def last_column= col
-        Thread.current[:arel_visitors_to_sql_last_column] = col
-      end
-
-      def last_column
-        Thread.current[:arel_visitors_to_sql_last_column]
-      end
-
       def visit_Arel_Nodes_DeleteStatement o
         [
           "DELETE FROM #{visit o.relation}",
@@ -97,7 +89,7 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def table_exists? name
-        @pool.table_exists? name
+        @schema_cache.table_exists? name
       end
 
       def column_for attr
@@ -110,13 +102,13 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def column_cache
-        @pool.columns_hash
+        @schema_cache.columns_hash
       end
 
       def visit_Arel_Nodes_Values o
         "VALUES (#{o.expressions.zip(o.columns).map { |value, attr|
           if Nodes::SqlLiteral === value
-            visit value
+            visit_Arel_Nodes_SqlLiteral value
           else
             quote(value, attr && column_for(attr))
           end
@@ -382,13 +374,14 @@ key on UpdateManager using UpdateManager#key=
 
       def literal o; o end
 
-      alias :visit_Arel_Nodes_BindParam  :literal
       alias :visit_Arel_Nodes_SqlLiteral :literal
       alias :visit_Arel_SqlLiteral       :literal # This is deprecated
       alias :visit_Bignum                :literal
       alias :visit_Fixnum                :literal
 
-      def quoted o; quote(o, last_column) end
+      def quoted o
+        quote(o, last_column)
+      end
 
       alias :visit_ActiveSupport_Multibyte_Chars :quoted
       alias :visit_ActiveSupport_StringInquirer  :quoted

data/test/nodes/test_node.rb

@@ -11,7 +11,6 @@ module Arel
         Nodes.const_get(k)
       }.grep(Class).each do |klass|
         next if Nodes::SqlLiteral == klass
-        next if Nodes::BindParam == klass
         next if klass.name =~ /^Arel::Nodes::Test/
         assert klass.ancestors.include?(Nodes::Node), klass.name
       end

data/test/support/fake_record.rb

@@ -3,9 +3,10 @@ module FakeRecord
   end
 
   class Connection
-    attr_reader :tables, :columns_hash, :visitor
+    attr_reader :tables, :columns_hash
+    attr_accessor :visitor
 
-    def initialize(visitor)
+    def initialize(visitor = nil)
       @tables = %w{ users photos developers products}
       @columns = {
         'users' => [
@@ -50,6 +51,10 @@ module FakeRecord
       "\"#{name.to_s}\""
     end
 
+    def schema_cache
+      self
+    end
+
     def quote thing, column = nil
       if column && column.type == :integer
         return 'NULL' if thing.nil?
@@ -79,7 +84,8 @@ module FakeRecord
 
     def initialize
       @spec = Spec.new(:adapter => 'america')
-      @connection = Connection.new(Arel::Visitors::ToSql.new(self))
+      @connection = Connection.new
+      @connection.visitor = Arel::Visitors::ToSql.new(connection)
     end
 
     def with_connection
@@ -93,6 +99,10 @@ module FakeRecord
     def columns_hash
       connection.columns_hash
     end
+
+    def schema_cache
+      connection
+    end
   end
 
   class Base

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.connection_pool
+        @visitor = IBM_DB.new Table.engine.connection
       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.connection_pool
+        @visitor = Informix.new Table.engine.connection
       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.connection_pool
+        @visitor = ToSql.new Table.engine.connection
         @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.connection_pool
+        @visitor = MSSQL.new Table.engine.connection
         @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.connection_pool
+        @visitor = MySQL.new Table.engine.connection
       end
 
       it 'squashes parenthesis on multiple unions' 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.connection_pool
+        @visitor = PostgreSQL.new Table.engine.connection
       end
 
       describe 'locking' do

data/test/visitors/test_to_sql.rb

@@ -1,24 +1,14 @@
 require 'helper'
 
-class Arel::Visitors::ToSql
-  def last_column; Thread.current[:arel_visitors_to_sql_last_column]; end
-end
-
 module Arel
   module Visitors
     describe 'the to_sql visitor' do
       before do
-        @visitor = ToSql.new Table.engine.connection_pool
+        @visitor = ToSql.new Table.engine.connection
         @table = Table.new(:users)
         @attr = @table[:id]
       end
 
-      it 'works with BindParams' do
-        node = Nodes::BindParam.new 'omg'
-        sql = @visitor.accept node
-        sql.must_be_like 'omg'
-      end
-
       it 'can define a dispatch method' do
         visited = false
         viz = Class.new(Arel::Visitors::Visitor) {
@@ -35,20 +25,6 @@ module Arel
         assert visited, 'hello method was called'
       end
 
-      it "should be thread safe around usage of last_column" do
-        visit_integer_column = Thread.new do
-          Thread.stop
-          @visitor.send(:visit_Arel_Attributes_Attribute, @attr)
-        end
-
-        sleep 0.2
-        @visitor.accept(@table[:name])
-        assert_equal(:string, @visitor.last_column.type)
-        visit_integer_column.run
-        visit_integer_column.join
-        assert_equal(:string, @visitor.last_column.type)
-      end
-
       it 'should not quote sql literals' do
         node = @table[Arel.star]
         sql = @visitor.accept node
@@ -226,7 +202,7 @@ module Arel
             end
           end
           in_node = Nodes::In.new @attr, %w{ a b c }
-          visitor = visitor.new(Table.engine.connection_pool)
+          visitor = visitor.new(Table.engine.connection)
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }
@@ -314,7 +290,7 @@ module Arel
             end
           end
           in_node = Nodes::NotIn.new @attr, %w{ a b c }
-          visitor = visitor.new(Table.engine.connection_pool)
+          visitor = visitor.new(Table.engine.connection)
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 2.2.3
-  prerelease: 
+  version: 3.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,41 +12,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70248113196260 !ruby/object:Gem::Requirement
+  requirement: &70238561431700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70248113196260
+  version_requirements: *70238561431700
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70248113195480 !ruby/object:Gem::Requirement
+  name: hoe
+  requirement: &70238561493640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70248113195480
+  version_requirements: *70238561493640
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70248113194600 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70238562708680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70248113194600
+  version_requirements: *70238562708680
 description: ! 'Arel is a SQL AST manager for Ruby. It
 
 
@@ -137,7 +137,6 @@ files:
 - lib/arel/tree_manager.rb
 - lib/arel/update_manager.rb
 - lib/arel/visitors.rb
-- lib/arel/visitors/bind_visitor.rb
 - lib/arel/visitors/depth_first.rb
 - lib/arel/visitors/dot.rb
 - lib/arel/visitors/ibm_db.rb
@@ -182,7 +181,6 @@ files:
 - test/test_select_manager.rb
 - test/test_table.rb
 - test/test_update_manager.rb
-- test/visitors/test_bind_visitor.rb
 - test/visitors/test_depth_first.rb
 - test/visitors/test_dot.rb
 - test/visitors/test_ibm_db.rb
@@ -211,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: arel
 rubygems_version: 1.8.11
@@ -249,7 +247,6 @@ test_files:
 - test/test_select_manager.rb
 - test/test_table.rb
 - test/test_update_manager.rb
-- test/visitors/test_bind_visitor.rb
 - test/visitors/test_depth_first.rb
 - test/visitors/test_dot.rb
 - test/visitors/test_ibm_db.rb

data/lib/arel/visitors/bind_visitor.rb

@@ -1,24 +0,0 @@
-module Arel
-  module Visitors
-    module BindVisitor
-      def initialize target
-        @block = nil
-        super
-      end
-
-      def accept node, &block
-        @block = block if block_given?
-        super
-      end
-
-      private
-      def visit_Arel_Nodes_BindParam o
-        if @block
-          @block.call
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/test/visitors/test_bind_visitor.rb

@@ -1,39 +0,0 @@
-require 'helper'
-require 'arel/visitors/bind_visitor'
-
-module Arel
-  module Visitors
-    class TestBindVisitor < MiniTest::Unit::TestCase
-      def test_visitor_yields_on_binds
-        visitor = Class.new(Arel::Visitors::Visitor) {
-          def initialize omg
-          end
-
-          include Arel::Visitors::BindVisitor
-        }.new nil
-
-        bp = Nodes::BindParam.new 'omg'
-        called = false
-        visitor.accept(bp) { called = true }
-        assert called
-      end
-
-      def test_visitor_only_yields_on_binds
-        visitor = Class.new(Arel::Visitors::Visitor) {
-          def initialize omg
-          end
-
-          include Arel::Visitors::BindVisitor
-        }.new(nil)
-
-        bp = Arel.sql 'omg'
-        called = false
-
-        assert_raises(TypeError) {
-          visitor.accept(bp) { called = true }
-        }
-        refute called
-      end
-    end
-  end
-end