NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitb05d3ae

committed

Error message editing in backend/libpq, backend/postmaster, backend/tcop.

Along the way, fix some logic problems in pgstat_initstats, notably thebogus assumption that malloc returns zeroed memory.

1 parent277dbb0 commitb05d3aeCopy full SHA for b05d3ae

File tree

21 files changed

+1249

-810

lines changed

doc/src/sgml
- sources.sgml
src
- backend
  - commands
    - alter.c
    - copy.c
  - libpq
  - postmaster
    - pgstat.c
    - postmaster.c
  - tcop
  - utils/error
    - elog.c
- include
  - tcop
    - utility.h
  - utils
    - elog.h
- test/regress/expected
  - portals.out

21 files changed

+1249

-810

lines changed

`‎doc/src/sgml/sources.sgml‎`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.9 2003/07/18 23:20:32 tgl Exp $`
	`2`	`+$Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.10 2003/07/22 19:00:07 tgl Exp $`
`3`	`3`	`-->`
`4`	`4`
`5`	`5`	`<chapter id="source">`
`@@ -234,6 +234,13 @@ less -x4`
`234`	`234`	`primary error message text.`
`235`	`235`	`</para>`
`236`	`236`	`</listitem>`
	`237`	`+ <listitem>`
	`238`	`+ <para>`
	`239`	`+ <function>errcode_for_socket_access</>() is a convenience function that`
	`240`	`+ selects an appropriate SQLSTATE error identifier for a failure in a`
	`241`	`+ socket-related system call.`
	`242`	`+ </para>`
	`243`	`+ </listitem>`
`237`	`244`	`</itemizedlist>`
`238`	`245`	`</para>`
`239`	`246`

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

Lines changed: 3 additions & 32 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/alter.c,v 1.2 2003/07/20 21:56:32 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/alter.c,v 1.3 2003/07/22 19:00:07 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -29,41 +29,12 @@`
`29`	`29`	`#include"commands/user.h"`
`30`	`30`	`#include"miscadmin.h"`
`31`	`31`	`#include"parser/parse_clause.h"`
	`32`	`+#include"tcop/utility.h"`
`32`	`33`	`#include"utils/acl.h"`
`33`	`34`	`#include"utils/lsyscache.h"`
`34`	`35`	`#include"utils/syscache.h"`
`35`	`36`
`36`	`37`
`37`		`-staticvoid`
`38`		`-CheckOwnership(RangeVar*rel,boolnoCatalogs)`
`39`		`-{`
`40`		`-OidrelOid;`
`41`		`-HeapTupletuple;`
`42`		`-`
`43`		`-relOid=RangeVarGetRelid(rel, false);`
`44`		`-tuple=SearchSysCache(RELOID,`
`45`		`-ObjectIdGetDatum(relOid),`
`46`		`-0,0,0);`
`47`		`-if (!HeapTupleIsValid(tuple))/* should not happen */`
`48`		`-elog(ERROR,"cache lookup failed for relation %u",relOid);`
`49`		`-`
`50`		`-if (!pg_class_ownercheck(relOid,GetUserId()))`
`51`		`-aclcheck_error(ACLCHECK_NOT_OWNER,rel->relname);`
`52`		`-`
`53`		`-if (noCatalogs)`
`54`		`-{`
`55`		`-if (!allowSystemTableMods&&`
`56`		`-IsSystemClass((Form_pg_class)GETSTRUCT(tuple)))`
`57`		`-ereport(ERROR,`
`58`		`-(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`59`		`-errmsg("relation \"%s\" is a system catalog",`
`60`		`-rel->relname)));`
`61`		`-}`
`62`		`-`
`63`		`-ReleaseSysCache(tuple);`
`64`		`-}`
`65`		`-`
`66`		`-`
`67`	`38`	`void`
`68`	`39`	`ExecRenameStmt(RenameStmt*stmt)`
`69`	`40`	`{`
`@@ -111,7 +82,7 @@ ExecRenameStmt(RenameStmt *stmt)`
`111`	`82`	`{`
`112`	`83`	`Oidrelid;`
`113`	`84`
`114`		`-CheckOwnership(stmt->relation, true);`
	`85`	`+CheckRelationOwnership(stmt->relation, true);`
`115`	`86`
`116`	`87`	`relid=RangeVarGetRelid(stmt->relation, false);`
`117`	`88`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.203 2003/07/21 17:04:58 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.204 2003/07/22 19:00:07 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1923,7 +1923,7 @@ CopyReadBinaryAttribute(int column_no, FmgrInfo *flinfo, Oid typelem,`
`1923`	`1923`	`/* Trouble if it didn't eat the whole buffer */`
`1924`	`1924`	`if (attribute_buf.cursor!=attribute_buf.len)`
`1925`	`1925`	`ereport(ERROR,`
`1926`		`-(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),`
	`1926`	`+(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),`
`1927`	`1927`	`errmsg("incorrect binary data format in field %d",`
`1928`	`1928`	`column_no)));`
`1929`	`1929`

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!

Commitb05d3ae

File tree

21 files changed

21 files changed

`‎doc/src/sgml/sources.sgml‎`

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

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

0 commit comments