Consolidated public and private channels into one,

        which also includes guild channels. Channels now have a joinable 
        field, which is true for channels that are created by users, and 
        false for guild channels. Chatting in guild channels now works, and 
        non-guild members can no longer join guild channels

1 files changed, 6 insertions, 3 deletions

diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp
index 16d0067e..ea7f620e 100644
--- a/src/account-server/dalstoragesql.hpp
+++ b/src/account-server/dalstoragesql.hpp
@@ -263,17 +263,20 @@ static char const *SQL_CHANNELS_TABLE =
         "id            INTEGER     PRIMARY KEY,"
         "name          VARCHAR(32) NOT NULL UNIQUE,"
         "announcement  VARCHAR(256) NOT NULL,"
-        "password      VARCHAR(32) NOT NULL"
+        "password      VARCHAR(32) NOT NULL,"
+        "joinable      INTEGER  NOT NULL"
 #elif defined (SQLITE_SUPPORT)
         "id      INTEGER     PRIMARY KEY,"
         "name    TEXT        NOT NULL UNIQUE,"
         "announcement    TEXT NOT NULL,"
-        "password        TEXT NOT NULL"
+        "password        TEXT NOT NULL,"
+        "joinable   INTEGER    NOT NULL"
 #elif defined (POSTGRESQL_SUPPORT)
         "id      SERIAL      PRIMARY KEY,"
         "name    TEXT        NOT NULL UNIQUE,"
         "announcement    TEXT NOT NULL,"
-        "password        TEXT NOT NULL"
+        "password        TEXT NOT NULL,"
+        "joinable   INTEGER    NOT NULL"
 #endif
     ");";