X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ut%2Fcheckdb.php;h=52618fedcb3559953582303f274efa26d300559e;hb=bdc1e8a02cb1cf18e41f4a8421f056c97932b7f3;hp=47b30f2dead043feaf24aecdb4930b6b51ee7613;hpb=12ddbc2037b16496dfb9d91c4f7091850146fcde;p=platal.git

diff --git a/ut/checkdb.php b/ut/checkdb.php
index 47b30f2..52618fe 100644
--- a/ut/checkdb.php
+++ b/ut/checkdb.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -67,7 +67,7 @@ class CheckDB extends PlTestCase
                 array('SELECT  pa.pid, pa.countryId
                          FROM  profile_addresses AS pa
                     LEFT JOIN  geoloc_countries  AS gc ON (pa.countryId = gc.iso_3166_1_a2)
-                        WHERE  gc.countryFR IS NULL OR gc.countryFR = \'\''),
+                        WHERE  gc.country IS NULL OR gc.country = \'\''),
 
             'missing nationalities' =>
                 array('SELECT  p.pid, p.nationality1, p.nationality2, p.nationality3
@@ -75,9 +75,9 @@ class CheckDB extends PlTestCase
                     LEFT JOIN  geoloc_countries AS g1 ON (p.nationality1 = g1.iso_3166_1_a2)
                     LEFT JOIN  geoloc_countries AS g2 ON (p.nationality2 = g2.iso_3166_1_a2)
                     LEFT JOIN  geoloc_countries AS g3 ON (p.nationality3 = g3.iso_3166_1_a2)
-                        WHERE  (p.nationality1 IS NOT NULL AND (g1.nationalityFR IS NULL OR g1.nationalityFR = \'\'))
-                               OR (p.nationality2 IS NOT NULL AND (g2.nationalityFR IS NULL OR g2.nationalityFR = \'\'))
-                               OR (p.nationality3 IS NOT NULL AND (g3.nationalityFR IS NULL OR g3.nationalityFR = \'\'))'),
+                        WHERE  (p.nationality1 IS NOT NULL AND (g1.nationality IS NULL OR g1.nationality = \'\'))
+                               OR (p.nationality2 IS NOT NULL AND (g2.nationality IS NULL OR g2.nationality = \'\'))
+                               OR (p.nationality3 IS NOT NULL AND (g3.nationality IS NULL OR g3.nationality = \'\'))'),
 
             'ax_id' =>
                 array('SELECT  pid, hrpid, ax_id, COUNT(ax_id) AS c
@@ -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(
@@ -189,5 +189,5 @@ class CheckDB extends PlTestCase
 
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>