Merge remote branch 'origin/xorg/f/geocoding' into xorg/master

[platal.git] / upgrade / newdirectory-0.0.1 / 07_corps.sql

diff --git a/upgrade/newdirectory-0.0.1/07_corps.sql b/upgrade/newdirectory-0.0.1/07_corps.sql
index 2fff115..dcdf08f 100644 (file)
--- a/upgrade/newdirectory-0.0.1/07_corps.sql
+++ b/upgrade/newdirectory-0.0.1/07_corps.sql
@@ -4,9 +4,9 @@ DROP TABLE IF EXISTS profile_corps_rank_enum;
 
 CREATE TABLE profile_corps (
   pid INT(11) NOT NULL,
-  original_corpsid INT(4) UNSIGNED NOT NULL DEFAULT 0,
-  current_corpsid INT(4) UNSIGNED NOT NULL DEFAULT 0,
-  rankid INT(4) UNSIGNED NOT NULL DEFAULT 0,
+  original_corpsid INT(4) UNSIGNED NOT NULL DEFAULT 1,
+  current_corpsid INT(4) UNSIGNED NOT NULL DEFAULT 1,
+  rankid INT(4) UNSIGNED NOT NULL DEFAULT 1,
   corps_pub ENUM('private', 'ax', 'public') NOT NULL DEFAULT 'private',
   PRIMARY KEY(pid)
 ) ENGINE=InnoDB, CHARSET=utf8;
@@ -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: