Use normal int everywhere in the table to store user ids (Closes #844).

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/upgrade/0.9.17/01_axletter.sql b/upgrade/0.9.17/01_axletter.sql
deleted file mode 100644 (file)
index 17ffb94..0000000
--- a/upgrade/0.9.17/01_axletter.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE axletter_rights CHANGE COLUMN user_id user_id SMALLINT UNSIGNED NOT NULL DEFAULT 0;
-
--- vim:set syntax=mysql:

diff --git a/upgrade/0.9.17/01_smallint_to_int.sql b/upgrade/0.9.17/01_smallint_to_int.sql
new file mode 100644 (file)
index 0000000..d7f3f86
--- /dev/null
+++ b/upgrade/0.9.17/01_smallint_to_int.sql
@@ -0,0 +1,39 @@
+ALTER TABLE adresses           MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE aliases            MODIFY COLUMN id             INT NOT NULL DEFAULT 0;
+ALTER TABLE applis_ins         MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE auth_user_md5      MODIFY COLUMN user_id        INT NOT NULL AUTO_INCREMENT;
+ALTER TABLE auth_user_quick    MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE axletter_ins       MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE axletter_rights    MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE binets_ins         MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE competences_ins    MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE contacts           MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE email_send_save    MODIFY COLUMN uid            INT NOT NULL;
+ALTER TABLE emails_watch       MODIFY COLUMN uid            INT DEFAULT NULL;
+ALTER TABLE entreprises        MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE evenements         MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE evenements_vus     MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE gapps_accounts     MODIFY COLUMN l_userid       INT DEFAULT NULL;
+ALTER TABLE gapps_queue        MODIFY COLUMN q_owner_id     INT DEFAULT NULL;
+ALTER TABLE gapps_queue        MODIFY COLUMN q_recipient_id INT DEFAULT NULL;
+ALTER TABLE groupesx_ins       MODIFY COLUMN guid           INT NOT NULL DEFAULT 0;
+ALTER TABLE homonymes          MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE ip_watch           MODIFY COLUMN uid            INT DEFAULT NULL;
+ALTER TABLE langues_ins        MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE mentor             MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE mentor_pays        MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE mentor_secteurs    MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE ml_moderate        MODIFY COLUMN mid            INT NOT NULL;
+ALTER TABLE ml_moderate        MODIFY COLUMN uid            INT NOT NULL;
+ALTER TABLE newsletter_ins     MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE perte_pass         MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE photo              MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE profile_medals_sub MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE register_subs      MODIFY COLUMN uid            INT NOT NULL;
+ALTER TABLE survey_surveys     MODIFY COLUMN author_id      INT NOT NULL;
+ALTER TABLE survey_votes       MODIFY COLUMN user_id        INT NOT NULL;
+ALTER TABLE tels               MODIFY COLUMN uid            INT NOT NULL DEFAULT 0;
+ALTER TABLE user_changes       MODIFY COLUMN user_id        INT NOT NULL DEFAULT 0;
+ALTER TABLE watch_profile      MODIFY COLUMN uid            INT NOT NULL;
+
+# vim:set syntax=sql:

diff --git a/upgrade/0.9.17/02_requests_hidden.sql b/upgrade/0.9.17/02_requests_hidden.sql
index ba7ade2..94c8248 100644 (file)
--- a/upgrade/0.9.17/02_requests_hidden.sql
+++ b/upgrade/0.9.17/02_requests_hidden.sql
@@ -1,5 +1,5 @@
 CREATE TABLE requests_hidden (
-  user_id SMALLINT UNSIGNED NOT NULL,
+  user_id INT NOT NULL,
   hidden_requests TEXT NOT NULL,
   PRIMARY KEY(user_id)
 ) CHARSET=utf8;