diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-05 16:40:20 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-05 16:40:20 +0000 |
| commit | deea69b90efa866544de6dd34b6e01c04f09806f (patch) | |
| tree | 27a30d675e37a94fc384ea9c0cc69062e50c2244 /src/backend/commands/command.c | |
| parent | 3d8820a364b3627b537b44b9cb23dc40a3c84144 (diff) | |
| download | postgresql-deea69b90efa866544de6dd34b6e01c04f09806f.tar.gz postgresql-deea69b90efa866544de6dd34b6e01c04f09806f.zip | |
Change some ABORTS to ERROR. Add line number when COPY Failure.
Diffstat (limited to 'src/backend/commands/command.c')
| -rw-r--r-- | src/backend/commands/command.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 98d3d614cb7..d9a4281ea12 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -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; |