# HG changeset patch
# User Dan
# Date 1210390320 14400
# Node ID fbe306070c40f98caf82146aba843942355226ae
# Parent  704e1d3ca378d9d11f70da99dc6fe64ce3165015
Fixed (again) the user -> user_id transition in enano_tags table

diff -r 704e1d3ca378 -r fbe306070c40 schema.sql
--- a/schema.sql	Sun Apr 13 17:03:15 2008 -0400
+++ b/schema.sql	Fri May 09 23:32:00 2008 -0400
@@ -243,7 +243,7 @@
   tag_name varchar(63) NOT NULL DEFAULT 'bla',
   page_id varchar(255) NOT NULL,
   namespace varchar(255) NOT NULL,
-  user mediumint(8) NOT NULL DEFAULT 1,
+  user_id mediumint(8) NOT NULL DEFAULT 1,
   PRIMARY KEY ( tag_id )
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff -r 704e1d3ca378 -r fbe306070c40 upgrade.php
--- a/upgrade.php	Sun Apr 13 17:03:15 2008 -0400
+++ b/upgrade.php	Fri May 09 23:32:00 2008 -0400
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0.4 (Ellyyllon)
+ * Version 1.0.5 (Ferrishyn)
  * upgrade.php - upgrade script
  * Copyright (C) 2006-2007 Dan Fuhry
  *
@@ -70,7 +70,7 @@
 // Everything related to versions goes here!
 
 // Valid versions to upgrade from
-$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3');
+$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4');
 
 // Basically a list of dependencies, which should be resolved automatically
 // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not
@@ -87,9 +87,10 @@
     '1.0.1' => Array('1.0.1.1'),
     '1.0.1.1' => Array('1.0.2b1'),
     '1.0.2b1' => Array('1.0.2'),
-    '1.0.2' => Array('1.0.3')
+    '1.0.2' => Array('1.0.3'),
+    '1.0.3' => Array('1.0.4')
   );
-$this_version   = '1.0.4';
+$this_version   = '1.0.5';
 $func_list = Array(
     '1.0' => Array('u_1_0_1_update_del_votes'),
     '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text'), // ,
diff -r 704e1d3ca378 -r fbe306070c40 upgrade.sql
--- a/upgrade.sql	Sun Apr 13 17:03:15 2008 -0400
+++ b/upgrade.sql	Fri May 09 23:32:00 2008 -0400
@@ -3,7 +3,10 @@
 -- ALL NON-SQL LINES, even otherwise blank lines, must start with "--" or they will get sent to MySQL!
 -- Common tasks (version numbers)
 DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version';
-INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.4' );
+INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.5' );
+---BEGIN 1.0.4---
+ALTER TABLE {{TABLE_PREFIX}}tags CHANGE user user_id mediumint(8) NOT NULL DEFAULT 1;
+---END 1.0.4---
 ---BEGIN 1.0.3---
 -- No DB changes in this release
 ---END 1.0.3---