summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-04-12 15:36:03 +0200
committerChristian Grothoff <christian@grothoff.org>2015-04-12 15:36:03 +0200
commit32f9c81ec9d45d13cb0bcf3cf6d8a4a5e01210c9 (patch)
tree64cfacd2e1b6a3741b4e7c26fcc47cbe654b9302
parent06afc160f56c397a3981f6459d4d93f0a9a3eeaa (diff)
parentfcca3115427383f232b0510d162b0e5972a2ce2d (diff)
downloadexchange-32f9c81ec9d45d13cb0bcf3cf6d8a4a5e01210c9.tar.gz
exchange-32f9c81ec9d45d13cb0bcf3cf6d8a4a5e01210c9.tar.bz2
exchange-32f9c81ec9d45d13cb0bcf3cf6d8a4a5e01210c9.zip
Merge branch 'master' of git+ssh://git.taler.net/var/git/mint
-rw-r--r--src/mintdb/plugin_mintdb_postgres.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index 19ae3a3bd..6197544ca 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -232,7 +232,7 @@ postgres_create_tables (void *cls,
*/
SQLEXEC("CREATE TABLE IF NOT EXISTS refresh_sessions "
"("
- " session_hash BYTEA PRIMARY KEY CHECK (length(session_hash) = 32)"
+ " session_hash BYTEA PRIMARY KEY CHECK (length(session_hash) = 64)"
",num_oldcoins INT2 NOT NULL"
",num_newcoins INT2 NOT NULL"
",noreveal_index INT2 NOT NULL"
@@ -283,6 +283,7 @@ postgres_create_tables (void *cls,
")");
SQLEXEC("CREATE TABLE IF NOT EXISTS deposits "
"( "
+ /* FIXME #3769: the following primary key may be too restrictive */
" coin_pub BYTEA NOT NULL PRIMARY KEY CHECK (length(coin_pub)=32)"
",denom_pub BYTEA NOT NULL" /* FIXME: Link this as a foreign key? */
",denom_sig BYTEA NOT NULL"
@@ -1409,7 +1410,7 @@ postgres_insert_deposit (void *cls,
TALER_PQ_QUERY_PARAM_PTR (&amount_nbo.value),
TALER_PQ_QUERY_PARAM_PTR (&amount_nbo.fraction),
TALER_PQ_QUERY_PARAM_PTR_SIZED (amount_nbo.currency,
- TALER_CURRENCY_LEN - 1),
+ 3),
TALER_PQ_QUERY_PARAM_PTR (&deposit->merchant_pub),
TALER_PQ_QUERY_PARAM_PTR (&deposit->h_contract),
TALER_PQ_QUERY_PARAM_PTR (&deposit->h_wire),