From f739deb50fbcc4c275f2d90daa2bd997ff9d0c7c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 11 May 2004 13:44:05 +0000
Subject: [PATCH] Add mention of rules/triggers:

> * Add MERGE command that does UPDATE, or on failure, INSERT (rules, triggers?)
---
 doc/TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/TODO b/doc/TODO
index 7a2977b705f..234afaa2c7f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Sun May  9 23:58:19 EDT 2004
+Last updated:		Tue May 11 09:44:01 EDT 2004
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -187,7 +187,7 @@ Commands
 * Have pg_ctl look at PGHOST in case it is a socket directory
 * Allow column-level privileges
 * Add a session mode to warn about non-standard SQL usage
-* Add MERGE command that does UPDATE, or on failure, INSERT
+* Add MERGE command that does UPDATE, or on failure, INSERT (rules, triggers?)
 
 * ALTER
 	o -ALTER TABLE ADD COLUMN does not honor DEFAULT and non-CHECK CONSTRAINT
-- 
GitLab