From ffe1ec4cb9c9ad23ecba095acb4e38edb741b402 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Thu, 26 Mar 2015 19:29:58 +0100 Subject: db: fix leftovers from #3716 --- src/mint/plugin_mintdb_postgres.c | 8 ++++---- src/pq/db_pq.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mint/plugin_mintdb_postgres.c b/src/mint/plugin_mintdb_postgres.c index 4b7637cf8..d33e0dbdb 100644 --- a/src/mint/plugin_mintdb_postgres.c +++ b/src/mint/plugin_mintdb_postgres.c @@ -182,7 +182,7 @@ postgres_create_tables (void *cls, SQLEXEC ("CREATE TABLE IF NOT EXISTS reserves" "(" " reserve_pub BYTEA PRIMARY KEY" - ",current_balance_value INT4 NOT NULL" + ",current_balance_value INT8 NOT NULL" ",current_balance_fraction INT4 NOT NULL" ",balance_currency VARCHAR(4) NOT NULL" ",expiration_date INT8 NOT NULL" @@ -194,7 +194,7 @@ postgres_create_tables (void *cls, SQLEXEC("CREATE TABLE IF NOT EXISTS reserves_in" "(" " reserve_pub BYTEA REFERENCES reserves (reserve_pub) ON DELETE CASCADE" - ",balance_value INT4 NOT NULL" + ",balance_value INT8 NOT NULL" ",balance_fraction INT4 NOT NULL" ",balance_currency VARCHAR(4) NOT NULL" ",expiration_date INT8 NOT NULL" @@ -217,7 +217,7 @@ postgres_create_tables (void *cls, " coin_pub BYTEA NOT NULL PRIMARY KEY" ",denom_pub BYTEA NOT NULL" ",denom_sig BYTEA NOT NULL" - ",expended_value INT4 NOT NULL" + ",expended_value INT8 NOT NULL" ",expended_fraction INT4 NOT NULL" ",expended_currency VARCHAR(4) NOT NULL" ",refresh_session_hash BYTEA" @@ -280,7 +280,7 @@ postgres_create_tables (void *cls, ",denom_sig BYTEA NOT NULL" ",transaction_id INT8 NOT NULL" ",amount_currency VARCHAR(4) NOT NULL" - ",amount_value INT4 NOT NULL" + ",amount_value INT8 NOT NULL" ",amount_fraction INT4 NOT NULL" ",merchant_pub BYTEA NOT NULL CHECK (length(merchant_pub)=32)" ",h_contract BYTEA NOT NULL CHECK (length(h_contract)=64)" diff --git a/src/pq/db_pq.c b/src/pq/db_pq.c index bbcf002ee..3594fcbf2 100644 --- a/src/pq/db_pq.c +++ b/src/pq/db_pq.c @@ -179,7 +179,7 @@ TALER_DB_extract_amount_nbo (PGresult *result, curr_num = PQfnumber (result, curr_name); GNUNET_assert (curr_num >= 0); - r_amount_nbo->value = *(uint32_t *) PQgetvalue (result, row, val_num); + r_amount_nbo->value = *(uint64_t *) PQgetvalue (result, row, val_num); r_amount_nbo->fraction = *(uint32_t *) PQgetvalue (result, row, frac_num); memset (r_amount_nbo->currency, 0, @@ -212,7 +212,7 @@ TALER_DB_extract_amount (PGresult *result, frac_name, curr_name, &amount_nbo); - r_amount->value = ntohl (amount_nbo.value); + r_amount->value = GNUNET_ntohll (amount_nbo.value); r_amount->fraction = ntohl (amount_nbo.fraction); (void) strncpy (r_amount->currency, amount_nbo.currency, TALER_CURRENCY_LEN); -- cgit v1.2.3