arel 2.1.0 → 2.1.1

data/History.txt

@@ -1,3 +1,10 @@
+== 2.1.1 / 2011/05/14
+
+* Bug fixes
+
+  * Fixed thread safety bug in ToSql visitor.  Thanks Damon McCormick and
+    Cameron Walters!
+
 == 2.1.0 / 2011/04/30
 
 * Enhancements

data/lib/arel.rb

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

data/lib/arel/nodes/infix_operation.rb

@@ -4,6 +4,7 @@ module Arel
     class InfixOperation < Binary
       include Arel::Expressions
       include Arel::Predications
+      include Arel::OrderPredications
       include Arel::AliasPredication
       include Arel::Math
 

data/lib/arel/visitors/to_sql.rb

@@ -8,14 +8,13 @@ module Arel
         @engine         = engine
         @connection     = nil
         @pool           = nil
-        @last_column    = nil
         @quoted_tables  = {}
         @quoted_columns = {}
       end
 
       def accept object
-        @last_column = nil
-        @pool        = @engine.connection_pool
+        self.last_column = nil
+        @pool = @engine.connection_pool
         @pool.with_connection do |conn|
           @connection = conn
           super
@@ -23,6 +22,14 @@ module Arel
       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}",
@@ -356,7 +363,7 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def visit_Arel_Attributes_Attribute o
-        @last_column = column_for o
+        self.last_column = column_for o
         join_name = o.relation.table_alias || o.relation.name
         "#{quote_table_name join_name}.#{quote_column_name o.name}"
       end
@@ -374,7 +381,7 @@ key on UpdateManager using UpdateManager#key=
       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
@@ -409,7 +416,8 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def quote_table_name name
-        @quoted_tables[name] ||= Arel::Nodes::SqlLiteral === name ? name : @connection.quote_table_name(name)
+        return name if Arel::Nodes::SqlLiteral === name
+        @quoted_tables[name] ||= @connection.quote_table_name(name)
       end
 
       def quote_column_name name

data/test/nodes/test_infix_operation.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    class TestInfixOperation < MiniTest::Unit::TestCase
+      def test_construct
+        operation = InfixOperation.new :+, 1, 2
+        assert_equal :+, operation.operator
+        assert_equal 1, operation.left
+        assert_equal 2, operation.right
+      end
+
+      def test_operation_alias
+        operation = InfixOperation.new :+, 1, 2
+        aliaz = operation.as('zomg')
+        assert_kind_of As, aliaz
+        assert_equal operation, aliaz.left
+        assert_equal 'zomg', aliaz.right
+      end
+
+      def test_opertaion_ordering
+        operation = InfixOperation.new :+, 1, 2
+        ordering = operation.desc
+        assert_kind_of Ordering, ordering
+        assert_equal operation, ordering.expr
+        assert_equal :desc, ordering.direction
+      end
+    end
+  end
+end

data/test/test_select_manager.rb

@@ -216,7 +216,7 @@ module Arel
         table   = Table.new :users, :engine => Table.engine, :as => 'foo'
         mgr = table.from table
         mgr.skip 10
-        mgr.to_sql.must_be_like %{ SELECT FROM "users" foo OFFSET 10 }
+        mgr.to_sql.must_be_like %{ SELECT FROM "users" "foo" OFFSET 10 }
       end
     end
 

data/test/visitors/test_to_sql.rb

@@ -1,5 +1,9 @@
 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
@@ -9,6 +13,20 @@ module Arel
         @attr = @table[:id]
       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

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arel
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.1.1
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 - Bryan Halmkamp
 - Emilio Tagua
@@ -17,49 +12,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+date: 2011-05-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2156937040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2156937040
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2156936540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 9
-        - 4
-        version: 2.9.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.1
   type: :development
-  version_requirements: *id001
-description: |-
-  Arel is a SQL AST manager for Ruby. It
-  
+  prerelease: false
+  version_requirements: *2156936540
+description: ! 'Arel is a SQL AST manager for Ruby. It
+
+
   1. Simplifies the generation complex of SQL queries
+
   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: 
+
+  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
 - .gemtest
 - History.txt
@@ -168,47 +170,41 @@ files:
 - test/visitors/test_postgres.rb
 - test/visitors/test_sqlite.rb
 - test/visitors/test_to_sql.rb
+- test/nodes/test_infix_operation.rb
 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.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Arel is a SQL AST manager for Ruby
-test_files: 
+test_files:
 - test/attributes/test_attribute.rb
 - test/nodes/test_as.rb
 - test/nodes/test_bin.rb
 - test/nodes/test_count.rb
 - test/nodes/test_delete_statement.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