diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 65 |
1 files changed, 37 insertions, 28 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index a7d106d44b2..02d1221b455 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -3645,7 +3645,7 @@ getAggregates(int *numAggs) "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, " "aggbasetype AS proargtypes, " "(%s aggowner) AS rolname, " - "'{=X}' AS aggacl " + "NULL AS aggacl " "FROM pg_aggregate " "where oid > '%u'::oid", username_subquery, @@ -3660,7 +3660,7 @@ getAggregates(int *numAggs) "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, " "aggbasetype AS proargtypes, " "(%s aggowner) AS rolname, " - "'{=X}' AS aggacl " + "NULL AS aggacl " "FROM pg_aggregate " "where oid > '%u'::oid", username_subquery, @@ -3791,7 +3791,7 @@ getFuncs(int *numFuncs) appendPQExpBuffer(query, "SELECT tableoid, oid, proname, prolang, " "pronargs, proargtypes, prorettype, " - "'{=X}' AS proacl, " + "NULL AS proacl, " "0::oid AS pronamespace, " "(%s proowner) AS rolname " "FROM pg_proc " @@ -3807,7 +3807,7 @@ getFuncs(int *numFuncs) " WHERE relname = 'pg_proc') AS tableoid, " "oid, proname, prolang, " "pronargs, proargtypes, prorettype, " - "'{=X}' AS proacl, " + "NULL AS proacl, " "0::oid AS pronamespace, " "(%s proowner) AS rolname " "FROM pg_proc " @@ -5374,7 +5374,7 @@ getProcLangs(int *numProcLangs) /* pg_language has a laninline column */ appendPQExpBuffer(query, "SELECT tableoid, oid, " "lanname, lanpltrusted, lanplcallfoid, " - "laninline, lanvalidator, lanacl, " + "laninline, lanvalidator, lanacl, " "(%s lanowner) AS lanowner " "FROM pg_language " "WHERE lanispl " @@ -5386,7 +5386,7 @@ getProcLangs(int *numProcLangs) /* pg_language has a lanowner column */ appendPQExpBuffer(query, "SELECT tableoid, oid, " "lanname, lanpltrusted, lanplcallfoid, " - "lanvalidator, lanacl, " + "0 AS laninline, lanvalidator, lanacl, " "(%s lanowner) AS lanowner " "FROM pg_language " "WHERE lanispl " @@ -5396,7 +5396,9 @@ getProcLangs(int *numProcLangs) else if (g_fout->remoteVersion >= 80100) { /* Languages are owned by the bootstrap superuser, OID 10 */ - appendPQExpBuffer(query, "SELECT tableoid, oid, *, " + appendPQExpBuffer(query, "SELECT tableoid, oid, " + "lanname, lanpltrusted, lanplcallfoid, " + "0 AS laninline, lanvalidator, lanacl, " "(%s '10') AS lanowner " "FROM pg_language " "WHERE lanispl " @@ -5406,17 +5408,33 @@ getProcLangs(int *numProcLangs) else if (g_fout->remoteVersion >= 70400) { /* Languages are owned by the bootstrap superuser, sysid 1 */ - appendPQExpBuffer(query, "SELECT tableoid, oid, *, " + appendPQExpBuffer(query, "SELECT tableoid, oid, " + "lanname, lanpltrusted, lanplcallfoid, " + "0 AS laninline, lanvalidator, lanacl, " "(%s '1') AS lanowner " "FROM pg_language " "WHERE lanispl " "ORDER BY oid", username_subquery); } - else if (g_fout->remoteVersion >= 70100) + else if (g_fout->remoteVersion >= 70300) { /* No clear notion of an owner at all before 7.4 ... */ - appendPQExpBuffer(query, "SELECT tableoid, oid, * FROM pg_language " + appendPQExpBuffer(query, "SELECT tableoid, oid, " + "lanname, lanpltrusted, lanplcallfoid, " + "0 AS laninline, lanvalidator, lanacl, " + "NULL AS lanowner " + "FROM pg_language " + "WHERE lanispl " + "ORDER BY oid"); + } + else if (g_fout->remoteVersion >= 70100) + { + appendPQExpBuffer(query, "SELECT tableoid, oid, " + "lanname, lanpltrusted, lanplcallfoid, " + "0 AS laninline, 0 AS lanvalidator, NULL AS lanacl, " + "NULL AS lanowner " + "FROM pg_language " "WHERE lanispl " "ORDER BY oid"); } @@ -5424,7 +5442,11 @@ getProcLangs(int *numProcLangs) { appendPQExpBuffer(query, "SELECT " "(SELECT oid FROM pg_class WHERE relname = 'pg_language') AS tableoid, " - "oid, * FROM pg_language " + "oid, " + "lanname, lanpltrusted, lanplcallfoid, " + "0 AS laninline, 0 AS lanvalidator, NULL AS lanacl, " + "NULL AS lanowner " + "FROM pg_language " "WHERE lanispl " "ORDER BY oid"); } @@ -5443,7 +5465,6 @@ getProcLangs(int *numProcLangs) i_lanname = PQfnumber(res, "lanname"); i_lanpltrusted = PQfnumber(res, "lanpltrusted"); i_lanplcallfoid = PQfnumber(res, "lanplcallfoid"); - /* these may fail and return -1: */ i_laninline = PQfnumber(res, "laninline"); i_lanvalidator = PQfnumber(res, "lanvalidator"); i_lanacl = PQfnumber(res, "lanacl"); @@ -5459,22 +5480,10 @@ getProcLangs(int *numProcLangs) planginfo[i].dobj.name = strdup(PQgetvalue(res, i, i_lanname)); planginfo[i].lanpltrusted = *(PQgetvalue(res, i, i_lanpltrusted)) == 't'; planginfo[i].lanplcallfoid = atooid(PQgetvalue(res, i, i_lanplcallfoid)); - if (i_laninline >= 0) - planginfo[i].laninline = atooid(PQgetvalue(res, i, i_laninline)); - else - planginfo[i].laninline = InvalidOid; - if (i_lanvalidator >= 0) - planginfo[i].lanvalidator = atooid(PQgetvalue(res, i, i_lanvalidator)); - else - planginfo[i].lanvalidator = InvalidOid; - if (i_lanacl >= 0) - planginfo[i].lanacl = strdup(PQgetvalue(res, i, i_lanacl)); - else - planginfo[i].lanacl = strdup("{=U}"); - if (i_lanowner >= 0) - planginfo[i].lanowner = strdup(PQgetvalue(res, i, i_lanowner)); - else - planginfo[i].lanowner = strdup(""); + planginfo[i].laninline = atooid(PQgetvalue(res, i, i_laninline)); + planginfo[i].lanvalidator = atooid(PQgetvalue(res, i, i_lanvalidator)); + planginfo[i].lanacl = strdup(PQgetvalue(res, i, i_lanacl)); + planginfo[i].lanowner = strdup(PQgetvalue(res, i, i_lanowner)); if (g_fout->remoteVersion < 70300) { |