aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
diff options
context:
space:
mode:
authorCarlos Galdino <carloshsgaldino@gmail.com>2012-05-15 19:25:15 -0300
committerCarlos Galdino <carloshsgaldino@gmail.com>2012-05-15 19:25:15 -0300
commit6c79e82002b497acc4e1515a1c40a4f12678cc28 (patch)
tree0322475854704f1b9e64f18b70fd3b768d15efc4 /activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
parent6f226e016066c88f2d6a952c37319c23bd8d7bfe (diff)
downloadrails-6c79e82002b497acc4e1515a1c40a4f12678cc28.tar.gz
rails-6c79e82002b497acc4e1515a1c40a4f12678cc28.tar.bz2
rails-6c79e82002b497acc4e1515a1c40a4f12678cc28.zip
Remove unnecessary calls to primary_key on sqlite3_adapter
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
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