- Patch #42886 by chx: critical feature: allow modules to be reordered.

3 files changed, 21 insertions, 1 deletions

diff --git a/database/database.mysql b/database/database.mysql
index e84d4518b..68671f14b 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -685,7 +685,9 @@ CREATE TABLE system (
   throttle tinyint(1) DEFAULT '0' NOT NULL,
   bootstrap int(2) NOT NULL default '0',
   schema_version smallint(2) unsigned NOT NULL default 0,
-  PRIMARY KEY (filename)
+  weight int(2) NOT NULL default '0',
+  PRIMARY KEY (filename),
+  KEY (weight)
 ) TYPE=MyISAM;
 
 --
diff --git a/database/database.pgsql b/database/database.pgsql
index 8b7659f5a..1529901dd 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -680,8 +680,10 @@ CREATE TABLE system (
   throttle smallint NOT NULL default '0',
   bootstrap integer NOT NULL default '0',
   schema_version smallint NOT NULL default 0,
+  weight smallint NOT NULL default 0,
   PRIMARY KEY (filename)
 );
+CREATE INDEX system_weight_idx ON system(weight);
 
 --
 -- Table structure for term_data
diff --git a/database/updates.inc b/database/updates.inc
index d4b440f3d..10a73f3d7 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1397,3 +1397,19 @@ function system_update_166() {
 
   return $ret;
 }
+
+function system_update_167() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_add_column($ret, 'system', 'weight', 'smallint', array('not null' => TRUE, 'default' => 0));
+      $ret[] = update_sql('CREATE INDEX {system}_weight_idx ON {system} (weight)');
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {system} ADD weight tinyint(3) unsigned default '0' NOT NULL, ADD KEY (weight)");
+      break;
+  }
+
+  return $ret;
+}