diff options
author | Christophe Genevey Metat <genevey.christophe@gmail.com> | 2016-07-13 09:41:19 +0000 |
---|---|---|
committer | Christophe Genevey Metat <genevey.christophe@gmail.com> | 2016-07-13 09:41:19 +0000 |
commit | 40bcae34248944ddb77b7939a69ddde62d682277 (patch) | |
tree | 852669309ef3bf4623c38e6f5493fc2fed5a6c4f /src/psycstore/plugin_psycstore_mysql.c | |
parent | 458574dc2ee09ba6e11def8d31fee5ce79093bdf (diff) | |
download | gnunet-40bcae34248944ddb77b7939a69ddde62d682277.tar.gz gnunet-40bcae34248944ddb77b7939a69ddde62d682277.zip |
start to fix psycstore mysql
Diffstat (limited to 'src/psycstore/plugin_psycstore_mysql.c')
-rw-r--r-- | src/psycstore/plugin_psycstore_mysql.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index 1057fea92..b1d36a160 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c | |||
@@ -358,12 +358,13 @@ database_setup (struct Plugin *plugin) | |||
358 | " PRIMARY KEY(id),\n" | 358 | " PRIMARY KEY(id),\n" |
359 | " UNIQUE KEY(pub_key(10))\n" | 359 | " UNIQUE KEY(pub_key(10))\n" |
360 | ");"); | 360 | ");"); |
361 | 361 | ||
362 | /** ERROR **/ | ||
363 | GNUNET_MYSQL_statement_run (plugin->mc, | 362 | GNUNET_MYSQL_statement_run (plugin->mc, |
364 | "CREATE TABLE IF NOT EXISTS slaves (\n" | 363 | "CREATE TABLE IF NOT EXISTS slaves (\n" |
365 | " id INT PRIMARY KEY,\n" | 364 | " id INT,\n" |
366 | " pub_key BLOB UNIQUE\n" | 365 | " pub_key BLOB,\n" |
366 | " PRIMARY KEY(id),\n" | ||
367 | " UNIQUE KEY(pub_key(10))\n" | ||
367 | ");"); | 368 | ");"); |
368 | 369 | ||
369 | GNUNET_MYSQL_statement_run (plugin->mc, | 370 | GNUNET_MYSQL_statement_run (plugin->mc, |
@@ -376,8 +377,9 @@ database_setup (struct Plugin *plugin) | |||
376 | " group_generation INT NOT NULL\n" | 377 | " group_generation INT NOT NULL\n" |
377 | ");"); | 378 | ");"); |
378 | 379 | ||
380 | /*** FIX because IF NOT EXISTS doesn't work ***/ | ||
379 | GNUNET_MYSQL_statement_run (plugin->mc, | 381 | GNUNET_MYSQL_statement_run (plugin->mc, |
380 | "CREATE INDEX IF NOT EXISTS idx_membership_channel_id_slave_id " | 382 | "CREATE INDEX idx_membership_channel_id_slave_id " |
381 | "ON membership (channel_id, slave_id);"); | 383 | "ON membership (channel_id, slave_id);"); |
382 | 384 | ||
383 | /** @todo messages table: add method_name column */ | 385 | /** @todo messages table: add method_name column */ |
@@ -395,7 +397,7 @@ database_setup (struct Plugin *plugin) | |||
395 | " psycstore_flags INT NOT NULL,\n" | 397 | " psycstore_flags INT NOT NULL,\n" |
396 | " data BLOB,\n" | 398 | " data BLOB,\n" |
397 | " PRIMARY KEY (channel_id, fragment_id),\n" | 399 | " PRIMARY KEY (channel_id, fragment_id),\n" |
398 | " UNIQUE (channel_id, message_id, fragment_offset)\n" | 400 | " UNIQUE KEY(channel_id, message_id, fragment_offset)\n" |
399 | ");"); | 401 | ");"); |
400 | 402 | ||
401 | GNUNET_MYSQL_statement_run (plugin->mc, | 403 | GNUNET_MYSQL_statement_run (plugin->mc, |
@@ -404,7 +406,7 @@ database_setup (struct Plugin *plugin) | |||
404 | " name TEXT NOT NULL,\n" | 406 | " name TEXT NOT NULL,\n" |
405 | " value_current BLOB,\n" | 407 | " value_current BLOB,\n" |
406 | " value_signed BLOB,\n" | 408 | " value_signed BLOB,\n" |
407 | " PRIMARY KEY (channel_id, name)\n" | 409 | " PRIMARY KEY (channel_id, name(10))\n" |
408 | ");"); | 410 | ");"); |
409 | 411 | ||
410 | GNUNET_MYSQL_statement_run (plugin->mc, | 412 | GNUNET_MYSQL_statement_run (plugin->mc, |
@@ -412,7 +414,7 @@ database_setup (struct Plugin *plugin) | |||
412 | " channel_id INT NOT NULL REFERENCES channels(id),\n" | 414 | " channel_id INT NOT NULL REFERENCES channels(id),\n" |
413 | " name TEXT NOT NULL,\n" | 415 | " name TEXT NOT NULL,\n" |
414 | " value BLOB,\n" | 416 | " value BLOB,\n" |
415 | " PRIMARY KEY (channel_id, name)\n" | 417 | " PRIMARY KEY (channel_id, name(10))\n" |
416 | ");"); | 418 | ");"); |
417 | 419 | ||
418 | /* Prepare statements */ | 420 | /* Prepare statements */ |