clean regression tests up a little bit, check that expression references the table

Author: funbringer

expected/pathman_calamity.out

@@ -306,7 +306,7 @@ ERROR:  'expression' should not be NULL
 SELECT validate_expression('calamity.part_test', 'valval');		/* not ok */
 ERROR:  cannot find type name for attribute "valval" of relation "part_test"
 SELECT validate_expression('calamity.part_test', 'random()');	/* not ok */
-ERROR:  functions in partitioning expression must be marked IMMUTABLE
+ERROR:  failed to analyze partitioning expression (random())
 SELECT validate_expression('calamity.part_test', 'val');		/* OK */
  validate_expression 
 ---------------------

expected/pathman_expressions.out

@@ -27,8 +27,20 @@ SELECT COUNT(*) FROM test_exprs.hash_rel;
      5
 (1 row)
 
+/* Try using constant expression */
+SELECT create_hash_partitions('test_exprs.hash_rel', '1 + 1', 4);
+ERROR:  partitioning expression should reference table "hash_rel"
+\set VERBOSITY default
+/* Try using mutable expression */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'random()', 4);
-ERROR:  functions in partitioning expression must be marked IMMUTABLE
+ERROR:  failed to analyze partitioning expression (random())
+DETAIL:  functions in partitioning expression must be marked IMMUTABLE
+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
 /* Check that 'pathman_hooks_enabled' is true (1 partition in plan) */
 EXPLAIN (COSTS OFF) INSERT INTO test_exprs.canary_copy
 SELECT * FROM test_exprs.canary WHERE val = 1;
@@ -40,7 +52,7 @@ SELECT * FROM test_exprs.canary WHERE val = 1;
                Filter: (val = 1)
 (4 rows)
 
-\set VERBOSITY default
+/* Try using missing columns */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2))', 4);
 ERROR:  failed to parse partitioning expression (value * value2)))
 DETAIL:  syntax error at or near ")"
@@ -132,10 +144,36 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_exprs.hash_rel WHERE (value * value2) = 5
 CREATE TABLE test_exprs.range_rel (id SERIAL PRIMARY KEY, dt TIMESTAMP, txt TEXT);
 INSERT INTO test_exprs.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2020-04-30', '1 month'::interval) as g;
-SELECT create_range_partitions('test_exprs.range_rel', 'RANDOM()', '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
-ERROR:  functions in partitioning expression must be marked IMMUTABLE
+/* Try using constant expression */
+SELECT create_range_partitions('test_exprs.range_rel', '''16 years''::interval',
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+ERROR:  partitioning expression should reference table "range_rel"
+\set VERBOSITY default
+/* Try using mutable expression */
+SELECT create_range_partitions('test_exprs.range_rel', 'RANDOM()',
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+ERROR:  failed to analyze partitioning expression (RANDOM())
+DETAIL:  functions in partitioning expression must be marked IMMUTABLE
+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_range_partitions(regclass,text,anyelement,interval,integer,boolean) line 12 at PERFORM
+/* Check that 'pathman_hooks_enabled' is true (1 partition in plan) */
+EXPLAIN (COSTS OFF) INSERT INTO test_exprs.canary_copy
+SELECT * FROM test_exprs.canary WHERE val = 1;
+            QUERY PLAN            
+----------------------------------
+ Insert on canary_copy
+   ->  Append
+         ->  Seq Scan on canary_0
+               Filter: (val = 1)
+(4 rows)
+
+\set VERBOSITY terse
 SELECT create_range_partitions('test_exprs.range_rel', 'AGE(dt, ''2000-01-01''::DATE)',
-		'15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
  create_range_partitions 
 -------------------------
                       10

sql/pathman_expressions.sql

@@ -25,15 +25,22 @@ INSERT INTO test_exprs.hash_rel (value, value2)
 	SELECT val, val * 2 FROM generate_series(1, 5) val;
 
 SELECT COUNT(*) FROM test_exprs.hash_rel;
+
+
+/* Try using constant expression */
+SELECT create_hash_partitions('test_exprs.hash_rel', '1 + 1', 4);
+
+
+\set VERBOSITY default
+
+/* Try using mutable expression */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'random()', 4);
 
 /* Check that 'pathman_hooks_enabled' is true (1 partition in plan) */
 EXPLAIN (COSTS OFF) INSERT INTO test_exprs.canary_copy
 SELECT * FROM test_exprs.canary WHERE val = 1;
 
-
-\set VERBOSITY default
-
+/* Try using missing columns */
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value2))', 4);
 SELECT create_hash_partitions('test_exprs.hash_rel', 'value * value3', 4);
 
@@ -66,9 +73,28 @@ CREATE TABLE test_exprs.range_rel (id SERIAL PRIMARY KEY, dt TIMESTAMP, txt TEXT
 
 INSERT INTO test_exprs.range_rel (dt, txt)
 SELECT g, md5(g::TEXT) FROM generate_series('2015-01-01', '2020-04-30', '1 month'::interval) as g;
-SELECT create_range_partitions('test_exprs.range_rel', 'RANDOM()', '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+
+
+/* Try using constant expression */
+SELECT create_range_partitions('test_exprs.range_rel', '''16 years''::interval',
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+
+
+\set VERBOSITY default
+
+/* Try using mutable expression */
+SELECT create_range_partitions('test_exprs.range_rel', 'RANDOM()',
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+
+/* Check that 'pathman_hooks_enabled' is true (1 partition in plan) */
+EXPLAIN (COSTS OFF) INSERT INTO test_exprs.canary_copy
+SELECT * FROM test_exprs.canary WHERE val = 1;
+
+\set VERBOSITY terse
+
+
 SELECT create_range_partitions('test_exprs.range_rel', 'AGE(dt, ''2000-01-01''::DATE)',
-		'15 years'::INTERVAL, '1 year'::INTERVAL, 10);
+							   '15 years'::INTERVAL, '1 year'::INTERVAL, 10);
 INSERT INTO test_exprs.range_rel_1 (dt, txt) VALUES ('2020-01-01'::DATE, md5('asdf'));
 SELECT COUNT(*) FROM test_exprs.range_rel_6;
 INSERT INTO test_exprs.range_rel_6 (dt, txt) VALUES ('2020-01-01'::DATE, md5('asdf'));

src/relation_info.c

@@ -183,8 +183,9 @@ refresh_pathman_relation_info(Oid relid,
 	fix_opfuncids(prel->expr);
 
 	expr_varnos = pull_varnos(prel->expr);
-	if (bms_singleton_member(expr_varnos) != PART_EXPR_VARNO)
-		elog(ERROR, "partitioning expression may reference only one table");
+	if (bms_num_members(expr_varnos) != 1)
+		elog(ERROR, "partitioning expression should reference table \"%s\"",
+			 get_rel_name(relid));
 
 	/* Extract Vars and varattnos of partitioning expression */
 	prel->expr_vars = NIL;
@@ -631,10 +632,6 @@ cook_partitioning_expression(const Oid relid,
 				   *raw_expr;
 	List		   *query_tree_list;
 
-	volatile bool	ok_rewrite = false; /* must be volatile, else
-										   cpu register might change
-										   in case of longjmp() */
-
 	char		   *query_string,
 				   *expr_serialized = ""; /* keep compiler happy */
 
@@ -645,9 +642,6 @@ cook_partitioning_expression(const Oid relid,
 
 	AssertTemporaryContext();
 
-	/* Make clang analyzer happy (v 3.5) */
-	(void) ok_rewrite;
-
 	/*
 	 * We use separate memory context here, just to make sure we won't
 	 * leave anything behind after parsing, rewriting and planning.
@@ -705,7 +699,6 @@ cook_partitioning_expression(const Oid relid,
 
 		/* This will fail with ERROR in case of wrong expression */
 		query_tree_list = pg_analyze_and_rewrite(parse_tree, query_string, NULL, 0);
-		ok_rewrite = true; /* tell PG_CATCH that we're fine */
 
 		if (list_length(query_tree_list) != 1)
 			elog(ERROR, "partitioning expression produced more than 1 query");
@@ -740,14 +733,6 @@ cook_partitioning_expression(const Oid relid,
 		/* Don't forget to enable pg_pathman's hooks */
 		pathman_hooks_enabled = true;
 
-		/*
-		 * Simply rethrow if rewrite of AST was successful.
-		 * NOTE: We aim to modify only ERRORs that
-		 * are relevant to analyze and rewrite steps.
-		 */
-		if (ok_rewrite)
-			PG_RE_THROW();
-
 		/* Switch to the original context & copy edata */
 		MemoryContextSwitchTo(old_mcxt);
 		error = CopyErrorData();