diff options
| author | David Athay <ko2fan@gmail.com> | 2008-08-18 16:32:33 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-08-18 16:32:33 +0000 |
| commit | ea1287bed502f43a1c00601e2a236fcbd5b29bdc (patch) | |
| tree | 6d985a7a504483befcc27dc552b14eb1f85d9eb5 /src/account-server/dalstoragesql.hpp | |
| parent | 43af98d8a72966ed2e97b387c6fd0f99a480eb4e (diff) | |
| download | manaserv-ea1287bed502f43a1c00601e2a236fcbd5b29bdc.tar.gz manaserv-ea1287bed502f43a1c00601e2a236fcbd5b29bdc.tar.bz2 manaserv-ea1287bed502f43a1c00601e2a236fcbd5b29bdc.tar.xz manaserv-ea1287bed502f43a1c00601e2a236fcbd5b29bdc.zip | |
Changed guilds to use character id.
Diffstat (limited to 'src/account-server/dalstoragesql.hpp')
| -rw-r--r-- | src/account-server/dalstoragesql.hpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp index 83062838..e485f6f9 100644 --- a/src/account-server/dalstoragesql.hpp +++ b/src/account-server/dalstoragesql.hpp @@ -75,6 +75,7 @@ static char const *SQL_ACCOUNTS_TABLE = "email VARCHAR(64) NOT NULL," "level TINYINT UNSIGNED NOT NULL," "banned TINYINT UNSIGNED NOT NULL," +// "activation VARCHAR(32)," "INDEX (id)" #error "Incorrect definition. Please fix the types." #elif defined (SQLITE_SUPPORT) @@ -84,13 +85,15 @@ static char const *SQL_ACCOUNTS_TABLE = "email TEXT NOT NULL," "level INTEGER NOT NULL," "banned INTEGER NOT NULL" +// "activation TEXT" #elif defined (POSTGRESQL_SUPPORT) "id SERIAL PRIMARY KEY," "username TEXT NOT NULL UNIQUE," "password TEXT NOT NULL," "email TEXT NOT NULL," "level INTEGER NOT NULL," - "banned INTEGER NOT NULL" + "banned INTEGER NOT NULL," +// "activation TEXT" #endif ");"; @@ -261,16 +264,13 @@ static char const *SQL_GUILDS_TABLE = "CREATE TABLE tmw_guilds (" #if defined (MYSQL_SUPPORT) "id INTEGER PRIMARY KEY AUTO_INCREMENT," - "name VARCHAR(32) NOT NULL UNIQUE," - "FOREIGN KEY (name) REFERENCES tmw_characters(name)" + "name VARCHAR(32) NOT NULL UNIQUE" #elif defined (SQLITE_SUPPORT) "id INTEGER PRIMARY KEY," - "name TEXT NOT NULL UNIQUE," - "FOREIGN KEY (name) REFERENCES tmw_characters(name)" + "name TEXT NOT NULL UNIQUE" #elif defined (POSTGRESQL_SUPPORT) "id SERIAL PRIMARY KEY," - "name TEXT NOT NULL UNIQUE," - "FOREIGN KEY (name) REFERENCES tmw_characters(name)" + "name TEXT NOT NULL UNIQUE" #endif ");"; @@ -282,23 +282,23 @@ static char const *GUILD_MEMBERS_TBL_NAME = "tmw_guild_members"; static char const *SQL_GUILD_MEMBERS_TABLE = "CREATE TABLE tmw_guild_members (" #if defined (MYSQL_SUPPORT) - "guild_id INTEGER NOT NULL," - "member_name VARCHAR(32) NOT NULL," - "rights INTEGER NOT NULL," + "guild_id INTEGER NOT NULL," + "member_id INTEGER NOT NULL," + "rights INTEGER NOT NULL," "FOREIGN KEY (guild_id) REFERENCES tmw_guilds(id)," - "FOREIGN KEY (member_name) REFERENCES tmw_characters(name)" + "FOREIGN KEY (member_id) REFERENCES tmw_characters(id)" #elif defined (SQLITE_SUPPORT) "guild_id INTEGER NOT NULL," - "member_name TEXT NOT NULL," + "member_id INTEGER NOT NULL," "rights INTEGER NOT NULL," "FOREIGN KEY (guild_id) REFERENCES tmw_guilds(id)," - "FOREIGN KEY (member_name) REFERENCES tmw_characters(name)" + "FOREIGN KEY (member_id) REFERENCES tmw_characters(id)" #elif defined (POSTGRESQL_SUPPORT) "guild_id INTEGER NOT NULL," - "member_name TEXT NOT NULL," + "member_id INTEGER NOT NULL," "rights INTEGER NOT NULL," "FOREIGN KEY (guild_id) REFERENCES tmw_guilds(id)," - "FOREIGN KEY (member_name) REFERENCES tmw_characters(name)" + "FOREIGN KEY (member_id) REFERENCES tmw_characters(id)" #endif ");"; |