Permalink
Browse files

Correct whitespace problem in Oracle default column value parsing. Cl…

…oses #2788.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2942 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 917189b commit 86aaa6e9886ec16a76618e819092d0748bbedd53 @jeremy jeremy committed Nov 8, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/oci_adapter.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Correct whitespace problem in Oracle default column value parsing. #2788 [rick@rickbradley.com]
+
* Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy. This allows you to act on the habtm association as you please while preserving referential integrity. #2065 [larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper]
* Deprecate the old, confusing :exclusively_dependent option in favor of :dependent => :delete_all. [Jeremy Kemper]
View
2 activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -331,7 +331,7 @@ def columns(table_name, name = nil) #:nodoc:
and col.owner = nvl(syn.table_owner, cat.owner)
and col.table_name = nvl(syn.table_name, cat.table_name)
}).map do |row|
- row['data_default'].gsub!(/^'(.*)'$/, '\1') if row['data_default']
+ row['data_default'].gsub!(/^'(.*)'\s*$/, '\1') if row['data_default']
OCIColumn.new(
oci_downcase(row['column_name']),
row['data_default'],

0 comments on commit 86aaa6e

Please sign in to comment.