diff options
Diffstat (limited to 'contrib/oid2name/oid2name.c')
| -rw-r--r-- | contrib/oid2name/oid2name.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 7186a7abd7..05f73ab1f5 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -367,7 +367,8 @@ sql_exec_dumpalldbs(PGconn *conn, struct options *opts) char todo[1024]; /* get the oid and database name from the system pg_database table */ - snprintf(todo, 1024, "SELECT d.oid AS \"Oid\", datname AS \"Database Name\", " + snprintf(todo, sizeof(todo), + "SELECT d.oid AS \"Oid\", datname AS \"Database Name\", " "spcname AS \"Tablespace\" FROM pg_database d JOIN pg_tablespace t ON " "(dattablespace = t.oid) ORDER BY 2"); @@ -383,7 +384,7 @@ sql_exec_dumpalltables(PGconn *conn, struct options *opts) char todo[1024]; char *addfields = ",c.oid AS \"Oid\", nspname AS \"Schema\", spcname as \"Tablespace\" "; - snprintf(todo, 1024, + snprintf(todo, sizeof(todo), "SELECT relfilenode as \"Filenode\", relname as \"Table Name\" %s " "FROM pg_class c " " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace " @@ -393,8 +394,7 @@ sql_exec_dumpalltables(PGconn *conn, struct options *opts) " %s" " t.oid = CASE" " WHEN reltablespace <> 0 THEN reltablespace" - " WHEN n.nsptablespace <> 0 THEN nsptablespace" - " WHEN d.dattablespace <> 0 THEN dattablespace" + " ELSE dattablespace" " END " "ORDER BY relname", opts->extended ? addfields : "", @@ -451,7 +451,7 @@ sql_exec_searchtables(PGconn *conn, struct options *opts) /* now build the query */ todo = (char *) myalloc(650 + strlen(qualifiers)); - snprintf(todo, 1024, + snprintf(todo, 650 + strlen(qualifiers), "SELECT relfilenode as \"Filenode\", relname as \"Table Name\" %s\n" "FROM pg_class c \n" " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace \n" @@ -460,8 +460,7 @@ sql_exec_searchtables(PGconn *conn, struct options *opts) "WHERE relkind IN ('r', 'i', 'S', 't') AND \n" " t.oid = CASE\n" " WHEN reltablespace <> 0 THEN reltablespace\n" - " WHEN n.nsptablespace <> 0 THEN nsptablespace\n" - " WHEN d.dattablespace <> 0 THEN dattablespace\n" + " ELSE dattablespace\n" " END AND \n" " (%s) \n" "ORDER BY relname\n", @@ -478,7 +477,8 @@ sql_exec_dumpalltbspc(PGconn *conn, struct options *opts) { char todo[1024]; - snprintf(todo, 1024, "SELECT oid AS \"Oid\", spcname as \"Tablespace Name\"\n" + snprintf(todo, sizeof(todo), + "SELECT oid AS \"Oid\", spcname as \"Tablespace Name\"\n" "FROM pg_tablespace"); sql_exec(conn, todo, opts->quiet); |