$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%'";
}
}
$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() {
}
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 );
}
$row = $dbw->fetchObject( $res );
- $id = intval( $row->ur_uid );
+ $id = intval( $row->ur_user );
$rightsNotation = array();
if ( $wgUser->isDeveloper() ) {
} 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' );
$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;
$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];
}
), $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
);
}
$this->mId = $dbw->insertId();
$dbw->insert( 'user_rights',
array(
- 'ur_uid' => $this->mId,
+ 'ur_user' => $this->mId,
'ur_rights' => implode( ',', $this->mRights )
), $fname
);
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
);
}
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 '';
-- 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;
-- 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)
);
-- 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)
);
-- 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)
);
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 ) {