aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-11-13 22:46:14 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-11-13 22:46:14 +0000
commit6201679f1a4c4aab8d86ae8c4d59a5996f54dd34 (patch)
tree75cf348e8b135f14dadb032ed7fdf0a3b6d23458 /activerecord/lib/active_record/connection_adapters
parent44ca6f4b6203455703d00d82e1c5952c6d7402e7 (diff)
downloadrails-6201679f1a4c4aab8d86ae8c4d59a5996f54dd34.tar.gz
rails-6201679f1a4c4aab8d86ae8c4d59a5996f54dd34.tar.bz2
rails-6201679f1a4c4aab8d86ae8c4d59a5996f54dd34.zip
Reapply [2942] which was elided by [2997]. References #2788. References #2848.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3009 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/oci_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
index 2c6aa83817..59191948d2 100644
--- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -338,7 +338,7 @@ begin
end
select_all(table_cols).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'],