Add some not null constraints to catalogs

[postgresql] / src / include / catalog / pg_policy.h

diff --git a/src/include/catalog/pg_policy.h b/src/include/catalog/pg_policy.h
index ae71f3f3a2f7983e90c19e2bc682dc8bf81b49d5..0dd9c50e5369bd0f4ee4ac6a587832fd212496f0 100644 (file)
--- a/src/include/catalog/pg_policy.h
+++ b/src/include/catalog/pg_policy.h
@@ -1,33 +1,42 @@
-/*
+/*-------------------------------------------------------------------------
+ *
  * pg_policy.h
- *   definition of the system "policy" relation (pg_policy)
+ *       definition of the "policy" system catalog (pg_policy)
+ *
  *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
+ * src/include/catalog/pg_policy.h
+ *
+ * NOTES
+ *       The Catalog.pm module reads this file and derives schema
+ *       information.
+ *
+ *-------------------------------------------------------------------------
  */
 #ifndef PG_POLICY_H
 #define PG_POLICY_H
 
 #include "catalog/genbki.h"
+#include "catalog/pg_policy_d.h"
 
 /* ----------------
  *             pg_policy definition. cpp turns this into
  *             typedef struct FormData_pg_policy
  * ----------------
  */
-#define PolicyRelationId       3256
-
-CATALOG(pg_policy,3256)
+CATALOG(pg_policy,3256,PolicyRelationId)
 {
-       NameData                polname;                /* Policy name. */
-       Oid                             polrelid;               /* Oid of the relation with policy. */
-       char                    polcmd;                 /* One of ACL_*_CHR, or '*' for all */
+       NameData        polname;                /* Policy name. */
+       Oid                     polrelid;               /* Oid of the relation with policy. */
+       char            polcmd;                 /* One of ACL_*_CHR, or '*' for all */
+       bool            polpermissive;  /* restrictive or permissive policy */
 
 #ifdef CATALOG_VARLEN
-       Oid                             polroles[1];    /* Roles associated with policy, not-NULL */
-       pg_node_tree    polqual;                /* Policy quals. */
-       pg_node_tree    polwithcheck;   /* WITH CHECK quals. */
+       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
 } FormData_pg_policy;
 
@@ -38,16 +47,4 @@ CATALOG(pg_policy,3256)
  */
 typedef FormData_pg_policy *Form_pg_policy;
 
-/* ----------------
- *             compiler constants for pg_policy
- * ----------------
- */
-#define Natts_pg_policy                                6
-#define Anum_pg_policy_polname         1
-#define Anum_pg_policy_polrelid                2
-#define Anum_pg_policy_polcmd          3
-#define Anum_pg_policy_polroles                4
-#define Anum_pg_policy_polqual         5
-#define Anum_pg_policy_polwithcheck    6
-
-#endif  /* PG_POLICY_H */
+#endif                                                 /* PG_POLICY_H */