diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 36 |
2 files changed, 20 insertions, 18 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 5f3c738b77..b0947a800d 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Optimize postgresql selects. [skaes@web.de] + * Update DB2 adapter. #2206. [contact@maik-schmidt.de] * Corrections to SQLServer native data types. #2267. [rails.20.clarry@spamgourmet.com] diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index e7bedaee9e..b26d4d35c9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -250,24 +250,24 @@ module ActiveRecord def select(sql, name = nil) res = execute(sql, name) results = res.result - rows = [] - if results.length > 0 - fields = res.fields - results.each do |row| - hashed_row = {} - row.each_index do |cel_index| - column = row[cel_index] - if res.type(cel_index) == BYTEA_COLUMN_TYPE_OID - column = unescape_bytea(column) - end - hashed_row[fields[cel_index]] = column - end - rows << hashed_row - end - end - return rows - end - + rows = [] + if results.length > 0 + fields = res.fields + hash_prototype = fields.inject({}){ |proto, field| proto[field] = nil; proto } + results.each do |row| + hashed_row = hash_prototype.clone + row.each_index do |col_num| + if res.type(col_num) == BYTEA_COLUMN_TYPE_OID + hashed_row[fields[col_num]] = unescape_bytea(row[col_num]) + else + hashed_row[fields[col_num]] = row[col_num] + end + end + rows << hashed_row + end + end + rows + end def escape_bytea(s) if PGconn.respond_to? :escape_bytea self.class.send(:define_method, :escape_bytea) do |s| |