Merge branch 'master' into testing

[quix0rs-gnu-social.git] / db / site.sql

diff --git a/db/site.sql b/db/site.sql
index 660ba475bb586edff429a7c271e8f434c96c2e96..c630a83d522cfdbf7c35f72adfb572d65b5b5bbb 100644 (file)
--- a/db/site.sql
+++ b/db/site.sql
@@ -1,17 +1,34 @@
 /* For managing multiple sites */
 
 create table status_network (
 /* For managing multiple sites */
 
 create table status_network (

-
-    nickname varchar(64) primary key comment 'nickname',
+       
+    site_id  integer auto_increment primary key comment 'unique id',
+    nickname varchar(64)  unique key comment 'nickname',

     hostname varchar(255) unique key comment 'alternate hostname if any',
     pathname varchar(255) unique key comment 'alternate pathname if any',
     hostname varchar(255) unique key comment 'alternate hostname if any',
     pathname varchar(255) unique key comment 'alternate pathname if any',

-    sitename varchar(255) comment 'display name',
+

     dbhost varchar(255) comment 'database host',
     dbuser varchar(255) comment 'database username',
     dbpass varchar(255) comment 'database password',
     dbname varchar(255) comment 'database name',
 
     dbhost varchar(255) comment 'database host',
     dbuser varchar(255) comment 'database username',
     dbpass varchar(255) comment 'database password',
     dbname varchar(255) comment 'database name',
 

+    sitename varchar(255) comment 'display name',
+    theme varchar(255) comment 'theme name',
+    logo varchar(255) comment 'site logo',
+    
+    tags text comment 'site meta-info tags (pipe-separated)',
+

     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;

+
+create table status_network_tag (
+    site_id integer  comment 'unique id',
+    tag varchar(64) comment 'tag name',
+    created datetime not null comment 'date the record was created',
+
+    constraint primary key (site_id, tag),
+    index status_network_tag_tag_idx (tag)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
+