Add some not null constraints to catalogs

Use BKI_FORCE_NOT_NULL on some catalog field declarations that are never
null (according to the source code that accesses them).

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 3e1de385e5e39adc7a3e09476d200228975d5cd7..836d623776fbe44a152af5582a764a1dca7c0a1f 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201807191
+#define CATALOG_VERSION_NO     201808271
 
 #endif

diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index 68800ffd8e42bacc9aa464fa836fa40faf744224..e4a37ec32688f641cb8633be0b795a3ada9608d8 100644 (file)
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -32,8 +32,8 @@ CATALOG(pg_attrdef,2604,AttrDefaultRelationId)
        int16           adnum;                  /* attnum of attribute */
 
 #ifdef CATALOG_VARLEN                  /* variable-length fields start here */
-       pg_node_tree adbin;                     /* nodeToString representation of default */
-       text            adsrc;                  /* human-readable representation of default */
+       pg_node_tree adbin BKI_FORCE_NOT_NULL;                  /* nodeToString representation of default */
+       text            adsrc BKI_FORCE_NOT_NULL;                       /* human-readable representation of default */
 #endif
 } FormData_pg_attrdef;
 

diff --git a/src/include/catalog/pg_default_acl.h b/src/include/catalog/pg_default_acl.h
index d0410f55868190b5878b9529622e7b9acad791b1..aee49fdb6da2c2092ff5a6802f180c559d7d8bef 100644 (file)
--- a/src/include/catalog/pg_default_acl.h
+++ b/src/include/catalog/pg_default_acl.h
@@ -34,7 +34,7 @@ CATALOG(pg_default_acl,826,DefaultAclRelationId)
        char            defaclobjtype;  /* see DEFACLOBJ_xxx constants below */
 
 #ifdef CATALOG_VARLEN                  /* variable-length fields start here */
-       aclitem         defaclacl[1];   /* permissions to add at CREATE time */
+       aclitem         defaclacl[1] BKI_FORCE_NOT_NULL;        /* permissions to add at CREATE time */
 #endif
 } FormData_pg_default_acl;
 

diff --git a/src/include/catalog/pg_policy.h b/src/include/catalog/pg_policy.h
index ea3765b1cbca664dd0ab486a4108adb52d81d17e..0dd9c50e5369bd0f4ee4ac6a587832fd212496f0 100644 (file)
--- a/src/include/catalog/pg_policy.h
+++ b/src/include/catalog/pg_policy.h
@@ -34,7 +34,7 @@ CATALOG(pg_policy,3256,PolicyRelationId)
        bool            polpermissive;  /* restrictive or permissive policy */
 
 #ifdef CATALOG_VARLEN
-       Oid                     polroles[1];    /* Roles associated with policy, not-NULL */
+       Oid                     polroles[1] BKI_FORCE_NOT_NULL; /* Roles associated with policy */
        pg_node_tree polqual;           /* Policy quals. */
        pg_node_tree polwithcheck;      /* WITH CHECK quals. */
 #endif

diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index a385445884cdbb1dfe402fd173bd774c9df4719e..0e50b87926542ce7068ffb1f2871850d37b34061 100644 (file)
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -38,8 +38,8 @@ CATALOG(pg_rewrite,2618,RewriteRelationId)
        bool            is_instead;
 
 #ifdef CATALOG_VARLEN                  /* variable-length fields start here */
-       pg_node_tree ev_qual;
-       pg_node_tree ev_action;
+       pg_node_tree ev_qual BKI_FORCE_NOT_NULL;
+       pg_node_tree ev_action BKI_FORCE_NOT_NULL;
 #endif
 } FormData_pg_rewrite;