X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=upgrade%2Fnewdirectory-0.0.1%2F15_addresses.sql;h=8ce64b6025d6dd9228925f38d569af8188bdf6cb;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=84101deb4b1c13eb864d1efd5c94f827b39f96cf;hpb=d989355f50a69412c756e6729c83cba913683e40;p=platal.git

diff --git a/upgrade/newdirectory-0.0.1/15_addresses.sql b/upgrade/newdirectory-0.0.1/15_addresses.sql
index 84101de..8ce64b6 100644
--- a/upgrade/newdirectory-0.0.1/15_addresses.sql
+++ b/upgrade/newdirectory-0.0.1/15_addresses.sql
@@ -38,17 +38,18 @@ INSERT INTO  profile_addresses (pid, id, postalCode, updateTime, pub, comment, l
                                 countryId, type, flags)
      SELECT  uid, adrid, postcode, datemaj, pub, NULL, glat, glng, IF(country = '' OR country = '00', NULL, country),
              IF(FIND_IN_SET('pro', 'statut'), 'job', 'home'),
-             CONCAT(IF(FIND_IN_SET('res-secondaire', 'statut'), 'secondary,', ''),
-                    IF(FIND_IN_SET('courrier', 'statut'), 'mail,', ''),
-                    IF(FIND_IN_SET('active', 'statut'), 'current,', ''),
-                    IF(FIND_IN_SET('temporaire', 'statut'), 'temporary', ''))
+             CONCAT(IF(FIND_IN_SET('res-secondaire', statut), 'secondary,', ''),
+                    IF(FIND_IN_SET('courrier', statut), 'mail,', ''),
+                    IF(FIND_IN_SET('active', statut), 'current,', ''),
+                    IF(FIND_IN_SET('temporaire', statut), 'temporary', ''))
        FROM  #x4dat#.adresses;
 
 INSERT INTO  profile_addresses (pid, jobid, id, postalCode, pub, comment,
                                 latitude, longitude, countryId, type)
-     SELECT  uid, entrid, 0, postcode, adr_pub, NULL, glat, glng,
-             IF(country = '' OR country = '00', NULL, country), 'job'
-       FROM  #x4dat#.entreprises;
+     SELECT  e.uid, j.id, e.entrid, e.postcode, e.adr_pub, NULL, e.glat, e.glng,
+             IF(e.country = '' OR e.country = '00', NULL, e.country), 'job'
+       FROM  #x4dat#.entreprises AS e
+ INNER JOIN  profile_job_enum    AS j ON (e.entreprise = j.name);
 
 DROP TABLE IF EXISTS geoloc_countries;
 CREATE TABLE geoloc_countries (