@@ -6243,8 +6243,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
62436243 "SELECT t.tableoid, t.oid, "
62446244 "t.relname AS indexname, "
62456245 "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
6246- "NULL AS indnkeyatts, "
6247- "NULL AS indnatts, "
6246+ "i.indnatts AS indnkeyatts, "
6247+ "i.indnatts AS indnatts, "
62486248 "t.relnatts AS indnkeys, "
62496249 "i.indkey, i.indisclustered, "
62506250 "i.indisreplident, t.relpages, "
@@ -6276,8 +6276,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
62766276 "SELECT t.tableoid, t.oid, "
62776277 "t.relname AS indexname, "
62786278 "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
6279- "NULL AS indnkeyatts, "
6280- "NULL AS indnatts, "
6279+ "i.indnatts AS indnkeyatts, "
6280+ "i.indnatts AS indnatts, "
62816281 "t.relnatts AS indnkeys, "
62826282 "i.indkey, i.indisclustered, "
62836283 "false AS indisreplident, t.relpages, "
@@ -6305,8 +6305,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
63056305 "SELECT t.tableoid, t.oid, "
63066306 "t.relname AS indexname, "
63076307 "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
6308- "NULL AS indnkeyatts, "
6309- "NULL AS indnatts, "
6308+ "i.indnatts AS indnkeyatts, "
6309+ "i.indnatts AS indnatts, "
63106310 "t.relnatts AS indnkeys, "
63116311 "i.indkey, i.indisclustered, "
63126312 "false AS indisreplident, t.relpages, "
@@ -6337,8 +6337,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
63376337 "SELECT t.tableoid, t.oid, "
63386338 "t.relname AS indexname, "
63396339 "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
6340- "NULL AS indnkeyatts, "
6341- "NULL AS indnatts, "
6340+ "i.indnatts AS indnkeyatts, "
6341+ "i.indnatts AS indnatts, "
63426342 "t.relnatts AS indnkeys, "
63436343 "i.indkey, i.indisclustered, "
63446344 "false AS indisreplident, t.relpages, "
@@ -6368,8 +6368,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
63686368 "SELECT t.tableoid, t.oid, "
63696369 "t.relname AS indexname, "
63706370 "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
6371- "NULL AS indnkeyatts, "
6372- "NULL AS indnatts, "
6371+ "i.indnatts AS indnkeyatts, "
6372+ "i.indnatts AS indnatts, "
63736373 "t.relnatts AS indnkeys, "
63746374 "i.indkey, i.indisclustered, "
63756375 "false AS indisreplident, t.relpages, "
@@ -6399,8 +6399,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
63996399 "SELECT t.tableoid, t.oid, "
64006400 "t.relname AS indexname, "
64016401 "pg_get_indexdef(i.indexrelid) AS indexdef, "
6402- "NULL AS indnkeyatts, "
6403- "NULL AS indnatts, "
6402+ "i.indnatts AS indnkeyatts, "
6403+ "i.indnatts AS indnatts, "
64046404 "t.relnatts AS indnkeys, "
64056405 "i.indkey, false AS indisclustered, "
64066406 "false AS indisreplident, t.relpages, "
@@ -6428,8 +6428,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
64286428 "t.oid, "
64296429 "t.relname AS indexname, "
64306430 "pg_get_indexdef(i.indexrelid) AS indexdef, "
6431- "NULL AS indnkeyatts, "
6432- "NULL AS indnatts, "
6431+ "i.indnatts AS indnkeyatts, "
6432+ "i.indnatts AS indnatts, "
64336433 "t.relnatts AS indnkeys, "
64346434 "i.indkey, false AS indisclustered, "
64356435 "false AS indisreplident, t.relpages, "