NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commit5e94f61

committed

Fix wrong assertion and poor error messages in "COPY (query) TO".

If the query is rewritten into a NOTIFY command by a DO INSTEADrule, we'd get an assertion failure, or in non-assert buildsissue a rather confusing error message. Improve that.Also fix a longstanding grammar mistake in a nearby error message.Per bug #18664 from Alexander Lakhin. Back-patch to all supportedbranches.Tender Wang and Tom LaneDiscussion:https://postgr.es/m/18664-ffd0ebc2386598df@postgresql.org

1 parent520ec24 commit5e94f61Copy full SHA for 5e94f61

File tree

3 files changed

+17

-5

lines changed

src
- backend/commands
  - copyto.c
- test/regress
  - expected
    - copydml.out
  - sql
    - copydml.sql

3 files changed

+17

-5

lines changed

`‎src/backend/commands/copyto.c‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ BeginCopyTo(ParseState *pstate,`
`466`	`466`	`if (q->querySource==QSRC_NON_INSTEAD_RULE)`
`467`	`467`	`ereport(ERROR,`
`468`	`468`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`469`		`-errmsg("DO ALSO rules are not supported fortheCOPY")));`
	`469`	`+errmsg("DO ALSO rules are not supported for COPY")));`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`ereport(ERROR,`
`@@ -483,7 +483,11 @@ BeginCopyTo(ParseState *pstate,`
`483`	`483`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`484`	`484`	`errmsg("COPY (SELECT INTO) is not supported")));`
`485`	`485`
`486`		`-Assert(query->utilityStmt==NULL);`
	`486`	`+/* The only other utility command we could see is NOTIFY */`
	`487`	`+if (query->utilityStmt!=NULL)`
	`488`	`+ereport(ERROR,`
	`489`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`490`	`+errmsg("COPY query must not be a utility command")));`
`487`	`491`
`488`	`492`	`/*`
`489`	`493`	`* Similarly the grammar doesn't enforce the presence of a RETURNING`

`‎src/test/regress/expected/copydml.out‎`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ ERROR: DO INSTEAD NOTHING rules are not supported for COPY`
`38`	`38`	`drop rule qqq on copydml_test;`
`39`	`39`	`create rule qqq as on insert to copydml_test do also delete from copydml_test;`
`40`	`40`	`copy (insert into copydml_test default values) to stdout;`
`41`		`-ERROR: DO ALSO rules are not supported fortheCOPY`
	`41`	`+ERROR: DO ALSO rules are not supported for COPY`
`42`	`42`	`drop rule qqq on copydml_test;`
`43`	`43`	`create rule qqq as on insert to copydml_test do instead (delete from copydml_test; delete from copydml_test);`
`44`	`44`	`copy (insert into copydml_test default values) to stdout;`
`@@ -54,7 +54,7 @@ ERROR: DO INSTEAD NOTHING rules are not supported for COPY`
`54`	`54`	`drop rule qqq on copydml_test;`
`55`	`55`	`create rule qqq as on update to copydml_test do also delete from copydml_test;`
`56`	`56`	`copy (update copydml_test set t = 'f') to stdout;`
`57`		`-ERROR: DO ALSO rules are not supported fortheCOPY`
	`57`	`+ERROR: DO ALSO rules are not supported for COPY`
`58`	`58`	`drop rule qqq on copydml_test;`
`59`	`59`	`create rule qqq as on update to copydml_test do instead (delete from copydml_test; delete from copydml_test);`
`60`	`60`	`copy (update copydml_test set t = 'f') to stdout;`
`@@ -70,7 +70,7 @@ ERROR: DO INSTEAD NOTHING rules are not supported for COPY`
`70`	`70`	`drop rule qqq on copydml_test;`
`71`	`71`	`create rule qqq as on delete to copydml_test do also insert into copydml_test default values;`
`72`	`72`	`copy (delete from copydml_test) to stdout;`
`73`		`-ERROR: DO ALSO rules are not supported fortheCOPY`
	`73`	`+ERROR: DO ALSO rules are not supported for COPY`
`74`	`74`	`drop rule qqq on copydml_test;`
`75`	`75`	`create rule qqq as on delete to copydml_test do instead (insert into copydml_test default values; insert into copydml_test default values);`
`76`	`76`	`copy (delete from copydml_test) to stdout;`
`@@ -80,6 +80,10 @@ create rule qqq as on delete to copydml_test where old.t <> 'f' do instead inser`
`80`	`80`	`copy (delete from copydml_test) to stdout;`
`81`	`81`	`ERROR: conditional DO INSTEAD rules are not supported for COPY`
`82`	`82`	`drop rule qqq on copydml_test;`
	`83`	`+create rule qqq as on insert to copydml_test do instead notify copydml_test;`
	`84`	`+copy (insert into copydml_test default values) to stdout;`
	`85`	`+ERROR: COPY query must not be a utility command`
	`86`	`+drop rule qqq on copydml_test;`
`83`	`87`	`-- triggers`
`84`	`88`	`create function qqq_trig() returns trigger as $$`
`85`	`89`	`begin`

`‎src/test/regress/sql/copydml.sql‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ create rule qqq as on delete to copydml_test where old.t <> 'f' do instead inser`
`66`	`66`	`copy (deletefrom copydml_test) to stdout;`
`67`	`67`	`droprule qqqon copydml_test;`
`68`	`68`
	`69`	`+createruleqqqason insert to copydml_test do instead notify copydml_test;`
	`70`	`+copy (insert into copydml_test defaultvalues) to stdout;`
	`71`	`+droprule qqqon copydml_test;`
	`72`	`+`
`69`	`73`	`-- triggers`
`70`	`74`	`createfunctionqqq_trig() returns triggeras $$`
`71`	`75`	`begin`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5e94f61

File tree

3 files changed

3 files changed

`‎src/backend/commands/copyto.c‎`

`‎src/test/regress/expected/copydml.out‎`

`‎src/test/regress/sql/copydml.sql‎`

0 commit comments