summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-09 00:15:45 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-09 00:15:54 +0100
commit99350928f4087a116de62350d7d3f293e50e468c (patch)
tree84f143effd684bfda4447c11fb256e7ec65d6243
parent4bf28bcaa25b8da6c28520a1aa18275dbe5f27a4 (diff)
we use CREATE INDEX IF NOT EXITS, this requires postgres>=9.6, bump dependency requirements
-rw-r--r--README4
-rw-r--r--configure.ac2
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/datastore/plugin_datastore_postgres.c18
4 files changed, 17 insertions, 9 deletions
diff --git a/README b/README
index a72d8b3b8..7f73525e8 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ worldwide group of independent free software developers. GNUnet is a
GNU package (http://www.gnu.org/).
This is an ALPHA release. There are known and significant bugs as
-well as many missing features in this release.
+well as many missing features in this release.
Additional documentation about GNUnet can be found at
https://gnunet.org/.
@@ -42,7 +42,7 @@ These are the direct dependencies for running GNUnet:
- libltdl >= 2.2 (part of GNU libtool)
- sqlite >= 3.8 (default database, required)
- mysql >= 5.1 (alternative to sqlite)
-- postgres >= 8.3 (alternative to sqlite)
+- postgres >= 9.6 (alternative to sqlite)
- libopus >= 1.0.1 (optional for experimental conversation tool)
- libpulse >= 2.0 (optional for experimental conversation tool)
- libogg >= 1.3.0 (optional for experimental conversation tool)
diff --git a/configure.ac b/configure.ac
index 9fa620128..273301f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -818,7 +818,7 @@ CPPFLAGS=$SAVE_CPPFLAGS
postgres=false
# even running the check for postgres breaks emscripten ...
if test "$taler_only" != yes; then
- AX_LIB_POSTGRESQL([])
+ AX_LIB_POSTGRESQL([9.6])
if test "$found_postgresql" = "yes"; then
CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
AC_CHECK_HEADERS([libpq-fe.h],
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c156336b..aea7d5ef7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -311,6 +311,7 @@ src/rest/gnunet-rest-server.c
src/rest/rest.c
src/revocation/gnunet-revocation.c
src/revocation/gnunet-service-revocation.c
+src/revocation/plugin_block_revocation.c
src/revocation/revocation_api.c
src/rps/gnunet-rps.c
src/rps/gnunet-service-rps.c
@@ -339,6 +340,7 @@ src/set/gnunet-set-ibf-profiler.c
src/set/gnunet-set-profiler.c
src/set/ibf.c
src/set/ibf_sim.c
+src/set/plugin_block_set_test.c
src/set/set_api.c
src/social/gnunet-service-social.c
src/social/gnunet-social.c
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 7b04cc68a..8b8737935 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -114,13 +114,17 @@ init_connection (struct Plugin *plugin)
if (PQresultStatus (ret) == PGRES_COMMAND_OK)
{
if ((GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)")) ||
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)")) ||
(GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_hash_vhash ON gn090 (hash,vhash)")) ||
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_hash_vhash ON gn090 (hash,vhash)")) ||
(GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_prio ON gn090 (prio)")) ||
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_prio ON gn090 (prio)")) ||
(GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_expire ON gn090 (expire)")) ||
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_expire ON gn090 (expire)")) ||
(GNUNET_OK !=
GNUNET_POSTGRES_exec (plugin->dbh,
"CREATE INDEX IF NOT EXISTS idx_prio_anon ON gn090 (prio,anonLevel)")) ||
@@ -128,9 +132,11 @@ init_connection (struct Plugin *plugin)
GNUNET_POSTGRES_exec (plugin->dbh,
"CREATE INDEX IF NOT EXISTS idx_prio_hash_anon ON gn090 (prio,hash,anonLevel)")) ||
(GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_repl_rvalue ON gn090 (repl,rvalue)")) ||
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_repl_rvalue ON gn090 (repl,rvalue)")) ||
(GNUNET_OK !=
- GNUNET_POSTGRES_exec (plugin->dbh, "CREATE INDEX IF NOT EXISTS idx_expire_hash ON gn090 (expire,hash)")))
+ GNUNET_POSTGRES_exec (plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS idx_expire_hash ON gn090 (expire,hash)")))
{
PQclear (ret);
PQfinish (plugin->dbh);