From 11d7b4d9b15a3e48dba5d6322f4758614e24434c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 26 Jun 2010 12:40:33 +0000
Subject: [PATCH] - Patch #818214 by dereine: improper table structure for
 url_alias().

---
 modules/system/system.install | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/system/system.install b/modules/system/system.install
index 95339e11234..4532a1c4c68 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1568,11 +1568,11 @@ function system_schema() {
       ),
     ),
     'unique keys' => array(
-      'alias_language_pid' => array('alias', 'language', 'pid'),
+      'alias_language' => array('alias', 'language'),
     ),
     'primary key' => array('pid'),
     'indexes' => array(
-      'source_language_pid' => array('source', 'language', 'pid'),
+      'source_language' => array('source', 'language'),
     ),
   );
 
@@ -2543,6 +2543,18 @@ function system_update_7055() {
   db_change_field('system', 'info', 'info', $spec);
 }
 
+/**
+ * Remove pid from indexes and unique keys of {}url_alias}.
+ */
+function system_update_7056() {
+  // Drop indexes.
+  db_drop_index('url_alias', 'source_language_pid');
+  db_drop_unique_key('url_alias', 'alias_language_pid');
+  // Add indexes back.
+  db_add_index('url_alias', 'source_language', array('source', 'language'));
+  db_add_unique_key('url_alias', 'alias_language', array('alias', 'language'));
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.