merchant

commit fec152c989ae1951c2120d23ead468beb8017ff0
parent f617bb09ed235b19155771cd36bc8d4872263d0c
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 24 Feb 2020 12:36:26 +0100

0000 is reserved for versioning

Diffstat:
M
src/backenddb/Makefile.am
 | 
2
+-
R
src/backenddb/drop0000.sql -> src/backenddb/drop0001.sql
 | 
0

M
src/backenddb/plugin_merchantdb_postgres.c
 | 
23
-----------------------

3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
@@ -13,7 +13,7 @@ sqldir = $(prefix)/share/taler/sql/merchant/
 sql_DATA = \
   0000.sql \
   0001.sql \
-  drop0000.sql
+  drop0001.sql
 
 if HAVE_POSTGRESQL
 if HAVE_GNUNETPQ
diff --git a/src/backenddb/drop0000.sql b/src/backenddb/drop0001.sql
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -3491,29 +3491,6 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
     GNUNET_free (pg);
     return NULL;
   }
-  ec = getenv ("TALER_MERCHANTDB_POSTGRES_CONFIG");
-  if (NULL != ec)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg,
-                                           "merchantdb-postgres",
-                                           "CONFIG",
-                                           ec);
-  }
-  else
-  {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_have_value (cfg,
-                                         "merchantdb-postgres",
-                                         "CONFIG"))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "merchantdb-postgres",
-                                 "CONFIG");
-      GNUNET_free (pg->sql_dir);
-      GNUNET_free (pg);
-      return NULL;
-    }
-  }
   pg->conn = GNUNET_PQ_connect_with_cfg (cfg,
                                          "merchantdb-postgres",
                                          "",