Commit ef0c2f3d authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

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

parents 2b141e67 68def4d6
......@@ -504,7 +504,6 @@
<FIELD NAME="edited" TYPE="int" LENGTH="1" DEFAULT="0" NOTNULL="false" />
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="artefact,usr" />
<KEY NAME="usrfk" TYPE="foreign" FIELDS="usr" REFTABLE="usr" REFFIELDS="id" />
</KEYS>
<INDEXES>
......
......@@ -2780,10 +2780,6 @@ function xmldb_core_upgrade($oldversion=0) {
$key = new XMLDBKey('primary');
$key->setAttributes(XMLDB_KEY_PRIMARY, array('blocktype'));
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;
......
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