From 257ae4081d1b5da12c4458f0642b9d2b7843abee Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 2 Mar 2010 10:38:08 +0100 Subject: [PATCH] Renames user_id to uid in requests related tables accordingly to our naming convention. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/admin.php | 7 +++++-- modules/profile.php | 12 ++++++------ modules/profile/general.inc.php | 2 +- modules/xnetevents.php | 8 +++++--- upgrade/account/20_naming_convention.sql | 6 ++++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/modules/admin.php b/modules/admin.php index 3d07318..3933b2a 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -965,7 +965,9 @@ class AdminModule extends PLModule $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1)))); $hidden = array(); - $res = XDB::query('SELECT hidden_requests FROM requests_hidden WHERE user_id = {?}', S::v('uid')); + $res = XDB::query('SELECT hidden_requests + FROM requests_hidden + WHERE uid = {?}', S::v('uid')); $hide_requests = $res->fetchOneCell(); if (Post::has('hide')) { $hide = array(); @@ -975,7 +977,8 @@ class AdminModule extends PLModule $hide[] = $cat; } $hide_requests = join(',', $hide); - XDB::query('REPLACE INTO requests_hidden (user_id, hidden_requests) VALUES({?}, {?})', + XDB::query('REPLACE INTO requests_hidden (uid, hidden_requests) + VALUES ({?}, {?})', S::v('uid'), $hide_requests); } elseif ($hide_requests) { foreach (explode(',', $hide_requests) as $hide_type) diff --git a/modules/profile.php b/modules/profile.php index fe1126e..18faa1b 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -181,23 +181,23 @@ class ProfileModule extends PLModule XDB::execute('DELETE FROM profile_photos WHERE pid = {?}', S::user()->profile()->id()); - XDB::execute('DELETE FROM requests - WHERE user_id = {?} AND type="photo"', + XDB::execute("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); $page->trigSuccess("Ta photo a bien été supprimée. Elle ne sera plus visible sur le site dans au plus une heure."); } elseif (Env::v('cancel')) { S::assert_xsrf_token(); - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', + $sql = XDB::query("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); } - $sql = XDB::query('SELECT COUNT(*) + $sql = XDB::query("SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index cac45ec..488d180 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -412,7 +412,7 @@ class ProfileGeneral extends ProfilePage if ($this->owner) { $res = XDB::query("SELECT COUNT(*) FROM requests - WHERE type='photo' AND user_id = {?}", + WHERE type = 'photo' AND uid = {?}", $this->owner->id()); $this->values['nouvellephoto'] = $res->fetchOneCell(); } else { diff --git a/modules/xnetevents.php b/modules/xnetevents.php index b16829e..43fa0a5 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -203,7 +203,8 @@ class XnetEventsModule extends PLModule } global $globals; - $res = XDB::query("SELECT stamp FROM requests + $res = XDB::query("SELECT stamp + FROM requests WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($evt['eid'], $globals->asso('id'))); $page->assign('validation', $res->numRows()); @@ -494,8 +495,9 @@ class XnetEventsModule extends PLModule $evt = $res->fetchOneAssoc(); // find out if there is already a request for a payment for this event require_once 'validations.inc.php'; - $res = XDB::query("SELECT stamp FROM requests - WHERE type = 'paiements' AND data LIKE {?}", + $res = XDB::query("SELECT stamp + FROM requests + WHERE type = 'paiements' AND data LIKE {?}", PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { diff --git a/upgrade/account/20_naming_convention.sql b/upgrade/account/20_naming_convention.sql index 877a2b0..5ef1dad 100644 --- a/upgrade/account/20_naming_convention.sql +++ b/upgrade/account/20_naming_convention.sql @@ -50,4 +50,10 @@ CHANGE COLUMN uid pid INT(11) not null; ALTER TABLE account_auth_openid CHANGE COLUMN user_id uid INT(11) not null; +# request + ALTER TABLE requests +CHANGE COLUMN user_id uid INT(11) NOT NULL; + ALTER TABLE requests_hidden +CHANGE COLUMN user_id uid INT(11) NOT NULL; + # vim:set ft=mysql: -- 2.1.4