Merge remote branch 'origin/platal-1.0.0'

[platal.git] / upgrade / newdirectory-0.0.1 / 04_telephone.sql

diff --git a/upgrade/newdirectory-0.0.1/04_telephone.sql b/upgrade/newdirectory-0.0.1/04_telephone.sql
index 00609e5..bc66f78 100644 (file)
--- a/upgrade/newdirectory-0.0.1/04_telephone.sql
+++ b/upgrade/newdirectory-0.0.1/04_telephone.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS profile_phones;
 
 CREATE TABLE `profile_phones` (
-    `uid` smallint unsigned NOT NULL,
+    `pid` smallint unsigned NOT NULL,
     `link_type` enum('address', 'pro', 'user') NOT NULL DEFAULT 'user' COMMENT 'type of parent element',
     `link_id` tinyint unsigned NOT NULL COMMENT 'id of his parent element',
     `tel_id` tinyint unsigned NOT NULL COMMENT 'index of this number for the couple (user, parent element)',
@@ -10,16 +10,10 @@ CREATE TABLE `profile_phones` (
     `display_tel` varchar(30) NOT NULL COMMENT 'display number',
     `pub` enum('private', 'ax', 'public') NOT NULL DEFAULT 'private',
     `comment` varchar(80) NOT NULL,
-    PRIMARY KEY(`uid`, `link_type`, `link_id`, `tel_id`),
+    PRIMARY KEY(`pid`, `link_type`, `link_id`, `tel_id`),
     INDEX (`search_tel`),
-    INDEX uid (uid)
+    INDEX pid (pid)
 ) ENGINE=InnoDB, CHARSET=utf8;
 
 
--- Adds a temporary column to convert phone prefixes from varchar to int
-ALTER TABLE `geoloc_pays` ADD COLUMN `tmp_phoneprf` smallint unsigned NULL;
-
--- Adds phone format column
-ALTER TABLE `geoloc_pays` ADD COLUMN `phoneformat` varchar(25) NOT NULL AFTER `nat`;
-
 # vim:set syntax=mysql: