Merge remote branch 'origin/master' 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 003a0a1..6906340 100644 (file)
--- a/upgrade/newdirectory-0.0.1/09_education.sql
+++ b/upgrade/newdirectory-0.0.1/09_education.sql
@@ -208,8 +208,20 @@ WHERE name = 'INSA Rouen';
 UPDATE profile_education_enum
 SET abbreviation = 'IAE de Paris', name = 'Institut d\'Administration des Entreprises de Paris', url = 'http://iae.univ-paris1.fr/'
 WHERE name = 'Institut d\'Administration des Entreprises';
+UPDATE profile_education_enum
+SET abbreviation = 'CNSMDP', name = 'Conservatoire National Supérieur de Musique et de Danse de Paris'
+WHERE name = 'Conservatoire national supérieur de musique et de danse de Paris';
+UPDATE profile_education_enum
+SET name = 'École Normale de Musique de Paris'
+WHERE name = 'École normale de musique de Paris';
 
 UPDATE profile_education_enum
+SET abbreviation = 'NDU', country = 'US'
+WHERE name = 'National Defense University';
+UPDATE profile_education_enum
+SET abbreviation = 'Brown', country = 'US'
+WHERE name = 'Brown University';
+UPDATE profile_education_enum
 SET abbreviation = 'Berkeley', name = 'University of California, Berkeley', country = 'US'
 WHERE name = 'Univ Berkeley';
 UPDATE profile_education_enum
@@ -255,6 +267,9 @@ UPDATE profile_education_enum
 SET abbreviation = 'The Wharton School', name = 'The Wharton School of the University of Pennsylvania', country = 'US', url = 'http://www.wharton.upenn.edu/'
 WHERE name = 'Univ Wharton';
 UPDATE profile_education_enum
+SET country = 'US'
+WHERE name = 'University of Pennsylvania';
+UPDATE profile_education_enum
 SET abbreviation = 'Columbia University', name = 'Columbia University in the City of New York', country = 'US'
 WHERE name = 'Univ Columbia';
 UPDATE profile_education_enum
@@ -509,7 +524,7 @@ WHERE name = 'IHEDN';
 
 UPDATE profile_education_enum
 SET name = "Centre des Hautes Études de l'Armement", country = 'FR', url ='http://www.chear.defense.gouv.fr/',
-WHERE name = 'CHEAr'
+abbreviation = 'CHEAr'
 WHERE name = 'CHEAr';
 
 -- Cleans duplicated entries
@@ -557,7 +572,6 @@ INSERT INTO  profile_education_enum (name, url, country, abbreviation)
              ('Universität Stuttgarti', 'http://www.uni-stuttgart.de/', 'DE', ''),
              ('Universitatea Politehnica din Bucureşti', 'http://www.pub.ro/', 'RO', 'Politehnica din Bucureşti'),
              ('University of Birmingham', 'http://www.bham.ac.uk/', 'GB', ''),
-             ('University of Pennsylvania', 'http://www.upenn.edu/', 'US', ''),
              ('University of Rome', '', 'IT', ''),
              ('University of Sheffield', 'http://www.shef.ac.uk/', 'GB', ''),
              ('University of Utah', 'http://www.utah.edu/', 'US', ''),
@@ -595,8 +609,8 @@ INSERT INTO  profile_education_enum (name, url, country, abbreviation)
 
 
 -- 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
+REPLACE INTO  profile_education (pid, id, fieldid, eduid, degreeid)
+      SELECT  e.pid, 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")