X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb%2Fkeydb_pg.c;h=c8392f721b9460800b73867c1189f63d4933313e;hb=2d53b0b62dd6c230f25c5d66104e6b367390485a;hp=7d59640b0fd2a82189f0411fe2f0d5018c7fdf97;hpb=51c1a7dd950efef6a4d00df1878341777f8064ff;p=onak.git

diff --git a/keydb/keydb_pg.c b/keydb/keydb_pg.c
index 7d59640..c8392f7 100644
--- a/keydb/keydb_pg.c
+++ b/keydb/keydb_pg.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "build-config.h"
 #include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
@@ -290,19 +291,19 @@ static int pg_delete_key(struct onak_dbctx *dbctx,
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_keys WHERE keyid = '%" PRIX64 "'",
+			"DELETE FROM onak_sigs WHERE signee = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_sigs WHERE signee = '%" PRIX64 "'",
+			"DELETE FROM onak_uids WHERE keyid = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_uids WHERE keyid = '%" PRIX64 "'",
+			"DELETE FROM onak_keys WHERE keyid = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
@@ -644,6 +645,7 @@ static int pg_iterate_keys(struct onak_dbctx *dbctx,
  * Include the basic keydb routines.
  */
 #define NEED_UPDATEKEYS 1
+#define NEED_GET 1
 #define NEED_GET_FP 1
 #include "keydb.c"
 
@@ -670,7 +672,8 @@ static void pg_cleanupdb(struct onak_dbctx *dbctx)
  *	this file are called in order to allow the DB to be initialized ready
  *	for access.
  */
-struct onak_dbctx *keydb_pg_init(struct onak_db_config *dbcfg, bool readonly)
+struct onak_dbctx *keydb_pg_init(struct onak_db_config *dbcfg,
+		__unused bool readonly)
 {
 	struct onak_dbctx *dbctx;
 	PGconn *dbconn;
@@ -702,8 +705,9 @@ struct onak_dbctx *keydb_pg_init(struct onak_db_config *dbcfg, bool readonly)
 	dbctx->cleanupdb		= pg_cleanupdb;
 	dbctx->starttrans		= pg_starttrans;
 	dbctx->endtrans			= pg_endtrans;
-	dbctx->fetch_key_id		= pg_fetch_key_id;
+	dbctx->fetch_key		= generic_fetch_key;
 	dbctx->fetch_key_fp		= generic_fetch_key_fp;
+	dbctx->fetch_key_id		= pg_fetch_key_id;
 	dbctx->fetch_key_text		= pg_fetch_key_text;
 	dbctx->store_key		= pg_store_key;
 	dbctx->update_keys		= generic_update_keys;