Commit e59e06b4 authored by Erwan Croze's avatar Erwan Croze 👋🏻
Browse files

Fix database for mysql

parent 3df2ee85
...@@ -98,7 +98,7 @@ string AbstractDb::primaryKeyStr (const string &type) const { ...@@ -98,7 +98,7 @@ string AbstractDb::primaryKeyStr (const string &type) const {
switch (d->backend) { switch (d->backend) {
case Mysql: case Mysql:
return type + " PRIMARY KEY AUTO_INCREMENT"; return " " + type + " AUTO_INCREMENT PRIMARY KEY";
case Sqlite3: case Sqlite3:
// See: ROWIDs and the INTEGER PRIMARY KEY // See: ROWIDs and the INTEGER PRIMARY KEY
// https://www.sqlite.org/lang_createtable.html // https://www.sqlite.org/lang_createtable.html
......
...@@ -546,19 +546,19 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -546,19 +546,19 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS sip_address (" "CREATE TABLE IF NOT EXISTS sip_address ("
" id" + primaryKeyStr("UNSIGNED BIGINT") + "," " id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" value VARCHAR(255) UNIQUE NOT NULL" " value VARCHAR(255) UNIQUE NOT NULL"
")"; ")";
*session << *session <<
"CREATE TABLE IF NOT EXISTS content_type (" "CREATE TABLE IF NOT EXISTS content_type ("
" id" + primaryKeyStr("UNSIGNED SMALLINT") + "," " id" + primaryKeyStr("SMALLINT UNSIGNED") + ","
" value VARCHAR(255) UNIQUE NOT NULL" " value VARCHAR(255) UNIQUE NOT NULL"
")"; ")";
*session << *session <<
"CREATE TABLE IF NOT EXISTS event (" "CREATE TABLE IF NOT EXISTS event ("
" id" + primaryKeyStr("UNSIGNED BIGINT") + "," " id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" type TINYINT UNSIGNED NOT NULL," " type TINYINT UNSIGNED NOT NULL,"
" date DATE NOT NULL" " date DATE NOT NULL"
")"; ")";
...@@ -566,7 +566,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -566,7 +566,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS chat_room (" "CREATE TABLE IF NOT EXISTS chat_room ("
// Server (for conference) or user sip address. // Server (for conference) or user sip address.
" peer_sip_address_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " peer_sip_address_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
// Dialog creation date. // Dialog creation date.
" creation_date DATE NOT NULL," " creation_date DATE NOT NULL,"
...@@ -589,8 +589,8 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -589,8 +589,8 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS chat_room_participant (" "CREATE TABLE IF NOT EXISTS chat_room_participant ("
" chat_room_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " chat_room_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" sip_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " sip_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" is_admin BOOLEAN NOT NULL," " is_admin BOOLEAN NOT NULL,"
...@@ -605,9 +605,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -605,9 +605,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_event (" "CREATE TABLE IF NOT EXISTS conference_event ("
" event_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" chat_room_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " chat_room_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" FOREIGN KEY (event_id)" " FOREIGN KEY (event_id)"
" REFERENCES event(id)" " REFERENCES event(id)"
...@@ -619,7 +619,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -619,7 +619,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_notified_event (" "CREATE TABLE IF NOT EXISTS conference_notified_event ("
" event_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" notify_id INT UNSIGNED NOT NULL," " notify_id INT UNSIGNED NOT NULL,"
...@@ -630,9 +630,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -630,9 +630,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_participant_event (" "CREATE TABLE IF NOT EXISTS conference_participant_event ("
" event_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" participant_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " participant_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" FOREIGN KEY (event_id)" " FOREIGN KEY (event_id)"
" REFERENCES conference_notified_event(event_id)" " REFERENCES conference_notified_event(event_id)"
...@@ -644,9 +644,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -644,9 +644,9 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_participant_device_event (" "CREATE TABLE IF NOT EXISTS conference_participant_device_event ("
" event_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" gruu_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " gruu_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" FOREIGN KEY (event_id)" " FOREIGN KEY (event_id)"
" REFERENCES conference_participant_event(event_id)" " REFERENCES conference_participant_event(event_id)"
...@@ -669,10 +669,10 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -669,10 +669,10 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_chat_message_event (" "CREATE TABLE IF NOT EXISTS conference_chat_message_event ("
" event_id" + primaryKeyStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" local_sip_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " local_sip_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" remote_sip_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " remote_sip_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
// See: https://tools.ietf.org/html/rfc5438#section-6.3 // See: https://tools.ietf.org/html/rfc5438#section-6.3
" imdn_message_id VARCHAR(255) NOT NULL," " imdn_message_id VARCHAR(255) NOT NULL,"
...@@ -694,8 +694,8 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -694,8 +694,8 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS chat_message_participant (" "CREATE TABLE IF NOT EXISTS chat_message_participant ("
" event_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" sip_address_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " sip_address_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" state TINYINT UNSIGNED NOT NULL," " state TINYINT UNSIGNED NOT NULL,"
" PRIMARY KEY (event_id, sip_address_id)," " PRIMARY KEY (event_id, sip_address_id),"
...@@ -709,10 +709,10 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -709,10 +709,10 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS chat_message_content (" "CREATE TABLE IF NOT EXISTS chat_message_content ("
" id" + primaryKeyStr("UNSIGNED BIGINT") + "," " id" + primaryKeyStr("BIGINT UNSIGNED") + ","
" event_id " + primaryKeyRefStr("UNSIGNED BIGINT") + "," " event_id " + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" content_type_id" + primaryKeyRefStr("UNSIGNED SMALLINT") + "," " content_type_id" + primaryKeyRefStr("SMALLINT UNSIGNED") + ","
" body TEXT NOT NULL," " body TEXT NOT NULL,"
" FOREIGN KEY (event_id)" " FOREIGN KEY (event_id)"
...@@ -725,7 +725,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -725,7 +725,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS chat_message_content_app_data (" "CREATE TABLE IF NOT EXISTS chat_message_content_app_data ("
" chat_message_content_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " chat_message_content_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" key VARCHAR(255)," " key VARCHAR(255),"
" data BLOB," " data BLOB,"
...@@ -738,7 +738,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate), ...@@ -738,7 +738,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
*session << *session <<
"CREATE TABLE IF NOT EXISTS conference_message_crypto_data (" "CREATE TABLE IF NOT EXISTS conference_message_crypto_data ("
" event_id" + primaryKeyRefStr("UNSIGNED BIGINT") + "," " event_id" + primaryKeyRefStr("BIGINT UNSIGNED") + ","
" key VARCHAR(255)," " key VARCHAR(255),"
" data BLOB," " data BLOB,"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment