Merge commit 'origin/master' into fusionax

[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 74de743..d899916 100644 (file)
--- a/upgrade/newdirectory-0.0.1/09_education.sql
+++ b/upgrade/newdirectory-0.0.1/09_education.sql
@@ -522,7 +522,7 @@ INSERT INTO  profile_education_enum (name, url, country, abbreviation)
              ('Cleveland State University', 'http://www.csuohio.edu/', 'US', 'CSU'),
              ('Centre de Perfectionnement aux Affaires du Nord', '', 'FR', 'CPA du Nord'),
              ('Centre de Perfectionnement aux Affaires de Lyon', '', '', 'CPA de Lyon'),
-             ('Amherst College', 'http://www.amherst.edu/', 'US', '')
+             ('Amherst College', 'http://www.amherst.edu/', 'US', ''),
              ('Ottawa University', 'http://www.ottawa.edu/', 'US', 'OU'),
              ('Indiana University', 'http://www.indiana.edu/', 'US', ''),
              ('University of Notre Dame du Lac', 'http://www.nd.edu/', 'US', 'Notre Dame'),
@@ -546,5 +546,18 @@ INSERT INTO  profile_education_enum (name, url, country, abbreviation)
              ('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');
 
+
+-- 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: