diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-15 15:28:46 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-15 15:28:46 -0700 |
| commit | dafc7343097be4b56510e693c487b284446bc1fb (patch) | |
| tree | 0322475854704f1b9e64f18b70fd3b768d15efc4 /activerecord | |
| parent | 6f226e016066c88f2d6a952c37319c23bd8d7bfe (diff) | |
| parent | 6c79e82002b497acc4e1515a1c40a4f12678cc28 (diff) | |
| download | rails-dafc7343097be4b56510e693c487b284446bc1fb.tar.gz rails-dafc7343097be4b56510e693c487b284446bc1fb.tar.bz2 rails-dafc7343097be4b56510e693c487b284446bc1fb.zip | |
Merge pull request #6333 from carlosgaldino/unnecessary-call
Remove unnecessary calls to primary_key on sqlite3_adapter
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 7b4be67131..5b9c9770df 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -540,7 +540,7 @@ module ActiveRecord :precision => column.precision, :scale => column.scale, :null => column.null) end - @definition.primary_key(primary_key(from)) if primary_key(from) + @definition.primary_key(from_primary_key) if from_primary_key yield @definition if block_given? end |