[Jruby-extras-devel] [750] trunk/activerecord-jdbc/lib/jdbc_adapter: Fix so that adapters handle quoted_id correctly.

[nobody]

Title: [750] trunk/activerecord-jdbc/lib/jdbc_adapter: Fix so that adapters handle quoted_id correctly.

Revision

750

Author

olabini

Date

2007-09-26 11:51:37 -0400 (Wed, 26 Sep 2007)

Log Message

Fix so that adapters handle quoted_id correctly. Oracle down to 10F

Modified Paths

• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_firebird.rb
• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb
• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb
• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb
• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb
• trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb

Diff

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_firebird.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_firebird.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_firebird.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -64,6 +64,8 @@
     end
     
     def quote(value, column = nil) # :nodoc:
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       if [Time, DateTime].include?(value.class)
         "CAST('#{value.strftime("%Y-%m-%d %H:%M:%S")}' AS TIMESTAMP)"
       else

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_hsqldb.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -92,6 +92,8 @@
     end
 
     def quote(value, column = nil) # :nodoc:
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       case value
       when String
         if column && column.type == :binary

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mimer.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -67,6 +67,8 @@
     end
 
     def quote(value, column = nil) #:nodoc:
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       if String === value && column && column.type == :binary
         return "X'#{quote_string(value.unpack("C*").collect {|v| v.to_s(16)}.join)}'"
       end

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -63,6 +63,8 @@
     # QUOTING ==================================================
     
     def quote(value, column = nil)
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       if column && column.type == :primary_key
         value.to_s
       elsif column && String === value && column.type == :binary && column.class.respond_to?(:string_to_binary)

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_oracle.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -301,6 +301,8 @@
     end
     
     def quote(value, column = nil) #:nodoc:
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       if column && [:text, :binary].include?(column.type)
         if /(.*?)\([0-9]+\)/ =~ column.sql_type
           %Q{empty_#{ $1.downcase }()}

Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb (749 => 750)

--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb	2007-09-26 15:39:33 UTC (rev 749)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb	2007-09-26 15:51:37 UTC (rev 750)
@@ -264,6 +264,8 @@
     end
 
     def quote(value, column = nil)
+      return value.quoted_id if value.respond_to?(:quoted_id)
+      
       if value.kind_of?(String) && column && column.type == :binary
         "'#{escape_bytea(value)}'"
       elsif column && column.type == :primary_key

_______________________________________________
Jruby-extras-devel mailing list
Jruby-extras-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/jruby-extras-devel