Fixes building history of watch_profile table.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/upgrade/newdirectory-0.0.1/01_nationalities.sql b/upgrade/newdirectory-0.0.1/01_nationalities.sql
new file mode 100644 (file)
index 0000000..54db8ca
--- /dev/null
+++ b/upgrade/newdirectory-0.0.1/01_nationalities.sql
@@ -0,0 +1,6 @@
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'web','appli1', 'appli2', 'addresses', 'section',
+                        'binets', 'medals', 'cv', 'jobs', 'photo');
+
+# vim:set syntax=mysql:

diff --git a/upgrade/newdirectory-0.0.1/02_networking.sql b/upgrade/newdirectory-0.0.1/02_networking.sql
index 3aaa122..57f636c 100644 (file)
--- a/upgrade/newdirectory-0.0.1/02_networking.sql
+++ b/upgrade/newdirectory-0.0.1/02_networking.sql
@@ -31,16 +31,16 @@ INSERT INTO `profile_networking` (`pid`, `nwid`, `network_type`, `address`, `pub
       WHERE `profile_web` <> "";
 
 -- Modify watch_profile to update 'field' from web to networking
-ALTER TABLE `watch_profile`
-     MODIFY `field` enum('nom', 'freetext', 'mobile', 'nationalite', 'nick',
-                         'web', 'networking', 'appli1', 'appli2', 'addresses',
-                         'section', 'binets', 'medals', 'cv', 'jobs', 'photo');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'web', 'networking', 'appli1', 'appli2', 'addresses', 'section',
+                        'binets', 'medals', 'cv', 'jobs', 'photo');
 
 UPDATE `watch_profile` SET `field` = 'networking' WHERE `field` = 'web';
 
-ALTER TABLE `watch_profile`
-     MODIFY `field` enum('nom', 'freetext', 'mobile', 'nationalite', 'nick',
-                         'networking', 'appli1', 'appli2', 'addresses',
-                         'section', 'binets', 'medals', 'cv', 'jobs', 'photo');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'appli1', 'appli2', 'addresses', 'section',
+                        'binets', 'medals', 'cv', 'jobs', 'photo');
 
 # vim:set syntax=mysql:

diff --git a/upgrade/newdirectory-0.0.1/06_education.sql b/upgrade/newdirectory-0.0.1/06_education.sql
index dc55947..ef9ecfc 100644 (file)
--- a/upgrade/newdirectory-0.0.1/06_education.sql
+++ b/upgrade/newdirectory-0.0.1/06_education.sql
@@ -85,19 +85,20 @@ INSERT IGNORE INTO  watch_profile (uid, ts, field)
               FROM  watch_profile
              WHERE  field = 'appli2';
 
-ALTER TABLE watch_profile MODIFY field enum('nom', 'freetext', 'mobile', 'nationalite', 'nationalite2',
-                                            'nationalite3', 'nick', 'web', 'networking', 'appli1', 'appli2',
-                                            'edus', 'addresses', 'section', 'binets', 'medals', 'cv', 'jobs',
-                                            'photo');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'appli1', 'appli2', 'edus', 'addresses', 'section',
+                        'binets', 'medals', 'cv', 'jobs', 'photo');
 
 UPDATE watch_profile SET field = 'edus' WHERE field = 'appli1';
 
 
 DELETE FROM watch_profile WHERE field = 'appli2';
 
-ALTER TABLE watch_profile MODIFY field enum('nom', 'freetext', 'mobile', 'nationalite', 'nationalite2',
-                                            'nationalite3', 'nick', 'web', 'networking', 'edus', 'addresses',
-                                            'section', 'binets', 'medals', 'cv', 'jobs', 'photo');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'edus', 'addresses', 'section', 'binets', 'medals',
+                        'cv', 'jobs', 'photo');
 
 # vim:set syntax=mysql:
 

diff --git a/upgrade/newdirectory-0.0.1/07_corps.sql b/upgrade/newdirectory-0.0.1/07_corps.sql
index 80f80bc..dcdf08f 100644 (file)
--- a/upgrade/newdirectory-0.0.1/07_corps.sql
+++ b/upgrade/newdirectory-0.0.1/07_corps.sql
@@ -656,8 +656,9 @@ INSERT IGNORE INTO  profile_corps_enum (abbreviation, name, still_exists)
                     ("INSEE", "Administrateurs de l'INSEE", 1),
                     ("Off", "Officiers des Armées", 1);
 
-ALTER TABLE watch_profile MODIFY field ENUM('nom', 'freetext', 'mobile', 'nationalite', 'nationalite2',
-                                            'nationalite3', 'nick', 'web', 'networking', 'edus', 'addresses',
-                                            'section', 'binets', 'medals', 'cv', 'jobs', 'photo', 'corps');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'edus', 'addresses', 'section', 'binets', 'medals',
+                        'cv', 'jobs', 'photo', 'corps');
 
 --  vim:set syntax=mysql:

diff --git a/upgrade/newdirectory-0.0.1/14_watchnames.sql b/upgrade/newdirectory-0.0.1/14_watchnames.sql
index 04b3483..db8c667 100644 (file)
--- a/upgrade/newdirectory-0.0.1/14_watchnames.sql
+++ b/upgrade/newdirectory-0.0.1/14_watchnames.sql
@@ -1,13 +1,13 @@
-ALTER TABLE watch_profile MODIFY field enum('search_names', 'nom', 'freetext', 'mobile', 'nationalite',
-                                            'nationalite2', 'nationalite3', 'nick', 'web', 'networking',
-                                            'edus', 'addresses', 'section', 'binets', 'medals', 'cv',
-                                            'jobs', 'photo', 'corps');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('search_names', 'nom', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'edus', 'addresses', 'section', 'binets', 'medals',
+                        'cv', 'jobs', 'photo', 'corps');
 
 UPDATE watch_profile SET field = 'search_names' WHERE field = 'nom' OR field = 'nick';
 
-ALTER TABLE watch_profile MODIFY field enum('search_names', 'freetext', 'mobile', 'nationalite',
-                                            'nationalite2', 'nationalite3', 'web', 'networking','edus',
-                                            'addresses', 'section', 'binets', 'medals', 'cv', 'jobs',
-                                            'photo', 'corps');
+ALTER TABLE  watch_profile
+     MODIFY  field ENUM('search_names', 'freetext', 'mobile', 'nationality1', 'nationality2', 'nationality3',
+                        'nick', 'networking', 'edus', 'addresses', 'section', 'binets', 'medals',
+                        'cv', 'jobs', 'photo', 'corps');
 
 # vim:set syntax=mysql: