arel 2.0.9 → 2.0.10

data/History.txt

@@ -1,3 +1,10 @@
+== 2.0.10 / 2011/05/14
+
+* Bug Fixes
+
+  * Fix thread safety issue in ToSql visitor.  Thanks Damon McCormick and
+    Cameron Walters!
+
 == 2.0.9  / 2010/02/25
 
 * Bug Fixes

data/lib/arel.rb

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

data/lib/arel/visitors/to_sql.rb

@@ -7,13 +7,12 @@ module Arel
       def initialize engine
         @engine         = engine
         @connection     = nil
-        @last_column    = nil
         @quoted_tables  = {}
         @quoted_columns = {}
       end
 
       def accept object
-        @last_column = nil
+        self.last_column = nil
         @engine.connection_pool.with_connection do |conn|
           @connection = conn
           super
@@ -280,7 +279,7 @@ module Arel
       end
 
       def visit_Arel_Attributes_Attribute o
-        @last_column = o.column
+        self.last_column = o.column
         join_name = o.relation.table_alias || o.relation.name
         "#{quote_table_name join_name}.#{quote_column_name o.name}"
       end
@@ -296,7 +295,15 @@ module Arel
       alias :visit_Arel_SqlLiteral :visit_Fixnum # This is deprecated
       alias :visit_Bignum :visit_Fixnum
 
-      def visit_String o; quote(o, @last_column) end
+      def visit_String o; quote(o, last_column) end
+
+      def last_column
+        Thread.current[:arel_visitors_to_sql_last_column]
+      end
+
+      def last_column= col
+        Thread.current[:arel_visitors_to_sql_last_column] = col
+      end
 
       alias :visit_ActiveSupport_Multibyte_Chars :visit_String
       alias :visit_BigDecimal :visit_String

data/test/nodes/test_node.rb

@@ -24,10 +24,5 @@ module Arel
       node.each.each { |n| list << n }
       assert_equal [node], list
     end
-
-    def test_enumerable
-      node = Nodes::Node.new
-      assert_kind_of Enumerable, node
-    end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -8,6 +8,21 @@ module Arel
         @attr = Table.new(:users)[:id]
       end
 
+      it "should be thread safe around usage of last_column" do
+        table = Table.new(:users)
+
+        visit_integer_column = Thread.new do
+          Thread.stop
+          @visitor.send(:visit_Arel_Attributes_Attribute, @attr)
+        end
+
+        @visitor.accept(table[:name])
+        assert_equal(:string, @visitor.send(:last_column).type)
+        visit_integer_column.run
+        visit_integer_column.join
+        assert_equal(:string, @visitor.send(:last_column).type)
+      end
+
       describe 'equality' do
         it 'should handle false' do
           sql = @visitor.accept Nodes::Equality.new(false, false)

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arel
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 2.0.10
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 9
-  version: 2.0.9
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 - Bryan Halmkamp
 - Emilio Tagua
@@ -17,90 +12,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-25 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157239820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157239820
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2157239280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157239280
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2157238760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157238760
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2157238300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.9.1
   type: :development
-  version_requirements: *id004
-description: 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.
-email: 
+  prerelease: false
+  version_requirements: *2157238300
+description: 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.
+email:
 - aaron@tenderlovemaking.com
 - bryan@brynary.com
 - miloops@gmail.com
 - nick@example.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - MIT-LICENSE.txt
 - Manifest.txt
 - README.markdown
-files: 
+files:
 - .autotest
 - History.txt
 - MIT-LICENSE.txt
@@ -226,42 +201,33 @@ files:
 - test/visitors/test_sqlite.rb
 - test/visitors/test_to_sql.rb
 - .gemtest
-has_rdoc: true
 homepage: http://github.com/rails/arel
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: arel
-rubygems_version: 1.5.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Arel is a Relational Algebra for Ruby
-test_files: 
+test_files:
 - test/attributes/test_attribute.rb
 - test/nodes/test_as.rb
 - test/nodes/test_count.rb