From: Stéphane Jacob Date: Sat, 26 Feb 2011 14:06:20 +0000 (+0100) Subject: Adapts ut to new mail chain. X-Git-Tag: xorg/1.1.0~104 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=11a28184545ae738f93241620786292c5ecf4ae8;p=platal.git Adapts ut to new mail chain. Signed-off-by: Stéphane Jacob --- diff --git a/ut/checkdb.php b/ut/checkdb.php index 7455441..e4eecf0 100644 --- a/ut/checkdb.php +++ b/ut/checkdb.php @@ -87,11 +87,11 @@ class CheckDB extends PlTestCase HAVING c > 1'), 'google apps' => - array('SELECT a.alias, g.g_status, eo.storage - FROM email_options AS eo - INNER JOIN aliases AS a ON (a.uid = eo.uid AND a.type = \'a_vie\') - INNER JOIN gapps_accounts AS g ON (g.l_userid = eo.uid) - WHERE FIND_IN_SET(\'googleapps\', eo.storage) > 0 AND g.g_status != \'active\'') + array('SELECT s.email, g.g_status, r.redirect + FROM email_redirect_account AS r + INNER JOIN email_source_account AS s ON (r.uid = s.uid AND s.type = \'forlife\') + INNER JOIN gapps_accounts AS g ON (g.l_userid = r.uid) + WHERE r.type = \'googleapps\' AND r.flags = \'active\' AND g.g_status != \'active\'') ); $tests = array(