Merge conflict in ec0925c22a3da7199650c9903a03a0017705ed5c Fix ENABLE/DISABLE TRIGGER to handle recursion correctly

[Sairakan]

Merge conflict due to both trying to add an extra field to Struct AlterTableCmd, resolve by just taking both changes.

Extension PR for validation: amazon-aurora/babelfish_extensions#54

Merge conflict in src/include/nodes/parsenodes.h
typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
{
	NodeTag		type;
	AlterTableType subtype;		/* Type of table alteration to apply */
	char	   *name;			/* column, constraint, or trigger to act on,
								 * or tablespace */
	int16		num;			/* attribute number for columns referenced by
								 * number */
	RoleSpec   *newowner;
	Node	   *def;			/* definition of new column, index,
								 * constraint, or parent table */
	DropBehavior behavior;		/* RESTRICT or CASCADE for DROP cases */
	bool		missing_ok;		/* skip error if missing? */
<<<<<<< ours
	char	   *schemaname;
=======
	bool		recurse;		/* exec-time recursion */
>>>>>>> theirs
} AlterTableCmd;