SolrDocument.primary_key should be the same as Solr's unique key.

projectblacklight · Feb 6, 2015 · 097bd57 · 097bd57
1 parent a9db4e4
commit 097bd57
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/blacklight/solr/document.rb b/lib/blacklight/solr/document.rb
@@ -175,9 +175,9 @@ module ClassMethods
     def unique_key
       @unique_key ||= 'id' 
     end
-    
+
     def primary_key
-      'id'
+      unique_key
     end
 
     def base_class

diff --git a/spec/lib/blacklight/solr/document_spec.rb b/spec/lib/blacklight/solr/document_spec.rb
@@ -47,6 +47,18 @@ def my_extension_method
 
     end
 
+    describe "Primary key" do
+      before(:each) do
+        MockDocument.unique_key = 'my_unique_key'
+      end
+      after(:each) do
+        MockDocument.unique_key = 'id'
+      end
+      it "should be the same as the unique key" do
+        expect(MockDocument.primary_key).to eq MockDocument.unique_key
+      end
+    end
+
     describe "#to_param" do
       it "should be a string" do
         @document = MockDocument.new :id => 1234