arel 2.0.2 → 2.0.3

data/History.txt

@@ -1,3 +1,10 @@
+== 2.0.3
+
+* Bug fixes
+
+  * Fixing Oracle support
+  * Added a visitor for "Class" objects
+
 == 2.0.2
 
 * Bug fixes

data/arel.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.1.20101111105523"
+  s.version = "2.0.2.20101111111102"
 
   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"]

data/lib/arel.rb

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

data/lib/arel/attributes.rb

@@ -13,7 +13,7 @@ module Arel
       when :date, :datetime, :timestamp, :time then Time
       when :boolean                            then Boolean
       else
-        raise NotImplementedError, "Column type `#{column.type}` is not currently handled"
+        Undefined
       end
     end
   end

data/lib/arel/attributes/attribute.rb

@@ -5,12 +5,13 @@ module Arel
       include Arel::Predications
     end
 
-    class String  < Attribute; end
-    class Time    < Attribute; end
-    class Boolean < Attribute; end
-    class Decimal < Attribute; end
-    class Float   < Attribute; end
-    class Integer < Attribute; end
+    class String    < Attribute; end
+    class Time      < Attribute; end
+    class Boolean   < Attribute; end
+    class Decimal   < Attribute; end
+    class Float     < Attribute; end
+    class Integer   < Attribute; end
+    class Undefined < Attribute; end
   end
 
   Attribute = Attributes::Attribute

data/lib/arel/visitors/oracle.rb

@@ -70,19 +70,14 @@ module Arel
             /DISTINCT.*FIRST_VALUE/ === projection
           end
         end
-        # FIXME: previous version with join and split broke ORDER BY clause
+        # Previous version with join and split broke ORDER BY clause
         # if it contained functions with several arguments (separated by ',').
-        # Currently splitting is done only if there is no function calls
         #
         # orders   = o.orders.map { |x| visit x }.join(', ').split(',')
         orders   = o.orders.map do |x|
           string = visit x
-          # if there is function call
-          if string.include?('(')
-            string
-          # if no function call then comma splits several ORDER BY columns
-          elsif string.include?(',')
-            string.split(',')
+          if string.include?(',')
+            split_order_string(string)
           else
             string
           end
@@ -94,6 +89,24 @@ module Arel
         end
         o
       end
+
+      # Split string by commas but count opening and closing brackets
+      # and ignore commas inside brackets.
+      def split_order_string(string)
+        array = []
+        i = 0
+        string.split(',').each do |part|
+          if array[i]
+            array[i] << ',' << part
+          else
+            # to ensure that array[i] will be String and not Arel::Nodes::SqlLiteral
+            array[i] = '' << part
+          end
+          i += 1 if array[i].count('(') == array[i].count(')')
+        end
+        array
+      end
+
     end
   end
 end

data/lib/arel/visitors/to_sql.rb

@@ -281,6 +281,7 @@ module Arel
       alias :visit_TrueClass :visit_String
       alias :visit_NilClass :visit_String
       alias :visit_ActiveSupport_StringInquirer :visit_String
+      alias :visit_Class :visit_String
 
       def quote value, column = nil
         @connection.quote value, column

data/test/test_attributes.rb

@@ -3,6 +3,11 @@ require 'helper'
 module Arel
   describe 'Attributes' do
     describe 'for' do
+      it 'deals with unknown column types' do
+        column = Struct.new(:type).new :crazy
+        Attributes.for(column).must_equal Attributes::Undefined
+      end
+
       it 'returns the correct constant for strings' do
         [:string, :text, :binary].each do |type|
           column = Struct.new(:type).new type

data/test/visitors/test_oracle.rb

@@ -43,6 +43,18 @@ module Arel
         }
       end
 
+      it 'splits orders with commas and function calls' do
+        # *sigh*
+        select = "DISTINCT foo.id, FIRST_VALUE(projects.name) OVER (foo) AS alias_0__"
+        stmt = Nodes::SelectStatement.new
+        stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
+        stmt.orders << Nodes::SqlLiteral.new('NVL(LOWER(bar, foo), foo) DESC, UPPER(baz)')
+        sql = @visitor.accept(stmt)
+        sql.must_be_like %{
+          SELECT #{select} ORDER BY alias_0__ DESC, alias_1__
+        }
+      end
+
       describe 'Nodes::SelectStatement' do
         describe 'limit' do
           it 'adds a rownum clause' do

data/test/visitors/test_to_sql.rb

@@ -21,6 +21,10 @@ module Arel
         end
       end
 
+      it "should visit_Class" do
+        @visitor.accept(DateTime).must_equal "'DateTime'"
+      end
+
       it "should visit_DateTime" do
         @visitor.accept DateTime.now
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency