diff options
| author | Pavan Deolasee | 2017-06-14 05:42:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-14 05:42:18 +0000 |
| commit | 15dd5274c323fb93e4e3ea9ad2185aaaec10f79c (patch) | |
| tree | 9dafb4c7f735d9429ea461dc792933af87493c33 /contrib/lo/lo.c | |
| parent | dfbb88e3bbb526dcb204b456b9e5cfd9d10d0d0a (diff) | |
| parent | d5cb3bab564e0927ffac7c8729eacf181a12dd40 (diff) | |
Merge from PG master upto d5cb3bab564e0927ffac7c8729eacf181a12dd40
This is the result of the "git merge remotes/PGSQL/master" upto the said commit
point. We have done some basic analysis, fixed compilation problems etc, but
bulk of the logical problems in conflict resolution etc will be handled by
subsequent commits.
Diffstat (limited to 'contrib/lo/lo.c')
| -rw-r--r-- | contrib/lo/lo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 953659305f..6bd2430931 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -9,13 +9,11 @@ #include "commands/trigger.h" #include "executor/spi.h" -#include "libpq/be-fsstubs.h" +#include "utils/builtins.h" #include "utils/rel.h" PG_MODULE_MAGIC; -#define atooid(x) ((Oid) strtoul((x), NULL, 10)) - /* * This is the trigger that protects us from orphaned large objects @@ -82,7 +80,7 @@ lo_manage(PG_FUNCTION_ARGS) char *newv = SPI_getvalue(newtuple, tupdesc, attnum); if (orig != NULL && (newv == NULL || strcmp(orig, newv) != 0)) - DirectFunctionCall1(lo_unlink, + DirectFunctionCall1(be_lo_unlink, ObjectIdGetDatum(atooid(orig))); if (newv) @@ -102,7 +100,7 @@ lo_manage(PG_FUNCTION_ARGS) if (orig != NULL) { - DirectFunctionCall1(lo_unlink, + DirectFunctionCall1(be_lo_unlink, ObjectIdGetDatum(atooid(orig))); pfree(orig); |