Commit8af310b

and

committed

Prevent creation of duplicate not-null constraints for domains

This was previously harmless, but now that we create pg_constraint rowsfor those, duplicates are not welcome anymore.Backpatch to 18.Co-authored-by: jian he <jian.universality@gmail.com>Co-authored-by: Álvaro Herrera <alvherre@kurilemu.de>Discussion:https://postgr.es/m/CACJufxFSC0mcQ82bSk58sO-WJY4P-o4N6RD2M0D=DD_u_6EzdQ@mail.gmail.com

1 parentf0151e2 commit8af310bCopy full SHA for 8af310b

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -939,11 +939,19 @@ DefineDomain(ParseState pstate, CreateDomainStmt stmt)`
`939`	`939`	`break;`
`940`	`940`
`941`	`941`	`caseCONSTR_NOTNULL:`
`942`		`-if (nullDefined&& !typNotNull)`
	`942`	`+if (nullDefined)`
	`943`	`+{`
	`944`	`+if (!typNotNull)`
	`945`	`+ereport(ERROR,`
	`946`	`+errcode(ERRCODE_SYNTAX_ERROR),`
	`947`	`+errmsg("conflicting NULL/NOT NULL constraints"),`
	`948`	`+parser_errposition(pstate,constr->location));`
	`949`	`+`
`943`	`950`	`ereport(ERROR,`
`944`		`-errcode(ERRCODE_SYNTAX_ERROR),`
`945`		`-errmsg("conflicting NULL/NOT NULLconstraints"),`
	`951`	`+errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
	`952`	`+errmsg("redundantNOT NULLconstraint definition"),`
`946`	`953`	`parser_errposition(pstate,constr->location));`
	`954`	`+}`
`947`	`955`	`if (constr->is_no_inherit)`
`948`	`956`	`ereport(ERROR,`
`949`	`957`	`errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1019,6 +1019,11 @@ insert into domain_test values (1, 2);`
`1019`	`1019`	`-- should fail`
`1020`	`1020`	`alter table domain_test add column c str_domain;`
`1021`	`1021`	`ERROR: domain str_domain does not allow null values`
	`1022`	`+-- disallow duplicated not-null constraints`
	`1023`	`+create domain int_domain1 as int constraint nn1 not null constraint nn2 not null;`
	`1024`	`+ERROR: redundant NOT NULL constraint definition`
	`1025`	`+LINE 1: ...domain int_domain1 as int constraint nn1 not null constraint...`
	`1026`	`+ ^`
`1022`	`1027`	`create domain str_domain2 as text check (value <> 'foo') default 'foo';`
`1023`	`1028`	`-- should fail`
`1024`	`1029`	`alter table domain_test add column d str_domain2;`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,9 @@ insert into domain_test values (1, 2);`
`602`	`602`	`-- should fail`
`603`	`603`	`altertable domain_test add column c str_domain;`
`604`	`604`
	`605`	`+-- disallow duplicated not-null constraints`
	`606`	`+createdomainint_domain1asintconstraint nn1not nullconstraint nn2not null;`
	`607`	`+`
`605`	`608`	`createdomainstr_domain2astextcheck (value<>'foo') default'foo';`
`606`	`609`
`607`	`610`	`-- should fail`

Comments

(0)