Commit 8344d72c authored by Alexander Korotkov's avatar Alexander Korotkov

Fixes for pg_dump.c regarding multiranges

This commit fixes two wrong version number checks and one wrong check for null.
parent 6df7a969
...@@ -4541,7 +4541,7 @@ binary_upgrade_set_type_oids_by_type_oid(Archive *fout, ...@@ -4541,7 +4541,7 @@ binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
*/ */
if (include_multirange_type) if (include_multirange_type)
{ {
if (fout->remoteVersion >= 130000) if (fout->remoteVersion >= 140000)
{ {
appendPQExpBuffer(upgrade_query, appendPQExpBuffer(upgrade_query,
"SELECT t.oid, t.typarray " "SELECT t.oid, t.typarray "
...@@ -8402,7 +8402,7 @@ getCasts(Archive *fout, int *numCasts) ...@@ -8402,7 +8402,7 @@ getCasts(Archive *fout, int *numCasts)
int i_castcontext; int i_castcontext;
int i_castmethod; int i_castmethod;
if (fout->remoteVersion >= 130000) if (fout->remoteVersion >= 140000)
{ {
appendPQExpBufferStr(query, "SELECT tableoid, oid, " appendPQExpBufferStr(query, "SELECT tableoid, oid, "
"castsource, casttarget, castfunc, castcontext, " "castsource, casttarget, castfunc, castcontext, "
...@@ -10709,7 +10709,7 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo) ...@@ -10709,7 +10709,7 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
appendPQExpBuffer(q, "\n subtype = %s", appendPQExpBuffer(q, "\n subtype = %s",
PQgetvalue(res, 0, PQfnumber(res, "rngsubtype"))); PQgetvalue(res, 0, PQfnumber(res, "rngsubtype")));
if (PQgetvalue(res, 0, PQfnumber(res, "rngmultitype"))) if (!PQgetisnull(res, 0, PQfnumber(res, "rngmultitype")))
appendPQExpBuffer(q, ",\n multirange_type_name = %s", appendPQExpBuffer(q, ",\n multirange_type_name = %s",
PQgetvalue(res, 0, PQfnumber(res, "rngmultitype"))); PQgetvalue(res, 0, PQfnumber(res, "rngmultitype")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment