Merge remote branch 'origin/platal-1.0.0'

[platal.git] / upgrade / merge-0.0.1 / 01_emails.sql

diff --git a/upgrade/merge-0.0.1/01_emails.sql b/upgrade/merge-0.0.1/01_emails.sql
index 30c9ba4..55de747 100644 (file)
--- a/upgrade/merge-0.0.1/01_emails.sql
+++ b/upgrade/merge-0.0.1/01_emails.sql
@@ -1,13 +1,13 @@
 INSERT INTO  profile_directory (uid, email_directory)
      SELECT  user_id, Mel_usage
        FROM  fusionax_anciens AS ax
- INNER JOIN  auth_user_md5    AS u ON (ax.id_ancien = CONVERT(u.matricule_ax, BINARY))
+ INNER JOIN  auth_user_md5    AS u ON (ax.id_ancien = u.matricule_ax)
       WHERE  Mel_publiable != '0' AND Mel_usage != '';
 
 INSERT IGNORE INTO  register_marketing (uid, email, type)
             SELECT  user_id, Mel_usage, 'ax'
               FROM  fusionax_anciens AS ax
-        INNER JOIN  auth_user_md5    AS u ON (ax.id_ancien = CONVERT(u.matricule_ax, BINARY))
+        INNER JOIN  auth_user_md5    AS u ON (ax.id_ancien = u.matricule_ax)
          LEFT JOIN  emails           AS e ON (e.uid = u.user_id AND e.flags = 'active')
              WHERE  Mel_usage != '' AND
                     Mel_usage NOT LIKE '%@polytechnique.edu' AND