Merge branch 'rel_future_beta' of https://github.com/postgrespro/pg_pathman into rel_future_beta

Author: zilder

expected/pathman_calamity.out

@@ -280,21 +280,21 @@ SELECT build_range_condition('calamity.part_test', 'val', NULL, 10);	/* OK */
 (1 row)
 
 /* check function validate_interval_value() */
-SELECT validate_interval_value(1::REGCLASS, 'expr', 2, '1 mon', 'cooked_expr');		/* not ok */
+SELECT validate_interval_value(1::REGCLASS, 'expr', 2, '1 mon', 'cooked_expr');			/* not ok */
 ERROR:  relation "1" does not exist
-SELECT validate_interval_value(NULL, 'expr', 2, '1 mon', 'cooked_expr');			/* not ok */
+SELECT validate_interval_value(NULL, 'expr', 2, '1 mon', 'cooked_expr');				/* not ok */
 ERROR:  'partrel' should not be NULL
-SELECT validate_interval_value('pg_class', NULL, 2, '1 mon', 'cooked_expr');		/* not ok */
+SELECT validate_interval_value('pg_class', NULL, 2, '1 mon', 'cooked_expr');			/* not ok */
 ERROR:  'expression' should not be NULL
-SELECT validate_interval_value('pg_class', 'oid', NULL, '1 mon', 'cooked_expr');	/* not ok */
+SELECT validate_interval_value('pg_class', 'relname', NULL, '1 mon', 'cooked_expr');	/* not ok */
 ERROR:  'parttype' should not be NULL
-SELECT validate_interval_value('pg_class', 'oid', 1, 'HASH', NULL);					/* not ok */
+SELECT validate_interval_value('pg_class', 'relname', 1, 'HASH', NULL);					/* not ok */
 ERROR:  interval should be NULL for HASH partitioned table
-SELECT validate_interval_value('pg_class', 'expr', 2, '1 mon', NULL);				/* not ok */
+SELECT validate_interval_value('pg_class', 'expr', 2, '1 mon', NULL);					/* not ok */
 ERROR:  failed to analyze partitioning expression "expr"
-SELECT validate_interval_value('pg_class', 'expr', 2, NULL, 'cooked_expr');			/* not ok */
+SELECT validate_interval_value('pg_class', 'expr', 2, NULL, 'cooked_expr');				/* not ok */
 ERROR:  unrecognized token: "cooked_expr"
-SELECT validate_interval_value('pg_class', 'EXPR', 1, 'HASH', NULL);				/* not ok */
+SELECT validate_interval_value('pg_class', 'EXPR', 1, 'HASH', NULL);					/* not ok */
 ERROR:  failed to analyze partitioning expression "EXPR"
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');

expected/pathman_expressions.out

@@ -235,7 +235,17 @@ SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
 												 expression,
 												 partition_data)"
 PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
-/* Try using multiple queries */
+/* Try using system attributes */
+SELECT create_hash_partitions('test_exprs.hash_rel', 'xmin', 4);
+ERROR:  failed to analyze partitioning expression "xmin"
+DETAIL:  system attributes are not supported
+CONTEXT:  SQL statement "SELECT public.validate_expression(parent_relid, expression)"
+PL/pgSQL function prepare_for_partitioning(regclass,text,boolean) line 9 at PERFORM
+SQL statement "SELECT public.prepare_for_partitioning(parent_relid,
+												 expression,
+												 partition_data)"
+PL/pgSQL function create_hash_partitions(regclass,text,integer,boolean,text[],text[]) line 4 at PERFORM
+/* Try using subqueries */
 SELECT create_hash_partitions('test_exprs.hash_rel',
 							  'value, (select oid from pg_class limit 1)',
 							  4);

sql/pathman_calamity.sql

@@ -132,14 +132,14 @@ SELECT build_range_condition('calamity.part_test', 'val', 10, NULL);	/* OK */
 SELECT build_range_condition('calamity.part_test', 'val', NULL, 10);	/* OK */
 
 /* check function validate_interval_value() */
-SELECT validate_interval_value(1::REGCLASS, 'expr', 2, '1 mon', 'cooked_expr');		/* not ok */
-SELECT validate_interval_value(NULL, 'expr', 2, '1 mon', 'cooked_expr');			/* not ok */
-SELECT validate_interval_value('pg_class', NULL, 2, '1 mon', 'cooked_expr');		/* not ok */
-SELECT validate_interval_value('pg_class', 'oid', NULL, '1 mon', 'cooked_expr');	/* not ok */
-SELECT validate_interval_value('pg_class', 'oid', 1, 'HASH', NULL);					/* not ok */
-SELECT validate_interval_value('pg_class', 'expr', 2, '1 mon', NULL);				/* not ok */
-SELECT validate_interval_value('pg_class', 'expr', 2, NULL, 'cooked_expr');			/* not ok */
-SELECT validate_interval_value('pg_class', 'EXPR', 1, 'HASH', NULL);				/* not ok */
+SELECT validate_interval_value(1::REGCLASS, 'expr', 2, '1 mon', 'cooked_expr');			/* not ok */
+SELECT validate_interval_value(NULL, 'expr', 2, '1 mon', 'cooked_expr');				/* not ok */
+SELECT validate_interval_value('pg_class', NULL, 2, '1 mon', 'cooked_expr');			/* not ok */
+SELECT validate_interval_value('pg_class', 'relname', NULL, '1 mon', 'cooked_expr');	/* not ok */
+SELECT validate_interval_value('pg_class', 'relname', 1, 'HASH', NULL);					/* not ok */
+SELECT validate_interval_value('pg_class', 'expr', 2, '1 mon', NULL);					/* not ok */
+SELECT validate_interval_value('pg_class', 'expr', 2, NULL, 'cooked_expr');				/* not ok */
+SELECT validate_interval_value('pg_class', 'EXPR', 1, 'HASH', NULL);					/* not ok */
 
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');

sql/pathman_expressions.sql

@@ -94,7 +94,10 @@ SELECT COUNT(*) FROM test_exprs.hash_rel;
 /* Try using constant expression */
 SELECT create_hash_partitions('test_exprs.hash_rel', '1 + 1', 4);
 
-/* Try using multiple queries */
+/* Try using system attributes */
+SELECT create_hash_partitions('test_exprs.hash_rel', 'xmin', 4);
+
+/* Try using subqueries */
 SELECT create_hash_partitions('test_exprs.hash_rel',
 							  'value, (select oid from pg_class limit 1)',
 							  4);

src/relation_info.c

@@ -731,6 +731,11 @@ cook_partitioning_expression(const Oid relid,
 			AttrNumber	attnum = expr_attr + FirstLowInvalidHeapAttributeNumber;
 			HeapTuple	htup;
 
+			/* Check that there's no system attributes in expression */
+			if (attnum < InvalidAttrNumber)
+				ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+								errmsg("system attributes are not supported")));
+
 			htup = SearchSysCache2(ATTNUM,
 								   ObjectIdGetDatum(relid),
 								   Int16GetDatum(attnum));