Merge branch 'master' of github.com:brynary/arel

* 'master' of github.com:brynary/arel:
  added missing method visit_Arel_Attributes_Decimal as alias for visit_Arel_Attributes_Attribute
  pass primary key name and value to ActiveRecord adapter insert method

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index ba31e3183b..3285037154 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -27,7 +27,11 @@ module Arel
     end
 
     def primary_key
-      @primary_key ||= self[@engine.connection.primary_key(name)]
+      @primary_key ||= begin
+        primary_key_name = @engine.connection.primary_key(name)
+        # some tables might be without primary key
+        primary_key_name && self[primary_key_name]
+      end
     end
 
     def alias