taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.taler.net/var/git/mint

Browse Source
This commit is contained in:
Christian Grothoff 2015-04-12 15:36:03 +02:00
commit 32f9c81ec9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mintdb/plugin_mintdb_postgres.c
View File

@ -232,7 +232,7 @@ postgres_create_tables (void *cls,
*/ */
SQLEXEC("CREATE TABLE IF NOT EXISTS refresh_sessions " 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_oldcoins INT2 NOT NULL"
",num_newcoins INT2 NOT NULL" ",num_newcoins INT2 NOT NULL"
",noreveal_index INT2 NOT NULL" ",noreveal_index INT2 NOT NULL"
@ -283,6 +283,7 @@ postgres_create_tables (void *cls,
")"); ")");
SQLEXEC("CREATE TABLE IF NOT EXISTS deposits " 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)" " 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_pub BYTEA NOT NULL" /* FIXME: Link this as a foreign key? */
",denom_sig BYTEA NOT NULL" ",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.value),
TALER_PQ_QUERY_PARAM_PTR (&amount_nbo.fraction), TALER_PQ_QUERY_PARAM_PTR (&amount_nbo.fraction),
TALER_PQ_QUERY_PARAM_PTR_SIZED (amount_nbo.currency, 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->merchant_pub),
TALER_PQ_QUERY_PARAM_PTR (&deposit->h_contract), TALER_PQ_QUERY_PARAM_PTR (&deposit->h_contract),
TALER_PQ_QUERY_PARAM_PTR (&deposit->h_wire), TALER_PQ_QUERY_PARAM_PTR (&deposit->h_wire),