From: toyomoyo <toyomoyo>
Date: Tue, 18 Apr 2006 03:30:57 +0000 (+0000)
Subject: the table_column function ate my auto_increments
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=025bec3169f6edb24a4d04a8de470d33bb5f62c1;p=moodle.git

the table_column function ate my auto_increments
---

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 532055779c..39ee8fc3b2 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1682,21 +1682,21 @@ function main_upgrade($oldversion=0) {
     if ($oldversion < 2006031000) {
 
         modify_database("","CREATE TABLE prefix_post (
-          `id` int(10) NOT NULL auto_increment,
-          `userid` int(10) NOT NULL default '0',
-          `courseid` int(10) NOT NULL default'0',
-          `groupid` int(10) NOT NULL default'0',
-          `moduleid` int(10) NOT NULL default'0',
-          `coursemoduleid` int(10) NOT NULL default'0',
+          `id` int(10) unsigned NOT NULL auto_increment,
+          `userid` int(10) unsigned NOT NULL default '0',
+          `courseid` int(10) unsigned NOT NULL default'0',
+          `groupid` int(10) unsigned NOT NULL default'0',
+          `moduleid` int(10) unsigned NOT NULL default'0',
+          `coursemoduleid` int(10) unsigned NOT NULL default'0',
           `subject` varchar(128) NOT NULL default '',
           `summary` longtext,
           `content` longtext,
           `uniquehash` varchar(128) NOT NULL default '',
-          `rating` int(10) NOT NULL default'0',
-          `format` int(10) NOT NULL default'0',
+          `rating` int(10) unsigned NOT NULL default'0',
+          `format` int(10) unsigned NOT NULL default'0',
           `publishstate` enum('draft','site','public') NOT NULL default 'draft',
-          `lastmodified` int(10) NOT NULL default '0',
-          `created` int(10) NOT NULL default '0',
+          `lastmodified` int(10) unsigned NOT NULL default '0',
+          `created` int(10) unsigned NOT NULL default '0',
           PRIMARY KEY  (`id`),
           UNIQUE KEY `id_user_idx` (`id`, `userid`),
           KEY `post_lastmodified_idx` (`lastmodified`),
@@ -1704,20 +1704,20 @@ function main_upgrade($oldversion=0) {
         ) TYPE=MyISAM  COMMENT='New moodle post table. Holds data posts such as forum entries or blog entries.';");
 
         modify_database("","CREATE TABLE prefix_tags (
-          `id` int(10) NOT NULL auto_increment,
+          `id` int(10) unsigned NOT NULL auto_increment,
           `type` varchar(255) NOT NULL default 'official',
-          `userid` int(10) NOT NULL default'0',
+          `userid` int(10) unsigned NOT NULL default'0',
           `text` varchar(255) NOT NULL default '',
           PRIMARY KEY  (`id`)
         ) TYPE=MyISAM COMMENT ='tags structure for moodle.';");
 
         modify_database("","CREATE TABLE prefix_blog_tag_instance (
-          `id` int(10) NOT NULL auto_increment,
-          `entryid` int(10) NOT NULL default'0',
-          `tagid` int(10) NOT NULL default'0',
-          `groupid` int(10) NOT NULL default'0',
-          `courseid` int(10) NOT NULL default'0',
-          `userid` int(10) NOT NULL default'0',
+          `id` int(10) unsigned NOT NULL auto_increment,
+          `entryid` int(10) unsigned NOT NULL default'0',
+          `tagid` int(10) unsigned NOT NULL default'0',
+          `groupid` int(10) unsigned NOT NULL default'0',
+          `courseid` int(10) unsigned NOT NULL default'0',
+          `userid` int(10) unsigned NOT NULL default'0',
           PRIMARY KEY  (`id`)
           ) TYPE=MyISAM COMMENT ='tag instance for blogs.';");
     }
@@ -1780,6 +1780,12 @@ function main_upgrade($oldversion=0) {
         table_column('course_modules','','visibleold','integer','1','unsigned','1','not null', 'visible');
     }
     
+    if ($oldversion < 2006041800) { // forgot auto_increments for ids
+        modify_database('',"ALTER TABLE post CHANGE id id INT UNSIGNED NOT NULL AUTO_INCREMENT");
+        modify_database('',"ALTER TABLE tags CHANGE id id INT UNSIGNED NOT NULL AUTO_INCREMENT");
+        modify_database('',"ALTER TABLE blog_tag_instance CHANGE id id INT UNSIGNED NOT NULL AUTO_INCREMENT");
+    }
+    
     return $result;
 }
 
diff --git a/version.php b/version.php
index b998ece6c9..5e7db38a09 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006041100;  // YYYYMMDD = date
+   $version = 2006041800;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.6 Beta 3';    // Human-friendly version name