diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/comment.c | 2 | ||||
| -rw-r--r-- | src/backend/commands/copy.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index cd2c71359f..9739c68ffd 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -772,7 +772,7 @@ CommentOperator(char *opername, List *arguments, char *comment) /*** Get the procedure associated with the operator ***/ data = (Form_pg_operator) GETSTRUCT(optuple); - oid = regproctooid(data->oprcode); + oid = RegprocToOid(data->oprcode); if (oid == InvalidOid) elog(ERROR, "operator '%s' does not have an underlying function", opername); diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index adba62242a..68773ba14e 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.110 2000/06/02 15:57:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.111 2000/06/05 07:28:42 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -473,7 +473,9 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim, char *null_p if (oids && !binary) { - CopySendString(oidout(tuple->t_data->t_oid), fp); + CopySendString(DatumGetCString(DirectFunctionCall1(oidout, + ObjectIdGetDatum(tuple->t_data->t_oid))), + fp); CopySendChar(delim[0], fp); } @@ -782,7 +784,8 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim, char *null done = 1; else { - loaded_oid = oidin(string); + loaded_oid = DatumGetObjectId(DirectFunctionCall1(oidin, + CStringGetDatum(string))); if (loaded_oid == InvalidOid) elog(ERROR, "COPY TEXT: Invalid Oid"); } |