[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -fix backenddb crash
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: -fix backenddb crash |
Date: |
Sun, 05 Jun 2022 23:48:43 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new bf16c6e2 -fix backenddb crash
bf16c6e2 is described below
commit bf16c6e29031e828c946a23002c323aa6f0d78de
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jun 5 23:48:41 2022 +0200
-fix backenddb crash
---
src/backenddb/drop0001.sql | 5 +----
src/backenddb/drop0002.sql | 31 -------------------------------
src/backenddb/test_merchantdb.c | 3 +++
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/src/backenddb/drop0001.sql b/src/backenddb/drop0001.sql
index cc24f059..ceff6af5 100644
--- a/src/backenddb/drop0001.sql
+++ b/src/backenddb/drop0001.sql
@@ -26,10 +26,7 @@ BEGIN;
-- Unregister patch (0003.sql)
--SELECT _v.unregister_patch('merchant-0003');
--- Unregister patch (0002.sql)
---SELECT _v.unregister_patch('merchant-0002');
-
--- Unregister patch (0001.sql)
+SELECT _v.unregister_patch('merchant-0002');
SELECT _v.unregister_patch('merchant-0001');
diff --git a/src/backenddb/drop0002.sql b/src/backenddb/drop0002.sql
deleted file mode 100644
index cfb6773c..00000000
--- a/src/backenddb/drop0002.sql
+++ /dev/null
@@ -1,31 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2021 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
--- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
---
-
--- Everything in one big transaction
-BEGIN;
-
-SELECT _v.unregister_patch('merchant-0002');
-
-
--- Drops for 0002.sql
-ALTER TABLE merchant_instances
- DROP COLUMN website,
- DROP COLUMN email,
- DROP COLUMN logo;
-
-
--- And we're out of here...
-COMMIT;
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index f7c2dde7..2d764e7d 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -100,6 +100,9 @@ static void
make_instance (char *instance_id,
struct InstanceData *instance)
{
+ memset (instance,
+ 0,
+ sizeof (*instance));
GNUNET_CRYPTO_eddsa_key_create (&instance->merchant_priv.eddsa_priv);
GNUNET_CRYPTO_eddsa_key_get_public (&instance->merchant_priv.eddsa_priv,
&instance->merchant_pub.eddsa_pub);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: -fix backenddb crash,
gnunet <=