From 097bd57be4785fffd9be60567a51de5b31f7d7c8 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Tue, 3 Feb 2015 11:58:41 -0800 Subject: [PATCH] SolrDocument.primary_key should be the same as Solr's unique key. --- lib/blacklight/solr/document.rb | 4 ++-- spec/lib/blacklight/solr/document_spec.rb | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/blacklight/solr/document.rb b/lib/blacklight/solr/document.rb index 6395bc072c..a206f16e6b 100644 --- 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 index 62f1e77b40..bd2e1fc7dd 100644 --- 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