@@ -3688,8 +3688,6 @@ getTypes(Archive *fout, int *numTypes)
36883688int i_inittypacl ;
36893689int i_initrtypacl ;
36903690int i_rolname ;
3691- int i_typinput ;
3692- int i_typoutput ;
36933691int i_typelem ;
36943692int i_typrelid ;
36953693int i_typrelkind ;
@@ -3734,8 +3732,7 @@ getTypes(Archive *fout, int *numTypes)
37343732"%s AS inittypacl, "
37353733"%s AS initrtypacl, "
37363734"(%s t.typowner) AS rolname, "
3737- "t.typinput::oid AS typinput, "
3738- "t.typoutput::oid AS typoutput, t.typelem, t.typrelid, "
3735+ "t.typelem, t.typrelid, "
37393736"CASE WHEN t.typrelid = 0 THEN ' '::\"char\" "
37403737"ELSE (SELECT relkind FROM pg_class WHERE oid = t.typrelid) END AS typrelkind, "
37413738"t.typtype, t.typisdefined, "
@@ -3763,8 +3760,7 @@ getTypes(Archive *fout, int *numTypes)
37633760"typnamespace, typacl, NULL as rtypacl, "
37643761"NULL AS inittypacl, NULL AS initrtypacl, "
37653762"(%s typowner) AS rolname, "
3766- "typinput::oid AS typinput, "
3767- "typoutput::oid AS typoutput, typelem, typrelid, "
3763+ "typelem, typrelid, "
37683764"CASE WHEN typrelid = 0 THEN ' '::\"char\" "
37693765"ELSE (SELECT relkind FROM pg_class WHERE oid = typrelid) END AS typrelkind, "
37703766"typtype, typisdefined, "
@@ -3779,8 +3775,7 @@ getTypes(Archive *fout, int *numTypes)
37793775"typnamespace, NULL AS typacl, NULL as rtypacl, "
37803776"NULL AS inittypacl, NULL AS initrtypacl, "
37813777"(%s typowner) AS rolname, "
3782- "typinput::oid AS typinput, "
3783- "typoutput::oid AS typoutput, typelem, typrelid, "
3778+ "typelem, typrelid, "
37843779"CASE WHEN typrelid = 0 THEN ' '::\"char\" "
37853780"ELSE (SELECT relkind FROM pg_class WHERE oid = typrelid) END AS typrelkind, "
37863781"typtype, typisdefined, "
@@ -3795,8 +3790,7 @@ getTypes(Archive *fout, int *numTypes)
37953790"typnamespace, NULL AS typacl, NULL as rtypacl, "
37963791"NULL AS inittypacl, NULL AS initrtypacl, "
37973792"(%s typowner) AS rolname, "
3798- "typinput::oid AS typinput, "
3799- "typoutput::oid AS typoutput, typelem, typrelid, "
3793+ "typelem, typrelid, "
38003794"CASE WHEN typrelid = 0 THEN ' '::\"char\" "
38013795"ELSE (SELECT relkind FROM pg_class WHERE oid = typrelid) END AS typrelkind, "
38023796"typtype, typisdefined, "
@@ -3820,8 +3814,6 @@ getTypes(Archive *fout, int *numTypes)
38203814i_inittypacl = PQfnumber (res ,"inittypacl" );
38213815i_initrtypacl = PQfnumber (res ,"initrtypacl" );
38223816i_rolname = PQfnumber (res ,"rolname" );
3823- i_typinput = PQfnumber (res ,"typinput" );
3824- i_typoutput = PQfnumber (res ,"typoutput" );
38253817i_typelem = PQfnumber (res ,"typelem" );
38263818i_typrelid = PQfnumber (res ,"typrelid" );
38273819i_typrelkind = PQfnumber (res ,"typrelkind" );