Merge pull request #350 from Ensembl/postfix/release96

revert patch 94_95_c

sql/patch_94_95_c.sql

--- Copyright [1999-2015] Wellcome Trust Sanger Institute and the EMBL-European Bioinformatics Institute
--- Copyright [2016-2018] EMBL-European Bioinformatics Institute
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---      http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-# patch_94_95_c.sql
-#
-# Title: Remove analysis_id from unique key constraint 
-#
-# Description:
-#   Not all object_xref have an analysis, remove analysis_id from unique key constraint
-
-ALTER TABLE object_xref
-        DROP INDEX xref_idx,
-        ADD UNIQUE KEY xref_idx (xref_id, ensembl_object_type, ensembl_id);
-
-# Patch identifier
-INSERT INTO meta (species_id, meta_key, meta_value)
-  VALUES (NULL, 'patch', 'patch_94_95_c.sql|ox_key_update');

sql/table.sql

@@ -2322,7 +2322,7 @@ CREATE TABLE object_xref (
 
   PRIMARY KEY (object_xref_id),
 
-  UNIQUE KEY xref_idx (xref_id, ensembl_object_type, ensembl_id),
+  UNIQUE KEY xref_idx (xref_id, ensembl_object_type, ensembl_id, analysis_id),
 
   KEY ensembl_idx (ensembl_object_type, ensembl_id),
   KEY analysis_idx (analysis_id)