database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-01 01:04:50 +03:00
Code

Don't try to hack pg_description if not superuser. (Really want a

Browse Source 
COMMENT ON LARGE OBJECT command instead, but no time for it now.)
Fix some code that would not work with OIDs > 2G.
This commit is contained in:
Tom Lane 2001-10-04 22:39:34 +00:00
parent a50696c9e1
commit c24e5ddf5f
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/psql/large_obj.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.16 2001/08/10 18:57:39 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.17 2001/10/04 22:39:34 tgl Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "large_obj.h" #include "large_obj.h"
@ -16,6 +16,9 @@
#include "print.h" #include "print.h"
#define atooid(x) ((Oid) strtoul((x), NULL, 10))
/* /*
* Since all large object ops must be in a transaction, we must do some magic * Since all large object ops must be in a transaction, we must do some magic
* here. You can set the variable lo_transaction to one of commit|rollback| * here. You can set the variable lo_transaction to one of commit|rollback|
@ -107,7 +110,7 @@ do_lo_export(const char *loid_arg, const char *filename_arg)
PQclear(res); PQclear(res);
} }
status = lo_export(pset.db, atol(loid_arg), filename_arg); status = lo_export(pset.db, atooid(loid_arg), filename_arg);
if (status != 1) if (status != 1)
{ /* of course this status is documented { /* of course this status is documented
* nowhere :( */ * nowhere :( */
@ -187,7 +190,9 @@ do_lo_import(const char *filename_arg, const char *comment_arg)
} }
/* insert description if given */ /* insert description if given */
if (comment_arg) /* XXX don't try to hack pg_description if not superuser */
/* XXX ought to replace this with some kind of COMMENT command */
if (comment_arg && pset.issuper)
{ {
char *cmdbuf; char *cmdbuf;
char *bufptr; char *bufptr;
@ -204,7 +209,7 @@ do_lo_import(const char *filename_arg, const char *comment_arg)
return false; return false;
} }
sprintf(cmdbuf, sprintf(cmdbuf,
"INSERT INTO pg_description VALUES (%u, " "INSERT INTO pg_description VALUES ('%u', "
"(SELECT oid FROM pg_class WHERE relname = 'pg_largeobject')," "(SELECT oid FROM pg_class WHERE relname = 'pg_largeobject'),"
" 0, '", loid); " 0, '", loid);
bufptr = cmdbuf + strlen(cmdbuf); bufptr = cmdbuf + strlen(cmdbuf);
@ -263,7 +268,7 @@ do_lo_unlink(const char *loid_arg)
{ {
PGresult *res; PGresult *res;
int status; int status;
Oid loid = (Oid) atol(loid_arg); Oid loid = atooid(loid_arg);
char buf[256]; char buf[256];
bool own_transaction = true; bool own_transaction = true;
const char *var = GetVariable(pset.vars, "LO_TRANSACTION"); const char *var = GetVariable(pset.vars, "LO_TRANSACTION");
@ -301,7 +306,11 @@ do_lo_unlink(const char *loid_arg)
} }
/* remove the comment as well */ /* remove the comment as well */
sprintf(buf, "DELETE FROM pg_description WHERE objoid = %u " /* XXX don't try to hack pg_description if not superuser */
/* XXX ought to replace this with some kind of COMMENT command */
if (pset.issuper)
{
sprintf(buf, "DELETE FROM pg_description WHERE objoid = '%u' "
"AND classoid = (SELECT oid FROM pg_class WHERE relname = 'pg_largeobject')", "AND classoid = (SELECT oid FROM pg_class WHERE relname = 'pg_largeobject')",
loid); loid);
if (!(res = PSQLexec(buf))) if (!(res = PSQLexec(buf)))
@ -313,7 +322,7 @@ do_lo_unlink(const char *loid_arg)
} }
return false; return false;
} }
}
if (own_transaction) if (own_transaction)
{ {
@ -327,7 +336,7 @@ do_lo_unlink(const char *loid_arg)
} }
fprintf(pset.queryFout, "lo_unlink %d\n", loid); fprintf(pset.queryFout, "lo_unlink %u\n", loid);
return true; return true;
} }