fix-conflict.patch

text/x-patch

Filename: fix-conflict.patch

Type: text/x-patch

Part: 0

Message: Re: operator exclusion constraints

Patch

Same data as JSON: GET /api/v1/attachments/:id/patch the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes. API reference →

Format: context

File	+	−
gram.y	10	2

*** gram.y~	Fri Nov  6 20:51:57 2009
--- gram.y	Fri Nov  6 20:58:39 2009
***************
*** 1595,1602 ****
  		;
  
  alter_table_cmd:
! 			/* ALTER TABLE <name> ADD [COLUMN] <coldef> */
! 			ADD_P opt_column columnDef
  				{
  					AlterTableCmd *n = makeNode(AlterTableCmd);
  					n->subtype = AT_AddColumn;
--- 1595,1610 ----
  		;
  
  alter_table_cmd:
! 			/* ALTER TABLE <name> ADD <coldef> */
! 			ADD_P columnDef
! 				{
! 					AlterTableCmd *n = makeNode(AlterTableCmd);
! 					n->subtype = AT_AddColumn;
! 					n->def = $2;
! 					$$ = (Node *)n;
! 				}
! 			/* ALTER TABLE <name> ADD COLUMN <coldef> */
! 			| ADD_P COLUMN columnDef
  				{
  					AlterTableCmd *n = makeNode(AlterTableCmd);
  					n->subtype = AT_AddColumn;