From 421829d4e7b9a1620d990de7a44b34e5133023e4 Mon Sep 17 00:00:00 2001 From: Jens Frank Date: Sun, 24 Oct 2004 09:51:13 +0000 Subject: [PATCH] Renaming columns: ug_gid => ug_group ug_uid => ug_user ur_uid => ur_user as proposed by Mr Vibber. --- includes/SpecialListadmins.php | 2 +- includes/SpecialListusers.php | 2 +- includes/SpecialMakesysop.php | 10 +++++----- includes/SpecialStatistics.php | 2 +- includes/User.php | 20 +++++++++---------- .../patch-rename-user_groups-and_rights.sql | 6 +++--- maintenance/archives/patch-user_rights.sql | 2 +- maintenance/archives/patch-userlevels.sql | 6 +++--- maintenance/tables.sql | 8 ++++---- maintenance/updaters.inc | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/includes/SpecialListadmins.php b/includes/SpecialListadmins.php index 5d057305e4..fba15ed7b7 100644 --- a/includes/SpecialListadmins.php +++ b/includes/SpecialListadmins.php @@ -33,7 +33,7 @@ class ListAdminsPage extends PageQueryPage { $userspace = Namespace::getUser(); return "SELECT ur_rights as type,{$userspace} as namespace,". "user_name as title, user_name as value ". - "FROM {$user} ,{$user_rights} WHERE user_id=ur_uid AND ur_rights LIKE '%sysop%'"; + "FROM {$user} ,{$user_rights} WHERE user_id=ur_user AND ur_rights LIKE '%sysop%'"; } } diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php index 6f9f0e26fa..f025e1a345 100644 --- a/includes/SpecialListusers.php +++ b/includes/SpecialListusers.php @@ -30,7 +30,7 @@ class ListUsersPage extends QueryPage { $user_rights = $dbr->tableName( 'user_rights' ); $userspace = Namespace::getUser(); return "SELECT ur_rights as type, $userspace as namespace, user_name as title, " . - "user_name as value FROM $user LEFT JOIN $user_rights ON user_id = ur_uid"; + "user_name as value FROM $user LEFT JOIN $user_rights ON user_id = ur_user"; } function sortDescending() { diff --git a/includes/SpecialMakesysop.php b/includes/SpecialMakesysop.php index d1da928016..ef3d0f22a0 100644 --- a/includes/SpecialMakesysop.php +++ b/includes/SpecialMakesysop.php @@ -160,10 +160,10 @@ class MakesysopForm { } if ( $username{0} == "#" ) { $id = intval( substr( $username, 1 ) ); - $sql = "SELECT ur_uid,ur_rights FROM $user_rights WHERE ur_uid=$id FOR UPDATE"; + $sql = "SELECT ur_user,ur_rights FROM $user_rights WHERE ur_user=$id FOR UPDATE"; } else { $encName = $dbw->strencode( $username ); - $sql = "SELECT ur_uid, ur_rights FROM $usertable LEFT JOIN $user_rights ON user_id=ur_uid WHERE user_name = '{$username}' FOR UPDATE"; + $sql = "SELECT ur_user, ur_rights FROM $usertable LEFT JOIN $user_rights ON user_id=ur_user WHERE user_name = '{$username}' FOR UPDATE"; } $prev = $dbw->ignoreErrors( TRUE ); @@ -176,7 +176,7 @@ class MakesysopForm { } $row = $dbw->fetchObject( $res ); - $id = intval( $row->ur_uid ); + $id = intval( $row->ur_user ); $rightsNotation = array(); if ( $wgUser->isDeveloper() ) { @@ -209,8 +209,8 @@ class MakesysopForm { } else { #$sql = "UPDATE $user_rights SET user_rights = '{$newrights}' WHERE user_id = $id LIMIT 1"; #$dbw->query($sql); - $dbw->replace( $user_rights, array( array( 'ur_uid', 'ur_rights' )), - array( 'ur_uid' => $id, 'ur_rights' => $newrights ) , $fname ); + $dbw->replace( $user_rights, array( array( 'ur_user', 'ur_rights' )), + array( 'ur_user' => $id, 'ur_rights' => $newrights ) , $fname ); $wgMemc->delete( "$dbName:user:id:$id" ); $log = new LogPage( 'rights' ); diff --git a/includes/SpecialStatistics.php b/includes/SpecialStatistics.php index ee716e637e..91d845c4be 100644 --- a/includes/SpecialStatistics.php +++ b/includes/SpecialStatistics.php @@ -46,7 +46,7 @@ function wfSpecialStatistics() { $row = $dbr->fetchObject( $res ); $total = $row->total; - $sql = "SELECT COUNT(ur_uid) AS total FROM $user_rights WHERE ur_rights LIKE '%sysop%'"; + $sql = "SELECT COUNT(ur_user) AS total FROM $user_rights WHERE ur_rights LIKE '%sysop%'"; $res = $dbr->query( $sql, $fname ); $row = $dbr->fetchObject( $res ); $admins = $row->total; diff --git a/includes/User.php b/includes/User.php index e6cec31fa2..162cb298d7 100644 --- a/includes/User.php +++ b/includes/User.php @@ -356,11 +356,11 @@ class User { $this->mToken = $s->user_token; $this->mRights = explode( ",", strtolower( - $dbr->selectField( 'user_rights', 'ur_rights', array( 'ur_uid' => $this->mId ) ) + $dbr->selectField( 'user_rights', 'ur_rights', array( 'ur_user' => $this->mId ) ) ) ); // Get groups id - $res = $dbr->select( 'user_groups', array( 'ug_gid' ), array( 'ug_uid' => $this->mId ) ); + $res = $dbr->select( 'user_groups', array( 'ug_group' ), array( 'ug_user' => $this->mId ) ); while($group = $dbr->fetchRow($res)) { $this->mGroups[] = $group[0]; } @@ -770,18 +770,18 @@ class User { ), $fname ); $dbw->set( 'user_rights', 'ur_rights', implode( ',', $this->mRights ), - 'ur_uid='. $this->mId, $fname ); + 'ur_user='. $this->mId, $fname ); $wgMemc->delete( "$wgDBname:user:id:$this->mId" ); // delete old groups - $dbw->delete( 'user_groups', array( 'ug_uid' => $this->mId), $fname); + $dbw->delete( 'user_groups', array( 'ug_user' => $this->mId), $fname); // save new ones foreach ($this->mGroups as $group) { $dbw->replace( 'user_groups', - array(array('ug_uid','ug_gid')), + array(array('ug_user','ug_group')), array( - 'ug_uid' => $this->mId, - 'ug_gid' => $group + 'ug_user' => $this->mId, + 'ug_group' => $group ), $fname ); } @@ -827,7 +827,7 @@ class User { $this->mId = $dbw->insertId(); $dbw->insert( 'user_rights', array( - 'ur_uid' => $this->mId, + 'ur_user' => $this->mId, 'ur_rights' => implode( ',', $this->mRights ) ), $fname ); @@ -835,8 +835,8 @@ class User { foreach ($this->mGroups as $group) { $dbw->insert( 'user_groups', array( - 'ug_uid' => $this->mId, - 'ug_gid' => $group + 'ug_user' => $this->mId, + 'ug_group' => $group ), $fname ); } diff --git a/maintenance/archives/patch-rename-user_groups-and_rights.sql b/maintenance/archives/patch-rename-user_groups-and_rights.sql index 288cedf9d1..4845d3c6d7 100644 --- a/maintenance/archives/patch-rename-user_groups-and_rights.sql +++ b/maintenance/archives/patch-rename-user_groups-and_rights.sql @@ -1,9 +1,9 @@ ALTER TABLE user_groups - CHANGE user_id ug_uid INT(5) UNSIGNED NOT NULL DEFAULT '0', - CHANGE group_id ug_gid INT(5) UNSIGNED NOT NULL DEFAULT '0'; + CHANGE user_id ug_user INT(5) UNSIGNED NOT NULL DEFAULT '0', + CHANGE group_id ug_group INT(5) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE user_rights - CHANGE user_id ur_uid INT(5) UNSIGNED NOT NULL, + CHANGE user_id ur_user INT(5) UNSIGNED NOT NULL, CHANGE user_rights ur_rights TINYBLOB NOT NULL DEFAULT ''; diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql index 6f4095d55d..f34d118ff4 100644 --- a/maintenance/archives/patch-user_rights.sql +++ b/maintenance/archives/patch-user_rights.sql @@ -6,7 +6,7 @@ -- database but keep user rights local to the wiki. CREATE TABLE user_rights ( - ur_uid int(5) unsigned NOT NULL, + ur_user int(5) unsigned NOT NULL, ur_rights tinyblob NOT NULL default '', UNIQUE KEY user_id (user_id) ) PACK_KEYS=1; diff --git a/maintenance/archives/patch-userlevels.sql b/maintenance/archives/patch-userlevels.sql index 1a719003dc..af83fabb2f 100644 --- a/maintenance/archives/patch-userlevels.sql +++ b/maintenance/archives/patch-userlevels.sql @@ -13,7 +13,7 @@ CREATE TABLE `group` ( -- Relation table between user and groups CREATE TABLE user_groups ( - ug_uid int(5) unsigned NOT NULL default '0', - ug_gid int(5) unsigned NOT NULL default '0', - PRIMARY KEY (ug_uid,ug_gid) + ug_user int(5) unsigned NOT NULL default '0', + ug_group int(5) unsigned NOT NULL default '0', + PRIMARY KEY (ug_user,ug_group) ); diff --git a/maintenance/tables.sql b/maintenance/tables.sql index a2c444e892..216b0d527b 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -20,7 +20,7 @@ CREATE TABLE user ( -- TODO: de-blob this; it should be a property table CREATE TABLE user_rights ( - ur_uid int(5) unsigned NOT NULL, + ur_user int(5) unsigned NOT NULL, ur_rights tinyblob NOT NULL default '', UNIQUE KEY user_id (user_id) ); @@ -352,7 +352,7 @@ CREATE TABLE `group` ( -- Relation table between user and groups CREATE TABLE user_groups ( - ug_uid int(5) unsigned NOT NULL default '0', - ug_gid int(5) unsigned NOT NULL default '0', - PRIMARY KEY (ug_uid,ug_gid) + ug_user int(5) unsigned NOT NULL default '0', + ug_group int(5) unsigned NOT NULL default '0', + PRIMARY KEY (ug_user,ug_group) ); diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index de1ac33599..5a8632ecab 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -31,7 +31,7 @@ $wgNewFields = array( array( 'recentchanges', 'rc_patrolled', 'patch-rc-patrol.sql' ), array( 'user', 'user_real_name', 'patch-user-realname.sql' ), array( 'user', 'user_token', 'patch-user_token.sql' ), - array( 'user_rights', 'ur_uid', 'patch-rename-user_groups-and_rights.sql' ), + array( 'user_rights', 'ur_user', 'patch-rename-user_groups-and_rights.sql' ), ); function add_table( $name, $patch ) { -- 2.20.1