--- rserv.c 2003-08-06 18:07:13.000000000 +0200 +++ rserv-7.3.2.c 2003-08-06 01:09:20.000000000 +0200 @@ -49,7 +49,7 @@ char *key; char *okey; char *newkey = NULL; - int deleted, inserted, updated; + int deleted; char sql[8192]; char outbuf[8192]; char oidbuf[64]; @@ -83,13 +83,8 @@ deleted = (TRIGGER_FIRED_BY_DELETE(CurrentTriggerData->tg_event)) ? 1 : 0; - inserted = (TRIGGER_FIRED_BY_INSERT(CurrentTriggerData->tg_event)) ? 1 : 0; - - updated = 0; - if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) { - updated = 1; + if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) newtuple = CurrentTriggerData->tg_newtuple; - } #ifndef PG_FUNCTION_INFO_V1 @@ -133,8 +128,8 @@ okey = key; snprintf(sql, 8192, "update _RSERV_LOG_ set logid = %d, logtime = now(), " - "insert = %d, update = %d, delete = %d where reloid = %u and key = '%s'", - GetCurrentTransactionId(), inserted, updated, deleted, rel->rd_id, okey); + "deleted = %d where reloid = %u and key = '%s'", + GetCurrentTransactionId(), deleted, rel->rd_id, okey); if (debug) elog(DEBUG3, "sql: %s", sql); @@ -152,10 +147,10 @@ else if (SPI_processed == 0) { snprintf(sql, 8192, "insert into _RSERV_LOG_ " - "(reloid, logid, logtime, insert, update, delete, key) " - "values (%u, %d, now(), %d, %d, %d, '%s')", + "(reloid, logid, logtime, deleted, key) " + "values (%u, %d, now(), %d, '%s')", rel->rd_id, GetCurrentTransactionId(), - inserted, updated, deleted, okey); + deleted, okey); if (debug) elog(DEBUG3, "sql: %s", sql); @@ -177,9 +172,9 @@ okey = newkey; snprintf(sql, 8192, "insert into _RSERV_LOG_ " - "(reloid, logid, logtime, insert, update, deleted, key) " - "values (%u, %d, now(), %d, %d, 0, '%s')", - rel->rd_id, GetCurrentTransactionId(), inserted, updated, okey); + "(reloid, logid, logtime, deleted, key) " + "values (%u, %d, now(), 0, '%s')", + rel->rd_id, GetCurrentTransactionId(), okey); if (debug) elog(DEBUG3, "sql: %s", sql);