Merge branch 'master' into fdw_select_simple

diff --cc src/backend/catalog/dependency.c
index b5e8ba8f9c0ca1dd9912f77fa7b47d9a97791b29,c4ccb5fb2aa21c6ac4cefe8d5976b0c6ea7bb6a0..d448c6f614dcd1ab74c20904f76d20afd916f247
--- 1/src/backend/catalog/dependency.c
--- 2/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@@ -2090,16 -2070,9 +2072,13 @@@ getObjectClass(const ObjectAddress *obj
            return OCLASS_FOREIGN_SERVER;
  
        case UserMappingRelationId:
-           Assert(object->objectSubId == 0);
            return OCLASS_USER_MAPPING;
  
 +      case ForeignTableRelationId:
 +          Assert(object->objectSubId == 0);
 +          return OCLASS_FOREIGN_TABLE;
 +
        case DefaultAclRelationId:
-           Assert(object->objectSubId == 0);
            return OCLASS_DEFACL;
    }
  

diff --cc src/include/catalog/pg_proc.h
Simple merge

diff --cc src/include/utils/builtins.h
Simple merge