Merge remote branch 'origin/xorg/f/geocoding' into xorg/master

[platal.git] / upgrade / newdirectory-0.0.1 / 10_promotion.sql

diff --git a/upgrade/newdirectory-0.0.1/10_promotion.sql b/upgrade/newdirectory-0.0.1/10_promotion.sql
index fb3b7b5..7dec54d 100644 (file)
--- a/upgrade/newdirectory-0.0.1/10_promotion.sql
+++ b/upgrade/newdirectory-0.0.1/10_promotion.sql
@@ -1,16 +1,12 @@
-INSERT INTO  profile_education (id, uid, grad_year, entry_year, eduid, degreeid, flags)
-     SELECT  100, user_id, promo_sortie, promo, 20, 2, 'primary'
-       FROM  auth_user_md5;
+INSERT INTO  profile_education (id, pid, grad_year, entry_year, eduid, degreeid, flags)
+     SELECT  100, u.user_id, u.promo_sortie, u.promo, e.id, d.id, 'primary'
+       FROM  #x4dat#.auth_user_md5                 AS u
+  LEFT JOIN  profile_education_enum        AS e ON (e.abbreviation = "X")
+  LEFT JOIN  profile_education_degree_enum AS d ON (d.degree = "Ingénieur");
 
-CREATE TABLE  profile_display (
-  uid INT(11) NOT NULL DEFAULT 0,
-  promo_display VARCHAR(255) DEFAULT '' NOT NULL,
-  PRIMARY KEY(uid)
-) CHARSET=utf8;
-
-INSERT IGNORE INTO  profile_display (uid, promo_display)
-            SELECT  uid, CONCAT("X", entry_year)
-              FROM  profile_education
-             WHERE  FIND_IN_SET('primary', flags);
+    UPDATE  profile_display   AS d
+INNER JOIN  profile_education AS e ON (d.pid = e.pid)
+       SET  d.promo = CONCAT("X", entry_year)
+     WHERE  FIND_IN_SET('primary', e.flags);
 
 -- vim:set syntax=mysql: