diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-05 07:29:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-05 07:29:25 +0000 |
| commit | 48165ec2262b73c5b81a6caabab66d883d013a83 (patch) | |
| tree | 08e878a2a1e7f76981406ac2b34729a510aecac6 /src/backend/commands/copy.c | |
| parent | c61db5ba2decf2e620f6ce3699d4b702957ed72a (diff) | |
| download | postgresql-48165ec2262b73c5b81a6caabab66d883d013a83.tar.gz | |
Latest round of fmgr updates. All functions with bool,char, or int2
inputs have been converted to newstyle. This should go a long way towards
fixing our portability problems with platforms where char and short
parameters are passed differently from int-width parameters. Still
more to do for the Alpha port however.
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 9 |
1 files changed, 6 insertions, 3 deletions
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"); } |