database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Change some ABORTS to ERROR. Add line number when COPY Failure.

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-05 16:40:20 +00:00
parent 3d8820a364
commit deea69b90e
44 changed files with 571 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/commands/command.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.22 1998/01/05 03:30:39 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.23 1998/01/05 16:38:44 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@ -294,11 +294,11 @@ PerformAddAttribute(char *relationName,
* normally, only the owner of a class can change its schema.
*/
if (IsSystemRelationName(relationName))
elog(ABORT, "PerformAddAttribute: class \"%s\" is a system catalog",
elog(ERROR, "PerformAddAttribute: class \"%s\" is a system catalog",
relationName);
#ifndef NO_SECURITY
if (!pg_ownercheck(userName, relationName, RELNAME))
elog(ABORT, "PerformAddAttribute: you do not own class \"%s\"",
elog(ERROR, "PerformAddAttribute: you do not own class \"%s\"",
relationName);
#endif
@ -306,9 +306,9 @@ PerformAddAttribute(char *relationName,
* we can't add a not null attribute
*/
if (colDef->is_not_null)
elog(ABORT, "Can't add a NOT NULL attribute to an existing relation");
elog(ERROR, "Can't add a NOT NULL attribute to an existing relation");
if (colDef->defval)
elog(ABORT, "ADD ATTRIBUTE: DEFAULT not yet implemented");
elog(ERROR, "ADD ATTRIBUTE: DEFAULT not yet implemented");
/*
* if the first element in the 'schema' list is a "*" then we are
@ -331,7 +331,7 @@ PerformAddAttribute(char *relationName,
relrdesc = heap_openr(relationName);
if (!RelationIsValid(relrdesc))
{
elog(ABORT, "PerformAddAttribute: unknown relation: \"%s\"",
elog(ERROR, "PerformAddAttribute: unknown relation: \"%s\"",
relationName);
}
myrelid = relrdesc->rd_id;
@ -353,7 +353,7 @@ PerformAddAttribute(char *relationName,
relrdesc = heap_open(childrelid);
if (!RelationIsValid(relrdesc))
{
elog(ABORT, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %d",
elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %d",
childrelid);
}
PerformAddAttribute((relrdesc->rd_rel->relname).data,
@ -369,7 +369,7 @@ PerformAddAttribute(char *relationName,
if (!PointerIsValid(reltup))
{
heap_close(relrdesc);
elog(ABORT, "PerformAddAttribute: relation \"%s\" not found",
elog(ERROR, "PerformAddAttribute: relation \"%s\" not found",
relationName);
}
@ -378,7 +378,7 @@ PerformAddAttribute(char *relationName,
*/
if (((Form_pg_class) GETSTRUCT(reltup))->relkind == RELKIND_INDEX)
{
elog(ABORT, "PerformAddAttribute: index relation \"%s\" not changed",
elog(ERROR, "PerformAddAttribute: index relation \"%s\" not changed",
relationName);
return;
}
@ -389,7 +389,7 @@ PerformAddAttribute(char *relationName,
{
pfree(reltup); /* XXX temp */
heap_close(relrdesc); /* XXX temp */
elog(ABORT, "PerformAddAttribute: relations limited to %d attributes",
elog(ERROR, "PerformAddAttribute: relations limited to %d attributes",
MaxHeapAttributeNumber);
return;
}
@ -450,7 +450,7 @@ PerformAddAttribute(char *relationName,
heap_endscan(attsdesc); /* XXX temp */
heap_close(attrdesc); /* XXX temp */
heap_close(relrdesc); /* XXX temp */
elog(ABORT, "PerformAddAttribute: attribute \"%s\" already exists in class \"%s\"",
elog(ERROR, "PerformAddAttribute: attribute \"%s\" already exists in class \"%s\"",
key[1].sk_argument,
relationName);
return;
@ -478,7 +478,7 @@ PerformAddAttribute(char *relationName,
if (!HeapTupleIsValid(typeTuple))
{
elog(ABORT, "Add: type \"%s\" nonexistent", p);
elog(ERROR, "Add: type \"%s\" nonexistent", p);
}
namestrcpy(&(attribute->attname), (char *) key[1].sk_argument);
attribute->atttypid = typeTuple->t_oid;