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/creatinh.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/creatinh.c')
| -rw-r--r-- | src/backend/commands/creatinh.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index 30ec08a3911..8e60f2b450b 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.23 1998/01/05 03:30:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.24 1998/01/05 16:38:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ DefineRelation(CreateStmt *stmt) List *constraints; if (strlen(stmt->relname) >= NAMEDATALEN) - elog(ABORT, "the relation name %s is >= %d characters long", stmt->relname, + elog(ERROR, "the relation name %s is >= %d characters long", stmt->relname, NAMEDATALEN); StrNCpy(relname, stmt->relname, NAMEDATALEN); /* make full length for * copy */ @@ -78,7 +78,7 @@ DefineRelation(CreateStmt *stmt) numberOfAttributes = length(schema); if (numberOfAttributes <= 0) { - elog(ABORT, "DefineRelation: %s", + elog(ERROR, "DefineRelation: %s", "please inherit from a relation or define an attribute"); } @@ -108,7 +108,7 @@ DefineRelation(CreateStmt *stmt) for (i = 0; i < ncheck; i++) { if (strcmp(check[i].ccname, cdef->name) == 0) - elog(ABORT, "DefineRelation: name (%s) of CHECK constraint duplicated", cdef->name); + elog(ERROR, "DefineRelation: name (%s) of CHECK constraint duplicated", cdef->name); } check[ncheck].ccname = cdef->name; } @@ -218,7 +218,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr) if (!strcmp(coldef->colname, restdef->colname)) { - elog(ABORT, "attribute '%s' duplicated", + elog(ERROR, "attribute '%s' duplicated", coldef->colname); } } @@ -231,7 +231,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr) { if (!strcmp(strVal(lfirst(entry)), strVal(lfirst(rest)))) { - elog(ABORT, "relation '%s' duplicated", + elog(ERROR, "relation '%s' duplicated", strVal(lfirst(entry))); } } @@ -252,12 +252,12 @@ MergeAttributes(List *schema, List *supers, List **supconstr) relation = heap_openr(name); if (relation == NULL) { - elog(ABORT, + elog(ERROR, "MergeAttr: Can't inherit from non-existent superclass '%s'", name); } if (relation->rd_rel->relkind == 'S') { - elog(ABORT, "MergeAttr: Can't inherit from sequence superclass '%s'", name); + elog(ERROR, "MergeAttr: Can't inherit from sequence superclass '%s'", name); } tupleDesc = RelationGetTupleDescriptor(relation); constr = tupleDesc->constr; @@ -567,7 +567,7 @@ checkAttrExists(char *attributeName, char *attributeType, List *schema) */ if (strcmp(attributeType, def->typename->name) != 0) { - elog(ABORT, "%s and %s conflict for %s", + elog(ERROR, "%s and %s conflict for %s", attributeType, def->typename->name, attributeName); } return 1; |