*** ri_triggers.c.orig	Mon Nov 12 01:09:09 2001
--- ri_triggers.c	Sun Apr  6 13:36:42 2003
***************
*** 354,366 ****
  	}
  
  	/*
! 	 * Note: We cannot avoid the check on UPDATE, even if old and new key
! 	 * are the same. Otherwise, someone could DELETE the PK that consists
! 	 * of the DEFAULT values, and if there are any references, a ON DELETE
! 	 * SET DEFAULT action would update the references to exactly these
! 	 * values but we wouldn't see that weired case (this is the only place
! 	 * to see it).
  	 */
  	if (SPI_connect() != SPI_OK_CONNECT)
  		elog(NOTICE, "SPI_connect() failed in RI_FKey_check()");
  
--- 354,372 ----
  	}
  
  	/*
! 	 * No need to check anything if old and new references are the
! 	 * same on UPDATE.
  	 */
+ 	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
+ 	{
+ 		if (ri_KeysEqual(fk_rel, old_row, new_row, &qkey,
+ 						 RI_KEYPAIR_FK_IDX))
+ 		{
+ 			heap_close(pk_rel, NoLock);
+ 			return PointerGetDatum(NULL);
+ 		}
+ 	}
+ 
  	if (SPI_connect() != SPI_OK_CONNECT)
  		elog(NOTICE, "SPI_connect() failed in RI_FKey_check()");
  
***************
*** 2447,2452 ****
--- 2453,2468 ----
  			if (SPI_finish() != SPI_OK_FINISH)
  				elog(NOTICE, "SPI_finish() failed in RI_FKey_setdefault_del()");
  
+ 			/*
+ 			 * In the case we delete the row who's key is equal to the
+ 			 * default values AND a referencing row in the foreign key
+ 			 * table exists, we would just have updated it to the same
+ 			 * values. We need to do another lookup now and in case a
+ 			 * reference exists, abort the operation. That is already
+ 			 * implemented in the NO ACTION trigger.
+ 			 */
+ 			RI_FKey_noaction_del(fcinfo);
+ 
  			return PointerGetDatum(NULL);
  
  			/*
***************
*** 2722,2727 ****
--- 2738,2753 ----
  
  			if (SPI_finish() != SPI_OK_FINISH)
  				elog(NOTICE, "SPI_finish() failed in RI_FKey_setdefault_upd()");
+ 
+ 			/*
+ 			 * In the case we updated the row who's key was equal to the
+ 			 * default values AND a referencing row in the foreign key
+ 			 * table exists, we would just have updated it to the same
+ 			 * values. We need to do another lookup now and in case a
+ 			 * reference exists, abort the operation. That is already
+ 			 * implemented in the NO ACTION trigger.
+ 			 */
+ 			RI_FKey_noaction_upd(fcinfo);
  
  			return PointerGetDatum(NULL);