diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-08 19:11:25 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-08 19:11:25 +0000 |
| commit | 86aaa6e9886ec16a76618e819092d0748bbedd53 (patch) | |
| tree | 720b05d7a90e5a05a701ce871df7c9d2a7ee2d9a /activerecord | |
| parent | 917189b076682063f389d7a1c767d4719d435f54 (diff) | |
| download | rails-86aaa6e9886ec16a76618e819092d0748bbedd53.tar.gz rails-86aaa6e9886ec16a76618e819092d0748bbedd53.tar.bz2 rails-86aaa6e9886ec16a76618e819092d0748bbedd53.zip | |
Correct whitespace problem in Oracle default column value parsing. Closes #2788.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2942 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/oci_adapter.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 76b4d0062e..0d371d43b7 100644 --- a/activerecord/CHANGELOG +++ b/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] diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb index 5f27fb1ca5..9f94df7277 100644 --- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb @@ -331,7 +331,7 @@ begin 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'], |