aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-07-12 17:00:29 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-07-12 17:00:29 -0700
commitc9710a43ff6cdc536f08983b007768ae6a66dd10 (patch)
treec9052d9bdf090adeba17d11cd61934b97a304a1a
parent7c4e0401d25e29b2960ae2adb31194d908cfd25b (diff)
downloadrails-c9710a43ff6cdc536f08983b007768ae6a66dd10.tar.gz
rails-c9710a43ff6cdc536f08983b007768ae6a66dd10.tar.bz2
rails-c9710a43ff6cdc536f08983b007768ae6a66dd10.zip
refactor PostgreSQLAdapter#result_as_array to create fewer Range objects
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 004c6620df..9bf08a7671 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -431,15 +431,15 @@ module ActiveRecord
def result_as_array(res) #:nodoc:
# check if we have any binary column and if they need escaping
unescape_col = []
- for j in 0...res.nfields do
+ res.nfields.times do |j|
# unescape string passed BYTEA field (OID == 17)
unescape_col << ( res.ftype(j)==17 )
end
ary = []
- for i in 0...res.ntuples do
+ res.ntuples.times do |i|
ary << []
- for j in 0...res.nfields do
+ res.nfields.times do |j|
data = res.getvalue(i,j)
data = unescape_bytea(data) if unescape_col[j] and data.is_a?(String)
ary[i] << data