@@ -13959,7 +13959,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1395913959 int i_aggmtransspace;
1396013960 int i_agginitval;
1396113961 int i_aggminitval;
13962- int i_convertok;
1396313962 int i_proparallel;
1396413963 const char *aggtransfn;
1396513964 const char *aggfinalfn;
@@ -13982,7 +13981,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1398213981 const char *aggmtransspace;
1398313982 const char *agginitval;
1398413983 const char *aggminitval;
13985- bool convertok;
1398613984 const char *proparallel;
1398713985 char defaultfinalmodify;
1398813986
@@ -14008,7 +14006,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1400814006 "aggkind, "
1400914007 "aggtransspace, agginitval, "
1401014008 "aggmtransspace, aggminitval, "
14011- "true AS convertok, "
1401214009 "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, "
1401314010 "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs, "
1401414011 "p.proparallel "
@@ -14029,7 +14026,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1402914026 "aggkind, "
1403014027 "aggtransspace, agginitval, "
1403114028 "aggmtransspace, aggminitval, "
14032- "true AS convertok, "
1403314029 "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, "
1403414030 "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs, "
1403514031 "p.proparallel "
@@ -14051,7 +14047,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1405114047 "aggkind, "
1405214048 "aggtransspace, agginitval, "
1405314049 "aggmtransspace, aggminitval, "
14054- "true AS convertok, "
1405514050 "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, "
1405614051 "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs "
1405714052 "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
@@ -14073,7 +14068,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1407314068 "'n' AS aggkind, "
1407414069 "0 AS aggtransspace, agginitval, "
1407514070 "0 AS aggmtransspace, NULL AS aggminitval, "
14076- "true AS convertok, "
1407714071 "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, "
1407814072 "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs "
1407914073 "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
@@ -14095,7 +14089,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1409514089 "'n' AS aggkind, "
1409614090 "0 AS aggtransspace, agginitval, "
1409714091 "0 AS aggmtransspace, NULL AS aggminitval, "
14098- "true AS convertok "
1409914092 "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
1410014093 "WHERE a.aggfnoid = p.oid "
1410114094 "AND p.oid = '%u'::pg_catalog.oid",
@@ -14115,7 +14108,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1411514108 "'n' AS aggkind, "
1411614109 "0 AS aggtransspace, agginitval, "
1411714110 "0 AS aggmtransspace, NULL AS aggminitval, "
14118- "true AS convertok "
1411914111 "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
1412014112 "WHERE a.aggfnoid = p.oid "
1412114113 "AND p.oid = '%u'::pg_catalog.oid",
@@ -14144,7 +14136,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1414414136 i_aggmtransspace = PQfnumber(res, "aggmtransspace");
1414514137 i_agginitval = PQfnumber(res, "agginitval");
1414614138 i_aggminitval = PQfnumber(res, "aggminitval");
14147- i_convertok = PQfnumber(res, "convertok");
1414814139 i_proparallel = PQfnumber(res, "proparallel");
1414914140
1415014141 aggtransfn = PQgetvalue(res, 0, i_aggtransfn);
@@ -14167,7 +14158,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1416714158 aggmtransspace = PQgetvalue(res, 0, i_aggmtransspace);
1416814159 agginitval = PQgetvalue(res, 0, i_agginitval);
1416914160 aggminitval = PQgetvalue(res, 0, i_aggminitval);
14170- convertok = (PQgetvalue(res, 0, i_convertok)[0] == 't');
1417114161
1417214162 if (fout->remoteVersion >= 80400)
1417314163 {
@@ -14191,19 +14181,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1419114181 else
1419214182 proparallel = NULL;
1419314183
14194- if (!convertok)
14195- {
14196- pg_log_warning("aggregate function %s could not be dumped correctly for this database version; ignored",
14197- aggsig);
14198-
14199- if (aggfullsig)
14200- free(aggfullsig);
14201-
14202- free(aggsig);
14203-
14204- return;
14205- }
14206-
1420714184 /* identify default modify flag for aggkind (must match DefineAggregate) */
1420814185 defaultfinalmodify = (aggkind == AGGKIND_NORMAL) ? AGGMODIFY_READ_ONLY : AGGMODIFY_READ_WRITE;
1420914186 /* replace omitted flags for old versions */
0 commit comments