TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix #8414. Performance problem with postgresql adapter primary_key function.

Browse Source
This commit is contained in:
kennyj 2012-12-05 01:12:46 +09:00
parent d3f4625aed
commit 634d28e6cf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/CHANGELOG.md
View File

@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ## ## Rails 4.0.0 (unreleased) ##
* Fix performance problem with primary_key method in PostgreSQL adapter when having many schemas.
Uses pg_constraint table instead of pg_depend table which has many records in general.
Fix #8414
*kennyj*
* Do not instantiate intermediate Active Record objects when eager loading. * Do not instantiate intermediate Active Record objects when eager loading.
These records caused `after_find` to run more than expected. These records caused `after_find` to run more than expected.
Fix #3313 Fix #3313

5
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
View File

@ -305,12 +305,11 @@ def pk_and_sequence_for(table) #:nodoc:
# Returns just a table's primary key # Returns just a table's primary key
def primary_key(table) def primary_key(table)
row = exec_query(<<-end_sql, 'SCHEMA').rows.first row = exec_query(<<-end_sql, 'SCHEMA').rows.first
SELECT DISTINCT(attr.attname) SELECT attr.attname
FROM pg_attribute attr FROM pg_attribute attr
INNER JOIN pg_depend dep ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1] INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
WHERE cons.contype = 'p' WHERE cons.contype = 'p'
AND dep.refobjid = '#{quote_table_name(table)}'::regclass AND cons.conrelid = '#{quote_table_name(table)}'::regclass
end_sql end_sql
row && row.first row && row.first