From: Christophe Genevey Metat <genevey.christophe@gmail.com>
Date: Wed, 13 Jul 2016 09:41:19 +0000 (+0000)
Subject: start to fix psycstore mysql
X-Git-Tag: initial-import-from-subversion-38251~536
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=40bcae34248944ddb77b7939a69ddde62d682277;p=oweals%2Fgnunet.git

start to fix psycstore mysql
---

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)
                               " PRIMARY KEY(id),\n"
                               " UNIQUE KEY(pub_key(10))\n"
                               ");");
-  
-/** ERROR **/
+
   GNUNET_MYSQL_statement_run (plugin->mc,
                               "CREATE TABLE IF NOT EXISTS slaves (\n"
-                              "  id INT PRIMARY KEY,\n"
-                              "  pub_key BLOB UNIQUE\n"
+                              " id INT,\n"
+                              " pub_key BLOB,\n"
+                              " PRIMARY KEY(id),\n"
+                              " UNIQUE KEY(pub_key(10))\n"
                               ");");
 
   GNUNET_MYSQL_statement_run (plugin->mc,
@@ -376,8 +377,9 @@ database_setup (struct Plugin *plugin)
                               "  group_generation INT NOT NULL\n"
                               ");");
 
+/*** FIX because IF NOT EXISTS doesn't work ***/
   GNUNET_MYSQL_statement_run (plugin->mc,
-                              "CREATE INDEX IF NOT EXISTS idx_membership_channel_id_slave_id "
+                              "CREATE INDEX idx_membership_channel_id_slave_id "
                               "ON membership (channel_id, slave_id);");
 
   /** @todo messages table: add method_name column */
@@ -395,7 +397,7 @@ database_setup (struct Plugin *plugin)
                               "  psycstore_flags INT NOT NULL,\n"
                               "  data BLOB,\n"
                               "  PRIMARY KEY (channel_id, fragment_id),\n"
-                              "  UNIQUE (channel_id, message_id, fragment_offset)\n"
+                              "  UNIQUE KEY(channel_id, message_id, fragment_offset)\n"
                               ");");
 
   GNUNET_MYSQL_statement_run (plugin->mc,
@@ -404,7 +406,7 @@ database_setup (struct Plugin *plugin)
                               "  name TEXT NOT NULL,\n"
                               "  value_current BLOB,\n"
                               "  value_signed BLOB,\n"
-                              "  PRIMARY KEY (channel_id, name)\n"
+                              "  PRIMARY KEY (channel_id, name(10))\n"
                               ");");
 
   GNUNET_MYSQL_statement_run (plugin->mc,
@@ -412,7 +414,7 @@ database_setup (struct Plugin *plugin)
                               "  channel_id INT NOT NULL REFERENCES channels(id),\n"
                               "  name TEXT NOT NULL,\n"
                               "  value BLOB,\n"
-                              "  PRIMARY KEY (channel_id, name)\n"
+                              "  PRIMARY KEY (channel_id, name(10))\n"
                               ");");
 
   /* Prepare statements */