making sure primary key is set on the columns

1 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index bafd79d614..db745e325f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -85,7 +85,15 @@ module ActiveRecord
 
         @columns     = Hash.new do |h, table_name|
           h[table_name] = with_connection do |conn|
-            conn.columns(table_name, "#{table_name} Columns")
+
+            # Fetch a list of columns
+            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
+
+              # set primary key information
+              columns.each do |column|
+                column.primary = column.name == primary_keys[table_name]
+              end
+            end
           end
         end