[PGPRO-8041] Corrected warning message; moved line with assignment

Tags: pg_pathman

Author: kovdb75

expected/pathman_runtime_nodes.out

@@ -491,7 +491,7 @@ UPDATE part_test SET val = val + 1 RETURNING *, tableoid::regclass;
 
 UPDATE part_test SET val = val + 1 RETURNING *, tableoid::regclass;
 NOTICE:  AFTER DELETE ROW (part_test_1)
-WARNING:  "SET pg_pathman.enable" must be called before any query. Command ignored.
+WARNING:  "pg_pathman.enable" must be called before any query, ignored
  val |  tableoid  
 -----+------------
    3 | pg_pathman

expected/pathman_runtime_nodes_1.out

@@ -491,7 +491,7 @@ UPDATE part_test SET val = val + 1 RETURNING *, tableoid::regclass;
 
 UPDATE part_test SET val = val + 1 RETURNING *, tableoid::regclass;
 NOTICE:  AFTER DELETE ROW (part_test_1)
-WARNING:  "SET pg_pathman.enable" must be called before any query. Command ignored.
+WARNING:  "pg_pathman.enable" must be called before any query, ignored
  val |  tableoid  
 -----+------------
    3 | pg_pathman

src/hooks.c

@@ -637,13 +637,12 @@ pathman_enable_check_hook(bool *newval, void **extra, GucSource source)
 #endif
 		IsSubTransaction())
 	{
-		/* Keep the old value. */
-		*newval = pathman_init_state.pg_pathman_enable;
-
 		ereport(WARNING,
 				(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
-				 errmsg("\"SET pg_pathman.enable\" must be called before any query. "
-						"Command ignored.")));
+				 errmsg("\"pg_pathman.enable\" must be called before any query, ignored")));
+
+		/* Keep the old value. */
+		*newval = pathman_init_state.pg_pathman_enable;
 	}
 
 	return true;