Update comments to reflect that tgenabled is not a boolean anymore.

hlinnaka · hlinnaka · commit c079090bbc8a · 2009-01-22T19:16:31.000Z
Jonah Harris, with minor tinkering by me.
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.244 2009/01/21 09:28:26 mha Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.245 2009/01/22 19:16:31 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -992,12 +992,14 @@ renametrig(Oid relid,
 /*
  * EnableDisableTrigger()
  *
- *	Called by ALTER TABLE ENABLE/DISABLE TRIGGER
+ *	Called by ALTER TABLE ENABLE/DISABLE [ REPLICA | ALWAYS ] TRIGGER
  *	to change 'tgenabled' field for the specified trigger(s)
  *
  * rel: relation to process (caller must hold suitable lock on it)
  * tgname: trigger to process, or NULL to scan all triggers
- * enable: new value for tgenabled field
+ * fires_when: new value for tgenabled field. In addition to generic
+ *			   enablement/disablement, this also defines when the trigger
+ *			   should be fired in session replication roles.
  * skip_system: if true, skip "system" triggers (constraint triggers)
  *
  * Caller should have checked permissions for the table; here we also
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.70 2009/01/01 17:23:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.71 2009/01/22 19:16:31 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,6 +95,10 @@ typedef struct TriggerData
 #define SESSION_REPLICATION_ROLE_LOCAL		2
 extern PGDLLIMPORT int	SessionReplicationRole;
 
+/*
+ * States at which a trigger can be fired. These are the
+ * possible values for pg_trigger.tgenabled.
+ */
 #define TRIGGER_FIRES_ON_ORIGIN				'O'
 #define TRIGGER_FIRES_ALWAYS				'A'
 #define TRIGGER_FIRES_ON_REPLICA			'R'

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.244 2009/01/21 09:28:26 mha Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.245 2009/01/22 19:16:31 heikki Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -992,12 +992,14 @@ renametrig(Oid relid,`
`992`	`992`	`/*`
`993`	`993`	`* EnableDisableTrigger()`
`994`	`994`	`*`
`995`		`- * Called by ALTER TABLE ENABLE/DISABLE TRIGGER`
	`995`	`+ * Called by ALTER TABLE ENABLE/DISABLE [ REPLICA \| ALWAYS ] TRIGGER`
`996`	`996`	`* to change 'tgenabled' field for the specified trigger(s)`
`997`	`997`	`*`
`998`	`998`	`* rel: relation to process (caller must hold suitable lock on it)`
`999`	`999`	`* tgname: trigger to process, or NULL to scan all triggers`
`1000`		`- * enable: new value for tgenabled field`
	`1000`	`+ * fires_when: new value for tgenabled field. In addition to generic`
	`1001`	`+ * enablement/disablement, this also defines when the trigger`
	`1002`	`+ * should be fired in session replication roles.`
`1001`	`1003`	`* skip_system: if true, skip "system" triggers (constraint triggers)`
`1002`	`1004`	`*`
`1003`	`1005`	`* Caller should have checked permissions for the table; here we also`