X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=upgrade%2Fnewdirectory-0.0.1%2F02_networking.sql;h=0e4667db827cad3cc267c7a3ec5d3623e4f0a4da;hb=0b14a85c429ad2ff39ee866df4d65de453e6beec;hp=57f636c15a665ba918aadaa5201310d5047a4958;hpb=86c104d10f56354b6f1ee516aa116ee678bb3847;p=platal.git

diff --git a/upgrade/newdirectory-0.0.1/02_networking.sql b/upgrade/newdirectory-0.0.1/02_networking.sql
index 57f636c..0e4667d 100644
--- a/upgrade/newdirectory-0.0.1/02_networking.sql
+++ b/upgrade/newdirectory-0.0.1/02_networking.sql
@@ -2,30 +2,31 @@ DROP TABLE IF EXISTS profile_networking_enum;
 DROP TABLE IF EXISTS profile_networking;
 
 CREATE TABLE `profile_networking_enum` (
-    `network_type` tinyint unsigned NOT NULL,
+    `nwid` tinyint unsigned NOT NULL,
     `name` varchar(30) NOT NULL,
     `icon` varchar(50) NOT NULL COMMENT 'icon filename',
     `filter` enum('email','web','number','none') NOT NULL DEFAULT 'none' COMMENT 'filter type for addresses',
+    `network_type` enum('web','im','social','other') NOT NULL DEFAULT 'other',
     `link` varchar(255) NOT NULL COMMENT 'string used to forge an URL linking to the the profile page',
-    PRIMARY KEY (`network_type`)
+    PRIMARY KEY (`nwid`)
 ) ENGINE=InnoDB, CHARSET=utf8, COMMENT='types of networking addresses';
 
 
 CREATE TABLE `profile_networking` (
     `pid` int NOT NULL COMMENT 'profile id',
-    `nwid` tinyint unsigned NOT NULL COMMENT 'number of the address for the user',
-    `network_type` tinyint unsigned NOT NULL,
+    `id` tinyint unsigned NOT NULL COMMENT 'number of the address for the user',
+    `nwid` tinyint unsigned NOT NULL COMMENT 'id of network, see profile_networking_enum',
     `address` varchar(255) NOT NULL,
     `pub` enum('private','public') NOT NULL DEFAULT 'private',
-    PRIMARY KEY (`pid`, `nwid`),
+    PRIMARY KEY (`pid`, `id`),
     INDEX uid (pid)
 ) ENGINE=InnoDB, CHARSET=utf8, COMMENT='networking addresses';
 
 -- Insert a first address type for old URLs
-INSERT INTO `profile_networking_enum` (`network_type`, `name`, `icon`, `filter`)
-     VALUES (0, 'Page web', 'web.gif', 'web');
+INSERT INTO `profile_networking_enum` (`nwid`, `name`, `icon`, `filter`, `network_type`, `link`)
+     VALUES (0, 'Page web', 'web.gif', 'web', 'web', '%s');
 
-INSERT INTO `profile_networking` (`pid`, `nwid`, `network_type`, `address`, `pub`)
+INSERT INTO `profile_networking` (`pid`, `id`, `nwid`, `address`, `pub`)
      SELECT `user_id`, 0, 0, `profile_web`, `profile_web_pub`
        FROM #x4dat#.`auth_user_quick`
       WHERE `profile_web` <> "";