Browse Source

Update migrate-db (user_id to id query was sub-optimal) and add commented-out drop user_id - fix to previous commit and relocation of update user query

Yannick Warnier 10 years ago
parent
commit
168f2fdce7

+ 1 - 0
main/install/migrate-db-1.9.0-1.10.0-pre.sql

@@ -66,6 +66,7 @@ ALTER TABLE track_e_login CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DE
 ALTER TABLE user MODIFY COLUMN user_id int unsigned DEFAULT null;
 ALTER TABLE user DROP PRIMARY KEY;
 ALTER TABLE user ADD COLUMN id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT AFTER user_id;
+UPDATE user SET id = user_id;
 
 ALTER TABLE user MODIFY COLUMN chatcall_date datetime default NULL;
 ALTER TABLE user MODIFY COLUMN chatcall_text varchar(50) default NULL;

+ 0 - 4
main/install/update-db-1.9.0-1.10.0.inc.php

@@ -122,10 +122,6 @@ if (defined('SYSTEM_INSTALLATION')) {
                 }
             }
 
-            // Updating user.id field
-            $sql = "UPDATE $dbNameForm.user SET id = $userId WHERE user_id = $userId";
-            iDatabase::query($sql);
-
             // Set null registration_date = 0000-00-00 00:00:00
             $sql = "UPDATE $dbNameForm.user SET registration_date = NULL WHERE registration_date = '0000-00-00 00:00:00'";
             iDatabase::query($sql);