Merge pull request activeadmin#1063 from jancel/34_maintain_backwards_compatibility

Fix string vs integer comparison on postgres.

Author: pcreux

lib/active_admin/comments/comment.rb

@@ -19,13 +19,27 @@ class Comment < ActiveRecord::Base
     def self.resource_type(record)
       record.class.base_class.name.to_s
     end
+    
+    def self.resource_id_cast(record)
+      # Postgres adapters won't compare strings to numbers (issue 34)
+      if resource_id_type == :string
+        record.id.to_s
+      else
+        record.id
+      end
+    end
 
     def self.find_for_resource_in_namespace(resource, namespace)
       where(:resource_type => resource_type(resource),
-            :resource_id => resource.id, 
+            :resource_id => resource_id_cast(resource), 
             :namespace => namespace.to_s)
     end
 
+  
+    def self.resource_id_type
+      columns.select { |i| i.name == "resource_id" }.first.type
+    end
+
   end
 
 end

spec/unit/comments_spec.rb

@@ -37,6 +37,24 @@
       end
     end
 
+    describe ".resource_id_cast" do
+      let(:post) { Post.create!(:title => "Testing.") }
+      let(:namespace_name) { "admin" }
+      
+      it "should cast resource_id as string" do
+        comment = ActiveAdmin::Comment.create! :resource => post,
+                                                :body => "Another Comment",
+                                                :namespace => namespace_name
+        ActiveAdmin::Comment.resource_id_cast(comment).class.should eql String
+      end
+    end
+
+    describe ".resource_id_type" do
+      it "should be :string" do
+        ActiveAdmin::Comment.resource_id_type.should eql :string
+      end
+    end
+    
     describe "Commenting on resource with string id" do
       let(:tag){ Tag.create!(:name => "cooltags") }
       let(:namespace_name){ "admin" }