Merge branch 'fusionax' into account

[platal.git] / upgrade / newdirectory-0.0.1 / 09_education.sql

diff --git a/upgrade/newdirectory-0.0.1/09_education.sql b/upgrade/newdirectory-0.0.1/09_education.sql
index abf3ba6..6ba922e 100644 (file)
--- a/upgrade/newdirectory-0.0.1/09_education.sql
+++ b/upgrade/newdirectory-0.0.1/09_education.sql
@@ -305,6 +305,9 @@ WHERE name = 'Univ Carnegie Mellon';
 UPDATE profile_education_enum
 SET abbreviation = 'Carolina', name = 'University of North Carolina at Chapel Hill', country = 'US'
 WHERE name = 'Univ of North Carolina at Chapel Hill';
+UPDATE profile_education_enum
+SET abbreviation = 'UM', country = 'US'
+WHERE name = 'University of Miami';
 
 UPDATE profile_education_enum
 SET abbreviation = 'TU Berlin', name = 'Technische Universität Berlin', country = 'DE'
@@ -461,6 +464,16 @@ UPDATE profile_education_enum
 SET abbreviation = 'NTNU', name = 'Norwegian University of Science and Technology', country = 'NO', url = 'http://www.ntnu.no/'
 WHERE name = 'Univ Trondheim';
 
+UPDATE profile_education_enum
+SET abbreviation = '', country = 'GB'
+WHERE name = 'University of Surrey';
+UPDATE profile_education_enum
+SET abbreviation = 'OIV', country = 'FR'
+WHERE name = 'Organisme International de la Vigne et du Vin';
+UPDATE profile_education_enum
+SET abbreviation = 'NSU', name = 'Novosibirsk State University', url = 'http://www.nsu.ru/', country = 'RU'
+WHERE name = 'Université de Novossibirsk (Новосибирский Государственный Университет)';
+
 -- Cleans duplicated entries
 UPDATE profile_education SET eduid = 0 WHERE eduid = 70;
 DELETE FROM profile_education_enum WHERE id = 70;
@@ -544,7 +557,21 @@ INSERT INTO  profile_education_enum (name, url, country, abbreviation)
              ('Centre Européen d\'Éducation Permanente', 'http://www.cedep.fr/', 'FR', 'CEDEP'),
              ('Collège Interarmées de Défense', 'http://www.college.interarmees.defense.gouv.fr/', 'FR', ''),
              ('Centre de Formation des Journalistes', 'http://www.cfpj.com/', 'FR', 'CFJ'),
-             ('Institut National des Hautes Études de Sécurité', 'http://www.inhes.interieur.gouv.fr/', 'FR', 'INHES');
+             ('Institut National des Hautes Études de Sécurité', 'http://www.inhes.interieur.gouv.fr/', 'FR', 'INHES'),
+             ('Université d\'Orléans', 'http://www.univ-orleans.fr/', 'FR', '');
+
+
+-- Médecine is not a university but an educational field
+REPLACE INTO  profile_education (uid, id, fieldid, eduid, degreeid)
+      SELECT  e.uid, e.id, f.id, 0, d.id
+        FROM  profile_education             AS e
+  INNER JOIN  profile_education_enum        AS l ON (l.id = e.eduid)
+  INNER JOIN  profile_education_degree_enum AS d ON (d.degree = "Doctorat")
+  INNER JOIN  profile_education_field_enum  AS f ON (f.field = "Médecine")
+       WHERE  l.name = "Médecine";
+
+DELETE FROM  profile_education_enum
+      WHERE  name = "Médecine";
 
 # vim:set syntax=mysql: