Merge remote-tracking branch '2ndq-bdr/deparse_9_4' into HEAD

* 2ndq-bdr/deparse_9_4: (34 commits)
  deparse: support GRANT/REVOKE
  deparse: Support ALTER EXTENSION / UPDATE TO
  deparse: support ALTER THING OWNER TO
  deparse: Support CREATE AGGREGATE
  deparse: Initial support for CREATE TEXT SEARCH CONFIGURATION
  deparse: Support CREATE TYPE via DefineStmt
  deparse: Support CREATE TEXT SEARCH DICTIONARY via DefineStmt
  deparse: Support CREATE TEXT SEARCH PARSER via DefineStmt
  deparse: Support CREATE TEXT SEARCH TEMPLATE via DefineStmt
  deparse: Support CREATE COLLATION via DefineStmt
  deparse: Support CREATE OPERATOR via DefineStmt
  deparse: Support CREATE CONVERSION
  deparse: Support CREATE OPERATOR FAMILY
  deparse: initial support for ALTER TABLE
  deparse: deparse CREATE FUNCTION
  deparse/core: enable deparse of function defaults expr
  deparse: support CREATE DOMAIN
  deparse: add support for ALTER THING RENAME
  deparse: support ALTER TYPE / ADD VALUE (for enums)
  deparse: add support for CREATE RULE
  ...

diff --cc src/backend/catalog/objectaddress.c
Simple merge

diff --cc src/backend/commands/event_trigger.c
Simple merge

diff --cc src/backend/commands/tablecmds.c
Simple merge

diff --cc src/include/catalog/objectaddress.h
Simple merge

diff --cc src/include/catalog/pg_proc.h
index 1a74e1df0390baf3d8c9fe47962ac1f3b207c89a,3463e3d35128c19376ff3241b7650bb4cc5e3620..fdea5f52bb719c799f2c1b7c732b56e70b1591ee
--- 1/src/include/catalog/pg_proc.h
--- 2/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@@ -4974,8 -4978,12 +4974,12 @@@ DATA(insert OID = 3785 (  pg_logical_sl
  DESCR("peek at binary changes from replication slot");
  
  /* event triggers */
 -DATA(insert OID = 3566 (  pg_event_trigger_dropped_objects        PGNSP PGUID 12 10 100 0 0 f f f f t t s 0 0 2249 "" "{26,26,23,25,25,25,25}" "{o,o,o,o,o,o,o}" "{classid, objid, objsubid, object_type, schema_name, object_name, object_identity}" _null_ pg_event_trigger_dropped_objects _null_ _null_ _null_ ));
 +DATA(insert OID = 3566 (  pg_event_trigger_dropped_objects        PGNSP PGUID 12 10 100 0 0 f f f f t t s 0 0 2249 "" "{26,26,23,16,16,25,25,25,25,1009,1009}" "{o,o,o,o,o,o,o,o,o,o,o}" "{classid, objid, objsubid, original, normal, object_type, schema_name, object_name, object_identity, address_names, address_args}" _null_ pg_event_trigger_dropped_objects _null_ _null_ _null_ ));
  DESCR("list objects dropped by the current command");
+ DATA(insert OID = 3564 (  pg_event_trigger_get_creation_commands PGNSP PGUID 12 10 100 0 0 f f f f t t s 0 0 2249 "" "{26,26,23,25,25,25,25,16,114}" "{o,o,o,o,o,o,o,o,o}" "{classid,objid,objsubid,command_tag,object_type,schema,identity,in_extension,command}" _null_ pg_event_trigger_get_creation_commands _null_ _null_ _null_ ));
+ DESCR("list JSON-formatted commands executed by the current command");
+ DATA(insert OID = 3565 (  pg_event_trigger_expand_command PGNSP PGUID 12 10 0 0 0 f f f f t f s 1 0 25 "114" _null_ _null_ _null_ _null_ pg_event_trigger_expand_command _null_ _null_ _null_ ));
+ DESCR("format JSON command");
  
  /* generic transition functions for ordered-set aggregates */
  DATA(insert OID = 3970 ( ordered_set_transition           PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2281 "2281 2276" _null_ _null_ _null_ _null_ ordered_set_transition _null_ _null_ _null_ ));

diff --cc src/include/commands/event_trigger.h
index 7ef01cb636ced0960ea375d9e01d54272f0210ed,814124444f7021115271a4ef23196f7d163c7160..185fb345f0a0a66f6f10b9a7ce9428fb947177cf
--- 1/src/include/commands/event_trigger.h
--- 2/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@@ -50,7 -51,17 +51,18 @@@ extern void EventTriggerSQLDrop(Node *p
  extern bool EventTriggerBeginCompleteQuery(void);
  extern void EventTriggerEndCompleteQuery(void);
  extern bool trackDroppedObjectsNeeded(void);
 -extern void EventTriggerSQLDropAddObject(ObjectAddress *object);
 +extern void EventTriggerSQLDropAddObject(const ObjectAddress *object,
 +                           bool original, bool normal);
  
+ extern void EventTriggerStashExtensionStart(void);
+ extern void EventTriggerStashExtensionStop(void);
+ extern void EventTriggerStashCommand(Oid objectId, ObjectType objtype,
+                        Node *parsetree);
+ extern void EventTriggerStashGrant(InternalGrant *istmt);
+ extern void EventTriggerComplexCmdStart(Node *parsetree, ObjectType objtype);
+ extern void EventTriggerComplexCmdSetOid(Oid objectId);
+ extern void EventTriggerRecordSubcmd(Node *subcmd, Oid relid,
+                        AttrNumber attnum, Oid newoid);
+ extern void EventTriggerComplexCmdEnd(void);
+ 
  #endif   /* EVENT_TRIGGER_H */

diff --cc src/include/utils/builtins.h
Simple merge