fix for issue #556

norman · May 26, 2014 · dbdb7f6 · dbdb7f6
1 parent 57baa35
commit dbdb7f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/friendly_id/base.rb b/lib/friendly_id/base.rb
@@ -222,7 +222,7 @@ def friendly_id_config
     end
 
     def primary_key_type
-      @primary_key_type ||= columns.find(&:primary).type
+      @primary_key_type ||= columns.find { |c| c.name == primary_key}.type
     end
   end
 

diff --git a/test/slugged_test.rb b/test/slugged_test.rb
@@ -265,7 +265,7 @@ def model_class
 
   test "should have a string as a primary key" do
     assert_equal model_class.primary_key, "string_key"
-    assert_equal model_class.columns.find(&:primary).name, "string_key"
+    assert_equal model_class.columns.find { |c| c.name == model_class.primary_key}.name, "string_key"
   end
 
   test "should be findable by the string primary key" do