Fixes a few errors.

[platal.git] / upgrade / merge-0.0.1 / 02_ax_data.sql

diff --git a/upgrade/merge-0.0.1/02_ax_data.sql b/upgrade/merge-0.0.1/02_ax_data.sql
index 3ebcc27..1fc96e8 100644 (file)
--- a/upgrade/merge-0.0.1/02_ax_data.sql
+++ b/upgrade/merge-0.0.1/02_ax_data.sql
@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS alumni_data (
   uid INT(11) NOT NULL,
-  matricule_ax INT(8) UNSIGNED NOT NULL,
+  matricule_ax CHAR(8) UNSIGNED NOT NULL,
   login_ax VARCHAR(15) NOT NULL,
   passwd_ax INT(11) UNSIGNED DEFAULT NULL,
   promo_type ENUM('', 'A', 'B', 'C', 'N', 'S') NOT NULL,
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS alumni_data (
 
 INSERT INTO  alumni_data (uid, matricule_ax, login_ax, passwd_ax, promo_type, membership_type,
              salutation, last_dues_paid_year, represents, checked)
-     SELECT  u.user_id, CONVERT(u.matricule_ax, UNSIGNED), f.Login, f.Password, f.Groupe_promo,
+     SELECT  u.user_id, u.matricule_ax, f.Login, f.Password, f.Groupe_promo,
              f.Type_membre, f.Civilite, f.annee_dernCot, f.Representant, 0
        FROM  fusionax_anciens AS f
  INNER JOIN  auth_user_md5    AS u ON (f.id_ancien = u.matricule_ax);