Commit 68def4d6 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Remove upgrade to add primary key on artefact_log (bug #845948)

The values of artefact,usr columns of the table are not necessarily
unique.  Perhaps a better option would be to create an id column.
This primary key was added in a3f6fbfe

.

Change-Id: Ib151a14f0943d799d45a7697abc00f117883cd95
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent 2b141e67
...@@ -504,7 +504,6 @@ ...@@ -504,7 +504,6 @@
<FIELD NAME="edited" TYPE="int" LENGTH="1" DEFAULT="0" NOTNULL="false" /> <FIELD NAME="edited" TYPE="int" LENGTH="1" DEFAULT="0" NOTNULL="false" />
</FIELDS> </FIELDS>
<KEYS> <KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="artefact,usr" />
<KEY NAME="usrfk" TYPE="foreign" FIELDS="usr" REFTABLE="usr" REFFIELDS="id" /> <KEY NAME="usrfk" TYPE="foreign" FIELDS="usr" REFTABLE="usr" REFFIELDS="id" />
</KEYS> </KEYS>
<INDEXES> <INDEXES>
......
...@@ -2780,10 +2780,6 @@ function xmldb_core_upgrade($oldversion=0) { ...@@ -2780,10 +2780,6 @@ function xmldb_core_upgrade($oldversion=0) {
$key = new XMLDBKey('primary'); $key = new XMLDBKey('primary');
$key->setAttributes(XMLDB_KEY_PRIMARY, array('blocktype')); $key->setAttributes(XMLDB_KEY_PRIMARY, array('blocktype'));
add_key($table, $key); add_key($table, $key);
$table = new XMLDBTable('artefact_log');
$key = new XMLDBKey('primary');
$key->setAttributes(XMLDB_KEY_PRIMARY, array('artefact', 'usr'));
add_key($table, $key);
} }
return $status; return $status;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment