Fix compilation for v10 and fix dropped_cols test, there is still segfault on update nodes

Author: ildus

expected/pathman_dropped_cols.out

@@ -103,7 +103,7 @@ BEGIN
   LOOP
     FOR d IN 1..2 LOOP
       INSERT INTO root_dict (root_id, start_date, num, main, dict_code, dict_name, edit_num, edit_date, sign) VALUES
-        (r.r, now(), 'num_' || d, (d % 2) + 1, 'code_' || d, 'name_' || d, NULL, NULL, '2014');
+        (r.r, '2010-10-10'::date, 'num_' || d, (d % 2) + 1, 'code_' || d, 'name_' || d, NULL, NULL, '2014');
     END LOOP;
   END LOOP;
 END
@@ -136,51 +136,51 @@ WHERE root_id = $1;
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 -- errors usually start here
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXECUTE getbyroot(2);
  id | root_id | start_date |  num  | main | edit_num | edit_date | dict_id 
 ----+---------+------------+-------+------+----------+-----------+---------
-  3 |       2 | 09-12-2018 | num_1 | 2    |          |           |       3
-  4 |       2 | 09-12-2018 | num_2 | 1    |          |           |       3
+  3 |       2 | 10-10-2010 | num_1 | 2    |          |           |       3
+  4 |       2 | 10-10-2010 | num_2 | 1    |          |           |       3
 (2 rows)
 
 EXPLAIN EXECUTE getbyroot(2);

sql/pathman_dropped_cols.sql

@@ -63,7 +63,7 @@ BEGIN
   LOOP
     FOR d IN 1..2 LOOP
       INSERT INTO root_dict (root_id, start_date, num, main, dict_code, dict_name, edit_num, edit_date, sign) VALUES
-        (r.r, now(), 'num_' || d, (d % 2) + 1, 'code_' || d, 'name_' || d, NULL, NULL, '2014');
+        (r.r, '2010-10-10'::date, 'num_' || d, (d % 2) + 1, 'code_' || d, 'name_' || d, NULL, NULL, '2014');
     END LOOP;
   END LOOP;
 END

src/include/compat/pg_compat.h

@@ -415,7 +415,7 @@ ExecCheck(ExprState *state, ExprContext *econtext)
 /*
  * extract_actual_join_clauses()
  */
-#if (PG_VERSION_NUM >= 100004) || \
+#if (PG_VERSION_NUM >= 100003) || \
 	(PG_VERSION_NUM <  100000 && PG_VERSION_NUM >= 90609) || \
 	(PG_VERSION_NUM <   90600 && PG_VERSION_NUM >= 90513)
 #define extract_actual_join_clauses_compat(restrictinfo_list, \

src/partition_router.c

@@ -170,11 +170,20 @@ prepare_modify_table_for_partition_router(PlanState *state, void *context)
 
 				if (!changed_method)
 				{
+					/* HACK: replace ModifyTable's execution method */
+#if PG_VERSION_NUM >= 110000
 					if (!mt_method)
 						mt_method = state->ExecProcNodeReal;
 
-					/* HACK: replace ModifyTable's execution method */
 					ExecSetExecProcNode(state, router_run_modify_table);
+#elif PG_VERSION_NUM >= 100000
+					if (!mt_method)
+						mt_method = state->ExecProcNode;
+
+					state->ExecProcNode = router_run_modify_table;
+#else
+#error "doesn't supported yet"
+#endif
 
 					changed_method = true;
 				}