Title: [886] trunk/activerecord-jdbc/lib/active_record/connection_adapters/
jdbc_adapter.rb: Fix for JRUBY-2018.
- Revision
- 886
- Author
- olabini
- Date
- 2008-01-24 17:55:13 -0500 (Thu, 24 Jan 2008)
Log Message
Fix for JRUBY-2018. Problem identified by K Venkatasubramaniyan.
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb (885 => 886)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2008-01-24 15:11:47 UTC (rev 885)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2008-01-24 22:55:13 UTC (rev 886)
@@ -61,10 +61,10 @@
extend JdbcSpec::ActiveRecordExtensions
alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
- def attributes_with_quotes(*args) #:nodoc:
- aq = attributes_with_quotes_pre_oracle(*args)
+ def attributes_with_quotes(include_primary_key = true, *args) #:nodoc:
+ aq = attributes_with_quotes_pre_oracle(include_primary_key, *args)
if connection.class == ConnectionAdapters::JdbcAdapter && (connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer))
- aq[self.class.primary_key] = "?" if args.first && aq[self.class.primary_key].nil?
+ aq[self.class.primary_key] = "?" if include_primary_key && aq[self.class.primary_key].nil?
end
aq
end
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
