arel 2.0.8 → 2.0.9.rc1

data/History.txt

@@ -1,3 +1,14 @@
+== 2.0.9  / unreleased
+
+* Bug Fixes
+
+  * Custom LOCK strings are allowed. Fixes LH # 6399
+    https://rails.lighthouseapp.com/projects/8994/tickets/6399-allow-database-specific-locking-clauses-to-be-used
+
+  * Strings passed to StringManager#on will be automatically tagged as SQL
+    literals. Fixes Rails LH #6384
+    https://rails.lighthouseapp.com/projects/8994/tickets/6384-activerecord-303-and-3-0-stable-generate-invalid-sql-for-has_many-through-association-with-conditions
+
 == 2.0.8  / 2010/02/08
 
 * Bug Fixes

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.8.beta.20110131120940"
+  s.version = "2.0.9.20110222133018"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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-01-31}
+  s.date = %q{2011-02-22}
   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"]
@@ -15,12 +15,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{arel}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Arel is a Relational Algebra for Ruby}
   s.test_files = ["test/attributes/test_attribute.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/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"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/arel.rb

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

data/lib/arel/nodes/lock.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class Lock < Arel::Nodes::Node
+    class Lock < Arel::Nodes::Unary
     end
   end
 end

data/lib/arel/select_manager.rb

@@ -34,10 +34,16 @@ module Arel
       @ctx.wheres.map { |c| to_sql.accept c }
     end
 
-    def lock locking = true
-      # FIXME: do we even need to store this?  If locking is +false+ shouldn't
-      # we just remove the node from the AST?
-      @ast.lock = Nodes::Lock.new
+    def lock locking = Arel.sql('FOR UPDATE')
+      case locking
+      when true
+        locking = Arel.sql('FOR UPDATE')
+      when Arel::Nodes::SqlLiteral
+      when String
+        locking = Arel.sql locking
+      end
+
+      @ast.lock = Nodes::Lock.new(locking)
       self
     end
 
@@ -213,6 +219,8 @@ module Arel
 
     private
     def collapse exprs
+      exprs.map! { |x| x.class == ::String ? Arel.sql(x) : x }
+
       return exprs.first if exprs.length == 1
 
       right = exprs.pop

data/lib/arel/visitors/mysql.rb

@@ -3,7 +3,7 @@ module Arel
     class MySQL < Arel::Visitors::ToSql
       private
       def visit_Arel_Nodes_Lock o
-        "FOR UPDATE"
+        visit o.expr
       end
 
       ###

data/lib/arel/visitors/postgresql.rb

@@ -3,7 +3,7 @@ module Arel
     class PostgreSQL < Arel::Visitors::ToSql
       private
       def visit_Arel_Nodes_Lock o
-        "FOR UPDATE"
+        visit o.expr
       end
 
       def visit_Arel_Nodes_SelectStatement o

data/test/test_select_manager.rb

@@ -90,6 +90,24 @@ module Arel
           mgr.to_sql.must_be_like %{ SELECT FROM "users" HAVING foo }
         end
       end
+
+      describe 'on' do
+        it 'converts to sqlliterals' do
+          table = Table.new :users
+          right = table.alias
+          mgr   = table.from table
+          mgr.join(right).on("omg")
+          mgr.to_sql.must_be_like %{ SELECT  FROM "users" INNER JOIN "users" "users_2" ON omg }
+        end
+
+        it 'converts to sqlliterals' do
+          table = Table.new :users
+          right = table.alias
+          mgr   = table.from table
+          mgr.join(right).on("omg", "123")
+          mgr.to_sql.must_be_like %{ SELECT  FROM "users" INNER JOIN "users" "users_2" ON omg AND 123 }
+        end
+      end
     end
 
     describe 'clone' do

data/test/visitors/test_depth_first.rb

@@ -56,7 +56,7 @@ module Arel
       end
 
       def test_lock
-        lock = Nodes::Lock.new
+        lock = Nodes::Lock.new true
         @visitor.accept lock
         assert_equal [lock], @collector.calls
       end

data/test/visitors/test_mysql.rb

@@ -29,11 +29,16 @@ module Arel
         sql.must_be_like "SELECT FROM DUAL"
       end
 
-      it 'uses FOR UPDATE when locking' do
-        stmt = Nodes::SelectStatement.new
-        stmt.lock = Nodes::Lock.new
-        sql = @visitor.accept(stmt)
-        sql.must_be_like "SELECT FROM DUAL FOR UPDATE"
+      describe 'locking' do
+        it 'defaults to FOR UPDATE when locking' do
+          node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
+          @visitor.accept(node).must_be_like "FOR UPDATE"
+        end
+
+        it 'allows a custom string to be used as a lock' do
+          node = Nodes::Lock.new(Arel.sql('LOCK IN SHARE MODE'))
+          @visitor.accept(node).must_be_like "LOCK IN SHARE MODE"
+        end
       end
     end
   end

data/test/visitors/test_postgres.rb

@@ -7,10 +7,19 @@ module Arel
         @visitor = PostgreSQL.new Table.engine
       end
 
-      it 'should produce a lock value' do
-        @visitor.accept(Nodes::Lock.new).must_be_like %{
-          FOR UPDATE
-        }
+      describe 'locking' do
+        it 'defaults to FOR UPDATE' do
+          @visitor.accept(Nodes::Lock.new(Arel.sql('FOR UPDATE'))).must_be_like %{
+            FOR UPDATE
+          }
+        end
+
+        it 'allows a custom string to be used as a lock' do
+          node = Nodes::Lock.new(Arel.sql('FOR SHARE'))
+          @visitor.accept(node).must_be_like %{
+            FOR SHARE
+          }
+        end
       end
 
       it "should escape LIMIT" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15424031
   prerelease: 
   segments: 
   - 2
   - 0
-  - 8
-  version: 2.0.8
+  - 9
+  - rc
+  - 1
+  version: 2.0.9.rc1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,12 +79,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        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.
@@ -225,6 +227,7 @@ files:
 - test/visitors/test_postgres.rb
 - test/visitors/test_sqlite.rb
 - test/visitors/test_to_sql.rb
+- .gemtest
 has_rdoc: true
 homepage: http://github.com/rails/arel
 licenses: []