- Patch #37373 by killes: bugfix: vocabulary_node_types was broken.

3 files changed, 17 insertions, 2 deletions

diff --git a/database/database.mysql b/database/database.mysql
index 11ae9aec4..85c1a44d2 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -822,7 +822,7 @@ CREATE TABLE vocabulary (
 
 CREATE TABLE vocabulary_node_types (
   vid int(10) unsigned NOT NULL DEFAULT '0',
-  type varchar(16) NOT NULL DEFAULT '',
+  type varchar(32) NOT NULL DEFAULT '',
   PRIMARY KEY (vid, type)
 ) TYPE=MyISAM;
 
diff --git a/database/database.pgsql b/database/database.pgsql
index 4eb0f7095..3abb1fa1a 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -819,7 +819,7 @@ CREATE TABLE vocabulary (
 
 CREATE TABLE vocabulary_node_types (
   vid integer NOT NULL default '0',
-  type varchar(16) NOT NULL default '',
+  type varchar(32) NOT NULL default '',
   PRIMARY KEY (vid, type)
 );
 
diff --git a/database/updates.inc b/database/updates.inc
index 6511ae991..72a4ea553 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1406,3 +1406,18 @@ function system_update_166() {
   return $ret;
 }
 
+function system_update_167() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("ALTER TABLE {vocabulary_node_types} CHANGE type varchar(32) NOT NULL default ''");
+      break;
+    case 'pgsql':
+      db_change_column($ret, 'vocabulary_node_types', 'type', 'type', 'varchar(32)', array('not null' => TRUE, 'default' => "''"));
+      break;
+  }
+
+  return $ret;
+}