From: Duck (Jakob Munih) <duck@obala.net>
Date: Sun, 22 Feb 2009 21:09:33 +0000 (+0100)
Subject: Move shared groups definition in a dedicated file
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9ebd80db16ca55985144da858c5b0f4abb398c2e;p=horde.git

Move shared groups definition in a dedicated file
---

diff --git a/folks/scripts/sql/folks.mysql.sql b/folks/scripts/sql/folks.mysql.sql
index a5a6c6aeb..65397991f 100644
--- a/folks/scripts/sql/folks.mysql.sql
+++ b/folks/scripts/sql/folks.mysql.sql
@@ -17,20 +17,6 @@ CREATE TABLE IF NOT EXISTS `folks_friends` (
   PRIMARY KEY  (`user_uid`, `friend_uid`),
   KEY `friend_ask` (`friend_ask`)
 );
-
--- friends SHARED
-CREATE TABLE IF NOT EXISTS `folks_friends` (
-  `user_uid` VARCHAR(32) NOT NULL,
-  `group_id` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  `friend_uid` VARCHAR(32) NOT NULL,
-  `friend_ask` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  PRIMARY KEY  (`user_uid`,`group_id`,`friend_uid`),
-  KEY `user_uid` (`user_uid`),
-  KEY `group_name` (`group_id`),
-  KEY `friend_uid` (`friend_uid`),
-  KEY `friend_ask` (`friend_ask`)
-);
-
 -- BLACKLIST
 CREATE TABLE IF NOT EXISTS `folks_blacklist` (
   `user_uid` VARCHAR(32) NOT NULL,
@@ -73,44 +59,6 @@ CREATE TABLE IF NOT EXISTS folks_online (
   INDEX (user_uid , out_from , out_to)
 );
 
-CREATE TABLE folks_shares (
-  share_id INT(10) UNSIGNED NOT NULL,
-  share_name VARCHAR(255) NOT NULL,
-  share_owner VARCHAR(32) NOT NULL,
-  share_flags TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  perm_creator TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
-  perm_DEFAULT TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
-  perm_guest TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
-  attribute_name VARCHAR(255) NOT NULL,
-  attribute_desc VARCHAR(255) NOT NULL,
-  attribute_type TINYINT(1) NOT NULL,
-  PRIMARY KEY  (share_id),
-  KEY share_name (share_name),
-  KEY share_owner (share_owner),
-  KEY perm_creator (perm_creator),
-  KEY perm_DEFAULT (perm_DEFAULT),
-  KEY perm_guest (perm_guest),
-  KEY attribute_type (attribute_type)
-);
-
-CREATE TABLE folks_shares_groups (
-  share_id INT(10) UNSIGNED NOT NULL,
-  group_uid INT(10) UNSIGNED NOT NULL,
-  perm TINYINT(3) UNSIGNED NOT NULL,
-  KEY share_id (share_id),
-  KEY group_uid (group_uid),
-  KEY perm (perm)
-);
-
-CREATE TABLE folks_shares_users (
-  share_id INT(10) UNSIGNED NOT NULL,
-  user_uid VARCHAR(32) NOT NULL,
-  perm SMALLINT(5) UNSIGNED NOT NULL,
-  KEY share_id (share_id),
-  KEY user_uid (user_uid),
-  KEY perm (perm)
-);
-
 CREATE TABLE IF NOT EXISTS folks_users (
   user_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT,
   user_uid VARCHAR(32) NOT NULL,
diff --git a/folks/scripts/sql/folks.sharedfriends.sql b/folks/scripts/sql/folks.sharedfriends.sql
new file mode 100644
index 000000000..8d7b7e92e
--- /dev/null
+++ b/folks/scripts/sql/folks.sharedfriends.sql
@@ -0,0 +1,53 @@
+--  $Id$
+
+CREATE TABLE IF NOT EXISTS `folks_friends` (
+  `user_uid` VARCHAR(32) NOT NULL,
+  `group_id` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
+  `friend_uid` VARCHAR(32) NOT NULL,
+  `friend_ask` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY  (`user_uid`,`group_id`,`friend_uid`),
+  KEY `user_uid` (`user_uid`),
+  KEY `group_name` (`group_id`),
+  KEY `friend_uid` (`friend_uid`),
+  KEY `friend_ask` (`friend_ask`)
+);
+
+
+CREATE TABLE folks_shares (
+  share_id INT(10) UNSIGNED NOT NULL,
+  share_name VARCHAR(255) NOT NULL,
+  share_owner VARCHAR(32) NOT NULL,
+  share_flags TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
+  perm_creator TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
+  perm_DEFAULT TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
+  perm_guest TINYINT(2) UNSIGNED NOT NULL DEFAULT '0',
+  attribute_name VARCHAR(255) NOT NULL,
+  attribute_desc VARCHAR(255) NOT NULL,
+  attribute_type TINYINT(1) NOT NULL,
+  PRIMARY KEY  (share_id),
+  KEY share_name (share_name),
+  KEY share_owner (share_owner),
+  KEY perm_creator (perm_creator),
+  KEY perm_DEFAULT (perm_DEFAULT),
+  KEY perm_guest (perm_guest),
+  KEY attribute_type (attribute_type)
+);
+
+CREATE TABLE folks_shares_groups (
+  share_id INT(10) UNSIGNED NOT NULL,
+  group_uid INT(10) UNSIGNED NOT NULL,
+  perm TINYINT(3) UNSIGNED NOT NULL,
+  KEY share_id (share_id),
+  KEY group_uid (group_uid),
+  KEY perm (perm)
+);
+
+CREATE TABLE folks_shares_users (
+  share_id INT(10) UNSIGNED NOT NULL,
+  user_uid VARCHAR(32) NOT NULL,
+  perm SMALLINT(5) UNSIGNED NOT NULL,
+  KEY share_id (share_id),
+  KEY user_uid (user_uid),
+  KEY perm (perm)
+);
+