database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-26 01:22:12 +03:00
Code Activity

Goodbye ABORT. Hello ERROR for all errors.

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-07 21:07:04 +00:00
parent e6c6146eb8
commit 679d39b9c8
99 changed files with 493 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/bootstrap/bootparse.y
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.12 1998/01/06 18:51:55 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.13 1998/01/07 21:02:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -203,10 +203,10 @@ Boot_InsertStmt:
LPAREN boot_tuplelist RPAREN
{
if (num_tuples_read != numattr)
elog(ABORT,"incorrect number of values for tuple");
elog(ERROR,"incorrect number of values for tuple");
if (reldesc == (Relation)NULL)
{
elog(ABORT,"must OPEN RELATION before INSERT\n");
elog(ERROR,"must OPEN RELATION before INSERT\n");
err_out();
}
if (DebugMode)

10
src/backend/bootstrap/bootstrap.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.31 1998/01/05 03:30:18 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.32 1998/01/07 21:02:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -572,18 +572,18 @@ closerel(char *name)
if (reldesc)
{
if (namestrcmp(RelationGetRelationName(reldesc), name) != 0)
elog(ABORT, "closerel: close of '%s' when '%s' was expected",
elog(ERROR, "closerel: close of '%s' when '%s' was expected",
name, relname ? relname : "(null)");
}
else
elog(ABORT, "closerel: close of '%s' before any relation was opened",
elog(ERROR, "closerel: close of '%s' before any relation was opened",
name);
}
if (reldesc == NULL)
{
elog(ABORT, "Warning: no opened relation to close.\n");
elog(ERROR, "Warning: no opened relation to close.\n");
}
else
{
@ -879,7 +879,7 @@ gettype(char *type)
heap_close(rdesc);
return (gettype(type));
}
elog(ABORT, "Error: unknown type '%s'.\n", type);
elog(ERROR, "Error: unknown type '%s'.\n", type);
err_out();
/* not reached, here to make compiler happy */
return 0;