From fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Fri, 26 Feb 2010 22:37:31 +0100 Subject: [PATCH] aliases.id => aliases.uid Signed-off-by: Florent Bruneau --- bin/cron/checkdb.php | 26 ++++++++--------- bin/cron/emails.check.php | 8 +++--- bin/cron/google_apps.php | 14 +++++----- bin/cron/homonymes.php | 2 +- bin/cron/rapports_inscription.php | 2 +- bin/lists.rpc.py | 6 ++-- classes/user.php | 8 +++--- classes/userfilter.php | 8 +++--- classes/xorgsession.php | 4 +-- include/emails.combobox.inc.php | 2 +- include/emails.inc.php | 8 +++--- include/name.func.inc.php | 4 +-- include/validations/names.inc.php | 4 +-- include/webservices/manageurs.server.inc.php | 2 +- modules/admin.php | 42 ++++++++++++++-------------- modules/admin/homonyms.inc.php | 8 +++--- modules/auth/auth.inc.php | 2 +- modules/axletter/axletter.inc.php | 4 +-- modules/email.php | 22 +++++++-------- modules/googleapps.php | 8 +++--- modules/marketing.php | 2 +- modules/platal.php | 4 +-- modules/register.php | 8 +++--- modules/register/register.inc.php | 6 ++-- modules/xnet.php | 4 +-- modules/xnetevents/xnetevents.inc.php | 8 +++--- modules/xnetgrp.php | 8 +++--- plugins/insert.getUserName.php | 4 +-- upgrade/account/20_naming_convention.sql | 6 +++- 29 files changed, 119 insertions(+), 115 deletions(-) diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php index b3bc249..c222052 100755 --- a/bin/cron/checkdb.php +++ b/bin/cron/checkdb.php @@ -94,7 +94,7 @@ check("SELECT user_id, nom, prenom, promo FROM auth_user_md5 WHERE hruid IS NULL /* validite de aliases */ check("SELECT a.* FROM aliases AS a - LEFT JOIN auth_user_md5 AS u ON u.user_id=a.id + LEFT JOIN auth_user_md5 AS u ON u.user_id=a.uid WHERE (a.type='alias' OR a.type='a_vie') AND u.prenom is null"); /* validite de profile_education */ @@ -151,10 +151,10 @@ check("SELECT a1.alias, a2.alias, e1.email, e2.flags (e1.uid 0 AND g.g_status != 'active'", "utilisateurs ayant une redirection vers Google Apps alors que leur compte GApps n'est pas actif"); diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php index 3febc77..61c6867 100755 --- a/bin/cron/emails.check.php +++ b/bin/cron/emails.check.php @@ -52,10 +52,10 @@ $sql = "SELECT a1.alias, a2.alias, e1.email INNER JOIN emails AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags))) LEFT JOIN email_watch AS w ON (e1.email = w.email) - INNER JOIN aliases AS a1 ON (a1.id = e1.uid AND a1.type = 'a_vie') - INNER JOIN aliases AS a2 ON (a2.id = e2.uid AND a2.type = 'a_vie') - INNER JOIN auth_user_md5 AS u1 ON (a1.id = u1.user_id) - INNER JOIN auth_user_md5 AS u2 ON (a2.id = u2.user_id) + INNER JOIN aliases AS a1 ON (a1.uid = e1.uid AND a1.type = 'a_vie') + INNER JOIN aliases AS a2 ON (a2.uid = e2.uid AND a2.type = 'a_vie') + INNER JOIN auth_user_md5 AS u1 ON (a1.uid = u1.user_id) + INNER JOIN auth_user_md5 AS u2 ON (a2.uid = u2.user_id) WHERE FIND_IN_SET('active', e1.flags) AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL ORDER BY a1.alias"; diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php index 76e3fe9..60b8311 100755 --- a/bin/cron/google_apps.php +++ b/bin/cron/google_apps.php @@ -35,7 +35,7 @@ $res = XDB::iterator( "SELECT g.g_account_name, a.id FROM gapps_accounts AS g LEFT JOIN aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie') - WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NOT NULL"); + WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NOT NULL"); while ($account = $res->next()) { XDB::execute( "UPDATE gapps_accounts @@ -49,7 +49,7 @@ $res = XDB::iterator( "SELECT g.g_account_name FROM gapps_accounts AS g LEFT JOIN aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie') - WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NULL"); + WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL"); while ($account = $res->next()) { if (!preg_match("/^admin-/", $account['g_account_name'])) { printf("Warning: GApps account '%s' has no local user_id.\n", $account['g_account_name']); @@ -61,7 +61,7 @@ $res = XDB::iterator( "SELECT g.g_account_name, a.id FROM gapps_nicknames AS g LEFT JOIN aliases AS a ON (a.alias = g.g_account_name AND a.type = 'a_vie') - WHERE (g.l_userid IS NULL or g.l_userid <= 0) AND a.id IS NOT NULL + WHERE (g.l_userid IS NULL or g.l_userid <= 0) AND a.uid IS NOT NULL GROUP BY g_account_name"); while ($nickname = $res->next()) { XDB::execute( @@ -76,7 +76,7 @@ $res = XDB::iterator( "SELECT g.g_account_name FROM gapps_nicknames AS g LEFT JOIN aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie') - WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NULL"); + WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL"); while ($nickname = $res->next()) { if (!preg_match("/^admin-/", $nickname['g_account_name'])) { printf("Warning: Nickname '%s' has no local user_id.\n", $nickname['g_account_name']); @@ -88,8 +88,8 @@ while ($nickname = $res->next()) { $res = XDB::iterator( "SELECT g.l_userid AS id, f.alias AS username, a.alias AS nickname FROM gapps_accounts AS g - INNER JOIN aliases AS f ON (f.id = g.l_userid AND f.type = 'a_vie') - INNER JOIN aliases AS a ON (a.id = g.l_userid AND a.type = 'alias') + INNER JOIN aliases AS f ON (f.uid = g.l_userid AND f.type = 'a_vie') + INNER JOIN aliases AS a ON (a.uid = g.l_userid AND a.type = 'alias') LEFT JOIN gapps_nicknames AS n ON (n.l_userid = g.l_userid AND n.g_nickname = a.alias) WHERE g.g_status = 'active' AND n.g_nickname IS NULL AND g.l_userid IS NOT NULL"); while ($nickname = $res->next()) { @@ -111,7 +111,7 @@ while ($nickname = $res->next()) { $res = XDB::iterator( "SELECT g.l_userid AS id, g.g_nickname AS nickname FROM gapps_nicknames AS g - LEFT JOIN aliases AS a ON (a.id = g.l_userid AND a.type = 'alias' AND a.alias = g.g_nickname) + LEFT JOIN aliases AS a ON (a.uid = g.l_userid AND a.type = 'alias' AND a.alias = g.g_nickname) WHERE g.l_userid IS NOT NULL AND a.alias IS NULL"); while ($nickname = $res->next()) { XDB::execute( diff --git a/bin/cron/homonymes.php b/bin/cron/homonymes.php index cbeee19..e9ec420 100755 --- a/bin/cron/homonymes.php +++ b/bin/cron/homonymes.php @@ -28,7 +28,7 @@ require('connect.db.inc.php'); require_once('validations/homonymes.inc.php'); $resRobot = XDB::iterator( - "SELECT id, alias, expire + "SELECT uid, alias, expire FROM aliases WHERE (expire = NOW() + INTERVAL 7 DAY OR expire <= NOW()) AND type = 'alias'"); diff --git a/bin/cron/rapports_inscription.php b/bin/cron/rapports_inscription.php index b7e9167..4059445 100755 --- a/bin/cron/rapports_inscription.php +++ b/bin/cron/rapports_inscription.php @@ -8,7 +8,7 @@ $MESSAGE = ''; $res = XDB::iterRow( "SELECT a.alias, u.promo, email FROM auth_user_md5 AS u - LEFT JOIN aliases AS a ON( u.user_id=a.id AND a.type='a_vie' ) + LEFT JOIN aliases AS a ON( u.user_id=a.uid AND a.type='a_vie' ) LEFT JOIN emails AS e ON( e.uid = u.user_id AND NOT FIND_IN_SET('filter',e.flags) ) WHERE u.date_ins > {?} GROUP BY alias diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py index b50ada9..a3cec92 100755 --- a/bin/lists.rpc.py +++ b/bin/lists.rpc.py @@ -126,7 +126,7 @@ class BasicAuthXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): def getUser(self, uid, md5, vhost): res = mysql_fetchone ("""SELECT CONCAT(u.prenom, ' ', u.nom), a.alias, u.perms FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( a.id=u.user_id AND a.type='a_vie' ) + INNER JOIN aliases AS a ON ( a.uid=u.user_id AND a.type='a_vie' ) WHERE u.user_id = '%s' AND u.password = '%s' AND u.perms IN ('admin', 'user') LIMIT 1""" %( uid, md5 ) ) if res: @@ -191,8 +191,8 @@ def to_forlife(email): if ( fqdn == PLATAL_DOMAIN ) or ( fqdn == PLATAL_DOMAIN2 ): res = mysql_fetchone("""SELECT CONCAT(f.alias, '@%s'), CONCAT(u.prenom, ' ', u.nom) FROM auth_user_md5 AS u - INNER JOIN aliases AS f ON (f.id=u.user_id AND f.type='a_vie') - INNER JOIN aliases AS a ON (a.id=u.user_id AND a.alias='%s' AND a.type!='homonyme') + INNER JOIN aliases AS f ON (f.uid=u.user_id AND f.type='a_vie') + INNER JOIN aliases AS a ON (a.uid=u.user_id AND a.alias='%s' AND a.type!='homonyme') WHERE u.perms IN ('admin', 'user') LIMIT 1""" %( PLATAL_DOMAIN, mbox ) ) if res: diff --git a/classes/user.php b/classes/user.php index 0123003..b99bc3a 100644 --- a/classes/user.php +++ b/classes/user.php @@ -85,7 +85,7 @@ class User extends PlUser if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) { $res = XDB::query('SELECT a.uid FROM accounts AS a - INNER JOIN aliases AS al ON (al.id = a.uid AND al.type IN (\'alias\', \'a_vie\')) + INNER JOIN aliases AS al ON (al.uid = a.uid AND al.type IN (\'alias\', \'a_vie\')) WHERE al.alias = {?}', $mbox); if ($res->numRows()) { return $res->fetchOneCell(); @@ -116,7 +116,7 @@ class User extends PlUser list($alias, $alias_fqdn) = explode('@', $redir); $res = XDB::query("SELECT a.uid FROM accounts AS a - LEFT JOIN aliases AS al ON (al.id = a.uid AND al.type IN ('alias', 'a_vie')) + LEFT JOIN aliases AS al ON (al.uid = a.uid AND al.type IN ('alias', 'a_vie')) WHERE al.alias = {?}", $alias); if ($res->numRows()) { return $res->fetchOneCell(); @@ -185,8 +185,8 @@ class User extends PlUser ' . $fields . ' FROM accounts AS a INNER JOIN account_types AS at ON (at.type = a.type) - LEFT JOIN aliases AS af ON (af.id = a.uid AND af.type = \'a_vie\') - LEFT JOIN aliases AS ab ON (ab.id = a.uid AND FIND_IN_SET(\'bestalias\', ab.flags)) + LEFT JOIN aliases AS af ON (af.uid = a.uid AND af.type = \'a_vie\') + LEFT JOIN aliases AS ab ON (ab.uid = a.uid AND FIND_IN_SET(\'bestalias\', ab.flags)) LEFT JOIN emails AS e ON (e.uid = a.uid AND e.flags = \'active\') LEFT JOIN email_options AS eo ON (eo.uid = a.uid) ' . $joins . ' diff --git a/classes/userfilter.php b/classes/userfilter.php index c54ddac..63157e5 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -2103,13 +2103,13 @@ class UserFilter extends PlFilter } foreach ($this->al as $sub=>$key) { if (is_null($key)) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\')'); + $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\')'); } else if ($key == self::ALIAS_BEST) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND FIND_IN_SET(\'bestalias\', $ME.flags)'); + $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND FIND_IN_SET(\'bestalias\', $ME.flags)'); } else if ($key == self::ALIAS_FORLIFE) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type = \'a_vie\''); + $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.uid = $UID AND $ME.type = \'a_vie\''); } else { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', XDB::format('$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND $ME.alias = {?}', $key)); + $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', XDB::format('$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND $ME.alias = {?}', $key)); } } foreach ($this->ve as $sub=>$key) { diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 93a746b..dea0dcb 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -81,7 +81,7 @@ class XorgSession extends PlSession { $res = XDB::query('SELECT a.uid, a.password FROM accounts AS a - INNER JOIN aliases AS l ON (l.id = a.uid AND l.type != \'homonyme\') + INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\') WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'', $login); if (list($uid, $password) = $res->fetchOneRow()) { @@ -272,7 +272,7 @@ class XorgSession extends PlSession { $res = XDB::query('SELECT a.uid AS user_id, a.hruid FROM aliases AS l - INNER JOIN accounts AS a ON (l.id = a.uid AND a.state = \'active\') + INNER JOIN accounts AS a ON (l.uid = a.uid AND a.state = \'active\') WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'', $token, $login); if ($res->numRows() == 1) { diff --git a/include/emails.combobox.inc.php b/include/emails.combobox.inc.php index 3d9a09f..7626b33 100644 --- a/include/emails.combobox.inc.php +++ b/include/emails.combobox.inc.php @@ -70,7 +70,7 @@ function fill_email_combobox(PlPage& $page, $user = null, $profile = null) $res = XDB::query( "SELECT alias FROM aliases - WHERE id={?} AND (type='a_vie' OR type='alias')", $user->id()); + WHERE uid={?} AND (type='a_vie' OR type='alias')", $user->id()); $res = $res->fetchAllAssoc(); $page->assign('list_email_X', $res); if (($domain == $globals->mail->domain) || ($domain == $globals->mail->domain2)) { diff --git a/include/emails.inc.php b/include/emails.inc.php index b7caf73..37582e6 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -31,7 +31,7 @@ function fix_bestalias(User &$user) { $res = XDB::query("SELECT COUNT(*) FROM aliases - WHERE id = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'", + WHERE uid = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'", $user->id()); if ($res->fetchOneCell()) { return; @@ -39,7 +39,7 @@ function fix_bestalias(User &$user) XDB::execute("UPDATE aliases SET flags=CONCAT(flags,',','bestalias') - WHERE id={?} AND type!='homonyme' + WHERE uid={?} AND type!='homonyme' ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) LIMIT 1", $user->id()); } @@ -114,7 +114,7 @@ function ids_from_mails(array $emails) if (count($domain_mails)) { $domain_users = array_map(array('XDB', 'escape'), array_keys($domain_mails)); $list = implode(',', $domain_users); - $res = XDB::query("SELECT alias, id + $res = XDB::query("SELECT alias, uid FROM aliases WHERE alias IN ($list)"); foreach ($res->fetchAllRow() as $row) { @@ -130,7 +130,7 @@ function ids_from_mails(array $emails) $alias_users[] = XDB::escape($user."@".$globals->mail->alias_dom); } $list = implode(',', $alias_users); - $res = XDB::query("SELECT v.alias, a.id + $res = XDB::query("SELECT v.alias, a.uid FROM virtual AS v INNER JOIN virtual_redirect AS r USING(vid) INNER JOIN aliases AS a ON (a.type = 'a_vie' diff --git a/include/name.func.inc.php b/include/name.func.inc.php index 745dfa6..547f535 100644 --- a/include/name.func.inc.php +++ b/include/name.func.inc.php @@ -274,11 +274,11 @@ function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu } if ($update_new) { XDB::execute("DELETE FROM aliases - WHERE FIND_IN_SET('usage', flags) AND id = {?}", + WHERE FIND_IN_SET('usage', flags) AND uid = {?}", S::i('uid')); } if ($new_alias) { - XDB::execute("INSERT INTO aliases (alias, type, flags, id) + XDB::execute("INSERT INTO aliases (alias, type, flags, uid) VALUES ({?}, 'alias', 'usage', {?})", $new_alias, S::i('uid')); } diff --git a/include/validations/names.inc.php b/include/validations/names.inc.php index 7e1e432..d891e59 100644 --- a/include/validations/names.inc.php +++ b/include/validations/names.inc.php @@ -58,11 +58,11 @@ class NamesReq extends Validate } $res = XDB::query("SELECT alias FROM aliases - WHERE id = {?} AND type = 'alias' AND FIND_IN_SET('usage', flags)", + WHERE uid = {?} AND type = 'alias' AND FIND_IN_SET('usage', flags)", $this->user->id()); $this->old_alias = $res->fetchOneCell(); if ($this->old_alias != $this->new_alias) { - $res = XDB::query("SELECT id + $res = XDB::query("SELECT uid FROM aliases WHERE alias = {?}", $this->new_alias); diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php index 8f1a05a..2fa54f8 100644 --- a/include/webservices/manageurs.server.inc.php +++ b/include/webservices/manageurs.server.inc.php @@ -181,7 +181,7 @@ function get_nouveau_infos($method, $params) { "SELECT a.nom, a.nom_usage,a.prenom, FIND_IN_SET('femme', a.flags) as femme, a.deces!= 0 as decede, a.naissance, a.promo, concat(al.alias, '@m4x.org') as mail FROM auth_user_md5 AS a - INNER JOIN aliases AS al ON (a.user_id = al.id) + INNER JOIN aliases AS al ON (a.user_id = al.uid) WHERE al.flags = 'bestalias' AND a.matricule = {?}",$params[1]); $data=$res->fetchOneAssoc(); //$data['mail'].='@polytechnique.org'; diff --git a/modules/admin.php b/modules/admin.php index 4654b23..988a3ea 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -271,8 +271,8 @@ class AdminModule extends PLModule // we are viewing a session $res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer FROM log_sessions AS ls - LEFT JOIN #x4dat#.aliases AS a ON (a.id = ls.uid AND a.type='a_vie') - LEFT JOIN #x4dat#.aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') + LEFT JOIN aliases AS a ON (a.uid = ls.uid AND a.type='a_vie') + LEFT JOIN aliases AS sa ON (sa.uid = ls.suid AND sa.type='a_vie') WHERE ls.id = {?}", $arg); $page->assign('session', $a = $res->fetchOneAssoc()); @@ -288,7 +288,7 @@ class AdminModule extends PLModule } else { $loguser = $action == 'user' ? $arg : Env::v('loguser'); - $res = XDB::query('SELECT id FROM aliases WHERE alias={?}', + $res = XDB::query('SELECT uid FROM aliases WHERE alias={?}', $loguser); $loguid = $res->fetchOneCell(); @@ -330,7 +330,7 @@ class AdminModule extends PLModule $select = "SELECT s.id, s.start, s.uid, a.alias as username FROM log_sessions AS s - LEFT JOIN #x4dat#.aliases AS a ON (a.id = s.uid AND a.type='a_vie') + LEFT JOIN aliases AS a ON (a.uid = s.uid AND a.type='a_vie') $where ORDER BY start DESC"; $res = XDB::iterator($select); @@ -545,7 +545,7 @@ class AdminModule extends PLModule $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué"); } } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { - $res = XDB::execute("INSERT INTO aliases (id, alias, type) + $res = XDB::execute("INSERT INTO aliases (uid, alias, type) VALUES ({?}, {?}, 'alias')", $user->id(), $alias); $page->trigSuccess("Nouvel alias '$alias' ajouté"); @@ -554,7 +554,7 @@ class AdminModule extends PLModule } } else if (!Post::blank('del_alias')) { XDB::execute("DELETE FROM aliases - WHERE id = {?} AND alias = {?} AND + WHERE uid = {?} AND alias = {?} AND type NOT IN ('a_vie', 'homonyme')", $user->id(), $val); XDB::execute("UPDATE emails @@ -566,10 +566,10 @@ class AdminModule extends PLModule } else if (!Post::blank('best')) { XDB::execute("UPDATE aliases SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ',')) - WHERE id = {?}", $user->id()); + WHERE uid = {?}", $user->id()); XDB::execute("UPDATE aliases SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') - WHERE id = {?} AND alias = {?}", $user->id(), $val); + WHERE uid = {?} AND alias = {?}", $user->id(), $val); // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the // validity of the bestalias. @@ -617,7 +617,7 @@ class AdminModule extends PLModule $page->assign('aliases', XDB::iterator("SELECT alias, type='a_vie' AS for_life, FIND_IN_SET('bestalias',flags) AS best, expire FROM aliases - WHERE id = {?} AND type != 'homonyme' + WHERE uid = {?} AND type != 'homonyme' ORDER BY type != 'a_vie'", $user->id())); $page->assign('account_types', XDB::iterator('SELECT * FROM account_types ORDER BY type')); $page->assign('skins', XDB::iterator('SELECT id, name FROM skins ORDER BY name')); @@ -859,9 +859,9 @@ class AdminModule extends PLModule IF(h.homonyme_id = s.id, a.type, NULL) AS type, ac.uid AS user_id FROM aliases AS a - LEFT JOIN homonyms AS h ON (h.homonyme_id = a.id) - INNER JOIN aliases AS s ON (s.id = h.user_id AND s.type='a_vie') - INNER JOIN accounts AS ac ON (ac.uid = a.id) + LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid) + INNER JOIN aliases AS s ON (s.uid = h.user_id AND s.type='a_vie') + INNER JOIN accounts AS ac ON (ac.uid = a.uid) WHERE a.type = 'homonyme' OR a.expire != '' ORDER BY a.alias, forlife"); $hnymes = Array(); @@ -925,10 +925,10 @@ class AdminModule extends PLModule $res = XDB::iterator( "SELECT a.hruid, pd.promo, p.ax_id, pd.directory_name, p.deathdate, DATE(MAX(s.start)) AS last - FROM #x4dat#.accounts AS a - INNER JOIN #x4dat#.account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) - INNER JOIN #x4dat#.profiles AS p ON (p.pid = ap.pid) - INNER JOIN #x4dat#.profile_display AS pd ON (pd.pid = p.pid) + FROM accounts AS a + INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) + INNER JOIN profiles AS p ON (p.pid = ap.pid) + INNER JOIN profile_display AS pd ON (pd.pid = p.pid) LEFT JOIN log_sessions AS s ON (s.uid = a.uid AND suid = 0) WHERE a.state = 'active' AND p.deathdate IS NOT NULL GROUP BY a.uid @@ -1191,10 +1191,10 @@ class AdminModule extends PLModule IF(w.ip = s2.ip, s2.host, s2.forward_host), IF(w.ip = s.ip, s.host, s.forward_host)), w.mask, w.detection, w.state, a.hruid - FROM #x4dat#.ip_watch AS w + FROM ip_watch AS w LEFT JOIN log_sessions AS s ON (s.ip = w.ip) LEFT JOIN log_sessions AS s2 ON (s2.forward_ip = w.ip) - LEFT JOIN #x4dat#.accounts AS a ON (a.uid = s.uid) + LEFT JOIN accounts AS a ON (a.uid = s.uid) GROUP BY w.ip, a.hruid ORDER BY w.state, w.ip, a.hruid"; $it = Xdb::iterRow($sql); @@ -1225,10 +1225,10 @@ class AdminModule extends PLModule } elseif ($action == 'edit') { $sql = "SELECT w.detection, w.state, w.last, w.description, w.mask, a1.hruid AS edit, a2.hruid AS hruid, s.host - FROM #x4dat#.ip_watch AS w - LEFT JOIN #x4dat#.accounts AS a1 ON (a1.uid = w.uid) + FROM ip_watch AS w + LEFT JOIN accounts AS a1 ON (a1.uid = w.uid) LEFT JOIN log_sessions AS s ON (w.ip = s.ip) - LEFT JOIN #x4dat#.accounts AS a2 ON (a2.uid = s.uid) + LEFT JOIN accounts AS a2 ON (a2.uid = s.uid) WHERE w.ip = {?} GROUP BY a2.hruid ORDER BY a2.hruid"; diff --git a/modules/admin/homonyms.inc.php b/modules/admin/homonyms.inc.php index c672ec4..0a60875 100644 --- a/modules/admin/homonyms.inc.php +++ b/modules/admin/homonyms.inc.php @@ -22,7 +22,7 @@ function select_if_homonyme(PlUser &$user) { return XDB::fetchOneCell("SELECT a.alias FROM aliases AS a - WHERE a.id = {?} AND a.expire != ''", + WHERE a.uid = {?} AND a.expire != ''", $user->id()); } @@ -54,7 +54,7 @@ function switch_bestalias(PlUser &$user, $loginbis) { // check if loginbis was the bestalias $bestailas = XDB::fetchOneCell("SELECT alias FROM aliases - WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", + WHERE uid = {?} AND FIND_IN_SET('bestalias', flags)", $user->id()); if ($bestalias && $bestalias != $loginbis) { return false; @@ -63,13 +63,13 @@ function switch_bestalias(PlUser &$user, $loginbis) { // select the shortest alias still alive $newbest = XDB::fetchOneCell("SELECT alias FROM aliases - WHERE id = {?} AND alias != {?} AND expire IS NULL + WHERE uid = {?} AND alias != {?} AND expire IS NULL ORDER BY LENGTH(alias) LIMIT 1", $user->id(), $loginbis); // change the bestalias flag XDB::execute("UPDATE aliases SET flags = (flags & (255 - 1)) | IF(alias = {?}, 1, 0) - WHERE id = {?}", $newbest, $user->id()); + WHERE uid = {?}", $newbest, $user->id()); return $newbest; } diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php index 62e94ef..f41b600 100644 --- a/modules/auth/auth.inc.php +++ b/modules/auth/auth.inc.php @@ -60,7 +60,7 @@ function gpex_make($chlg, $privkey, $datafields, $charset) } else if ($val == 'username') { $res = XDB::query("SELECT alias FROM aliases - WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", + WHERE uid = {?} AND FIND_IN_SET('bestalias', flags)", S::i('uid')); $min_username = $res->fetchOneCell(); $params .= gpex_prepare_param($val, $min_username, $tohash, $charset); diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php index b42ad35..9d0b026 100644 --- a/modules/axletter/axletter.inc.php +++ b/modules/axletter/axletter.inc.php @@ -149,7 +149,7 @@ class AXLetter extends MassMailer static public function grantPerms($uid) { if (!is_numeric($uid)) { - $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $uid); + $res = XDB::query("SELECT uid FROM aliases WHERE alias = {?}", $uid); $uid = $res->fetchOneCell(); } if (!$uid) { @@ -161,7 +161,7 @@ class AXLetter extends MassMailer static public function revokePerms($uid) { if (!is_numeric($uid)) { - $res = XDB::query("SELECT id FROM aliases WHERE alias = {?}", $uid); + $res = XDB::query("SELECT uid FROM aliases WHERE alias = {?}", $uid); $uid = $res->fetchOneCell(); } if (!$uid) { diff --git a/modules/email.php b/modules/email.php index 5347cd3..db028d1 100644 --- a/modules/email.php +++ b/modules/email.php @@ -63,10 +63,10 @@ class EmailModule extends PLModule XDB::execute("UPDATE aliases SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ',')) - WHERE id = {?}", $user->id()); + WHERE uid = {?}", $user->id()); XDB::execute("UPDATE aliases SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') - WHERE id = {?} AND alias = {?}", $user->id(), $email); + WHERE uid = {?} AND alias = {?}", $user->id(), $email); // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the @@ -79,7 +79,7 @@ class EmailModule extends PLModule (alias REGEXP '\\\\.[0-9]{2}$') AS cent_ans, FIND_IN_SET('bestalias',flags) AS best, expire FROM aliases - WHERE id = {?} AND type!='homonyme' + WHERE uid = {?} AND type!='homonyme' ORDER BY LENGTH(alias)"; $page->assign('aliases', XDB::iterator($sql, $user->id())); @@ -87,7 +87,7 @@ class EmailModule extends PLModule $homonyme = XDB::query( "SELECT alias FROM aliases - INNER JOIN homonyms ON (id = homonyme_id) + INNER JOIN homonyms ON (uid = homonyme_id) WHERE user_id = {?} AND type = 'homonyme'", $user->id()); $page->assign('homonyme', $homonyme->fetchOneCell()); @@ -303,7 +303,7 @@ class EmailModule extends PLModule $res = XDB::query( "SELECT alias,expire FROM aliases - WHERE id={?} AND (type='a_vie' OR type='alias') + WHERE uid={?} AND (type='a_vie' OR type='alias') ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $user->id()); $page->assign('alias', $res->fetchAllAssoc()); $page->assign('emails', $redirect->emails); @@ -487,7 +487,7 @@ class EmailModule extends PLModule "SELECT ac.full_name, a.alias as forlife FROM accounts AS ac INNER JOIN contacts AS c ON (ac.uid = c.contact) - INNER JOIN aliases AS a ON (ac.uid = a.id AND FIND_IN_SET('bestalias', a.flags)) + INNER JOIN aliases AS a ON (ac.uid = a.uid AND FIND_IN_SET('bestalias', a.flags)) WHERE c.uid = {?} ORDER BY ac.full_name", S::i('uid')); $page->assign('contacts', $res->fetchAllAssoc()); @@ -574,7 +574,7 @@ class EmailModule extends PLModule global $globals; $res = XDB::query("SELECT e.email, e.rewrite, a.alias FROM emails AS e - INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') + INNER JOIN aliases AS a ON (a.uid = e.uid AND a.type = 'a_vie') WHERE e.email = {?} AND e.hash = {?}", $mail, $hash); XDB::query("UPDATE emails @@ -732,7 +732,7 @@ class EmailModule extends PLModule $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife FROM email_watch AS w LEFT JOIN emails AS e USING(email) - LEFT JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') + LEFT JOIN aliases AS a ON (a.uid = e.uid AND a.type = 'a_vie') ORDER BY w.state, w.email, a.alias"; $it = Xdb::iterRow($sql); @@ -759,9 +759,9 @@ class EmailModule extends PLModule $sql = "SELECT w.detection, w.state, w.last, w.description, a1.alias AS edit, a2.alias AS forlife FROM email_watch AS w - LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') + LEFT JOIN aliases AS a1 ON (a1.uid = w.uid AND a1.type = 'a_vie') LEFT JOIN emails AS e ON (w.email = e.email) - LEFT JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie') + LEFT JOIN aliases AS a2 ON (a2.uid = e.uid AND a2.type = 'a_vie') WHERE w.email = {?} ORDER BY a2.alias"; $it = Xdb::iterRow($sql, $email); @@ -864,7 +864,7 @@ class EmailModule extends PLModule LEFT JOIN emails AS e2 ON (e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags) AND e1.email != e2.email) INNER JOIN accounts AS acc ON (e1.uid = acc.uid) - INNER JOIN aliases AS a ON (acc.uid = a.id AND FIND_IN_SET('bestalias', a.flags)) + INNER JOIN aliases AS a ON (acc.uid = a.uid AND FIND_IN_SET('bestalias', a.flags)) WHERE e1.email = {?} GROUP BY e1.uid", $email); diff --git a/modules/googleapps.php b/modules/googleapps.php index 2463966..e75ce5c 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -136,7 +136,7 @@ class GoogleAppsModule extends PLModule "SELECT q_id, q_recipient_id, a.alias, j_type, j_parameters, UNIX_TIMESTAMP(q.p_entry_date) AS p_entry_date FROM gapps_queue AS q - LEFT JOIN aliases AS a ON (a.id = q_recipient_id AND a.type = 'a_vie') + LEFT JOIN aliases AS a ON (a.uid = q_recipient_id AND a.type = 'a_vie') WHERE p_status IN ('idle', 'active', 'softfail') AND p_admin_request IS TRUE ORDER BY p_entry_date"); @@ -154,7 +154,7 @@ class GoogleAppsModule extends PLModule "SELECT q.q_id, q.q_recipient_id, a.alias, q.j_type, q.r_result, UNIX_TIMESTAMP(q.p_entry_date) AS p_entry_date FROM gapps_queue AS q - LEFT JOIN aliases AS a ON (a.id = q.q_recipient_id AND a.type = 'a_vie') + LEFT JOIN aliases AS a ON (a.uid = q.q_recipient_id AND a.type = 'a_vie') WHERE q.p_status = 'hardfail' ORDER BY p_entry_date DESC LIMIT 20"); @@ -171,8 +171,8 @@ class GoogleAppsModule extends PLModule $res = XDB::query( "SELECT q.*, ao.alias AS q_owner, ar.alias AS q_recipient FROM gapps_queue AS q - LEFT JOIN aliases AS ao ON (ao.id = q.q_owner_id AND ao.type = 'a_vie') - LEFT JOIN aliases AS ar ON (ar.id = q.q_recipient_id AND ar.type = 'a_vie') + LEFT JOIN aliases AS ao ON (ao.uid = q.q_owner_id AND ao.type = 'a_vie') + LEFT JOIN aliases AS ar ON (ar.uid = q.q_recipient_id AND ar.type = 'a_vie') WHERE q_id = {?}", $job); $sql_job = $res->fetchOneAssoc(); $sql_job['decoded_parameters'] = var_export(json_decode($sql_job['j_parameters'], true), true); diff --git a/modules/marketing.php b/modules/marketing.php index eea4a83..ae7fc5d 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -123,7 +123,7 @@ class MarketingModule extends PLModule $res = XDB::iterator( "SELECT r.*, a.alias FROM register_marketing AS r - LEFT JOIN aliases AS a ON (r.sender=a.id AND a.type = 'a_vie') + LEFT JOIN aliases AS a ON (r.sender=a.uid AND a.type = 'a_vie') WHERE uid={?} ORDER BY date", $user->id()); $page->assign('addr', $res); diff --git a/modules/platal.php b/modules/platal.php index 2c9596d..197728e 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -147,7 +147,7 @@ class PlatalModule extends PLModule # carva will extend to users not in the main domain. $res = XDB::query("SELECT alias FROM aliases - WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", + WHERE uid = {?} AND FIND_IN_SET('bestalias', flags)", S::user()->id()); $page->assign('bestalias', $res->fetchOneCell()); } @@ -185,7 +185,7 @@ class PlatalModule extends PLModule # carva will extend to users not in the main domain. $res = XDB::query("SELECT alias FROM aliases - WHERE id = {?} AND FIND_IN_SET('bestalias', flags)", + WHERE uid = {?} AND FIND_IN_SET('bestalias', flags)", S::user()->id()); $page->assign('bestalias', $res->fetchOneCell()); } diff --git a/modules/register.php b/modules/register.php index 340c290..8f50516 100644 --- a/modules/register.php +++ b/modules/register.php @@ -337,12 +337,12 @@ class RegisterModule extends PLModule date = NOW(), naissance = {?}, date_ins = NOW() WHERE user_id = {?}", $password, $naissance, $uid); XDB::execute("REPLACE INTO auth_user_quick (user_id) VALUES ({?})", $uid); - XDB::execute("INSERT INTO aliases (id, alias, type) + XDB::execute("INSERT INTO aliases (uid, alias, type) VALUES ({?}, {?}, 'a_vie')", $uid, $forlife); - XDB::execute("INSERT INTO aliases (id, alias, type, flags) + XDB::execute("INSERT INTO aliases (uid, alias, type, flags) VALUES ({?}, {?}, 'alias', 'bestalias')", $uid, $bestalias); if ($mailorg2) { - XDB::execute("INSERT INTO aliases (id, alias, type) + XDB::execute("INSERT INTO aliases (uid, alias, type) VALUES ({?}, {?}, 'alias')", $uid, $mailorg2); } @@ -444,7 +444,7 @@ class RegisterModule extends PLModule GROUP_CONCAT(m.email SEPARATOR ', ') AS mails, MAX(m.last) AS dateDernier FROM register_marketing AS m INNER JOIN auth_user_md5 AS s ON (m.sender = s.user_id) - INNER JOIN aliases AS sa ON (sa.id = m.sender + INNER JOIN aliases AS sa ON (sa.uid = m.sender AND FIND_IN_SET('bestalias', sa.flags)) WHERE m.uid = {?} GROUP BY m.sender diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php index 9b35993..971d35f 100644 --- a/modules/register/register.inc.php +++ b/modules/register/register.inc.php @@ -99,7 +99,7 @@ function check_old_mat($promo, $mat, &$nom, &$prenom, &$ourmat, &$ourid, &$watch $res = XDB::iterRow( 'SELECT user_id, nom, prenom, matricule, alias, FIND_IN_SET(\'watch\', u.flags), naissance_ini FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id = a.id and FIND_IN_SET("bestalias", a.flags)) + INNER JOIN aliases AS a ON (u.user_id = a.uid and FIND_IN_SET("bestalias", a.flags)) WHERE promo={?} AND deces=0 AND perms IN ("user","admin")', $promo); while (list($_uid, $_nom, $_prenom, $_mat, $alias, $watch, $naiss) = $res->next()) { if (user_cmp($prenom, $nom, $_prenom, $_nom)) { @@ -167,14 +167,14 @@ function create_aliases (&$sub) $forlife = $res->fetchOneCell(); } - $res = XDB::query('SELECT id, type, expire FROM aliases WHERE alias={?}', $mailorg); + $res = XDB::query('SELECT uid, type, expire FROM aliases WHERE alias={?}', $mailorg); if ($res->numRows()) { list($h_id, $h_type, $expire) = $res->fetchOneRow(); if ($h_type != 'homonyme' and empty($expire)) { XDB::execute('UPDATE aliases SET expire=ADDDATE(NOW(),INTERVAL 1 MONTH) WHERE alias={?}', $mailorg); XDB::execute('REPLACE INTO homonyms (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $h_id); XDB::execute('REPLACE INTO homonyms (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $uid); - $res = XDB::query("SELECT alias FROM aliases WHERE id={?} AND expire IS NULL", $h_id); + $res = XDB::query("SELECT alias FROM aliases WHERE uid={?} AND expire IS NULL", $h_id); $als = $res->fetchColumn(); $mailer = new PlMailer(); diff --git a/modules/xnet.php b/modules/xnet.php index e4895a3..00e929e 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -43,8 +43,8 @@ class XnetModule extends PLModule } $res = XDB::query("SELECT attachmime, attach - FROM aliases - INNER JOIN photo ON(id = uid) + FROM aliases AS a + INNER JOIN photo AS p ON(a.uid = p.uid) WHERE alias = {?}", $x); if ((list($type, $data) = $res->fetchOneRow())) { diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 48c0961..4d61bf3 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -304,8 +304,8 @@ function event_change_shortname(&$page, $eid, $old, $new) XDB::execute("INSERT IGNORE INTO virtual_redirect ( SELECT {?} AS vid, IF(al.alias IS NULL, a.email, CONCAT(al.alias, {?})) AS redirect FROM group_event_participants AS ep - LEFT JOIN #x4dat#.accounts AS a ON (ep.uid = a.uid) - LEFT JOIN #x4dat#.aliases AS al ON (al.id = a.uid AND al.type = 'a_vie') + LEFT JOIN accounts AS a ON (ep.uid = a.uid) + LEFT JOIN aliases AS al ON (al.uid = a.uid AND al.type = 'a_vie') WHERE ep.eid = {?} AND " . $where[$v] . " GROUP BY ep.uid)", $lastid[$v], '@' . $globals->mail->domain, $eid); @@ -313,8 +313,8 @@ function event_change_shortname(&$page, $eid, $old, $new) XDB::execute("INSERT IGNORE INTO virtual_redirect ( SELECT {?} AS vid, IF(al.alias IS NULL, a.email, CONCAT(al.alias, {?})) AS redirect FROM group_members AS m - LEFT JOIN #x4dat#.accounts AS a ON (a.uid = m.uid) - LEFT JOIN #x4dat#.aliases AS al ON (al.id = a.uid AND al.type = 'a_vie') + LEFT JOIN accounts AS a ON (a.uid = m.uid) + LEFT JOIN aliases AS al ON (al.uid = a.uid AND al.type = 'a_vie') LEFT JOIN group_event_participants AS ep ON (ep.uid = m.uid AND ep.eid = {?}) WHERE m.asso_id = {?} AND ep.uid IS NULL GROUP BY m.uid)", diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index de108fc..2ab86db 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -474,8 +474,8 @@ class XnetGrpModule extends PLModule CONCAT(al.alias,"@polytechnique.org"), m.email) FROM group_members AS m - INNER JOIN #x4dat#.aliases AS al ON (al.type = "a_vie" - AND al.id = m.uid) + INNER JOIN aliases AS al ON (al.type = "a_vie" + AND al.uid = m.uid) WHERE perms="admin" AND m.asso_id = {?}', $globals->asso('id')); $emails = $res->fetchColumn(); @@ -795,9 +795,9 @@ class XnetGrpModule extends PLModule private function changeLogin(PlPage &$page, PlUser &$user, MMList &$mmlist, $login) { // Search the uid of the user... - $res = XDB::query("SELECT f.id, f.alias + $res = XDB::query("SELECT f.uid, f.alias FROM aliases AS a - INNER JOIN aliases AS f ON (f.id = a.id AND f.type = 'a_vie') + INNER JOIN aliases AS f ON (f.uid = a.uid AND f.type = 'a_vie') WHERE a.alias = {?}", $login); if ($res->numRows() == 0) { diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php index b1846a3..9cc219f 100644 --- a/plugins/insert.getUserName.php +++ b/plugins/insert.getUserName.php @@ -32,14 +32,14 @@ function smarty_insert_getUsername() if (Cookie::v('domain', 'login') != 'alias') { $res = XDB::query("SELECT alias FROM aliases - WHERE id={?} AND (type IN ('a_vie','alias') AND FIND_IN_SET('bestalias', flags))", $id); + WHERE uid={?} AND (type IN ('a_vie','alias') AND FIND_IN_SET('bestalias', flags))", $id); return $res->fetchOneCell(); } else { $res = XDB::query(" SELECT v.alias FROM virtual AS v INNER JOIN virtual_redirect USING(vid) - INNER JOIN aliases AS a ON(id={?} AND a.type='a_vie') + INNER JOIN aliases AS a ON(uid={?} AND a.type='a_vie') WHERE redirect = CONCAT(a.alias, {?}) OR redirect = CONCAT(a.alias, {?})", $id, "@".$globals->mail->domain, "@".$globals->mail->domain2); diff --git a/upgrade/account/20_naming_convention.sql b/upgrade/account/20_naming_convention.sql index 75cdebd..3dfadf4 100644 --- a/upgrade/account/20_naming_convention.sql +++ b/upgrade/account/20_naming_convention.sql @@ -16,9 +16,13 @@ CHANGE COLUMN montant_max amount_max DECIMAL(10,2) NOT NULL DEFAULT 0.00; CHANGE COLUMN montant amount VARCHAR(15) NOT NULL DEFAULT '0.00', CHANGE COLUMN cle pkey VARCHAR(5) NOT NULL; +# emails + ALTER TABLE aliases +CHANGE COLUMN id uid INT(11) not null; + # profile ALTER TABLE profile_photos -CHANGE COLUMN uid pid INT(6) not null; +CHANGE COLUMN uid pid INT(11) not null; ALTER TABLE profile_skills CHANGE COLUMN uid pid INT(11) not null; ALTER TABLE profile_langskills -- 2.1.4