Merge pull request #4040 from maxious/3949-fix-solr-delete_package

[#3949] Fix and test Solr index delete_package implementation

ckan/lib/search/index.py

@@ -314,12 +314,10 @@ def commit(self):
             log.exception(e)
             raise SearchIndexError(e)
 
-
     def delete_package(self, pkg_dict):
         conn = make_connection()
-        query = "+%s:%s (+id:\"%s\" OR +name:\"%s\") +site_id:\"%s\"" % (TYPE_FIELD, PACKAGE_TYPE,
-                                                       pkg_dict.get('id'), pkg_dict.get('id'),
-                                                       config.get('ckan.site_id'))
+        query = "+%s:%s AND +(id:\"%s\" OR name:\"%s\") AND +site_id:\"%s\"" % \
+                (TYPE_FIELD, PACKAGE_TYPE, pkg_dict.get('id'), pkg_dict.get('id'), config.get('ckan.site_id'))
         try:
             commit = asbool(config.get('ckan.search.solr_commit', 'true'))
             conn.delete(q=query, commit=commit)

ckan/tests/lib/search/test_index.py

@@ -81,6 +81,28 @@ def test_clear_index(self):
         response = self.solr_client.search(q='name:monkey', fq=self.fq)
         assert_equal(len(response), 0)
 
+    def test_delete_package(self):
+        self.package_index.index_package(self.base_package_dict)
+
+        pkg_dict = self.base_package_dict.copy()
+        pkg_dict.update({
+            'id': 'test-index-2',
+            'name': 'monkey2'
+        })
+        self.package_index.index_package(pkg_dict)
+
+        response = self.solr_client.search(q='title:Monkey', fq=self.fq)
+        assert_equal(len(response), 2)
+        response_ids = sorted([x['id'] for x in response.docs])
+        assert_equal(response_ids, ['test-index', 'test-index-2'])
+
+        self.package_index.delete_package(pkg_dict)
+
+        response = self.solr_client.search(q='title:Monkey', fq=self.fq)
+        assert_equal(len(response), 1)
+        response_ids = sorted([x['id'] for x in response.docs])
+        assert_equal(response_ids, ['test-index'])
+
     def test_index_illegal_xml_chars(self):
 
         pkg_dict = self.base_package_dict.copy()