BUG: pg_stat_statements query normalization issues with combined queries

diff --git a/contrib/pg_stat_statements/expected/pg_stat_statements.out b/contrib/pg_stat_statements/expected/pg_stat_statements.out
index 3573c19..3826d38 100644
--- a/contrib/pg_stat_statements/expected/pg_stat_statements.out
+++ b/contrib/pg_stat_statements/expected/pg_stat_statements.out
@@ -1,21 +1,346 @@
 CREATE EXTENSION pg_stat_statements;
-CREATE TABLE test (a int, b char(20));
--- test the basic functionality of pg_stat_statements
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
 SELECT pg_stat_statements_reset();
  pg_stat_statements_reset 
 --------------------------
  
 (1 row)
 
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+SELECT 'world' AS "text";
+ text  
+-------
+ world
+(1 row)
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello' AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+COMMIT;
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+ ?column? 
+----------
+        5
+(1 row)
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+ i 
+---
+ 1
+ 2
+(2 rows)
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
+  f  
+-----
+ 1.0
+ 2.0
+(2 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                  query                  | calls | rows 
+-----------------------------------------+-------+------
+ SELECT ? || ?                           |     1 |    1
+ SELECT ? AS "float"                     |     1 |    1
+                                         |     1 |    1
+ SELECT ? + ?                            |     2 |    2
+ SELECT ? AS "int"                       |     2 |    2
+ SELECT ? AS i UNION SELECT ? ORDER BY i |     1 |    2
+ WITH t(f) AS (                         +|     1 |    2
+   VALUES (?), (?)                      +|       | 
+ )                                      +|       | 
+   SELECT f FROM t ORDER BY f            |       | 
+ SELECT ? + ? + ? AS "add"               |     3 |    3
+ SELECT ?                               +|     4 |    4
+                                        +|       | 
+   AS "text"                             |       | 
+(9 rows)
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
-                       query                        | calls | rows 
-----------------------------------------------------+-------+------
- SELECT pg_stat_statements_reset();                 |     1 |    1
- UPDATE test SET b = ? WHERE a > ?;                 |     1 |    5
- INSERT INTO test VALUES(generate_series(?, ?), ?); |     1 |   10
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+ a |          b           
+---+----------------------
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(4 rows)
+
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+ a | b 
+---+---
+(0 rows)
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+ a |          b           
+---+----------------------
+ 1 | 111                 
+ 2 | 222                 
+ 3 | 333                 
+ 4 | 444                 
+ 5 | 555                 
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(9 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                       query                       | calls | rows 
+---------------------------------------------------+-------+------
+ DELETE FROM test WHERE a > ?                      |     1 |    1
+                                                   |     1 |    1
+ UPDATE test SET b = ? WHERE a > ?                 |     1 |    3
+ SELECT * FROM test WHERE a > ? ORDER BY a         |     2 |    4
+ UPDATE test SET b = ? WHERE a = ?                 |     6 |    6
+ SELECT * FROM test ORDER BY a                     |     1 |    9
+ INSERT INTO test VALUES(generate_series(?, ?), ?) |     1 |   10
+(7 rows)
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "one";
+ one 
+-----
+   1
+(1 row)
+
+SELECT 1 + 1 AS "two";
+ two 
+-----
+   2
+(1 row)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+ query | calls | rows 
+-------+-------+------
+(0 rows)
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'top';
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(3);
+ plus_two 
+----------
+        5
+(1 row)
+
+SELECT PLUS_TWO(7);
+ plus_two 
+----------
+        9
+(1 row)
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(8);
+ plus_one 
+----------
+        9
+(1 row)
+
+SELECT PLUS_ONE(10);
+ plus_one 
+----------
+       11
+(1 row)
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+       query        | calls | rows 
+--------------------+-------+------
+ SELECT ?::TEXT     |     1 |    1
+ SELECT PLUS_ONE(?) |     2 |    2
+ SELECT PLUS_TWO(?) |     2 |    2
 (3 rows)
 
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'all';
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(-1);
+ plus_two 
+----------
+        1
+(1 row)
+
+SELECT PLUS_TWO(2);
+ plus_two 
+----------
+        4
+(1 row)
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(3);
+ plus_one 
+----------
+        4
+(1 row)
+
+SELECT PLUS_ONE(1);
+ plus_one 
+----------
+        2
+(1 row)
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+            query            | calls | rows 
+-----------------------------+-------+------
+                             |     1 |    1
+ SELECT (i + ? + ?)::INTEGER |     2 |    2
+ SELECT PLUS_ONE(?)          |     2 |    2
+ SELECT PLUS_TWO(?)          |     2 |    2
+(4 rows)
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track_utility = TRUE;
+CREATE INDEX test_b ON test(b);
 DROP TABLE test;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+              query              | calls | rows 
+---------------------------------+-------+------
+ CREATE INDEX test_b ON test(b)  |     1 |    0
+ DROP FUNCTION PLUS_ONE(INTEGER) |     1 |    0
+ DROP FUNCTION PLUS_TWO(INTEGER) |     1 |    0
+ DROP TABLE test                 |     1 |    0
+                                 |     1 |    1
+(5 rows)
+
 DROP EXTENSION pg_stat_statements;
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 8ce24e0..423f950 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -298,10 +298,9 @@ static void pgss_ProcessUtility(Node *parsetree, const char *queryString,
 static uint32 pgss_hash_fn(const void *key, Size keysize);
 static int	pgss_match_fn(const void *key1, const void *key2, Size keysize);
 static uint32 pgss_hash_string(const char *str);
-static void pgss_store(const char *query, uint32 queryId,
-		   double total_time, uint64 rows,
-		   const BufferUsage *bufusage,
-		   pgssJumbleState *jstate);
+static void pgss_store(const char *query, int query_loc, int query_len,
+			   uint32 queryId, double total_time, uint64 rows,
+			   const BufferUsage *bufusage, pgssJumbleState *jstate);
 static void pg_stat_statements_internal(FunctionCallInfo fcinfo,
 							pgssVersion api_version,
 							bool showtext);
@@ -324,7 +323,7 @@ static void JumbleRangeTable(pgssJumbleState *jstate, List *rtable);
 static void JumbleExpr(pgssJumbleState *jstate, Node *node);
 static void RecordConstLocation(pgssJumbleState *jstate, int location);
 static char *generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding);
+							   int query_len, int *query_len_p, int encoding);
 static void fill_in_constant_lengths(pgssJumbleState *jstate, const char *query);
 static int	comp_location(const void *a, const void *b);
 
@@ -820,7 +819,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 	 * there's no need for an early entry.
 	 */
 	if (jstate.clocations_count > 0)
-		pgss_store(pstate->p_sourcetext,
+		pgss_store(pstate->p_sourcetext, query->qlocation, query->qlength,
 				   query->queryId,
 				   0,
 				   0,
@@ -925,6 +924,8 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 		InstrEndLoop(queryDesc->totaltime);
 
 		pgss_store(queryDesc->sourceText,
+				   queryDesc->plannedstmt->qlocation,
+				   queryDesc->plannedstmt->qlength,
 				   queryId,
 				   queryDesc->totaltime->total * 1000.0,		/* convert to msec */
 				   queryDesc->estate->es_processed,
@@ -971,6 +972,9 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		BufferUsage bufusage_start,
 					bufusage;
 		uint32		queryId;
+		ParseNode  *parsenode = (ParseNode *) parsetree;
+
+		Assert(isParseNode(node));
 
 		bufusage_start = pgBufferUsage;
 		INSTR_TIME_SET_CURRENT(start);
@@ -1034,7 +1038,7 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		/* For utility statements, we just hash the query string directly */
 		queryId = pgss_hash_string(queryString);
 
-		pgss_store(queryString,
+		pgss_store(queryString, parsenode->qlocation, parsenode->qlength,
 				   queryId,
 				   INSTR_TIME_GET_MILLISEC(duration),
 				   rows,
@@ -1103,7 +1107,7 @@ pgss_hash_string(const char *str)
  * query string.  total_time, rows, bufusage are ignored in this case.
  */
 static void
-pgss_store(const char *query, uint32 queryId,
+pgss_store(const char *query, int query_loc, int query_len, uint32 queryId,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
 		   pgssJumbleState *jstate)
@@ -1112,15 +1116,15 @@ pgss_store(const char *query, uint32 queryId,
 	pgssEntry  *entry;
 	char	   *norm_query = NULL;
 	int			encoding = GetDatabaseEncoding();
-	int			query_len;
 
-	Assert(query != NULL);
+	Assert(query != NULL && query_loc >= 0 && query_len >= 0);
 
 	/* Safety check... */
 	if (!pgss || !pgss_hash)
 		return;
 
-	query_len = strlen(query);
+	if (query_len == 0)
+		query_len = strlen(query);
 
 	/* Set up key for hashtable search */
 	key.userid = GetUserId();
@@ -1140,6 +1144,11 @@ pgss_store(const char *query, uint32 queryId,
 		bool		stored;
 		bool		do_gc;
 
+		/* skip leading spaces */
+		while (isspace(query[query_loc]))
+			query_loc++, query_len--;
+		/* should skip trailing spaces? encoding dependence? */
+
 		/*
 		 * Create a new, normalized query string if caller asked.  We don't
 		 * need to hold the lock while doing this work.  (Note: in any case,
@@ -1150,11 +1159,17 @@ pgss_store(const char *query, uint32 queryId,
 		if (jstate)
 		{
 			LWLockRelease(pgss->lock);
-			norm_query = generate_normalized_query(jstate, query,
+			norm_query = generate_normalized_query(jstate, query, query_loc,
 												   &query_len,
 												   encoding);
 			LWLockAcquire(pgss->lock, LW_SHARED);
 		}
+		else if (strlen(query) != query_len)
+		{
+			norm_query = palloc(query_len + 1);
+			memcpy(norm_query, query + query_loc, query_len);
+			norm_query[query_len+1] = '\0';
+		}
 
 		/* Append new query text to file with only shared lock held */
 		stored = qtext_store(norm_query ? norm_query : query, query_len,
@@ -2882,15 +2897,15 @@ RecordConstLocation(pgssJumbleState *jstate, int location)
  */
 static char *
 generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding)
+						  int query_loc, int *query_len_p, int encoding)
 {
 	char	   *norm_query;
 	int			query_len = *query_len_p;
 	int			i,
 				len_to_wrt,		/* Length (in bytes) to write */
-				quer_loc = 0,	/* Source query byte location */
+				quer_loc = query_loc, /* Source query byte location */
 				n_quer_loc = 0, /* Normalized query byte location */
-				last_off = 0,	/* Offset from start for previous tok */
+				last_off = query_loc,	/* Offset from start for previous tok */
 				last_tok_len = 0;		/* Length (in bytes) of that tok */
 
 	/*
@@ -2933,7 +2948,7 @@ generate_normalized_query(pgssJumbleState *jstate, const char *query,
 	 * We've copied up until the last ignorable constant.  Copy over the
 	 * remaining bytes of the original query string.
 	 */
-	len_to_wrt = query_len - quer_loc;
+	len_to_wrt = query_loc + query_len - quer_loc;
 
 	Assert(len_to_wrt >= 0);
 	memcpy(norm_query + n_quer_loc, query + quer_loc, len_to_wrt);
diff --git a/contrib/pg_stat_statements/sql/pg_stat_statements.sql b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
index 7e2b263..5a30436 100644
--- a/contrib/pg_stat_statements/sql/pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
@@ -1,15 +1,183 @@
 CREATE EXTENSION pg_stat_statements;
 
-CREATE TABLE test (a int, b char(20));
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+
+SELECT 1 AS "int";
+
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+SELECT 'world' AS "text";
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+SELECT 'hello' AS "text";
+COMMIT;
+
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
 
--- test the basic functionality of pg_stat_statements
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
+
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
 
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+SELECT 1 AS "one";
+SELECT 1 + 1 AS "two";
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'top';
+
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(3);
+SELECT PLUS_TWO(7);
 
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(8);
+SELECT PLUS_ONE(10);
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'all';
+
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(-1);
+SELECT PLUS_TWO(2);
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(3);
+SELECT PLUS_ONE(1);
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track_utility = TRUE;
+
+CREATE INDEX test_b ON test(b);
 DROP TABLE test;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
 
 DROP EXTENSION pg_stat_statements;
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 41dde50..e652feb 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -177,6 +177,11 @@ planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		result = (*planner_hook) (parse, cursorOptions, boundParams);
 	else
 		result = standard_planner(parse, cursorOptions, boundParams);
+
+	/* copy query location to planned statement */
+	result->qlocation = parse->qlocation;
+	result->qlength = parse->qlength;
+
 	return result;
 }
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 5e65fe7..01a450d 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -307,6 +307,11 @@ transformStmt(ParseState *pstate, Node *parseTree)
 	result->querySource = QSRC_ORIGINAL;
 	result->canSetTag = true;
 
+	/* keep track of location & length */
+	Assert(isParseNode(parseTree));
+	result->qlocation = ((ParseNode*) parseTree)->qlocation;
+	result->qlength = ((ParseNode*) parseTree)->qlength;
+
 	return result;
 }
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 2ed7b52..d720972 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -179,6 +179,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
 			   bool *deferrable, bool *initdeferred, bool *not_valid,
 			   bool *no_inherit, core_yyscan_t yyscanner);
 static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
+static void setQueryLocation(Node *node, core_yyscan_t yyscanner, int start);
 
 %}
 
@@ -762,14 +763,20 @@ stmtblock:	stmtmulti
 stmtmulti:	stmtmulti ';' stmt
 				{
 					if ($3 != NULL)
+					{
+						setQueryLocation($3, yyscanner, @2+1);
 						$$ = lappend($1, $3);
+					}
 					else
 						$$ = $1;
 				}
 			| stmt
 				{
 					if ($1 != NULL)
+					{
+						setQueryLocation($1, yyscanner, 0);
 						$$ = list_make1($1);
+					}
 					else
 						$$ = NIL;
 				}
@@ -15284,6 +15291,23 @@ makeRecursiveViewSelect(char *relname, List *aliases, Node *query)
 	return (Node *) s;
 }
 
+/* set qlocation & qlength for statements starting at "start" */
+static void
+setQueryLocation(Node *node, core_yyscan_t yyscanner, int start)
+{
+	base_yy_extra_type *extra = pg_yyget_extra(yyscanner);
+	ParseNode *pn = (ParseNode *) node;
+	Assert(isParseNode(node));
+
+	pn->qlocation = start;
+	if (extra->last_semicolon == -1 || start == (extra->last_semicolon + 1))
+		/* reduction triggered by end of input */
+		pn->qlength = strlen(extra->core_yy_extra.scanbuf) - start;
+	else
+		/* reduction triggered by ';' */
+		pn->qlength = extra->last_semicolon - start;
+}
+
 /* parser_init()
  * Initialize to parse one query string
  */
@@ -15291,4 +15315,5 @@ void
 parser_init(base_yy_extra_type *yyext)
 {
 	yyext->parsetree = NIL;		/* in case grammar forgets to set it */
+	yyext->last_semicolon = -1;
 }
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index acd9269..470a697 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -351,7 +351,8 @@ not_equals		"!="
  * If you change either set, adjust the character lists appearing in the
  * rule for "operator"!
  */
-self			[,()\[\].;\:\+\-\*\/\%\^\<\>\=]
+semicolon		;
+self			[,()\[\].\:\+\-\*\/\%\^\<\>\=]
 op_chars		[\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=]
 operator		{op_chars}+
 
@@ -845,7 +846,11 @@ other			.
 					SET_YYLLOC();
 					return NOT_EQUALS;
 				}
-
+{semicolon}		{
+					SET_YYLLOC();
+					pg_yyget_extra(yyscanner)->last_semicolon = *yylloc;
+					return yytext[0];
+				}
 {self}			{
 					SET_YYLLOC();
 					return yytext[0];
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index c514d3f..1a5e68d 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -308,7 +308,6 @@ typedef enum NodeTag
 	T_UpdateStmt,
 	T_SelectStmt,
 	T_AlterTableStmt,
-	T_AlterTableCmd,
 	T_AlterDomainStmt,
 	T_SetOperationStmt,
 	T_GrantStmt,
@@ -406,7 +405,6 @@ typedef enum NodeTag
 	T_AlterPolicyStmt,
 	T_CreateTransformStmt,
 	T_CreateAmStmt,
-	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
@@ -459,6 +457,8 @@ typedef enum NodeTag
 	T_PartitionSpec,
 	T_PartitionBoundSpec,
 	T_PartitionRangeDatum,
+	T_AlterTableCmd,
+	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index fc532fb..704694c 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -78,6 +78,24 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 /* Currently, SELECT ... FOR [KEY] UPDATE/SHARE requires UPDATE privileges */
 #define ACL_SELECT_FOR_UPDATE	ACL_UPDATE
 
+/*
+ * A ParseNode is a Node with additional location information.
+ * Zero qlengh means not set.
+ * If non-zero, then qlocation is within to the initial query string.
+ */
+typedef struct ParseNode
+{
+	NodeTag		type;
+	int			qlocation;
+	int			qlength;
+} ParseNode;
+
+/*
+ * All high-level statements coming out of the parser are ParseNode,
+ * plus Query & PlannedStmt.
+ */
+#define isParseNodeTag(tag)	((T_Query <= (tag)) && ((tag) < T_A_Expr))
+#define isParseNode(nodeptr) isParseNodeTag(nodeTag(nodeptr))
 
 /*****************************************************************************
  *	Query Tree
@@ -99,6 +117,8 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 typedef struct Query
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
@@ -1322,6 +1342,8 @@ typedef struct TriggerTransition
 typedef struct InsertStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to insert into */
 	List	   *cols;			/* optional: names of the target columns */
 	Node	   *selectStmt;		/* the source SELECT/VALUES, or NULL */
@@ -1337,6 +1359,8 @@ typedef struct InsertStmt
 typedef struct DeleteStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to delete from */
 	List	   *usingClause;	/* optional using clause for more tables */
 	Node	   *whereClause;	/* qualifications */
@@ -1351,6 +1375,8 @@ typedef struct DeleteStmt
 typedef struct UpdateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to update */
 	List	   *targetList;		/* the target list (of ResTarget) */
 	Node	   *whereClause;	/* qualifications */
@@ -1383,6 +1409,8 @@ typedef enum SetOperation
 typedef struct SelectStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 
 	/*
 	 * These fields are used only in "leaf" SelectStmts.
@@ -1450,6 +1478,8 @@ typedef struct SelectStmt
 typedef struct SetOperationStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	SetOperation op;			/* type of set op */
 	bool		all;			/* ALL specified? */
 	Node	   *larg;			/* left child */
@@ -1541,6 +1571,8 @@ typedef enum ObjectType
 typedef struct CreateSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *schemaname;		/* the name of the schema to create */
 	Node	   *authrole;		/* the owner of the created schema */
 	List	   *schemaElts;		/* schema components (list of parsenodes) */
@@ -1560,6 +1592,8 @@ typedef enum DropBehavior
 typedef struct AlterTableStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* table to work on */
 	List	   *cmds;			/* list of subcommands */
 	ObjectType	relkind;		/* type of object */
@@ -1637,6 +1671,8 @@ typedef enum AlterTableType
 typedef struct ReplicaIdentityStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char		identity_type;
 	char	   *name;
 } ReplicaIdentityStmt;
@@ -1665,6 +1701,8 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 typedef struct AlterDomainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char		subtype;		/*------------
 								 *	T = alter column default
 								 *	N = alter column drop not null
@@ -1712,6 +1750,8 @@ typedef enum GrantObjectType
 typedef struct GrantStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
 	GrantTargetType targtype;	/* type of the grant target */
 	GrantObjectType objtype;	/* kind of object being operated on */
@@ -1762,6 +1802,8 @@ typedef struct AccessPriv
 typedef struct GrantRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *granted_roles;	/* list of roles to be granted/revoked */
 	List	   *grantee_roles;	/* list of member roles to add/delete */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
@@ -1777,6 +1819,8 @@ typedef struct GrantRoleStmt
 typedef struct AlterDefaultPrivilegesStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *options;		/* list of DefElem */
 	GrantStmt  *action;			/* GRANT/REVOKE action (with objects=NIL) */
 } AlterDefaultPrivilegesStmt;
@@ -1792,6 +1836,8 @@ typedef struct AlterDefaultPrivilegesStmt
 typedef struct CopyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* the relation to copy */
 	Node	   *query;			/* the query (SELECT or DML statement with
 								 * RETURNING) to copy */
@@ -1823,6 +1869,8 @@ typedef enum
 typedef struct VariableSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	VariableSetKind kind;
 	char	   *name;			/* variable to be set */
 	List	   *args;			/* List of A_Const nodes */
@@ -1836,6 +1884,8 @@ typedef struct VariableSetStmt
 typedef struct VariableShowStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;
 } VariableShowStmt;
 
@@ -1853,6 +1903,8 @@ typedef struct VariableShowStmt
 typedef struct CreateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to create */
 	List	   *tableElts;		/* column definitions (list of ColumnDef) */
 	List	   *inhRelations;	/* relations to inherit from (list of
@@ -1980,6 +2032,8 @@ typedef struct Constraint
 typedef struct CreateTableSpaceStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	Node	   *owner;
 	char	   *location;
@@ -1989,6 +2043,8 @@ typedef struct CreateTableSpaceStmt
 typedef struct DropTableSpaceStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	bool		missing_ok;		/* skip error if missing? */
 } DropTableSpaceStmt;
@@ -1996,6 +2052,8 @@ typedef struct DropTableSpaceStmt
 typedef struct AlterTableSpaceOptionsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	List	   *options;
 	bool		isReset;
@@ -2004,6 +2062,8 @@ typedef struct AlterTableSpaceOptionsStmt
 typedef struct AlterTableMoveAllStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *orig_tablespacename;
 	ObjectType	objtype;		/* Object type to move */
 	List	   *roles;			/* List of roles to move objects of */
@@ -2019,6 +2079,8 @@ typedef struct AlterTableMoveAllStmt
 typedef struct CreateExtensionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;
 	bool		if_not_exists;	/* just do nothing if it already exists? */
 	List	   *options;		/* List of DefElem nodes */
@@ -2028,6 +2090,8 @@ typedef struct CreateExtensionStmt
 typedef struct AlterExtensionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;
 	List	   *options;		/* List of DefElem nodes */
 } AlterExtensionStmt;
@@ -2035,6 +2099,8 @@ typedef struct AlterExtensionStmt
 typedef struct AlterExtensionContentsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;		/* Extension's name */
 	int			action;			/* +1 = add object, -1 = drop object */
 	ObjectType	objtype;		/* Object's type */
@@ -2050,6 +2116,8 @@ typedef struct AlterExtensionContentsStmt
 typedef struct CreateFdwStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2058,6 +2126,8 @@ typedef struct CreateFdwStmt
 typedef struct AlterFdwStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2071,6 +2141,8 @@ typedef struct AlterFdwStmt
 typedef struct CreateForeignServerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *servertype;		/* optional server type */
 	char	   *version;		/* optional server version */
@@ -2081,6 +2153,8 @@ typedef struct CreateForeignServerStmt
 typedef struct AlterForeignServerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *version;		/* optional server version */
 	List	   *options;		/* generic options to server */
@@ -2094,7 +2168,7 @@ typedef struct AlterForeignServerStmt
 
 typedef struct CreateForeignTableStmt
 {
-	CreateStmt	base;
+	CreateStmt	base;			/* is a ParseNode */
 	char	   *servername;
 	List	   *options;
 } CreateForeignTableStmt;
@@ -2107,6 +2181,8 @@ typedef struct CreateForeignTableStmt
 typedef struct CreateUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2115,6 +2191,8 @@ typedef struct CreateUserMappingStmt
 typedef struct AlterUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2123,6 +2201,8 @@ typedef struct AlterUserMappingStmt
 typedef struct DropUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	bool		missing_ok;		/* ignore missing mappings */
@@ -2143,6 +2223,8 @@ typedef enum ImportForeignSchemaType
 typedef struct ImportForeignSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *server_name;	/* FDW server name */
 	char	   *remote_schema;	/* remote schema name to query */
 	char	   *local_schema;	/* local schema to create objects in */
@@ -2158,6 +2240,8 @@ typedef struct ImportForeignSchemaStmt
 typedef struct CreatePolicyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	char	   *cmd_name;		/* the command name the policy applies to */
@@ -2174,6 +2258,8 @@ typedef struct CreatePolicyStmt
 typedef struct AlterPolicyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	List	   *roles;			/* the roles associated with the policy */
@@ -2188,6 +2274,8 @@ typedef struct AlterPolicyStmt
 typedef struct CreateAmStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *amname;			/* access method name */
 	List	   *handler_name;	/* handler function name */
 	char		amtype;			/* type of access method */
@@ -2200,6 +2288,8 @@ typedef struct CreateAmStmt
 typedef struct CreateTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	RangeVar   *relation;		/* relation trigger is on */
 	List	   *funcname;		/* qual. name of function to call */
@@ -2227,6 +2317,8 @@ typedef struct CreateTrigStmt
 typedef struct CreateEventTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char	   *eventname;		/* event's identifier */
 	List	   *whenclause;		/* list of DefElems indicating filtering */
@@ -2240,6 +2332,8 @@ typedef struct CreateEventTrigStmt
 typedef struct AlterEventTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char		tgenabled;		/* trigger's firing configuration WRT
 								 * session_replication_role */
@@ -2253,6 +2347,8 @@ typedef struct AlterEventTrigStmt
 typedef struct CreatePLangStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	char	   *plname;			/* PL name */
 	List	   *plhandler;		/* PL call handler function (qual. name) */
@@ -2280,6 +2376,8 @@ typedef enum RoleStmtType
 typedef struct CreateRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RoleStmtType stmt_type;		/* ROLE/USER/GROUP */
 	char	   *role;			/* role name */
 	List	   *options;		/* List of DefElem nodes */
@@ -2288,6 +2386,8 @@ typedef struct CreateRoleStmt
 typedef struct AlterRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *role;			/* role */
 	List	   *options;		/* List of DefElem nodes */
 	int			action;			/* +1 = add members, -1 = drop members */
@@ -2296,6 +2396,8 @@ typedef struct AlterRoleStmt
 typedef struct AlterRoleSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *role;			/* role */
 	char	   *database;		/* database name, or NULL */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
@@ -2304,6 +2406,8 @@ typedef struct AlterRoleSetStmt
 typedef struct DropRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;			/* List of roles to remove */
 	bool		missing_ok;		/* skip error if a role is missing? */
 } DropRoleStmt;
@@ -2316,6 +2420,8 @@ typedef struct DropRoleStmt
 typedef struct CreateSeqStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to create */
 	List	   *options;
 	Oid			ownerId;		/* ID of owner, or InvalidOid for default */
@@ -2325,6 +2431,8 @@ typedef struct CreateSeqStmt
 typedef struct AlterSeqStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to alter */
 	List	   *options;
 	bool		missing_ok;		/* skip error if a role is missing? */
@@ -2337,6 +2445,8 @@ typedef struct AlterSeqStmt
 typedef struct DefineStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	kind;			/* aggregate, operator, type */
 	bool		oldstyle;		/* hack to signal old CREATE AGG syntax */
 	List	   *defnames;		/* qualified name (list of Value strings) */
@@ -2351,6 +2461,8 @@ typedef struct DefineStmt
 typedef struct CreateDomainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *domainname;		/* qualified name (list of Value strings) */
 	TypeName   *typeName;		/* the base type */
 	CollateClause *collClause;	/* untransformed COLLATE spec, if any */
@@ -2364,6 +2476,8 @@ typedef struct CreateDomainStmt
 typedef struct CreateOpClassStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opclassname;	/* qualified name (list of Value strings) */
 	List	   *opfamilyname;	/* qualified name (ditto); NIL if omitted */
 	char	   *amname;			/* name of index AM opclass is for */
@@ -2397,6 +2511,8 @@ typedef struct CreateOpClassItem
 typedef struct CreateOpFamilyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 } CreateOpFamilyStmt;
@@ -2408,6 +2524,8 @@ typedef struct CreateOpFamilyStmt
 typedef struct AlterOpFamilyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 	bool		isDrop;			/* ADD or DROP the items? */
@@ -2422,6 +2540,8 @@ typedef struct AlterOpFamilyStmt
 typedef struct DropStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *objects;		/* list of sublists of names (as Values) */
 	List	   *arguments;		/* list of sublists of arguments (as Values) */
 	ObjectType	removeType;		/* object type */
@@ -2437,6 +2557,8 @@ typedef struct DropStmt
 typedef struct TruncateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *relations;		/* relations (RangeVars) to be truncated */
 	bool		restart_seqs;	/* restart owned sequences? */
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
@@ -2449,6 +2571,8 @@ typedef struct TruncateStmt
 typedef struct CommentStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2462,6 +2586,8 @@ typedef struct CommentStmt
 typedef struct SecLabelStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2491,6 +2617,8 @@ typedef struct SecLabelStmt
 typedef struct DeclareCursorStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	int			options;		/* bitmask of options (see above) */
 	Node	   *query;			/* the raw SELECT query */
@@ -2503,6 +2631,8 @@ typedef struct DeclareCursorStmt
 typedef struct ClosePortalStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	/* NULL means CLOSE ALL */
 } ClosePortalStmt;
@@ -2526,6 +2656,8 @@ typedef enum FetchDirection
 typedef struct FetchStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	FetchDirection direction;	/* see above */
 	long		howMany;		/* number of rows, or position argument */
 	char	   *portalname;		/* name of portal (cursor) */
@@ -2546,6 +2678,8 @@ typedef struct FetchStmt
 typedef struct IndexStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *idxname;		/* name of new index, or NULL for default */
 	RangeVar   *relation;		/* relation to build index on */
 	char	   *accessMethod;	/* name of access method (eg. btree) */
@@ -2574,6 +2708,8 @@ typedef struct IndexStmt
 typedef struct CreateFunctionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	List	   *funcname;		/* qualified name of function to create */
 	List	   *parameters;		/* a list of FunctionParameter */
@@ -2604,6 +2740,8 @@ typedef struct FunctionParameter
 typedef struct AlterFunctionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	FuncWithArgs *func;			/* name and args of function */
 	List	   *actions;		/* list of DefElem */
 } AlterFunctionStmt;
@@ -2617,6 +2755,8 @@ typedef struct AlterFunctionStmt
 typedef struct DoStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *args;			/* List of DefElem nodes */
 } DoStmt;
 
@@ -2635,6 +2775,8 @@ typedef struct InlineCodeBlock
 typedef struct RenameStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	renameType;		/* OBJECT_TABLE, OBJECT_COLUMN, etc */
 	ObjectType	relationType;	/* if column name, associated relation type */
 	RangeVar   *relation;		/* in case it's a table */
@@ -2654,6 +2796,8 @@ typedef struct RenameStmt
 typedef struct AlterObjectDependsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_FUNCTION, OBJECT_TRIGGER, etc */
 	RangeVar   *relation;		/* in case a table is involved */
 	List	   *objname;		/* name of the object */
@@ -2668,6 +2812,8 @@ typedef struct AlterObjectDependsStmt
 typedef struct AlterObjectSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2683,6 +2829,8 @@ typedef struct AlterObjectSchemaStmt
 typedef struct AlterOwnerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2698,6 +2846,8 @@ typedef struct AlterOwnerStmt
 typedef struct AlterOperatorStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opername;		/* operator name */
 	List	   *operargs;		/* operator's argument TypeNames */
 	List	   *options;		/* List of DefElem nodes */
@@ -2711,6 +2861,8 @@ typedef struct AlterOperatorStmt
 typedef struct RuleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation the rule is for */
 	char	   *rulename;		/* name of the rule */
 	Node	   *whereClause;	/* qualifications */
@@ -2727,6 +2879,8 @@ typedef struct RuleStmt
 typedef struct NotifyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to notify */
 	char	   *payload;		/* the payload string, or NULL if none */
 } NotifyStmt;
@@ -2738,6 +2892,8 @@ typedef struct NotifyStmt
 typedef struct ListenStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to listen on */
 } ListenStmt;
 
@@ -2748,6 +2904,8 @@ typedef struct ListenStmt
 typedef struct UnlistenStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* name to unlisten on, or NULL for all */
 } UnlistenStmt;
 
@@ -2772,6 +2930,8 @@ typedef enum TransactionStmtKind
 typedef struct TransactionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	TransactionStmtKind kind;	/* see above */
 	List	   *options;		/* for BEGIN/START and savepoint commands */
 	char	   *gid;			/* for two-phase-commit related commands */
@@ -2784,6 +2944,8 @@ typedef struct TransactionStmt
 typedef struct CompositeTypeStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *typevar;		/* the composite type to be created */
 	List	   *coldeflist;		/* list of ColumnDef nodes */
 } CompositeTypeStmt;
@@ -2795,6 +2957,8 @@ typedef struct CompositeTypeStmt
 typedef struct CreateEnumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *vals;			/* enum values (list of Value strings) */
 } CreateEnumStmt;
@@ -2806,6 +2970,8 @@ typedef struct CreateEnumStmt
 typedef struct CreateRangeStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *params;			/* range parameters (list of DefElem) */
 } CreateRangeStmt;
@@ -2817,6 +2983,8 @@ typedef struct CreateRangeStmt
 typedef struct AlterEnumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	char	   *oldVal;			/* old enum value's name, if renaming */
 	char	   *newVal;			/* new enum value's name */
@@ -2839,6 +3007,8 @@ typedef enum ViewCheckOption
 typedef struct ViewStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *view;			/* the view to be created */
 	List	   *aliases;		/* target column names */
 	Node	   *query;			/* the SELECT query */
@@ -2854,6 +3024,8 @@ typedef struct ViewStmt
 typedef struct LoadStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *filename;		/* file to load */
 } LoadStmt;
 
@@ -2864,6 +3036,8 @@ typedef struct LoadStmt
 typedef struct CreatedbStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to create */
 	List	   *options;		/* List of DefElem nodes */
 } CreatedbStmt;
@@ -2875,6 +3049,8 @@ typedef struct CreatedbStmt
 typedef struct AlterDatabaseStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to alter */
 	List	   *options;		/* List of DefElem nodes */
 } AlterDatabaseStmt;
@@ -2882,6 +3058,8 @@ typedef struct AlterDatabaseStmt
 typedef struct AlterDatabaseSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* database name */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
 } AlterDatabaseSetStmt;
@@ -2893,6 +3071,8 @@ typedef struct AlterDatabaseSetStmt
 typedef struct DropdbStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* database to drop */
 	bool		missing_ok;		/* skip error if db is missing? */
 } DropdbStmt;
@@ -2904,6 +3084,8 @@ typedef struct DropdbStmt
 typedef struct AlterSystemStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	VariableSetStmt *setstmt;	/* SET subcommand */
 } AlterSystemStmt;
 
@@ -2914,6 +3096,8 @@ typedef struct AlterSystemStmt
 typedef struct ClusterStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation being indexed, or NULL if all */
 	char	   *indexname;		/* original index defined */
 	bool		verbose;		/* print progress info */
@@ -2942,6 +3126,8 @@ typedef enum VacuumOption
 typedef struct VacuumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	int			options;		/* OR of VacuumOption flags */
 	RangeVar   *relation;		/* single table to process, or NULL */
 	List	   *va_cols;		/* list of column names, or NIL for all */
@@ -2958,6 +3144,8 @@ typedef struct VacuumStmt
 typedef struct ExplainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	List	   *options;		/* list of DefElem nodes */
 } ExplainStmt;
@@ -2978,6 +3166,8 @@ typedef struct ExplainStmt
 typedef struct CreateTableAsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	IntoClause *into;			/* destination table */
 	ObjectType	relkind;		/* OBJECT_TABLE or OBJECT_MATVIEW */
@@ -2992,6 +3182,8 @@ typedef struct CreateTableAsStmt
 typedef struct RefreshMatViewStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		concurrent;		/* allow concurrent access? */
 	bool		skipData;		/* true for WITH NO DATA */
 	RangeVar   *relation;		/* relation to insert into */
@@ -3004,6 +3196,8 @@ typedef struct RefreshMatViewStmt
 typedef struct CheckPointStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 } CheckPointStmt;
 
 /* ----------------------
@@ -3022,6 +3216,8 @@ typedef enum DiscardMode
 typedef struct DiscardStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	DiscardMode target;
 } DiscardStmt;
 
@@ -3032,6 +3228,8 @@ typedef struct DiscardStmt
 typedef struct LockStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *relations;		/* relations to lock */
 	int			mode;			/* lock mode */
 	bool		nowait;			/* no wait mode */
@@ -3044,6 +3242,8 @@ typedef struct LockStmt
 typedef struct ConstraintsSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *constraints;	/* List of names as RangeVars */
 	bool		deferred;
 } ConstraintsSetStmt;
@@ -3068,6 +3268,8 @@ typedef enum ReindexObjectType
 typedef struct ReindexStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ReindexObjectType kind;		/* REINDEX_OBJECT_INDEX, REINDEX_OBJECT_TABLE,
 								 * etc. */
 	RangeVar   *relation;		/* Table or index to reindex */
@@ -3082,6 +3284,8 @@ typedef struct ReindexStmt
 typedef struct CreateConversionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *conversion_name;	/* Name of the conversion */
 	char	   *for_encoding_name;		/* source encoding name */
 	char	   *to_encoding_name;		/* destination encoding name */
@@ -3096,6 +3300,8 @@ typedef struct CreateConversionStmt
 typedef struct CreateCastStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	TypeName   *sourcetype;
 	TypeName   *targettype;
 	FuncWithArgs *func;
@@ -3110,6 +3316,8 @@ typedef struct CreateCastStmt
 typedef struct CreateTransformStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;
 	TypeName   *type_name;
 	char	   *lang;
@@ -3124,6 +3332,8 @@ typedef struct CreateTransformStmt
 typedef struct PrepareStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* Name of plan, arbitrary */
 	List	   *argtypes;		/* Types of parameters (List of TypeName) */
 	Node	   *query;			/* The query itself (as a raw parsetree) */
@@ -3138,6 +3348,8 @@ typedef struct PrepareStmt
 typedef struct ExecuteStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to execute */
 	List	   *params;			/* Values to assign to parameters */
 } ExecuteStmt;
@@ -3150,6 +3362,8 @@ typedef struct ExecuteStmt
 typedef struct DeallocateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to remove */
 	/* NULL means DEALLOCATE ALL */
 } DeallocateStmt;
@@ -3160,6 +3374,8 @@ typedef struct DeallocateStmt
 typedef struct DropOwnedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;
 	DropBehavior behavior;
 } DropOwnedStmt;
@@ -3170,6 +3386,8 @@ typedef struct DropOwnedStmt
 typedef struct ReassignOwnedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;
 	Node	   *newrole;
 } ReassignOwnedStmt;
@@ -3180,6 +3398,8 @@ typedef struct ReassignOwnedStmt
 typedef struct AlterTSDictionaryStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *dictname;		/* qualified name (list of Value strings) */
 	List	   *options;		/* List of DefElem nodes */
 } AlterTSDictionaryStmt;
@@ -3199,6 +3419,8 @@ typedef enum AlterTSConfigType
 typedef struct AlterTSConfigurationStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	AlterTSConfigType kind;		/* ALTER_TSCONFIG_ADD_MAPPING, etc */
 	List	   *cfgname;		/* qualified name (list of Value strings) */
 
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index e2fbc7d..bf9cae4 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -36,6 +36,8 @@
 typedef struct PlannedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location, or -1 if unknown */
+	int			qlength;		/* query length, 0 if unknown */
 
 	CmdType		commandType;	/* select|insert|update|delete */
 
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 6d8e493..e373ab2 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -49,6 +49,8 @@ typedef struct base_yy_extra_type
 	char	   *lookahead_end;	/* end of current token */
 	char		lookahead_hold_char;	/* to be put back at *lookahead_end */
 
+	int			last_semicolon;	/* for query length computation */
+
 	/*
 	 * State variables that belong to the grammar.
 	 */

diff --git a/contrib/pg_stat_statements/expected/pg_stat_statements.out b/contrib/pg_stat_statements/expected/pg_stat_statements.out
index 3573c19..5a1b227 100644
--- a/contrib/pg_stat_statements/expected/pg_stat_statements.out
+++ b/contrib/pg_stat_statements/expected/pg_stat_statements.out
@@ -1,21 +1,346 @@
 CREATE EXTENSION pg_stat_statements;
-CREATE TABLE test (a int, b char(20));
--- test the basic functionality of pg_stat_statements
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
 SELECT pg_stat_statements_reset();
  pg_stat_statements_reset 
 --------------------------
  
 (1 row)
 
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+SELECT 'world' AS "text";
+ text  
+-------
+ world
+(1 row)
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello' AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+COMMIT;
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+ ?column? 
+----------
+        5
+(1 row)
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+ i 
+---
+ 1
+ 2
+(2 rows)
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
+  f  
+-----
+ 1.0
+ 2.0
+(2 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                  query                  | calls | rows 
+-----------------------------------------+-------+------
+ SELECT ? || ?                           |     1 |    1
+ SELECT ? AS "float"                     |     1 |    1
+ SELECT pg_stat_statements_reset()       |     1 |    1
+ SELECT ? + ?                            |     2 |    2
+ SELECT ? AS "int"                       |     2 |    2
+ SELECT ? AS i UNION SELECT ? ORDER BY i |     1 |    2
+ WITH t(f) AS (                         +|     1 |    2
+   VALUES (?), (?)                      +|       | 
+ )                                      +|       | 
+   SELECT f FROM t ORDER BY f            |       | 
+ SELECT ? + ? + ? AS "add"               |     3 |    3
+ SELECT ?                               +|     4 |    4
+                                        +|       | 
+   AS "text"                             |       | 
+(9 rows)
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
-                       query                        | calls | rows 
-----------------------------------------------------+-------+------
- SELECT pg_stat_statements_reset();                 |     1 |    1
- UPDATE test SET b = ? WHERE a > ?;                 |     1 |    5
- INSERT INTO test VALUES(generate_series(?, ?), ?); |     1 |   10
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+ a |          b           
+---+----------------------
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(4 rows)
+
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+ a | b 
+---+---
+(0 rows)
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+ a |          b           
+---+----------------------
+ 1 | 111                 
+ 2 | 222                 
+ 3 | 333                 
+ 4 | 444                 
+ 5 | 555                 
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(9 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                       query                       | calls | rows 
+---------------------------------------------------+-------+------
+ DELETE FROM test WHERE a > ?                      |     1 |    1
+ SELECT pg_stat_statements_reset()                 |     1 |    1
+ UPDATE test SET b = ? WHERE a > ?                 |     1 |    3
+ SELECT * FROM test WHERE a > ? ORDER BY a         |     2 |    4
+ UPDATE test SET b = ? WHERE a = ?                 |     6 |    6
+ SELECT * FROM test ORDER BY a                     |     1 |    9
+ INSERT INTO test VALUES(generate_series(?, ?), ?) |     1 |   10
+(7 rows)
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "one";
+ one 
+-----
+   1
+(1 row)
+
+SELECT 1 + 1 AS "two";
+ two 
+-----
+   2
+(1 row)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+ query | calls | rows 
+-------+-------+------
+(0 rows)
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'top';
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(3);
+ plus_two 
+----------
+        5
+(1 row)
+
+SELECT PLUS_TWO(7);
+ plus_two 
+----------
+        9
+(1 row)
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(8);
+ plus_one 
+----------
+        9
+(1 row)
+
+SELECT PLUS_ONE(10);
+ plus_one 
+----------
+       11
+(1 row)
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+       query        | calls | rows 
+--------------------+-------+------
+ SELECT ?::TEXT     |     1 |    1
+ SELECT PLUS_ONE(?) |     2 |    2
+ SELECT PLUS_TWO(?) |     2 |    2
 (3 rows)
 
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'all';
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(-1);
+ plus_two 
+----------
+        1
+(1 row)
+
+SELECT PLUS_TWO(2);
+ plus_two 
+----------
+        4
+(1 row)
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(3);
+ plus_one 
+----------
+        4
+(1 row)
+
+SELECT PLUS_ONE(1);
+ plus_one 
+----------
+        2
+(1 row)
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+               query               | calls | rows 
+-----------------------------------+-------+------
+ SELECT pg_stat_statements_reset() |     1 |    1
+ SELECT (i + ? + ?)::INTEGER       |     2 |    2
+ SELECT PLUS_ONE(?)                |     2 |    2
+ SELECT PLUS_TWO(?)                |     2 |    2
+(4 rows)
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track_utility = TRUE;
+CREATE INDEX test_b ON test(b);
 DROP TABLE test;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+               query               | calls | rows 
+-----------------------------------+-------+------
+ CREATE INDEX test_b ON test(b)    |     1 |    0
+ DROP FUNCTION PLUS_ONE(INTEGER)   |     1 |    0
+ DROP FUNCTION PLUS_TWO(INTEGER)   |     1 |    0
+ DROP TABLE test                   |     1 |    0
+ SELECT pg_stat_statements_reset() |     1 |    1
+(5 rows)
+
 DROP EXTENSION pg_stat_statements;
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 8ce24e0..d265de9 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -298,10 +298,9 @@ static void pgss_ProcessUtility(Node *parsetree, const char *queryString,
 static uint32 pgss_hash_fn(const void *key, Size keysize);
 static int	pgss_match_fn(const void *key1, const void *key2, Size keysize);
 static uint32 pgss_hash_string(const char *str);
-static void pgss_store(const char *query, uint32 queryId,
-		   double total_time, uint64 rows,
-		   const BufferUsage *bufusage,
-		   pgssJumbleState *jstate);
+static void pgss_store(const char *query, int query_loc, int query_len,
+			   uint32 queryId, double total_time, uint64 rows,
+			   const BufferUsage *bufusage, pgssJumbleState *jstate);
 static void pg_stat_statements_internal(FunctionCallInfo fcinfo,
 							pgssVersion api_version,
 							bool showtext);
@@ -324,7 +323,7 @@ static void JumbleRangeTable(pgssJumbleState *jstate, List *rtable);
 static void JumbleExpr(pgssJumbleState *jstate, Node *node);
 static void RecordConstLocation(pgssJumbleState *jstate, int location);
 static char *generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding);
+							   int query_len, int *query_len_p, int encoding);
 static void fill_in_constant_lengths(pgssJumbleState *jstate, const char *query);
 static int	comp_location(const void *a, const void *b);
 
@@ -820,7 +819,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 	 * there's no need for an early entry.
 	 */
 	if (jstate.clocations_count > 0)
-		pgss_store(pstate->p_sourcetext,
+		pgss_store(pstate->p_sourcetext, query->qlocation, query->qlength,
 				   query->queryId,
 				   0,
 				   0,
@@ -925,6 +924,8 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 		InstrEndLoop(queryDesc->totaltime);
 
 		pgss_store(queryDesc->sourceText,
+				   queryDesc->plannedstmt->qlocation,
+				   queryDesc->plannedstmt->qlength,
 				   queryId,
 				   queryDesc->totaltime->total * 1000.0,		/* convert to msec */
 				   queryDesc->estate->es_processed,
@@ -971,6 +972,9 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		BufferUsage bufusage_start,
 					bufusage;
 		uint32		queryId;
+		ParseNode  *parsenode = (ParseNode *) parsetree;
+
+		Assert(isParseNode(node));
 
 		bufusage_start = pgBufferUsage;
 		INSTR_TIME_SET_CURRENT(start);
@@ -1034,7 +1038,7 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		/* For utility statements, we just hash the query string directly */
 		queryId = pgss_hash_string(queryString);
 
-		pgss_store(queryString,
+		pgss_store(queryString, parsenode->qlocation, parsenode->qlength,
 				   queryId,
 				   INSTR_TIME_GET_MILLISEC(duration),
 				   rows,
@@ -1103,7 +1107,7 @@ pgss_hash_string(const char *str)
  * query string.  total_time, rows, bufusage are ignored in this case.
  */
 static void
-pgss_store(const char *query, uint32 queryId,
+pgss_store(const char *query, int query_loc, int query_len, uint32 queryId,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
 		   pgssJumbleState *jstate)
@@ -1112,15 +1116,15 @@ pgss_store(const char *query, uint32 queryId,
 	pgssEntry  *entry;
 	char	   *norm_query = NULL;
 	int			encoding = GetDatabaseEncoding();
-	int			query_len;
 
-	Assert(query != NULL);
+	Assert(query != NULL && query_loc >= 0 && query_len >= 0);
 
 	/* Safety check... */
 	if (!pgss || !pgss_hash)
 		return;
 
-	query_len = strlen(query);
+	if (query_len == 0)
+		query_len = strlen(query);
 
 	/* Set up key for hashtable search */
 	key.userid = GetUserId();
@@ -1140,6 +1144,11 @@ pgss_store(const char *query, uint32 queryId,
 		bool		stored;
 		bool		do_gc;
 
+		/* skip leading spaces */
+		while (isspace(query[query_loc]))
+			query_loc++, query_len--;
+		/* should skip trailing spaces? encoding dependence? */
+
 		/*
 		 * Create a new, normalized query string if caller asked.  We don't
 		 * need to hold the lock while doing this work.  (Note: in any case,
@@ -1150,11 +1159,17 @@ pgss_store(const char *query, uint32 queryId,
 		if (jstate)
 		{
 			LWLockRelease(pgss->lock);
-			norm_query = generate_normalized_query(jstate, query,
+			norm_query = generate_normalized_query(jstate, query, query_loc,
 												   &query_len,
 												   encoding);
 			LWLockAcquire(pgss->lock, LW_SHARED);
 		}
+		else if (strlen(query) != query_len)
+		{
+			norm_query = palloc(query_len + 1);
+			memcpy(norm_query, query + query_loc, query_len);
+			norm_query[query_len] = '\0';
+		}
 
 		/* Append new query text to file with only shared lock held */
 		stored = qtext_store(norm_query ? norm_query : query, query_len,
@@ -2882,15 +2897,15 @@ RecordConstLocation(pgssJumbleState *jstate, int location)
  */
 static char *
 generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding)
+						  int query_loc, int *query_len_p, int encoding)
 {
 	char	   *norm_query;
 	int			query_len = *query_len_p;
 	int			i,
 				len_to_wrt,		/* Length (in bytes) to write */
-				quer_loc = 0,	/* Source query byte location */
+				quer_loc = query_loc, /* Source query byte location */
 				n_quer_loc = 0, /* Normalized query byte location */
-				last_off = 0,	/* Offset from start for previous tok */
+				last_off = query_loc,	/* Offset from start for previous tok */
 				last_tok_len = 0;		/* Length (in bytes) of that tok */
 
 	/*
@@ -2933,7 +2948,7 @@ generate_normalized_query(pgssJumbleState *jstate, const char *query,
 	 * We've copied up until the last ignorable constant.  Copy over the
 	 * remaining bytes of the original query string.
 	 */
-	len_to_wrt = query_len - quer_loc;
+	len_to_wrt = query_loc + query_len - quer_loc;
 
 	Assert(len_to_wrt >= 0);
 	memcpy(norm_query + n_quer_loc, query + quer_loc, len_to_wrt);
diff --git a/contrib/pg_stat_statements/sql/pg_stat_statements.sql b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
index 7e2b263..5a30436 100644
--- a/contrib/pg_stat_statements/sql/pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
@@ -1,15 +1,183 @@
 CREATE EXTENSION pg_stat_statements;
 
-CREATE TABLE test (a int, b char(20));
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+
+SELECT 1 AS "int";
+
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+SELECT 'world' AS "text";
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+SELECT 'hello' AS "text";
+COMMIT;
+
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
 
--- test the basic functionality of pg_stat_statements
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
+
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
 
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+SELECT 1 AS "one";
+SELECT 1 + 1 AS "two";
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'top';
+
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(3);
+SELECT PLUS_TWO(7);
 
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(8);
+SELECT PLUS_ONE(10);
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'all';
+
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(-1);
+SELECT PLUS_TWO(2);
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(3);
+SELECT PLUS_ONE(1);
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track_utility = TRUE;
+
+CREATE INDEX test_b ON test(b);
 DROP TABLE test;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
 
 DROP EXTENSION pg_stat_statements;
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 41dde50..e652feb 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -177,6 +177,11 @@ planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		result = (*planner_hook) (parse, cursorOptions, boundParams);
 	else
 		result = standard_planner(parse, cursorOptions, boundParams);
+
+	/* copy query location to planned statement */
+	result->qlocation = parse->qlocation;
+	result->qlength = parse->qlength;
+
 	return result;
 }
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index a558083..bdff79c 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -307,6 +307,11 @@ transformStmt(ParseState *pstate, Node *parseTree)
 	result->querySource = QSRC_ORIGINAL;
 	result->canSetTag = true;
 
+	/* keep track of location & length */
+	Assert(isParseNode(parseTree));
+	result->qlocation = ((ParseNode*) parseTree)->qlocation;
+	result->qlength = ((ParseNode*) parseTree)->qlength;
+
 	return result;
 }
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 834a009..b0657f4 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -178,6 +178,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
 			   bool *deferrable, bool *initdeferred, bool *not_valid,
 			   bool *no_inherit, core_yyscan_t yyscanner);
 static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
+static void setQueryLocation(Node *node, core_yyscan_t yyscanner, int start);
 
 %}
 
@@ -761,14 +762,20 @@ stmtblock:	stmtmulti
 stmtmulti:	stmtmulti ';' stmt
 				{
 					if ($3 != NULL)
+					{
+						setQueryLocation($3, yyscanner, @2+1);
 						$$ = lappend($1, $3);
+					}
 					else
 						$$ = $1;
 				}
 			| stmt
 				{
 					if ($1 != NULL)
+					{
+						setQueryLocation($1, yyscanner, 0);
 						$$ = list_make1($1);
+					}
 					else
 						$$ = NIL;
 				}
@@ -15283,6 +15290,23 @@ makeRecursiveViewSelect(char *relname, List *aliases, Node *query)
 	return (Node *) s;
 }
 
+/* set qlocation & qlength for statements starting at "start" */
+static void
+setQueryLocation(Node *node, core_yyscan_t yyscanner, int start)
+{
+	base_yy_extra_type *extra = pg_yyget_extra(yyscanner);
+	ParseNode *pn = (ParseNode *) node;
+	Assert(isParseNode(node));
+
+	pn->qlocation = start;
+	if (extra->last_semicolon == -1 || start == (extra->last_semicolon + 1))
+		/* reduction triggered by end of input */
+		pn->qlength = strlen(extra->core_yy_extra.scanbuf) - start;
+	else
+		/* reduction triggered by ';' */
+		pn->qlength = extra->last_semicolon - start;
+}
+
 /* parser_init()
  * Initialize to parse one query string
  */
@@ -15290,4 +15314,5 @@ void
 parser_init(base_yy_extra_type *yyext)
 {
 	yyext->parsetree = NIL;		/* in case grammar forgets to set it */
+	yyext->last_semicolon = -1;
 }
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index acd9269..470a697 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -351,7 +351,8 @@ not_equals		"!="
  * If you change either set, adjust the character lists appearing in the
  * rule for "operator"!
  */
-self			[,()\[\].;\:\+\-\*\/\%\^\<\>\=]
+semicolon		;
+self			[,()\[\].\:\+\-\*\/\%\^\<\>\=]
 op_chars		[\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=]
 operator		{op_chars}+
 
@@ -845,7 +846,11 @@ other			.
 					SET_YYLLOC();
 					return NOT_EQUALS;
 				}
-
+{semicolon}		{
+					SET_YYLLOC();
+					pg_yyget_extra(yyscanner)->last_semicolon = *yylloc;
+					return yytext[0];
+				}
 {self}			{
 					SET_YYLLOC();
 					return yytext[0];
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index c514d3f..1a5e68d 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -308,7 +308,6 @@ typedef enum NodeTag
 	T_UpdateStmt,
 	T_SelectStmt,
 	T_AlterTableStmt,
-	T_AlterTableCmd,
 	T_AlterDomainStmt,
 	T_SetOperationStmt,
 	T_GrantStmt,
@@ -406,7 +405,6 @@ typedef enum NodeTag
 	T_AlterPolicyStmt,
 	T_CreateTransformStmt,
 	T_CreateAmStmt,
-	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
@@ -459,6 +457,8 @@ typedef enum NodeTag
 	T_PartitionSpec,
 	T_PartitionBoundSpec,
 	T_PartitionRangeDatum,
+	T_AlterTableCmd,
+	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index fc532fb..704694c 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -78,6 +78,24 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 /* Currently, SELECT ... FOR [KEY] UPDATE/SHARE requires UPDATE privileges */
 #define ACL_SELECT_FOR_UPDATE	ACL_UPDATE
 
+/*
+ * A ParseNode is a Node with additional location information.
+ * Zero qlengh means not set.
+ * If non-zero, then qlocation is within to the initial query string.
+ */
+typedef struct ParseNode
+{
+	NodeTag		type;
+	int			qlocation;
+	int			qlength;
+} ParseNode;
+
+/*
+ * All high-level statements coming out of the parser are ParseNode,
+ * plus Query & PlannedStmt.
+ */
+#define isParseNodeTag(tag)	((T_Query <= (tag)) && ((tag) < T_A_Expr))
+#define isParseNode(nodeptr) isParseNodeTag(nodeTag(nodeptr))
 
 /*****************************************************************************
  *	Query Tree
@@ -99,6 +117,8 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 typedef struct Query
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
@@ -1322,6 +1342,8 @@ typedef struct TriggerTransition
 typedef struct InsertStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to insert into */
 	List	   *cols;			/* optional: names of the target columns */
 	Node	   *selectStmt;		/* the source SELECT/VALUES, or NULL */
@@ -1337,6 +1359,8 @@ typedef struct InsertStmt
 typedef struct DeleteStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to delete from */
 	List	   *usingClause;	/* optional using clause for more tables */
 	Node	   *whereClause;	/* qualifications */
@@ -1351,6 +1375,8 @@ typedef struct DeleteStmt
 typedef struct UpdateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to update */
 	List	   *targetList;		/* the target list (of ResTarget) */
 	Node	   *whereClause;	/* qualifications */
@@ -1383,6 +1409,8 @@ typedef enum SetOperation
 typedef struct SelectStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 
 	/*
 	 * These fields are used only in "leaf" SelectStmts.
@@ -1450,6 +1478,8 @@ typedef struct SelectStmt
 typedef struct SetOperationStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	SetOperation op;			/* type of set op */
 	bool		all;			/* ALL specified? */
 	Node	   *larg;			/* left child */
@@ -1541,6 +1571,8 @@ typedef enum ObjectType
 typedef struct CreateSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *schemaname;		/* the name of the schema to create */
 	Node	   *authrole;		/* the owner of the created schema */
 	List	   *schemaElts;		/* schema components (list of parsenodes) */
@@ -1560,6 +1592,8 @@ typedef enum DropBehavior
 typedef struct AlterTableStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* table to work on */
 	List	   *cmds;			/* list of subcommands */
 	ObjectType	relkind;		/* type of object */
@@ -1637,6 +1671,8 @@ typedef enum AlterTableType
 typedef struct ReplicaIdentityStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char		identity_type;
 	char	   *name;
 } ReplicaIdentityStmt;
@@ -1665,6 +1701,8 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 typedef struct AlterDomainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char		subtype;		/*------------
 								 *	T = alter column default
 								 *	N = alter column drop not null
@@ -1712,6 +1750,8 @@ typedef enum GrantObjectType
 typedef struct GrantStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
 	GrantTargetType targtype;	/* type of the grant target */
 	GrantObjectType objtype;	/* kind of object being operated on */
@@ -1762,6 +1802,8 @@ typedef struct AccessPriv
 typedef struct GrantRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *granted_roles;	/* list of roles to be granted/revoked */
 	List	   *grantee_roles;	/* list of member roles to add/delete */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
@@ -1777,6 +1819,8 @@ typedef struct GrantRoleStmt
 typedef struct AlterDefaultPrivilegesStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *options;		/* list of DefElem */
 	GrantStmt  *action;			/* GRANT/REVOKE action (with objects=NIL) */
 } AlterDefaultPrivilegesStmt;
@@ -1792,6 +1836,8 @@ typedef struct AlterDefaultPrivilegesStmt
 typedef struct CopyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* the relation to copy */
 	Node	   *query;			/* the query (SELECT or DML statement with
 								 * RETURNING) to copy */
@@ -1823,6 +1869,8 @@ typedef enum
 typedef struct VariableSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	VariableSetKind kind;
 	char	   *name;			/* variable to be set */
 	List	   *args;			/* List of A_Const nodes */
@@ -1836,6 +1884,8 @@ typedef struct VariableSetStmt
 typedef struct VariableShowStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;
 } VariableShowStmt;
 
@@ -1853,6 +1903,8 @@ typedef struct VariableShowStmt
 typedef struct CreateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to create */
 	List	   *tableElts;		/* column definitions (list of ColumnDef) */
 	List	   *inhRelations;	/* relations to inherit from (list of
@@ -1980,6 +2032,8 @@ typedef struct Constraint
 typedef struct CreateTableSpaceStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	Node	   *owner;
 	char	   *location;
@@ -1989,6 +2043,8 @@ typedef struct CreateTableSpaceStmt
 typedef struct DropTableSpaceStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	bool		missing_ok;		/* skip error if missing? */
 } DropTableSpaceStmt;
@@ -1996,6 +2052,8 @@ typedef struct DropTableSpaceStmt
 typedef struct AlterTableSpaceOptionsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	List	   *options;
 	bool		isReset;
@@ -2004,6 +2062,8 @@ typedef struct AlterTableSpaceOptionsStmt
 typedef struct AlterTableMoveAllStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *orig_tablespacename;
 	ObjectType	objtype;		/* Object type to move */
 	List	   *roles;			/* List of roles to move objects of */
@@ -2019,6 +2079,8 @@ typedef struct AlterTableMoveAllStmt
 typedef struct CreateExtensionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;
 	bool		if_not_exists;	/* just do nothing if it already exists? */
 	List	   *options;		/* List of DefElem nodes */
@@ -2028,6 +2090,8 @@ typedef struct CreateExtensionStmt
 typedef struct AlterExtensionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;
 	List	   *options;		/* List of DefElem nodes */
 } AlterExtensionStmt;
@@ -2035,6 +2099,8 @@ typedef struct AlterExtensionStmt
 typedef struct AlterExtensionContentsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *extname;		/* Extension's name */
 	int			action;			/* +1 = add object, -1 = drop object */
 	ObjectType	objtype;		/* Object's type */
@@ -2050,6 +2116,8 @@ typedef struct AlterExtensionContentsStmt
 typedef struct CreateFdwStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2058,6 +2126,8 @@ typedef struct CreateFdwStmt
 typedef struct AlterFdwStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2071,6 +2141,8 @@ typedef struct AlterFdwStmt
 typedef struct CreateForeignServerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *servertype;		/* optional server type */
 	char	   *version;		/* optional server version */
@@ -2081,6 +2153,8 @@ typedef struct CreateForeignServerStmt
 typedef struct AlterForeignServerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *version;		/* optional server version */
 	List	   *options;		/* generic options to server */
@@ -2094,7 +2168,7 @@ typedef struct AlterForeignServerStmt
 
 typedef struct CreateForeignTableStmt
 {
-	CreateStmt	base;
+	CreateStmt	base;			/* is a ParseNode */
 	char	   *servername;
 	List	   *options;
 } CreateForeignTableStmt;
@@ -2107,6 +2181,8 @@ typedef struct CreateForeignTableStmt
 typedef struct CreateUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2115,6 +2191,8 @@ typedef struct CreateUserMappingStmt
 typedef struct AlterUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2123,6 +2201,8 @@ typedef struct AlterUserMappingStmt
 typedef struct DropUserMappingStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *user;			/* user role */
 	char	   *servername;		/* server name */
 	bool		missing_ok;		/* ignore missing mappings */
@@ -2143,6 +2223,8 @@ typedef enum ImportForeignSchemaType
 typedef struct ImportForeignSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *server_name;	/* FDW server name */
 	char	   *remote_schema;	/* remote schema name to query */
 	char	   *local_schema;	/* local schema to create objects in */
@@ -2158,6 +2240,8 @@ typedef struct ImportForeignSchemaStmt
 typedef struct CreatePolicyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	char	   *cmd_name;		/* the command name the policy applies to */
@@ -2174,6 +2258,8 @@ typedef struct CreatePolicyStmt
 typedef struct AlterPolicyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	List	   *roles;			/* the roles associated with the policy */
@@ -2188,6 +2274,8 @@ typedef struct AlterPolicyStmt
 typedef struct CreateAmStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *amname;			/* access method name */
 	List	   *handler_name;	/* handler function name */
 	char		amtype;			/* type of access method */
@@ -2200,6 +2288,8 @@ typedef struct CreateAmStmt
 typedef struct CreateTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	RangeVar   *relation;		/* relation trigger is on */
 	List	   *funcname;		/* qual. name of function to call */
@@ -2227,6 +2317,8 @@ typedef struct CreateTrigStmt
 typedef struct CreateEventTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char	   *eventname;		/* event's identifier */
 	List	   *whenclause;		/* list of DefElems indicating filtering */
@@ -2240,6 +2332,8 @@ typedef struct CreateEventTrigStmt
 typedef struct AlterEventTrigStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char		tgenabled;		/* trigger's firing configuration WRT
 								 * session_replication_role */
@@ -2253,6 +2347,8 @@ typedef struct AlterEventTrigStmt
 typedef struct CreatePLangStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	char	   *plname;			/* PL name */
 	List	   *plhandler;		/* PL call handler function (qual. name) */
@@ -2280,6 +2376,8 @@ typedef enum RoleStmtType
 typedef struct CreateRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RoleStmtType stmt_type;		/* ROLE/USER/GROUP */
 	char	   *role;			/* role name */
 	List	   *options;		/* List of DefElem nodes */
@@ -2288,6 +2386,8 @@ typedef struct CreateRoleStmt
 typedef struct AlterRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *role;			/* role */
 	List	   *options;		/* List of DefElem nodes */
 	int			action;			/* +1 = add members, -1 = drop members */
@@ -2296,6 +2396,8 @@ typedef struct AlterRoleStmt
 typedef struct AlterRoleSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *role;			/* role */
 	char	   *database;		/* database name, or NULL */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
@@ -2304,6 +2406,8 @@ typedef struct AlterRoleSetStmt
 typedef struct DropRoleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;			/* List of roles to remove */
 	bool		missing_ok;		/* skip error if a role is missing? */
 } DropRoleStmt;
@@ -2316,6 +2420,8 @@ typedef struct DropRoleStmt
 typedef struct CreateSeqStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to create */
 	List	   *options;
 	Oid			ownerId;		/* ID of owner, or InvalidOid for default */
@@ -2325,6 +2431,8 @@ typedef struct CreateSeqStmt
 typedef struct AlterSeqStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to alter */
 	List	   *options;
 	bool		missing_ok;		/* skip error if a role is missing? */
@@ -2337,6 +2445,8 @@ typedef struct AlterSeqStmt
 typedef struct DefineStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	kind;			/* aggregate, operator, type */
 	bool		oldstyle;		/* hack to signal old CREATE AGG syntax */
 	List	   *defnames;		/* qualified name (list of Value strings) */
@@ -2351,6 +2461,8 @@ typedef struct DefineStmt
 typedef struct CreateDomainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *domainname;		/* qualified name (list of Value strings) */
 	TypeName   *typeName;		/* the base type */
 	CollateClause *collClause;	/* untransformed COLLATE spec, if any */
@@ -2364,6 +2476,8 @@ typedef struct CreateDomainStmt
 typedef struct CreateOpClassStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opclassname;	/* qualified name (list of Value strings) */
 	List	   *opfamilyname;	/* qualified name (ditto); NIL if omitted */
 	char	   *amname;			/* name of index AM opclass is for */
@@ -2397,6 +2511,8 @@ typedef struct CreateOpClassItem
 typedef struct CreateOpFamilyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 } CreateOpFamilyStmt;
@@ -2408,6 +2524,8 @@ typedef struct CreateOpFamilyStmt
 typedef struct AlterOpFamilyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 	bool		isDrop;			/* ADD or DROP the items? */
@@ -2422,6 +2540,8 @@ typedef struct AlterOpFamilyStmt
 typedef struct DropStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *objects;		/* list of sublists of names (as Values) */
 	List	   *arguments;		/* list of sublists of arguments (as Values) */
 	ObjectType	removeType;		/* object type */
@@ -2437,6 +2557,8 @@ typedef struct DropStmt
 typedef struct TruncateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *relations;		/* relations (RangeVars) to be truncated */
 	bool		restart_seqs;	/* restart owned sequences? */
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
@@ -2449,6 +2571,8 @@ typedef struct TruncateStmt
 typedef struct CommentStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2462,6 +2586,8 @@ typedef struct CommentStmt
 typedef struct SecLabelStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2491,6 +2617,8 @@ typedef struct SecLabelStmt
 typedef struct DeclareCursorStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	int			options;		/* bitmask of options (see above) */
 	Node	   *query;			/* the raw SELECT query */
@@ -2503,6 +2631,8 @@ typedef struct DeclareCursorStmt
 typedef struct ClosePortalStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	/* NULL means CLOSE ALL */
 } ClosePortalStmt;
@@ -2526,6 +2656,8 @@ typedef enum FetchDirection
 typedef struct FetchStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	FetchDirection direction;	/* see above */
 	long		howMany;		/* number of rows, or position argument */
 	char	   *portalname;		/* name of portal (cursor) */
@@ -2546,6 +2678,8 @@ typedef struct FetchStmt
 typedef struct IndexStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *idxname;		/* name of new index, or NULL for default */
 	RangeVar   *relation;		/* relation to build index on */
 	char	   *accessMethod;	/* name of access method (eg. btree) */
@@ -2574,6 +2708,8 @@ typedef struct IndexStmt
 typedef struct CreateFunctionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	List	   *funcname;		/* qualified name of function to create */
 	List	   *parameters;		/* a list of FunctionParameter */
@@ -2604,6 +2740,8 @@ typedef struct FunctionParameter
 typedef struct AlterFunctionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	FuncWithArgs *func;			/* name and args of function */
 	List	   *actions;		/* list of DefElem */
 } AlterFunctionStmt;
@@ -2617,6 +2755,8 @@ typedef struct AlterFunctionStmt
 typedef struct DoStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *args;			/* List of DefElem nodes */
 } DoStmt;
 
@@ -2635,6 +2775,8 @@ typedef struct InlineCodeBlock
 typedef struct RenameStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	renameType;		/* OBJECT_TABLE, OBJECT_COLUMN, etc */
 	ObjectType	relationType;	/* if column name, associated relation type */
 	RangeVar   *relation;		/* in case it's a table */
@@ -2654,6 +2796,8 @@ typedef struct RenameStmt
 typedef struct AlterObjectDependsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_FUNCTION, OBJECT_TRIGGER, etc */
 	RangeVar   *relation;		/* in case a table is involved */
 	List	   *objname;		/* name of the object */
@@ -2668,6 +2812,8 @@ typedef struct AlterObjectDependsStmt
 typedef struct AlterObjectSchemaStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2683,6 +2829,8 @@ typedef struct AlterObjectSchemaStmt
 typedef struct AlterOwnerStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2698,6 +2846,8 @@ typedef struct AlterOwnerStmt
 typedef struct AlterOperatorStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *opername;		/* operator name */
 	List	   *operargs;		/* operator's argument TypeNames */
 	List	   *options;		/* List of DefElem nodes */
@@ -2711,6 +2861,8 @@ typedef struct AlterOperatorStmt
 typedef struct RuleStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation the rule is for */
 	char	   *rulename;		/* name of the rule */
 	Node	   *whereClause;	/* qualifications */
@@ -2727,6 +2879,8 @@ typedef struct RuleStmt
 typedef struct NotifyStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to notify */
 	char	   *payload;		/* the payload string, or NULL if none */
 } NotifyStmt;
@@ -2738,6 +2892,8 @@ typedef struct NotifyStmt
 typedef struct ListenStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to listen on */
 } ListenStmt;
 
@@ -2748,6 +2904,8 @@ typedef struct ListenStmt
 typedef struct UnlistenStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *conditionname;	/* name to unlisten on, or NULL for all */
 } UnlistenStmt;
 
@@ -2772,6 +2930,8 @@ typedef enum TransactionStmtKind
 typedef struct TransactionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	TransactionStmtKind kind;	/* see above */
 	List	   *options;		/* for BEGIN/START and savepoint commands */
 	char	   *gid;			/* for two-phase-commit related commands */
@@ -2784,6 +2944,8 @@ typedef struct TransactionStmt
 typedef struct CompositeTypeStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *typevar;		/* the composite type to be created */
 	List	   *coldeflist;		/* list of ColumnDef nodes */
 } CompositeTypeStmt;
@@ -2795,6 +2957,8 @@ typedef struct CompositeTypeStmt
 typedef struct CreateEnumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *vals;			/* enum values (list of Value strings) */
 } CreateEnumStmt;
@@ -2806,6 +2970,8 @@ typedef struct CreateEnumStmt
 typedef struct CreateRangeStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *params;			/* range parameters (list of DefElem) */
 } CreateRangeStmt;
@@ -2817,6 +2983,8 @@ typedef struct CreateRangeStmt
 typedef struct AlterEnumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	char	   *oldVal;			/* old enum value's name, if renaming */
 	char	   *newVal;			/* new enum value's name */
@@ -2839,6 +3007,8 @@ typedef enum ViewCheckOption
 typedef struct ViewStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *view;			/* the view to be created */
 	List	   *aliases;		/* target column names */
 	Node	   *query;			/* the SELECT query */
@@ -2854,6 +3024,8 @@ typedef struct ViewStmt
 typedef struct LoadStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *filename;		/* file to load */
 } LoadStmt;
 
@@ -2864,6 +3036,8 @@ typedef struct LoadStmt
 typedef struct CreatedbStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to create */
 	List	   *options;		/* List of DefElem nodes */
 } CreatedbStmt;
@@ -2875,6 +3049,8 @@ typedef struct CreatedbStmt
 typedef struct AlterDatabaseStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to alter */
 	List	   *options;		/* List of DefElem nodes */
 } AlterDatabaseStmt;
@@ -2882,6 +3058,8 @@ typedef struct AlterDatabaseStmt
 typedef struct AlterDatabaseSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* database name */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
 } AlterDatabaseSetStmt;
@@ -2893,6 +3071,8 @@ typedef struct AlterDatabaseSetStmt
 typedef struct DropdbStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *dbname;			/* database to drop */
 	bool		missing_ok;		/* skip error if db is missing? */
 } DropdbStmt;
@@ -2904,6 +3084,8 @@ typedef struct DropdbStmt
 typedef struct AlterSystemStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	VariableSetStmt *setstmt;	/* SET subcommand */
 } AlterSystemStmt;
 
@@ -2914,6 +3096,8 @@ typedef struct AlterSystemStmt
 typedef struct ClusterStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation being indexed, or NULL if all */
 	char	   *indexname;		/* original index defined */
 	bool		verbose;		/* print progress info */
@@ -2942,6 +3126,8 @@ typedef enum VacuumOption
 typedef struct VacuumStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	int			options;		/* OR of VacuumOption flags */
 	RangeVar   *relation;		/* single table to process, or NULL */
 	List	   *va_cols;		/* list of column names, or NIL for all */
@@ -2958,6 +3144,8 @@ typedef struct VacuumStmt
 typedef struct ExplainStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	List	   *options;		/* list of DefElem nodes */
 } ExplainStmt;
@@ -2978,6 +3166,8 @@ typedef struct ExplainStmt
 typedef struct CreateTableAsStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	IntoClause *into;			/* destination table */
 	ObjectType	relkind;		/* OBJECT_TABLE or OBJECT_MATVIEW */
@@ -2992,6 +3182,8 @@ typedef struct CreateTableAsStmt
 typedef struct RefreshMatViewStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		concurrent;		/* allow concurrent access? */
 	bool		skipData;		/* true for WITH NO DATA */
 	RangeVar   *relation;		/* relation to insert into */
@@ -3004,6 +3196,8 @@ typedef struct RefreshMatViewStmt
 typedef struct CheckPointStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 } CheckPointStmt;
 
 /* ----------------------
@@ -3022,6 +3216,8 @@ typedef enum DiscardMode
 typedef struct DiscardStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	DiscardMode target;
 } DiscardStmt;
 
@@ -3032,6 +3228,8 @@ typedef struct DiscardStmt
 typedef struct LockStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *relations;		/* relations to lock */
 	int			mode;			/* lock mode */
 	bool		nowait;			/* no wait mode */
@@ -3044,6 +3242,8 @@ typedef struct LockStmt
 typedef struct ConstraintsSetStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *constraints;	/* List of names as RangeVars */
 	bool		deferred;
 } ConstraintsSetStmt;
@@ -3068,6 +3268,8 @@ typedef enum ReindexObjectType
 typedef struct ReindexStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	ReindexObjectType kind;		/* REINDEX_OBJECT_INDEX, REINDEX_OBJECT_TABLE,
 								 * etc. */
 	RangeVar   *relation;		/* Table or index to reindex */
@@ -3082,6 +3284,8 @@ typedef struct ReindexStmt
 typedef struct CreateConversionStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *conversion_name;	/* Name of the conversion */
 	char	   *for_encoding_name;		/* source encoding name */
 	char	   *to_encoding_name;		/* destination encoding name */
@@ -3096,6 +3300,8 @@ typedef struct CreateConversionStmt
 typedef struct CreateCastStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	TypeName   *sourcetype;
 	TypeName   *targettype;
 	FuncWithArgs *func;
@@ -3110,6 +3316,8 @@ typedef struct CreateCastStmt
 typedef struct CreateTransformStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	bool		replace;
 	TypeName   *type_name;
 	char	   *lang;
@@ -3124,6 +3332,8 @@ typedef struct CreateTransformStmt
 typedef struct PrepareStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* Name of plan, arbitrary */
 	List	   *argtypes;		/* Types of parameters (List of TypeName) */
 	Node	   *query;			/* The query itself (as a raw parsetree) */
@@ -3138,6 +3348,8 @@ typedef struct PrepareStmt
 typedef struct ExecuteStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to execute */
 	List	   *params;			/* Values to assign to parameters */
 } ExecuteStmt;
@@ -3150,6 +3362,8 @@ typedef struct ExecuteStmt
 typedef struct DeallocateStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to remove */
 	/* NULL means DEALLOCATE ALL */
 } DeallocateStmt;
@@ -3160,6 +3374,8 @@ typedef struct DeallocateStmt
 typedef struct DropOwnedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;
 	DropBehavior behavior;
 } DropOwnedStmt;
@@ -3170,6 +3386,8 @@ typedef struct DropOwnedStmt
 typedef struct ReassignOwnedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *roles;
 	Node	   *newrole;
 } ReassignOwnedStmt;
@@ -3180,6 +3398,8 @@ typedef struct ReassignOwnedStmt
 typedef struct AlterTSDictionaryStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	List	   *dictname;		/* qualified name (list of Value strings) */
 	List	   *options;		/* List of DefElem nodes */
 } AlterTSDictionaryStmt;
@@ -3199,6 +3419,8 @@ typedef enum AlterTSConfigType
 typedef struct AlterTSConfigurationStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location */
+	int			qlength;		/* query length, 0 if unset */
 	AlterTSConfigType kind;		/* ALTER_TSCONFIG_ADD_MAPPING, etc */
 	List	   *cfgname;		/* qualified name (list of Value strings) */
 
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index e2fbc7d..bf9cae4 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -36,6 +36,8 @@
 typedef struct PlannedStmt
 {
 	NodeTag		type;
+	int			qlocation;		/* query location, or -1 if unknown */
+	int			qlength;		/* query length, 0 if unknown */
 
 	CmdType		commandType;	/* select|insert|update|delete */
 
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 6d8e493..e373ab2 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -49,6 +49,8 @@ typedef struct base_yy_extra_type
 	char	   *lookahead_end;	/* end of current token */
 	char		lookahead_hold_char;	/* to be put back at *lookahead_end */
 
+	int			last_semicolon;	/* for query length computation */
+
 	/*
 	 * State variables that belong to the grammar.
 	 */

diff --git a/contrib/pg_stat_statements/expected/pg_stat_statements.out b/contrib/pg_stat_statements/expected/pg_stat_statements.out
index 3573c19..06f6ffe 100644
--- a/contrib/pg_stat_statements/expected/pg_stat_statements.out
+++ b/contrib/pg_stat_statements/expected/pg_stat_statements.out
@@ -1,21 +1,363 @@
 CREATE EXTENSION pg_stat_statements;
-CREATE TABLE test (a int, b char(20));
--- test the basic functionality of pg_stat_statements
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+SELECT 'world' AS "text";
+ text  
+-------
+ world
+(1 row)
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello' AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+COMMIT;
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+ ?column? 
+----------
+        5
+(1 row)
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+ i 
+---
+ 1
+ 2
+(2 rows)
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
+  f  
+-----
+ 1.0
+ 2.0
+(2 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                  query                  | calls | rows 
+-----------------------------------------+-------+------
+ SELECT ? || ?                           |     1 |    1
+ SELECT ? AS "float"                     |     1 |    1
+ SELECT pg_stat_statements_reset()       |     1 |    1
+ SELECT ? + ?                            |     2 |    2
+ SELECT ? AS "int"                       |     2 |    2
+ SELECT ? AS i UNION SELECT ? ORDER BY i |     1 |    2
+ WITH t(f) AS (                         +|     1 |    2
+   VALUES (?), (?)                      +|       | 
+ )                                      +|       | 
+   SELECT f FROM t ORDER BY f            |       | 
+ SELECT ? + ? + ? AS "add"               |     3 |    3
+ SELECT ?                               +|     4 |    4
+                                        +|       | 
+   AS "text"                             |       | 
+(9 rows)
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
  pg_stat_statements_reset 
 --------------------------
  
 (1 row)
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
-                       query                        | calls | rows 
-----------------------------------------------------+-------+------
- SELECT pg_stat_statements_reset();                 |     1 |    1
- UPDATE test SET b = ? WHERE a > ?;                 |     1 |    5
- INSERT INTO test VALUES(generate_series(?, ?), ?); |     1 |   10
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+ a |          b           
+---+----------------------
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(4 rows)
+
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+ a | b 
+---+---
+(0 rows)
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+ a |          b           
+---+----------------------
+ 1 | 111                 
+ 2 | 222                 
+ 3 | 333                 
+ 4 | 444                 
+ 5 | 555                 
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(9 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                       query                       | calls | rows 
+---------------------------------------------------+-------+------
+ DELETE FROM test WHERE a > ?                      |     1 |    1
+ SELECT pg_stat_statements_reset()                 |     1 |    1
+ UPDATE test SET b = ? WHERE a > ?                 |     1 |    3
+ SELECT * FROM test WHERE a > ? ORDER BY a         |     2 |    4
+ UPDATE test SET b = ? WHERE a = ?                 |     6 |    6
+ SELECT * FROM test ORDER BY a                     |     1 |    9
+ INSERT INTO test VALUES(generate_series(?, ?), ?) |     1 |   10
+(7 rows)
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "one";
+ one 
+-----
+   1
+(1 row)
+
+SELECT 1 + 1 AS "two";
+ two 
+-----
+   2
+(1 row)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+ query | calls | rows 
+-------+-------+------
+(0 rows)
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'top';
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(3);
+ plus_two 
+----------
+        5
+(1 row)
+
+SELECT PLUS_TWO(7);
+ plus_two 
+----------
+        9
+(1 row)
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(8);
+ plus_one 
+----------
+        9
+(1 row)
+
+SELECT PLUS_ONE(10);
+ plus_one 
+----------
+       11
+(1 row)
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+       query        | calls | rows 
+--------------------+-------+------
+ SELECT ?::TEXT     |     1 |    1
+ SELECT PLUS_ONE(?) |     2 |    2
+ SELECT PLUS_TWO(?) |     2 |    2
 (3 rows)
 
-DROP TABLE test;
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'all';
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(-1);
+ plus_two 
+----------
+        1
+(1 row)
+
+SELECT PLUS_TWO(2);
+ plus_two 
+----------
+        4
+(1 row)
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(3);
+ plus_one 
+----------
+        4
+(1 row)
+
+SELECT PLUS_ONE(1);
+ plus_one 
+----------
+        2
+(1 row)
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+               query               | calls | rows 
+-----------------------------------+-------+------
+ SELECT pg_stat_statements_reset() |     1 |    1
+ SELECT (i + ? + ?)::INTEGER       |     2 |    2
+ SELECT PLUS_ONE(?)                |     2 |    2
+ SELECT PLUS_TWO(?)                |     2 |    2
+(4 rows)
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track_utility = TRUE;
+SELECT 1;
+ ?column? 
+----------
+        1
+(1 row)
+
+CREATE INDEX test_b ON test(b);
+DROP TABLE test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION PLUS_ONE(INTEGER);
+NOTICE:  table "test" does not exist, skipping
+DROP TABLE IF EXISTS test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER);
+NOTICE:  table "test" does not exist, skipping
+NOTICE:  table "test" does not exist, skipping
+NOTICE:  function plus_one(pg_catalog.int4) does not exist, skipping
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                   query                   | calls | rows 
+-------------------------------------------+-------+------
+ CREATE INDEX test_b ON test(b)            |     1 |    0
+ DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER) |     1 |    0
+ DROP FUNCTION PLUS_ONE(INTEGER)           |     1 |    0
+ DROP FUNCTION PLUS_TWO(INTEGER)           |     1 |    0
+ DROP TABLE IF EXISTS test                 |     3 |    0
+ DROP TABLE test                           |     1 |    0
+ SELECT ?                                  |     1 |    1
+ SELECT pg_stat_statements_reset()         |     1 |    1
+(8 rows)
+
 DROP EXTENSION pg_stat_statements;
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 8ce24e0..471a24c 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -297,11 +297,10 @@ static void pgss_ProcessUtility(Node *parsetree, const char *queryString,
 					DestReceiver *dest, char *completionTag);
 static uint32 pgss_hash_fn(const void *key, Size keysize);
 static int	pgss_match_fn(const void *key1, const void *key2, Size keysize);
-static uint32 pgss_hash_string(const char *str);
-static void pgss_store(const char *query, uint32 queryId,
-		   double total_time, uint64 rows,
-		   const BufferUsage *bufusage,
-		   pgssJumbleState *jstate);
+static uint32 pgss_hash_string(char *str, int length);
+static void pgss_store(const char *query, int query_loc, int query_len,
+			   uint32 queryId, double total_time, uint64 rows,
+			   const BufferUsage *bufusage, pgssJumbleState *jstate);
 static void pg_stat_statements_internal(FunctionCallInfo fcinfo,
 							pgssVersion api_version,
 							bool showtext);
@@ -324,7 +323,7 @@ static void JumbleRangeTable(pgssJumbleState *jstate, List *rtable);
 static void JumbleExpr(pgssJumbleState *jstate, Node *node);
 static void RecordConstLocation(pgssJumbleState *jstate, int location);
 static char *generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding);
+							   int query_loc, int *query_len_p, int encoding);
 static void fill_in_constant_lengths(pgssJumbleState *jstate, const char *query);
 static int	comp_location(const void *a, const void *b);
 
@@ -820,7 +819,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 	 * there's no need for an early entry.
 	 */
 	if (jstate.clocations_count > 0)
-		pgss_store(pstate->p_sourcetext,
+		pgss_store(pstate->p_sourcetext, query->location, query->length,
 				   query->queryId,
 				   0,
 				   0,
@@ -925,6 +924,8 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 		InstrEndLoop(queryDesc->totaltime);
 
 		pgss_store(queryDesc->sourceText,
+				   queryDesc->plannedstmt->location,
+				   queryDesc->plannedstmt->length,
 				   queryId,
 				   queryDesc->totaltime->total * 1000.0,		/* convert to msec */
 				   queryDesc->estate->es_processed,
@@ -971,6 +972,9 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		BufferUsage bufusage_start,
 					bufusage;
 		uint32		queryId;
+		ParseNode  *parsenode = (ParseNode *) parsetree;
+
+		Assert(isParseNode(parsetree));
 
 		bufusage_start = pgBufferUsage;
 		INSTR_TIME_SET_CURRENT(start);
@@ -1031,10 +1035,11 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString,
 		bufusage.blk_write_time = pgBufferUsage.blk_write_time;
 		INSTR_TIME_SUBTRACT(bufusage.blk_write_time, bufusage_start.blk_write_time);
 
-		/* For utility statements, we just hash the query string directly */
-		queryId = pgss_hash_string(queryString);
+		/* For utility statements, we just hash the relevant part of query string */
+		queryId = pgss_hash_string((char *) queryString + parsenode->location,
+								   parsenode->length);
 
-		pgss_store(queryString,
+		pgss_store(queryString, parsenode->location, parsenode->length,
 				   queryId,
 				   INSTR_TIME_GET_MILLISEC(duration),
 				   rows,
@@ -1084,15 +1089,18 @@ pgss_match_fn(const void *key1, const void *key2, Size keysize)
 		return 1;
 }
 
+
 /*
- * Given an arbitrarily long query string, produce a hash for the purposes of
- * identifying the query, without normalizing constants.  Used when hashing
- * utility statements.
+ * Given an arbitrarily query string, produce a hash for the purposes of
+ * identifying the query, without normalizing constants, and with some trimming.
+ * Used when hashing utility statements.
  */
 static uint32
-pgss_hash_string(const char *str)
+pgss_hash_string(char *str, int len)
 {
-	return hash_any((const unsigned char *) str, strlen(str));
+	while (isspace(*str))
+		str++, len--;
+	return hash_any((const unsigned char *) str, len);
 }
 
 /*
@@ -1103,7 +1111,7 @@ pgss_hash_string(const char *str)
  * query string.  total_time, rows, bufusage are ignored in this case.
  */
 static void
-pgss_store(const char *query, uint32 queryId,
+pgss_store(const char *query, int query_loc, int query_len, uint32 queryId,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
 		   pgssJumbleState *jstate)
@@ -1112,15 +1120,15 @@ pgss_store(const char *query, uint32 queryId,
 	pgssEntry  *entry;
 	char	   *norm_query = NULL;
 	int			encoding = GetDatabaseEncoding();
-	int			query_len;
 
-	Assert(query != NULL);
+	Assert(query != NULL && query_loc >= 0 && query_len >= 0);
 
 	/* Safety check... */
 	if (!pgss || !pgss_hash)
 		return;
 
-	query_len = strlen(query);
+	if (query_len == 0)
+		query_len = strlen(query);
 
 	/* Set up key for hashtable search */
 	key.userid = GetUserId();
@@ -1140,6 +1148,11 @@ pgss_store(const char *query, uint32 queryId,
 		bool		stored;
 		bool		do_gc;
 
+		/* skip leading spaces */
+		while (isspace(query[query_loc]))
+			query_loc++, query_len--;
+		/* should skip trailing spaces? encoding dependence? */
+
 		/*
 		 * Create a new, normalized query string if caller asked.  We don't
 		 * need to hold the lock while doing this work.  (Note: in any case,
@@ -1150,14 +1163,14 @@ pgss_store(const char *query, uint32 queryId,
 		if (jstate)
 		{
 			LWLockRelease(pgss->lock);
-			norm_query = generate_normalized_query(jstate, query,
+			norm_query = generate_normalized_query(jstate, query, query_loc,
 												   &query_len,
 												   encoding);
 			LWLockAcquire(pgss->lock, LW_SHARED);
 		}
 
 		/* Append new query text to file with only shared lock held */
-		stored = qtext_store(norm_query ? norm_query : query, query_len,
+		stored = qtext_store(norm_query ? norm_query : query + query_loc, query_len,
 							 &query_offset, &gc_count);
 
 		/*
@@ -1771,10 +1784,7 @@ entry_dealloc(void)
 
 /*
  * Given a null-terminated string, allocate a new entry in the external query
- * text file and store the string there.
- *
- * Although we could compute the string length via strlen(), callers already
- * have it handy, so we require them to pass it too.
+ * text file and store the string there, possibly truncated at query_len.
  *
  * If successful, returns true, and stores the new entry's offset in the file
  * into *query_offset.  Also, if gc_count isn't NULL, *gc_count is set to the
@@ -1822,7 +1832,9 @@ qtext_store(const char *query, int query_len,
 	if (lseek(fd, off, SEEK_SET) != off)
 		goto error;
 
-	if (write(fd, query, query_len + 1) != query_len + 1)
+	/* add truncated query and 0 termination */
+	if (write(fd, query, query_len) != query_len ||
+		write(fd, "\0", 1) != 1)
 		goto error;
 
 	CloseTransientFile(fd);
@@ -2882,15 +2894,15 @@ RecordConstLocation(pgssJumbleState *jstate, int location)
  */
 static char *
 generate_normalized_query(pgssJumbleState *jstate, const char *query,
-						  int *query_len_p, int encoding)
+						  int query_loc, int *query_len_p, int encoding)
 {
 	char	   *norm_query;
 	int			query_len = *query_len_p;
 	int			i,
 				len_to_wrt,		/* Length (in bytes) to write */
-				quer_loc = 0,	/* Source query byte location */
+				quer_loc = query_loc, /* Source query byte location */
 				n_quer_loc = 0, /* Normalized query byte location */
-				last_off = 0,	/* Offset from start for previous tok */
+				last_off = query_loc,	/* Offset from start for previous tok */
 				last_tok_len = 0;		/* Length (in bytes) of that tok */
 
 	/*
@@ -2933,7 +2945,7 @@ generate_normalized_query(pgssJumbleState *jstate, const char *query,
 	 * We've copied up until the last ignorable constant.  Copy over the
 	 * remaining bytes of the original query string.
 	 */
-	len_to_wrt = query_len - quer_loc;
+	len_to_wrt = query_loc + query_len - quer_loc;
 
 	Assert(len_to_wrt >= 0);
 	memcpy(norm_query + n_quer_loc, query + quer_loc, len_to_wrt);
diff --git a/contrib/pg_stat_statements/sql/pg_stat_statements.sql b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
index 7e2b263..2a32f23 100644
--- a/contrib/pg_stat_statements/sql/pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
@@ -1,15 +1,188 @@
 CREATE EXTENSION pg_stat_statements;
 
-CREATE TABLE test (a int, b char(20));
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+
+SELECT 1 AS "int";
+
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+SELECT 'world' AS "text";
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+SELECT 'hello' AS "text";
+COMMIT;
+
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
 
--- test the basic functionality of pg_stat_statements
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
+
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+SELECT 1 AS "one";
+SELECT 1 + 1 AS "two";
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'top';
+
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(3);
+SELECT PLUS_TWO(7);
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(8);
+SELECT PLUS_ONE(10);
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'all';
+
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(-1);
+SELECT PLUS_TWO(2);
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(3);
+SELECT PLUS_ONE(1);
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track_utility = TRUE;
+
+SELECT 1;
+CREATE INDEX test_b ON test(b);
+DROP TABLE test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP TABLE IF EXISTS test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
 
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
 
-DROP TABLE test;
 
 DROP EXTENSION pg_stat_statements;
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 7902d43..e3f3030 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -257,7 +257,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 		ownerId = GetUserId();
 
 	/* Unix-ify the offered path, and strip any trailing slashes */
-	location = pstrdup(stmt->location);
+	location = pstrdup(stmt->location_dir);
 	canonicalize_path(location);
 
 	/* disallow quotes, else CREATE DATABASE would be at risk */
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 6955298..8a6afa8 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -79,6 +79,8 @@ _copyPlannedStmt(const PlannedStmt *from)
 {
 	PlannedStmt *newnode = makeNode(PlannedStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(commandType);
 	COPY_SCALAR_FIELD(queryId);
 	COPY_SCALAR_FIELD(hasReturning);
@@ -2734,6 +2736,8 @@ _copyQuery(const Query *from)
 {
 	Query	   *newnode = makeNode(Query);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(commandType);
 	COPY_SCALAR_FIELD(querySource);
 	COPY_SCALAR_FIELD(queryId);
@@ -2776,6 +2780,8 @@ _copyInsertStmt(const InsertStmt *from)
 {
 	InsertStmt *newnode = makeNode(InsertStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(cols);
 	COPY_NODE_FIELD(selectStmt);
@@ -2791,6 +2797,8 @@ _copyDeleteStmt(const DeleteStmt *from)
 {
 	DeleteStmt *newnode = makeNode(DeleteStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(usingClause);
 	COPY_NODE_FIELD(whereClause);
@@ -2805,6 +2813,8 @@ _copyUpdateStmt(const UpdateStmt *from)
 {
 	UpdateStmt *newnode = makeNode(UpdateStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(targetList);
 	COPY_NODE_FIELD(whereClause);
@@ -2820,6 +2830,8 @@ _copySelectStmt(const SelectStmt *from)
 {
 	SelectStmt *newnode = makeNode(SelectStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(distinctClause);
 	COPY_NODE_FIELD(intoClause);
 	COPY_NODE_FIELD(targetList);
@@ -2847,6 +2859,8 @@ _copySetOperationStmt(const SetOperationStmt *from)
 {
 	SetOperationStmt *newnode = makeNode(SetOperationStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(op);
 	COPY_SCALAR_FIELD(all);
 	COPY_NODE_FIELD(larg);
@@ -2864,6 +2878,8 @@ _copyAlterTableStmt(const AlterTableStmt *from)
 {
 	AlterTableStmt *newnode = makeNode(AlterTableStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(cmds);
 	COPY_SCALAR_FIELD(relkind);
@@ -2892,6 +2908,8 @@ _copyAlterDomainStmt(const AlterDomainStmt *from)
 {
 	AlterDomainStmt *newnode = makeNode(AlterDomainStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(subtype);
 	COPY_NODE_FIELD(typeName);
 	COPY_STRING_FIELD(name);
@@ -2907,6 +2925,8 @@ _copyGrantStmt(const GrantStmt *from)
 {
 	GrantStmt  *newnode = makeNode(GrantStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(is_grant);
 	COPY_SCALAR_FIELD(targtype);
 	COPY_SCALAR_FIELD(objtype);
@@ -2946,6 +2966,8 @@ _copyGrantRoleStmt(const GrantRoleStmt *from)
 {
 	GrantRoleStmt *newnode = makeNode(GrantRoleStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(granted_roles);
 	COPY_NODE_FIELD(grantee_roles);
 	COPY_SCALAR_FIELD(is_grant);
@@ -2961,6 +2983,8 @@ _copyAlterDefaultPrivilegesStmt(const AlterDefaultPrivilegesStmt *from)
 {
 	AlterDefaultPrivilegesStmt *newnode = makeNode(AlterDefaultPrivilegesStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(options);
 	COPY_NODE_FIELD(action);
 
@@ -2972,6 +2996,8 @@ _copyDeclareCursorStmt(const DeclareCursorStmt *from)
 {
 	DeclareCursorStmt *newnode = makeNode(DeclareCursorStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(portalname);
 	COPY_SCALAR_FIELD(options);
 	COPY_NODE_FIELD(query);
@@ -2984,6 +3010,8 @@ _copyClosePortalStmt(const ClosePortalStmt *from)
 {
 	ClosePortalStmt *newnode = makeNode(ClosePortalStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(portalname);
 
 	return newnode;
@@ -2994,6 +3022,8 @@ _copyClusterStmt(const ClusterStmt *from)
 {
 	ClusterStmt *newnode = makeNode(ClusterStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_STRING_FIELD(indexname);
 	COPY_SCALAR_FIELD(verbose);
@@ -3006,6 +3036,8 @@ _copyCopyStmt(const CopyStmt *from)
 {
 	CopyStmt   *newnode = makeNode(CopyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(query);
 	COPY_NODE_FIELD(attlist);
@@ -3026,6 +3058,8 @@ _copyCopyStmt(const CopyStmt *from)
 static void
 CopyCreateStmtFields(const CreateStmt *from, CreateStmt *newnode)
 {
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(tableElts);
 	COPY_NODE_FIELD(inhRelations);
@@ -3065,6 +3099,8 @@ _copyDefineStmt(const DefineStmt *from)
 {
 	DefineStmt *newnode = makeNode(DefineStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(kind);
 	COPY_SCALAR_FIELD(oldstyle);
 	COPY_NODE_FIELD(defnames);
@@ -3079,6 +3115,8 @@ _copyDropStmt(const DropStmt *from)
 {
 	DropStmt   *newnode = makeNode(DropStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(objects);
 	COPY_NODE_FIELD(arguments);
 	COPY_SCALAR_FIELD(removeType);
@@ -3094,6 +3132,8 @@ _copyTruncateStmt(const TruncateStmt *from)
 {
 	TruncateStmt *newnode = makeNode(TruncateStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relations);
 	COPY_SCALAR_FIELD(restart_seqs);
 	COPY_SCALAR_FIELD(behavior);
@@ -3106,6 +3146,8 @@ _copyCommentStmt(const CommentStmt *from)
 {
 	CommentStmt *newnode = makeNode(CommentStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(objtype);
 	COPY_NODE_FIELD(objname);
 	COPY_NODE_FIELD(objargs);
@@ -3119,6 +3161,8 @@ _copySecLabelStmt(const SecLabelStmt *from)
 {
 	SecLabelStmt *newnode = makeNode(SecLabelStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(objtype);
 	COPY_NODE_FIELD(objname);
 	COPY_NODE_FIELD(objargs);
@@ -3133,6 +3177,8 @@ _copyFetchStmt(const FetchStmt *from)
 {
 	FetchStmt  *newnode = makeNode(FetchStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(direction);
 	COPY_SCALAR_FIELD(howMany);
 	COPY_STRING_FIELD(portalname);
@@ -3146,6 +3192,8 @@ _copyIndexStmt(const IndexStmt *from)
 {
 	IndexStmt  *newnode = makeNode(IndexStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(idxname);
 	COPY_NODE_FIELD(relation);
 	COPY_STRING_FIELD(accessMethod);
@@ -3174,6 +3222,8 @@ _copyCreateFunctionStmt(const CreateFunctionStmt *from)
 {
 	CreateFunctionStmt *newnode = makeNode(CreateFunctionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(replace);
 	COPY_NODE_FIELD(funcname);
 	COPY_NODE_FIELD(parameters);
@@ -3202,6 +3252,8 @@ _copyAlterFunctionStmt(const AlterFunctionStmt *from)
 {
 	AlterFunctionStmt *newnode = makeNode(AlterFunctionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(func);
 	COPY_NODE_FIELD(actions);
 
@@ -3213,6 +3265,8 @@ _copyDoStmt(const DoStmt *from)
 {
 	DoStmt	   *newnode = makeNode(DoStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(args);
 
 	return newnode;
@@ -3223,6 +3277,8 @@ _copyRenameStmt(const RenameStmt *from)
 {
 	RenameStmt *newnode = makeNode(RenameStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(renameType);
 	COPY_SCALAR_FIELD(relationType);
 	COPY_NODE_FIELD(relation);
@@ -3241,6 +3297,8 @@ _copyAlterObjectDependsStmt(const AlterObjectDependsStmt *from)
 {
 	AlterObjectDependsStmt *newnode = makeNode(AlterObjectDependsStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(objectType);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(objname);
@@ -3255,6 +3313,8 @@ _copyAlterObjectSchemaStmt(const AlterObjectSchemaStmt *from)
 {
 	AlterObjectSchemaStmt *newnode = makeNode(AlterObjectSchemaStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(objectType);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(object);
@@ -3270,6 +3330,8 @@ _copyAlterOwnerStmt(const AlterOwnerStmt *from)
 {
 	AlterOwnerStmt *newnode = makeNode(AlterOwnerStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(objectType);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(object);
@@ -3284,6 +3346,8 @@ _copyAlterOperatorStmt(const AlterOperatorStmt *from)
 {
 	AlterOperatorStmt *newnode = makeNode(AlterOperatorStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(opername);
 	COPY_NODE_FIELD(operargs);
 	COPY_NODE_FIELD(options);
@@ -3296,6 +3360,8 @@ _copyRuleStmt(const RuleStmt *from)
 {
 	RuleStmt   *newnode = makeNode(RuleStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relation);
 	COPY_STRING_FIELD(rulename);
 	COPY_NODE_FIELD(whereClause);
@@ -3312,6 +3378,8 @@ _copyNotifyStmt(const NotifyStmt *from)
 {
 	NotifyStmt *newnode = makeNode(NotifyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(conditionname);
 	COPY_STRING_FIELD(payload);
 
@@ -3323,6 +3391,8 @@ _copyListenStmt(const ListenStmt *from)
 {
 	ListenStmt *newnode = makeNode(ListenStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(conditionname);
 
 	return newnode;
@@ -3333,6 +3403,8 @@ _copyUnlistenStmt(const UnlistenStmt *from)
 {
 	UnlistenStmt *newnode = makeNode(UnlistenStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(conditionname);
 
 	return newnode;
@@ -3343,6 +3415,8 @@ _copyTransactionStmt(const TransactionStmt *from)
 {
 	TransactionStmt *newnode = makeNode(TransactionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(kind);
 	COPY_NODE_FIELD(options);
 	COPY_STRING_FIELD(gid);
@@ -3355,6 +3429,8 @@ _copyCompositeTypeStmt(const CompositeTypeStmt *from)
 {
 	CompositeTypeStmt *newnode = makeNode(CompositeTypeStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(typevar);
 	COPY_NODE_FIELD(coldeflist);
 
@@ -3366,6 +3442,8 @@ _copyCreateEnumStmt(const CreateEnumStmt *from)
 {
 	CreateEnumStmt *newnode = makeNode(CreateEnumStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(typeName);
 	COPY_NODE_FIELD(vals);
 
@@ -3377,6 +3455,8 @@ _copyCreateRangeStmt(const CreateRangeStmt *from)
 {
 	CreateRangeStmt *newnode = makeNode(CreateRangeStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(typeName);
 	COPY_NODE_FIELD(params);
 
@@ -3388,6 +3468,8 @@ _copyAlterEnumStmt(const AlterEnumStmt *from)
 {
 	AlterEnumStmt *newnode = makeNode(AlterEnumStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(typeName);
 	COPY_STRING_FIELD(oldVal);
 	COPY_STRING_FIELD(newVal);
@@ -3403,6 +3485,8 @@ _copyViewStmt(const ViewStmt *from)
 {
 	ViewStmt   *newnode = makeNode(ViewStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(view);
 	COPY_NODE_FIELD(aliases);
 	COPY_NODE_FIELD(query);
@@ -3418,6 +3502,8 @@ _copyLoadStmt(const LoadStmt *from)
 {
 	LoadStmt   *newnode = makeNode(LoadStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(filename);
 
 	return newnode;
@@ -3428,6 +3514,8 @@ _copyCreateDomainStmt(const CreateDomainStmt *from)
 {
 	CreateDomainStmt *newnode = makeNode(CreateDomainStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(domainname);
 	COPY_NODE_FIELD(typeName);
 	COPY_NODE_FIELD(collClause);
@@ -3441,6 +3529,8 @@ _copyCreateOpClassStmt(const CreateOpClassStmt *from)
 {
 	CreateOpClassStmt *newnode = makeNode(CreateOpClassStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(opclassname);
 	COPY_NODE_FIELD(opfamilyname);
 	COPY_STRING_FIELD(amname);
@@ -3472,6 +3562,8 @@ _copyCreateOpFamilyStmt(const CreateOpFamilyStmt *from)
 {
 	CreateOpFamilyStmt *newnode = makeNode(CreateOpFamilyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(opfamilyname);
 	COPY_STRING_FIELD(amname);
 
@@ -3483,6 +3575,8 @@ _copyAlterOpFamilyStmt(const AlterOpFamilyStmt *from)
 {
 	AlterOpFamilyStmt *newnode = makeNode(AlterOpFamilyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(opfamilyname);
 	COPY_STRING_FIELD(amname);
 	COPY_SCALAR_FIELD(isDrop);
@@ -3496,6 +3590,8 @@ _copyCreatedbStmt(const CreatedbStmt *from)
 {
 	CreatedbStmt *newnode = makeNode(CreatedbStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(dbname);
 	COPY_NODE_FIELD(options);
 
@@ -3507,6 +3603,8 @@ _copyAlterDatabaseStmt(const AlterDatabaseStmt *from)
 {
 	AlterDatabaseStmt *newnode = makeNode(AlterDatabaseStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(dbname);
 	COPY_NODE_FIELD(options);
 
@@ -3518,6 +3616,8 @@ _copyAlterDatabaseSetStmt(const AlterDatabaseSetStmt *from)
 {
 	AlterDatabaseSetStmt *newnode = makeNode(AlterDatabaseSetStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(dbname);
 	COPY_NODE_FIELD(setstmt);
 
@@ -3529,6 +3629,8 @@ _copyDropdbStmt(const DropdbStmt *from)
 {
 	DropdbStmt *newnode = makeNode(DropdbStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(dbname);
 	COPY_SCALAR_FIELD(missing_ok);
 
@@ -3540,6 +3642,8 @@ _copyVacuumStmt(const VacuumStmt *from)
 {
 	VacuumStmt *newnode = makeNode(VacuumStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(options);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(va_cols);
@@ -3552,6 +3656,8 @@ _copyExplainStmt(const ExplainStmt *from)
 {
 	ExplainStmt *newnode = makeNode(ExplainStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(query);
 	COPY_NODE_FIELD(options);
 
@@ -3563,6 +3669,8 @@ _copyCreateTableAsStmt(const CreateTableAsStmt *from)
 {
 	CreateTableAsStmt *newnode = makeNode(CreateTableAsStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(query);
 	COPY_NODE_FIELD(into);
 	COPY_SCALAR_FIELD(relkind);
@@ -3577,6 +3685,8 @@ _copyRefreshMatViewStmt(const RefreshMatViewStmt *from)
 {
 	RefreshMatViewStmt *newnode = makeNode(RefreshMatViewStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(concurrent);
 	COPY_SCALAR_FIELD(skipData);
 	COPY_NODE_FIELD(relation);
@@ -3589,6 +3699,8 @@ _copyReplicaIdentityStmt(const ReplicaIdentityStmt *from)
 {
 	ReplicaIdentityStmt *newnode = makeNode(ReplicaIdentityStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(identity_type);
 	COPY_STRING_FIELD(name);
 
@@ -3600,6 +3712,8 @@ _copyAlterSystemStmt(const AlterSystemStmt *from)
 {
 	AlterSystemStmt *newnode = makeNode(AlterSystemStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(setstmt);
 
 	return newnode;
@@ -3610,6 +3724,8 @@ _copyCreateSeqStmt(const CreateSeqStmt *from)
 {
 	CreateSeqStmt *newnode = makeNode(CreateSeqStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(sequence);
 	COPY_NODE_FIELD(options);
 	COPY_SCALAR_FIELD(ownerId);
@@ -3623,6 +3739,8 @@ _copyAlterSeqStmt(const AlterSeqStmt *from)
 {
 	AlterSeqStmt *newnode = makeNode(AlterSeqStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(sequence);
 	COPY_NODE_FIELD(options);
 	COPY_SCALAR_FIELD(missing_ok);
@@ -3635,6 +3753,8 @@ _copyVariableSetStmt(const VariableSetStmt *from)
 {
 	VariableSetStmt *newnode = makeNode(VariableSetStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(kind);
 	COPY_STRING_FIELD(name);
 	COPY_NODE_FIELD(args);
@@ -3648,6 +3768,8 @@ _copyVariableShowStmt(const VariableShowStmt *from)
 {
 	VariableShowStmt *newnode = makeNode(VariableShowStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(name);
 
 	return newnode;
@@ -3658,6 +3780,8 @@ _copyDiscardStmt(const DiscardStmt *from)
 {
 	DiscardStmt *newnode = makeNode(DiscardStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(target);
 
 	return newnode;
@@ -3668,9 +3792,11 @@ _copyCreateTableSpaceStmt(const CreateTableSpaceStmt *from)
 {
 	CreateTableSpaceStmt *newnode = makeNode(CreateTableSpaceStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(tablespacename);
 	COPY_NODE_FIELD(owner);
-	COPY_STRING_FIELD(location);
+	COPY_STRING_FIELD(location_dir);
 	COPY_NODE_FIELD(options);
 
 	return newnode;
@@ -3681,6 +3807,8 @@ _copyDropTableSpaceStmt(const DropTableSpaceStmt *from)
 {
 	DropTableSpaceStmt *newnode = makeNode(DropTableSpaceStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(tablespacename);
 	COPY_SCALAR_FIELD(missing_ok);
 
@@ -3692,6 +3820,8 @@ _copyAlterTableSpaceOptionsStmt(const AlterTableSpaceOptionsStmt *from)
 {
 	AlterTableSpaceOptionsStmt *newnode = makeNode(AlterTableSpaceOptionsStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(tablespacename);
 	COPY_NODE_FIELD(options);
 	COPY_SCALAR_FIELD(isReset);
@@ -3704,6 +3834,8 @@ _copyAlterTableMoveAllStmt(const AlterTableMoveAllStmt *from)
 {
 	AlterTableMoveAllStmt *newnode = makeNode(AlterTableMoveAllStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(orig_tablespacename);
 	COPY_SCALAR_FIELD(objtype);
 	COPY_NODE_FIELD(roles);
@@ -3718,6 +3850,8 @@ _copyCreateExtensionStmt(const CreateExtensionStmt *from)
 {
 	CreateExtensionStmt *newnode = makeNode(CreateExtensionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(extname);
 	COPY_SCALAR_FIELD(if_not_exists);
 	COPY_NODE_FIELD(options);
@@ -3730,6 +3864,8 @@ _copyAlterExtensionStmt(const AlterExtensionStmt *from)
 {
 	AlterExtensionStmt *newnode = makeNode(AlterExtensionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(extname);
 	COPY_NODE_FIELD(options);
 
@@ -3741,6 +3877,8 @@ _copyAlterExtensionContentsStmt(const AlterExtensionContentsStmt *from)
 {
 	AlterExtensionContentsStmt *newnode = makeNode(AlterExtensionContentsStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(extname);
 	COPY_SCALAR_FIELD(action);
 	COPY_SCALAR_FIELD(objtype);
@@ -3755,6 +3893,8 @@ _copyCreateFdwStmt(const CreateFdwStmt *from)
 {
 	CreateFdwStmt *newnode = makeNode(CreateFdwStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(fdwname);
 	COPY_NODE_FIELD(func_options);
 	COPY_NODE_FIELD(options);
@@ -3767,6 +3907,8 @@ _copyAlterFdwStmt(const AlterFdwStmt *from)
 {
 	AlterFdwStmt *newnode = makeNode(AlterFdwStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(fdwname);
 	COPY_NODE_FIELD(func_options);
 	COPY_NODE_FIELD(options);
@@ -3779,6 +3921,8 @@ _copyCreateForeignServerStmt(const CreateForeignServerStmt *from)
 {
 	CreateForeignServerStmt *newnode = makeNode(CreateForeignServerStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(servername);
 	COPY_STRING_FIELD(servertype);
 	COPY_STRING_FIELD(version);
@@ -3793,6 +3937,8 @@ _copyAlterForeignServerStmt(const AlterForeignServerStmt *from)
 {
 	AlterForeignServerStmt *newnode = makeNode(AlterForeignServerStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(servername);
 	COPY_STRING_FIELD(version);
 	COPY_NODE_FIELD(options);
@@ -3806,6 +3952,8 @@ _copyCreateUserMappingStmt(const CreateUserMappingStmt *from)
 {
 	CreateUserMappingStmt *newnode = makeNode(CreateUserMappingStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(user);
 	COPY_STRING_FIELD(servername);
 	COPY_NODE_FIELD(options);
@@ -3818,6 +3966,8 @@ _copyAlterUserMappingStmt(const AlterUserMappingStmt *from)
 {
 	AlterUserMappingStmt *newnode = makeNode(AlterUserMappingStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(user);
 	COPY_STRING_FIELD(servername);
 	COPY_NODE_FIELD(options);
@@ -3830,6 +3980,8 @@ _copyDropUserMappingStmt(const DropUserMappingStmt *from)
 {
 	DropUserMappingStmt *newnode = makeNode(DropUserMappingStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(user);
 	COPY_STRING_FIELD(servername);
 	COPY_SCALAR_FIELD(missing_ok);
@@ -3855,6 +4007,8 @@ _copyImportForeignSchemaStmt(const ImportForeignSchemaStmt *from)
 {
 	ImportForeignSchemaStmt *newnode = makeNode(ImportForeignSchemaStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(server_name);
 	COPY_STRING_FIELD(remote_schema);
 	COPY_STRING_FIELD(local_schema);
@@ -3870,6 +4024,8 @@ _copyCreateTransformStmt(const CreateTransformStmt *from)
 {
 	CreateTransformStmt *newnode = makeNode(CreateTransformStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(replace);
 	COPY_NODE_FIELD(type_name);
 	COPY_STRING_FIELD(lang);
@@ -3884,6 +4040,8 @@ _copyCreateAmStmt(const CreateAmStmt *from)
 {
 	CreateAmStmt *newnode = makeNode(CreateAmStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(amname);
 	COPY_NODE_FIELD(handler_name);
 	COPY_SCALAR_FIELD(amtype);
@@ -3896,6 +4054,8 @@ _copyCreateTrigStmt(const CreateTrigStmt *from)
 {
 	CreateTrigStmt *newnode = makeNode(CreateTrigStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(trigname);
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(funcname);
@@ -3919,6 +4079,8 @@ _copyCreateEventTrigStmt(const CreateEventTrigStmt *from)
 {
 	CreateEventTrigStmt *newnode = makeNode(CreateEventTrigStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(trigname);
 	COPY_STRING_FIELD(eventname);
 	COPY_NODE_FIELD(whenclause);
@@ -3932,6 +4094,8 @@ _copyAlterEventTrigStmt(const AlterEventTrigStmt *from)
 {
 	AlterEventTrigStmt *newnode = makeNode(AlterEventTrigStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(trigname);
 	COPY_SCALAR_FIELD(tgenabled);
 
@@ -3943,6 +4107,8 @@ _copyCreatePLangStmt(const CreatePLangStmt *from)
 {
 	CreatePLangStmt *newnode = makeNode(CreatePLangStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(replace);
 	COPY_STRING_FIELD(plname);
 	COPY_NODE_FIELD(plhandler);
@@ -3958,6 +4124,8 @@ _copyCreateRoleStmt(const CreateRoleStmt *from)
 {
 	CreateRoleStmt *newnode = makeNode(CreateRoleStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(stmt_type);
 	COPY_STRING_FIELD(role);
 	COPY_NODE_FIELD(options);
@@ -3970,6 +4138,8 @@ _copyAlterRoleStmt(const AlterRoleStmt *from)
 {
 	AlterRoleStmt *newnode = makeNode(AlterRoleStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(role);
 	COPY_NODE_FIELD(options);
 	COPY_SCALAR_FIELD(action);
@@ -3982,6 +4152,8 @@ _copyAlterRoleSetStmt(const AlterRoleSetStmt *from)
 {
 	AlterRoleSetStmt *newnode = makeNode(AlterRoleSetStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(role);
 	COPY_STRING_FIELD(database);
 	COPY_NODE_FIELD(setstmt);
@@ -3994,6 +4166,8 @@ _copyDropRoleStmt(const DropRoleStmt *from)
 {
 	DropRoleStmt *newnode = makeNode(DropRoleStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(roles);
 	COPY_SCALAR_FIELD(missing_ok);
 
@@ -4005,6 +4179,8 @@ _copyLockStmt(const LockStmt *from)
 {
 	LockStmt   *newnode = makeNode(LockStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(relations);
 	COPY_SCALAR_FIELD(mode);
 	COPY_SCALAR_FIELD(nowait);
@@ -4017,6 +4193,8 @@ _copyConstraintsSetStmt(const ConstraintsSetStmt *from)
 {
 	ConstraintsSetStmt *newnode = makeNode(ConstraintsSetStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(constraints);
 	COPY_SCALAR_FIELD(deferred);
 
@@ -4028,6 +4206,8 @@ _copyReindexStmt(const ReindexStmt *from)
 {
 	ReindexStmt *newnode = makeNode(ReindexStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(kind);
 	COPY_NODE_FIELD(relation);
 	COPY_STRING_FIELD(name);
@@ -4041,6 +4221,8 @@ _copyCreateSchemaStmt(const CreateSchemaStmt *from)
 {
 	CreateSchemaStmt *newnode = makeNode(CreateSchemaStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(schemaname);
 	COPY_NODE_FIELD(authrole);
 	COPY_NODE_FIELD(schemaElts);
@@ -4054,6 +4236,8 @@ _copyCreateConversionStmt(const CreateConversionStmt *from)
 {
 	CreateConversionStmt *newnode = makeNode(CreateConversionStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(conversion_name);
 	COPY_STRING_FIELD(for_encoding_name);
 	COPY_STRING_FIELD(to_encoding_name);
@@ -4068,6 +4252,8 @@ _copyCreateCastStmt(const CreateCastStmt *from)
 {
 	CreateCastStmt *newnode = makeNode(CreateCastStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(sourcetype);
 	COPY_NODE_FIELD(targettype);
 	COPY_NODE_FIELD(func);
@@ -4082,6 +4268,8 @@ _copyPrepareStmt(const PrepareStmt *from)
 {
 	PrepareStmt *newnode = makeNode(PrepareStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(name);
 	COPY_NODE_FIELD(argtypes);
 	COPY_NODE_FIELD(query);
@@ -4094,6 +4282,8 @@ _copyExecuteStmt(const ExecuteStmt *from)
 {
 	ExecuteStmt *newnode = makeNode(ExecuteStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(name);
 	COPY_NODE_FIELD(params);
 
@@ -4105,6 +4295,8 @@ _copyDeallocateStmt(const DeallocateStmt *from)
 {
 	DeallocateStmt *newnode = makeNode(DeallocateStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(name);
 
 	return newnode;
@@ -4115,6 +4307,8 @@ _copyDropOwnedStmt(const DropOwnedStmt *from)
 {
 	DropOwnedStmt *newnode = makeNode(DropOwnedStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(roles);
 	COPY_SCALAR_FIELD(behavior);
 
@@ -4126,6 +4320,8 @@ _copyReassignOwnedStmt(const ReassignOwnedStmt *from)
 {
 	ReassignOwnedStmt *newnode = makeNode(ReassignOwnedStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(roles);
 	COPY_NODE_FIELD(newrole);
 
@@ -4137,6 +4333,8 @@ _copyAlterTSDictionaryStmt(const AlterTSDictionaryStmt *from)
 {
 	AlterTSDictionaryStmt *newnode = makeNode(AlterTSDictionaryStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_NODE_FIELD(dictname);
 	COPY_NODE_FIELD(options);
 
@@ -4148,6 +4346,8 @@ _copyAlterTSConfigurationStmt(const AlterTSConfigurationStmt *from)
 {
 	AlterTSConfigurationStmt *newnode = makeNode(AlterTSConfigurationStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_SCALAR_FIELD(kind);
 	COPY_NODE_FIELD(cfgname);
 	COPY_NODE_FIELD(tokentype);
@@ -4164,6 +4364,8 @@ _copyCreatePolicyStmt(const CreatePolicyStmt *from)
 {
 	CreatePolicyStmt *newnode = makeNode(CreatePolicyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(policy_name);
 	COPY_NODE_FIELD(table);
 	COPY_STRING_FIELD(cmd_name);
@@ -4180,6 +4382,8 @@ _copyAlterPolicyStmt(const AlterPolicyStmt *from)
 {
 	AlterPolicyStmt *newnode = makeNode(AlterPolicyStmt);
 
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
 	COPY_STRING_FIELD(policy_name);
 	COPY_NODE_FIELD(table);
 	COPY_NODE_FIELD(roles);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 548a2aa..8916028 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -913,6 +913,8 @@ _equalExtensibleNode(const ExtensibleNode *a, const ExtensibleNode *b)
 static bool
 _equalQuery(const Query *a, const Query *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(commandType);
 	COMPARE_SCALAR_FIELD(querySource);
 	/* we intentionally ignore queryId, since it might not be set */
@@ -953,6 +955,8 @@ _equalQuery(const Query *a, const Query *b)
 static bool
 _equalInsertStmt(const InsertStmt *a, const InsertStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(cols);
 	COMPARE_NODE_FIELD(selectStmt);
@@ -966,6 +970,8 @@ _equalInsertStmt(const InsertStmt *a, const InsertStmt *b)
 static bool
 _equalDeleteStmt(const DeleteStmt *a, const DeleteStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(usingClause);
 	COMPARE_NODE_FIELD(whereClause);
@@ -978,6 +984,8 @@ _equalDeleteStmt(const DeleteStmt *a, const DeleteStmt *b)
 static bool
 _equalUpdateStmt(const UpdateStmt *a, const UpdateStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(targetList);
 	COMPARE_NODE_FIELD(whereClause);
@@ -991,6 +999,8 @@ _equalUpdateStmt(const UpdateStmt *a, const UpdateStmt *b)
 static bool
 _equalSelectStmt(const SelectStmt *a, const SelectStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(distinctClause);
 	COMPARE_NODE_FIELD(intoClause);
 	COMPARE_NODE_FIELD(targetList);
@@ -1016,6 +1026,8 @@ _equalSelectStmt(const SelectStmt *a, const SelectStmt *b)
 static bool
 _equalSetOperationStmt(const SetOperationStmt *a, const SetOperationStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(op);
 	COMPARE_SCALAR_FIELD(all);
 	COMPARE_NODE_FIELD(larg);
@@ -1031,6 +1043,8 @@ _equalSetOperationStmt(const SetOperationStmt *a, const SetOperationStmt *b)
 static bool
 _equalAlterTableStmt(const AlterTableStmt *a, const AlterTableStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(cmds);
 	COMPARE_SCALAR_FIELD(relkind);
@@ -1055,6 +1069,8 @@ _equalAlterTableCmd(const AlterTableCmd *a, const AlterTableCmd *b)
 static bool
 _equalAlterDomainStmt(const AlterDomainStmt *a, const AlterDomainStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(subtype);
 	COMPARE_NODE_FIELD(typeName);
 	COMPARE_STRING_FIELD(name);
@@ -1068,6 +1084,8 @@ _equalAlterDomainStmt(const AlterDomainStmt *a, const AlterDomainStmt *b)
 static bool
 _equalGrantStmt(const GrantStmt *a, const GrantStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(is_grant);
 	COMPARE_SCALAR_FIELD(targtype);
 	COMPARE_SCALAR_FIELD(objtype);
@@ -1101,6 +1119,8 @@ _equalAccessPriv(const AccessPriv *a, const AccessPriv *b)
 static bool
 _equalGrantRoleStmt(const GrantRoleStmt *a, const GrantRoleStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(granted_roles);
 	COMPARE_NODE_FIELD(grantee_roles);
 	COMPARE_SCALAR_FIELD(is_grant);
@@ -1114,6 +1134,8 @@ _equalGrantRoleStmt(const GrantRoleStmt *a, const GrantRoleStmt *b)
 static bool
 _equalAlterDefaultPrivilegesStmt(const AlterDefaultPrivilegesStmt *a, const AlterDefaultPrivilegesStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_NODE_FIELD(action);
 
@@ -1123,6 +1145,8 @@ _equalAlterDefaultPrivilegesStmt(const AlterDefaultPrivilegesStmt *a, const Alte
 static bool
 _equalDeclareCursorStmt(const DeclareCursorStmt *a, const DeclareCursorStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(portalname);
 	COMPARE_SCALAR_FIELD(options);
 	COMPARE_NODE_FIELD(query);
@@ -1133,6 +1157,8 @@ _equalDeclareCursorStmt(const DeclareCursorStmt *a, const DeclareCursorStmt *b)
 static bool
 _equalClosePortalStmt(const ClosePortalStmt *a, const ClosePortalStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(portalname);
 
 	return true;
@@ -1141,6 +1167,8 @@ _equalClosePortalStmt(const ClosePortalStmt *a, const ClosePortalStmt *b)
 static bool
 _equalClusterStmt(const ClusterStmt *a, const ClusterStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_STRING_FIELD(indexname);
 	COMPARE_SCALAR_FIELD(verbose);
@@ -1151,6 +1179,8 @@ _equalClusterStmt(const ClusterStmt *a, const ClusterStmt *b)
 static bool
 _equalCopyStmt(const CopyStmt *a, const CopyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(query);
 	COMPARE_NODE_FIELD(attlist);
@@ -1165,6 +1195,8 @@ _equalCopyStmt(const CopyStmt *a, const CopyStmt *b)
 static bool
 _equalCreateStmt(const CreateStmt *a, const CreateStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(tableElts);
 	COMPARE_NODE_FIELD(inhRelations);
@@ -1192,6 +1224,8 @@ _equalTableLikeClause(const TableLikeClause *a, const TableLikeClause *b)
 static bool
 _equalDefineStmt(const DefineStmt *a, const DefineStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_SCALAR_FIELD(oldstyle);
 	COMPARE_NODE_FIELD(defnames);
@@ -1204,6 +1238,8 @@ _equalDefineStmt(const DefineStmt *a, const DefineStmt *b)
 static bool
 _equalDropStmt(const DropStmt *a, const DropStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(objects);
 	COMPARE_NODE_FIELD(arguments);
 	COMPARE_SCALAR_FIELD(removeType);
@@ -1217,6 +1253,8 @@ _equalDropStmt(const DropStmt *a, const DropStmt *b)
 static bool
 _equalTruncateStmt(const TruncateStmt *a, const TruncateStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relations);
 	COMPARE_SCALAR_FIELD(restart_seqs);
 	COMPARE_SCALAR_FIELD(behavior);
@@ -1227,6 +1265,8 @@ _equalTruncateStmt(const TruncateStmt *a, const TruncateStmt *b)
 static bool
 _equalCommentStmt(const CommentStmt *a, const CommentStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(objtype);
 	COMPARE_NODE_FIELD(objname);
 	COMPARE_NODE_FIELD(objargs);
@@ -1238,6 +1278,8 @@ _equalCommentStmt(const CommentStmt *a, const CommentStmt *b)
 static bool
 _equalSecLabelStmt(const SecLabelStmt *a, const SecLabelStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(objtype);
 	COMPARE_NODE_FIELD(objname);
 	COMPARE_NODE_FIELD(objargs);
@@ -1250,6 +1292,8 @@ _equalSecLabelStmt(const SecLabelStmt *a, const SecLabelStmt *b)
 static bool
 _equalFetchStmt(const FetchStmt *a, const FetchStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(direction);
 	COMPARE_SCALAR_FIELD(howMany);
 	COMPARE_STRING_FIELD(portalname);
@@ -1261,6 +1305,8 @@ _equalFetchStmt(const FetchStmt *a, const FetchStmt *b)
 static bool
 _equalIndexStmt(const IndexStmt *a, const IndexStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(idxname);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_STRING_FIELD(accessMethod);
@@ -1287,6 +1333,8 @@ _equalIndexStmt(const IndexStmt *a, const IndexStmt *b)
 static bool
 _equalCreateFunctionStmt(const CreateFunctionStmt *a, const CreateFunctionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(replace);
 	COMPARE_NODE_FIELD(funcname);
 	COMPARE_NODE_FIELD(parameters);
@@ -1311,6 +1359,8 @@ _equalFunctionParameter(const FunctionParameter *a, const FunctionParameter *b)
 static bool
 _equalAlterFunctionStmt(const AlterFunctionStmt *a, const AlterFunctionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(func);
 	COMPARE_NODE_FIELD(actions);
 
@@ -1320,6 +1370,8 @@ _equalAlterFunctionStmt(const AlterFunctionStmt *a, const AlterFunctionStmt *b)
 static bool
 _equalDoStmt(const DoStmt *a, const DoStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(args);
 
 	return true;
@@ -1328,6 +1380,8 @@ _equalDoStmt(const DoStmt *a, const DoStmt *b)
 static bool
 _equalRenameStmt(const RenameStmt *a, const RenameStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(renameType);
 	COMPARE_SCALAR_FIELD(relationType);
 	COMPARE_NODE_FIELD(relation);
@@ -1344,6 +1398,8 @@ _equalRenameStmt(const RenameStmt *a, const RenameStmt *b)
 static bool
 _equalAlterObjectDependsStmt(const AlterObjectDependsStmt *a, const AlterObjectDependsStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(objectType);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(objname);
@@ -1356,6 +1412,8 @@ _equalAlterObjectDependsStmt(const AlterObjectDependsStmt *a, const AlterObjectD
 static bool
 _equalAlterObjectSchemaStmt(const AlterObjectSchemaStmt *a, const AlterObjectSchemaStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(objectType);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(object);
@@ -1369,6 +1427,8 @@ _equalAlterObjectSchemaStmt(const AlterObjectSchemaStmt *a, const AlterObjectSch
 static bool
 _equalAlterOwnerStmt(const AlterOwnerStmt *a, const AlterOwnerStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(objectType);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(object);
@@ -1381,6 +1441,8 @@ _equalAlterOwnerStmt(const AlterOwnerStmt *a, const AlterOwnerStmt *b)
 static bool
 _equalAlterOperatorStmt(const AlterOperatorStmt *a, const AlterOperatorStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(opername);
 	COMPARE_NODE_FIELD(operargs);
 	COMPARE_NODE_FIELD(options);
@@ -1391,6 +1453,8 @@ _equalAlterOperatorStmt(const AlterOperatorStmt *a, const AlterOperatorStmt *b)
 static bool
 _equalRuleStmt(const RuleStmt *a, const RuleStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_STRING_FIELD(rulename);
 	COMPARE_NODE_FIELD(whereClause);
@@ -1405,6 +1469,8 @@ _equalRuleStmt(const RuleStmt *a, const RuleStmt *b)
 static bool
 _equalNotifyStmt(const NotifyStmt *a, const NotifyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(conditionname);
 	COMPARE_STRING_FIELD(payload);
 
@@ -1414,6 +1480,8 @@ _equalNotifyStmt(const NotifyStmt *a, const NotifyStmt *b)
 static bool
 _equalListenStmt(const ListenStmt *a, const ListenStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(conditionname);
 
 	return true;
@@ -1422,6 +1490,8 @@ _equalListenStmt(const ListenStmt *a, const ListenStmt *b)
 static bool
 _equalUnlistenStmt(const UnlistenStmt *a, const UnlistenStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(conditionname);
 
 	return true;
@@ -1430,6 +1500,8 @@ _equalUnlistenStmt(const UnlistenStmt *a, const UnlistenStmt *b)
 static bool
 _equalTransactionStmt(const TransactionStmt *a, const TransactionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_STRING_FIELD(gid);
@@ -1440,6 +1512,8 @@ _equalTransactionStmt(const TransactionStmt *a, const TransactionStmt *b)
 static bool
 _equalCompositeTypeStmt(const CompositeTypeStmt *a, const CompositeTypeStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(typevar);
 	COMPARE_NODE_FIELD(coldeflist);
 
@@ -1449,6 +1523,8 @@ _equalCompositeTypeStmt(const CompositeTypeStmt *a, const CompositeTypeStmt *b)
 static bool
 _equalCreateEnumStmt(const CreateEnumStmt *a, const CreateEnumStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(typeName);
 	COMPARE_NODE_FIELD(vals);
 
@@ -1458,6 +1534,8 @@ _equalCreateEnumStmt(const CreateEnumStmt *a, const CreateEnumStmt *b)
 static bool
 _equalCreateRangeStmt(const CreateRangeStmt *a, const CreateRangeStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(typeName);
 	COMPARE_NODE_FIELD(params);
 
@@ -1467,6 +1545,8 @@ _equalCreateRangeStmt(const CreateRangeStmt *a, const CreateRangeStmt *b)
 static bool
 _equalAlterEnumStmt(const AlterEnumStmt *a, const AlterEnumStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(typeName);
 	COMPARE_STRING_FIELD(oldVal);
 	COMPARE_STRING_FIELD(newVal);
@@ -1480,6 +1560,8 @@ _equalAlterEnumStmt(const AlterEnumStmt *a, const AlterEnumStmt *b)
 static bool
 _equalViewStmt(const ViewStmt *a, const ViewStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(view);
 	COMPARE_NODE_FIELD(aliases);
 	COMPARE_NODE_FIELD(query);
@@ -1493,6 +1575,8 @@ _equalViewStmt(const ViewStmt *a, const ViewStmt *b)
 static bool
 _equalLoadStmt(const LoadStmt *a, const LoadStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(filename);
 
 	return true;
@@ -1501,6 +1585,8 @@ _equalLoadStmt(const LoadStmt *a, const LoadStmt *b)
 static bool
 _equalCreateDomainStmt(const CreateDomainStmt *a, const CreateDomainStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(domainname);
 	COMPARE_NODE_FIELD(typeName);
 	COMPARE_NODE_FIELD(collClause);
@@ -1512,6 +1598,8 @@ _equalCreateDomainStmt(const CreateDomainStmt *a, const CreateDomainStmt *b)
 static bool
 _equalCreateOpClassStmt(const CreateOpClassStmt *a, const CreateOpClassStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(opclassname);
 	COMPARE_NODE_FIELD(opfamilyname);
 	COMPARE_STRING_FIELD(amname);
@@ -1539,6 +1627,8 @@ _equalCreateOpClassItem(const CreateOpClassItem *a, const CreateOpClassItem *b)
 static bool
 _equalCreateOpFamilyStmt(const CreateOpFamilyStmt *a, const CreateOpFamilyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(opfamilyname);
 	COMPARE_STRING_FIELD(amname);
 
@@ -1548,6 +1638,8 @@ _equalCreateOpFamilyStmt(const CreateOpFamilyStmt *a, const CreateOpFamilyStmt *
 static bool
 _equalAlterOpFamilyStmt(const AlterOpFamilyStmt *a, const AlterOpFamilyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(opfamilyname);
 	COMPARE_STRING_FIELD(amname);
 	COMPARE_SCALAR_FIELD(isDrop);
@@ -1559,6 +1651,8 @@ _equalAlterOpFamilyStmt(const AlterOpFamilyStmt *a, const AlterOpFamilyStmt *b)
 static bool
 _equalCreatedbStmt(const CreatedbStmt *a, const CreatedbStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(dbname);
 	COMPARE_NODE_FIELD(options);
 
@@ -1568,6 +1662,8 @@ _equalCreatedbStmt(const CreatedbStmt *a, const CreatedbStmt *b)
 static bool
 _equalAlterDatabaseStmt(const AlterDatabaseStmt *a, const AlterDatabaseStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(dbname);
 	COMPARE_NODE_FIELD(options);
 
@@ -1577,6 +1673,8 @@ _equalAlterDatabaseStmt(const AlterDatabaseStmt *a, const AlterDatabaseStmt *b)
 static bool
 _equalAlterDatabaseSetStmt(const AlterDatabaseSetStmt *a, const AlterDatabaseSetStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(dbname);
 	COMPARE_NODE_FIELD(setstmt);
 
@@ -1586,6 +1684,8 @@ _equalAlterDatabaseSetStmt(const AlterDatabaseSetStmt *a, const AlterDatabaseSet
 static bool
 _equalDropdbStmt(const DropdbStmt *a, const DropdbStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(dbname);
 	COMPARE_SCALAR_FIELD(missing_ok);
 
@@ -1595,6 +1695,8 @@ _equalDropdbStmt(const DropdbStmt *a, const DropdbStmt *b)
 static bool
 _equalVacuumStmt(const VacuumStmt *a, const VacuumStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(options);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(va_cols);
@@ -1605,6 +1707,8 @@ _equalVacuumStmt(const VacuumStmt *a, const VacuumStmt *b)
 static bool
 _equalExplainStmt(const ExplainStmt *a, const ExplainStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(query);
 	COMPARE_NODE_FIELD(options);
 
@@ -1614,6 +1718,8 @@ _equalExplainStmt(const ExplainStmt *a, const ExplainStmt *b)
 static bool
 _equalCreateTableAsStmt(const CreateTableAsStmt *a, const CreateTableAsStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(query);
 	COMPARE_NODE_FIELD(into);
 	COMPARE_SCALAR_FIELD(relkind);
@@ -1626,6 +1732,8 @@ _equalCreateTableAsStmt(const CreateTableAsStmt *a, const CreateTableAsStmt *b)
 static bool
 _equalRefreshMatViewStmt(const RefreshMatViewStmt *a, const RefreshMatViewStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(concurrent);
 	COMPARE_SCALAR_FIELD(skipData);
 	COMPARE_NODE_FIELD(relation);
@@ -1636,6 +1744,8 @@ _equalRefreshMatViewStmt(const RefreshMatViewStmt *a, const RefreshMatViewStmt *
 static bool
 _equalReplicaIdentityStmt(const ReplicaIdentityStmt *a, const ReplicaIdentityStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(identity_type);
 	COMPARE_STRING_FIELD(name);
 
@@ -1645,6 +1755,8 @@ _equalReplicaIdentityStmt(const ReplicaIdentityStmt *a, const ReplicaIdentityStm
 static bool
 _equalAlterSystemStmt(const AlterSystemStmt *a, const AlterSystemStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(setstmt);
 
 	return true;
@@ -1654,6 +1766,8 @@ _equalAlterSystemStmt(const AlterSystemStmt *a, const AlterSystemStmt *b)
 static bool
 _equalCreateSeqStmt(const CreateSeqStmt *a, const CreateSeqStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(sequence);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_SCALAR_FIELD(ownerId);
@@ -1665,6 +1779,8 @@ _equalCreateSeqStmt(const CreateSeqStmt *a, const CreateSeqStmt *b)
 static bool
 _equalAlterSeqStmt(const AlterSeqStmt *a, const AlterSeqStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(sequence);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_SCALAR_FIELD(missing_ok);
@@ -1675,6 +1791,8 @@ _equalAlterSeqStmt(const AlterSeqStmt *a, const AlterSeqStmt *b)
 static bool
 _equalVariableSetStmt(const VariableSetStmt *a, const VariableSetStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_STRING_FIELD(name);
 	COMPARE_NODE_FIELD(args);
@@ -1686,6 +1804,8 @@ _equalVariableSetStmt(const VariableSetStmt *a, const VariableSetStmt *b)
 static bool
 _equalVariableShowStmt(const VariableShowStmt *a, const VariableShowStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(name);
 
 	return true;
@@ -1694,6 +1814,8 @@ _equalVariableShowStmt(const VariableShowStmt *a, const VariableShowStmt *b)
 static bool
 _equalDiscardStmt(const DiscardStmt *a, const DiscardStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(target);
 
 	return true;
@@ -1702,9 +1824,11 @@ _equalDiscardStmt(const DiscardStmt *a, const DiscardStmt *b)
 static bool
 _equalCreateTableSpaceStmt(const CreateTableSpaceStmt *a, const CreateTableSpaceStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(tablespacename);
 	COMPARE_NODE_FIELD(owner);
-	COMPARE_STRING_FIELD(location);
+	COMPARE_STRING_FIELD(location_dir);
 	COMPARE_NODE_FIELD(options);
 
 	return true;
@@ -1713,6 +1837,8 @@ _equalCreateTableSpaceStmt(const CreateTableSpaceStmt *a, const CreateTableSpace
 static bool
 _equalDropTableSpaceStmt(const DropTableSpaceStmt *a, const DropTableSpaceStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(tablespacename);
 	COMPARE_SCALAR_FIELD(missing_ok);
 
@@ -1723,6 +1849,8 @@ static bool
 _equalAlterTableSpaceOptionsStmt(const AlterTableSpaceOptionsStmt *a,
 								 const AlterTableSpaceOptionsStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(tablespacename);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_SCALAR_FIELD(isReset);
@@ -1734,6 +1862,8 @@ static bool
 _equalAlterTableMoveAllStmt(const AlterTableMoveAllStmt *a,
 							const AlterTableMoveAllStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(orig_tablespacename);
 	COMPARE_SCALAR_FIELD(objtype);
 	COMPARE_NODE_FIELD(roles);
@@ -1746,6 +1876,8 @@ _equalAlterTableMoveAllStmt(const AlterTableMoveAllStmt *a,
 static bool
 _equalCreateExtensionStmt(const CreateExtensionStmt *a, const CreateExtensionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(extname);
 	COMPARE_SCALAR_FIELD(if_not_exists);
 	COMPARE_NODE_FIELD(options);
@@ -1756,6 +1888,8 @@ _equalCreateExtensionStmt(const CreateExtensionStmt *a, const CreateExtensionStm
 static bool
 _equalAlterExtensionStmt(const AlterExtensionStmt *a, const AlterExtensionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(extname);
 	COMPARE_NODE_FIELD(options);
 
@@ -1765,6 +1899,8 @@ _equalAlterExtensionStmt(const AlterExtensionStmt *a, const AlterExtensionStmt *
 static bool
 _equalAlterExtensionContentsStmt(const AlterExtensionContentsStmt *a, const AlterExtensionContentsStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(extname);
 	COMPARE_SCALAR_FIELD(action);
 	COMPARE_SCALAR_FIELD(objtype);
@@ -1777,6 +1913,8 @@ _equalAlterExtensionContentsStmt(const AlterExtensionContentsStmt *a, const Alte
 static bool
 _equalCreateFdwStmt(const CreateFdwStmt *a, const CreateFdwStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(fdwname);
 	COMPARE_NODE_FIELD(func_options);
 	COMPARE_NODE_FIELD(options);
@@ -1787,6 +1925,8 @@ _equalCreateFdwStmt(const CreateFdwStmt *a, const CreateFdwStmt *b)
 static bool
 _equalAlterFdwStmt(const AlterFdwStmt *a, const AlterFdwStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(fdwname);
 	COMPARE_NODE_FIELD(func_options);
 	COMPARE_NODE_FIELD(options);
@@ -1797,6 +1937,8 @@ _equalAlterFdwStmt(const AlterFdwStmt *a, const AlterFdwStmt *b)
 static bool
 _equalCreateForeignServerStmt(const CreateForeignServerStmt *a, const CreateForeignServerStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(servername);
 	COMPARE_STRING_FIELD(servertype);
 	COMPARE_STRING_FIELD(version);
@@ -1809,6 +1951,8 @@ _equalCreateForeignServerStmt(const CreateForeignServerStmt *a, const CreateFore
 static bool
 _equalAlterForeignServerStmt(const AlterForeignServerStmt *a, const AlterForeignServerStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(servername);
 	COMPARE_STRING_FIELD(version);
 	COMPARE_NODE_FIELD(options);
@@ -1820,6 +1964,8 @@ _equalAlterForeignServerStmt(const AlterForeignServerStmt *a, const AlterForeign
 static bool
 _equalCreateUserMappingStmt(const CreateUserMappingStmt *a, const CreateUserMappingStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(user);
 	COMPARE_STRING_FIELD(servername);
 	COMPARE_NODE_FIELD(options);
@@ -1830,6 +1976,8 @@ _equalCreateUserMappingStmt(const CreateUserMappingStmt *a, const CreateUserMapp
 static bool
 _equalAlterUserMappingStmt(const AlterUserMappingStmt *a, const AlterUserMappingStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(user);
 	COMPARE_STRING_FIELD(servername);
 	COMPARE_NODE_FIELD(options);
@@ -1840,6 +1988,8 @@ _equalAlterUserMappingStmt(const AlterUserMappingStmt *a, const AlterUserMapping
 static bool
 _equalDropUserMappingStmt(const DropUserMappingStmt *a, const DropUserMappingStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(user);
 	COMPARE_STRING_FIELD(servername);
 	COMPARE_SCALAR_FIELD(missing_ok);
@@ -1862,6 +2012,8 @@ _equalCreateForeignTableStmt(const CreateForeignTableStmt *a, const CreateForeig
 static bool
 _equalImportForeignSchemaStmt(const ImportForeignSchemaStmt *a, const ImportForeignSchemaStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(server_name);
 	COMPARE_STRING_FIELD(remote_schema);
 	COMPARE_STRING_FIELD(local_schema);
@@ -1875,6 +2027,8 @@ _equalImportForeignSchemaStmt(const ImportForeignSchemaStmt *a, const ImportFore
 static bool
 _equalCreateTransformStmt(const CreateTransformStmt *a, const CreateTransformStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(replace);
 	COMPARE_NODE_FIELD(type_name);
 	COMPARE_STRING_FIELD(lang);
@@ -1887,6 +2041,8 @@ _equalCreateTransformStmt(const CreateTransformStmt *a, const CreateTransformStm
 static bool
 _equalCreateAmStmt(const CreateAmStmt *a, const CreateAmStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(amname);
 	COMPARE_NODE_FIELD(handler_name);
 	COMPARE_SCALAR_FIELD(amtype);
@@ -1897,6 +2053,8 @@ _equalCreateAmStmt(const CreateAmStmt *a, const CreateAmStmt *b)
 static bool
 _equalCreateTrigStmt(const CreateTrigStmt *a, const CreateTrigStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(trigname);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(funcname);
@@ -1918,6 +2076,8 @@ _equalCreateTrigStmt(const CreateTrigStmt *a, const CreateTrigStmt *b)
 static bool
 _equalCreateEventTrigStmt(const CreateEventTrigStmt *a, const CreateEventTrigStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(trigname);
 	COMPARE_STRING_FIELD(eventname);
 	COMPARE_NODE_FIELD(whenclause);
@@ -1929,6 +2089,8 @@ _equalCreateEventTrigStmt(const CreateEventTrigStmt *a, const CreateEventTrigStm
 static bool
 _equalAlterEventTrigStmt(const AlterEventTrigStmt *a, const AlterEventTrigStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(trigname);
 	COMPARE_SCALAR_FIELD(tgenabled);
 
@@ -1938,6 +2100,8 @@ _equalAlterEventTrigStmt(const AlterEventTrigStmt *a, const AlterEventTrigStmt *
 static bool
 _equalCreatePLangStmt(const CreatePLangStmt *a, const CreatePLangStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(replace);
 	COMPARE_STRING_FIELD(plname);
 	COMPARE_NODE_FIELD(plhandler);
@@ -1951,6 +2115,8 @@ _equalCreatePLangStmt(const CreatePLangStmt *a, const CreatePLangStmt *b)
 static bool
 _equalCreateRoleStmt(const CreateRoleStmt *a, const CreateRoleStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(stmt_type);
 	COMPARE_STRING_FIELD(role);
 	COMPARE_NODE_FIELD(options);
@@ -1961,6 +2127,8 @@ _equalCreateRoleStmt(const CreateRoleStmt *a, const CreateRoleStmt *b)
 static bool
 _equalAlterRoleStmt(const AlterRoleStmt *a, const AlterRoleStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(role);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_SCALAR_FIELD(action);
@@ -1971,6 +2139,8 @@ _equalAlterRoleStmt(const AlterRoleStmt *a, const AlterRoleStmt *b)
 static bool
 _equalAlterRoleSetStmt(const AlterRoleSetStmt *a, const AlterRoleSetStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(role);
 	COMPARE_STRING_FIELD(database);
 	COMPARE_NODE_FIELD(setstmt);
@@ -1981,6 +2151,8 @@ _equalAlterRoleSetStmt(const AlterRoleSetStmt *a, const AlterRoleSetStmt *b)
 static bool
 _equalDropRoleStmt(const DropRoleStmt *a, const DropRoleStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(roles);
 	COMPARE_SCALAR_FIELD(missing_ok);
 
@@ -1990,6 +2162,8 @@ _equalDropRoleStmt(const DropRoleStmt *a, const DropRoleStmt *b)
 static bool
 _equalLockStmt(const LockStmt *a, const LockStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(relations);
 	COMPARE_SCALAR_FIELD(mode);
 	COMPARE_SCALAR_FIELD(nowait);
@@ -2000,6 +2174,8 @@ _equalLockStmt(const LockStmt *a, const LockStmt *b)
 static bool
 _equalConstraintsSetStmt(const ConstraintsSetStmt *a, const ConstraintsSetStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(constraints);
 	COMPARE_SCALAR_FIELD(deferred);
 
@@ -2009,6 +2185,8 @@ _equalConstraintsSetStmt(const ConstraintsSetStmt *a, const ConstraintsSetStmt *
 static bool
 _equalReindexStmt(const ReindexStmt *a, const ReindexStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_STRING_FIELD(name);
@@ -2020,6 +2198,8 @@ _equalReindexStmt(const ReindexStmt *a, const ReindexStmt *b)
 static bool
 _equalCreateSchemaStmt(const CreateSchemaStmt *a, const CreateSchemaStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(schemaname);
 	COMPARE_NODE_FIELD(authrole);
 	COMPARE_NODE_FIELD(schemaElts);
@@ -2031,6 +2211,8 @@ _equalCreateSchemaStmt(const CreateSchemaStmt *a, const CreateSchemaStmt *b)
 static bool
 _equalCreateConversionStmt(const CreateConversionStmt *a, const CreateConversionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(conversion_name);
 	COMPARE_STRING_FIELD(for_encoding_name);
 	COMPARE_STRING_FIELD(to_encoding_name);
@@ -2043,6 +2225,8 @@ _equalCreateConversionStmt(const CreateConversionStmt *a, const CreateConversion
 static bool
 _equalCreateCastStmt(const CreateCastStmt *a, const CreateCastStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(sourcetype);
 	COMPARE_NODE_FIELD(targettype);
 	COMPARE_NODE_FIELD(func);
@@ -2055,6 +2239,8 @@ _equalCreateCastStmt(const CreateCastStmt *a, const CreateCastStmt *b)
 static bool
 _equalPrepareStmt(const PrepareStmt *a, const PrepareStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(name);
 	COMPARE_NODE_FIELD(argtypes);
 	COMPARE_NODE_FIELD(query);
@@ -2065,6 +2251,8 @@ _equalPrepareStmt(const PrepareStmt *a, const PrepareStmt *b)
 static bool
 _equalExecuteStmt(const ExecuteStmt *a, const ExecuteStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(name);
 	COMPARE_NODE_FIELD(params);
 
@@ -2074,6 +2262,8 @@ _equalExecuteStmt(const ExecuteStmt *a, const ExecuteStmt *b)
 static bool
 _equalDeallocateStmt(const DeallocateStmt *a, const DeallocateStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(name);
 
 	return true;
@@ -2082,6 +2272,8 @@ _equalDeallocateStmt(const DeallocateStmt *a, const DeallocateStmt *b)
 static bool
 _equalDropOwnedStmt(const DropOwnedStmt *a, const DropOwnedStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(roles);
 	COMPARE_SCALAR_FIELD(behavior);
 
@@ -2091,6 +2283,8 @@ _equalDropOwnedStmt(const DropOwnedStmt *a, const DropOwnedStmt *b)
 static bool
 _equalReassignOwnedStmt(const ReassignOwnedStmt *a, const ReassignOwnedStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(roles);
 	COMPARE_NODE_FIELD(newrole);
 
@@ -2100,6 +2294,8 @@ _equalReassignOwnedStmt(const ReassignOwnedStmt *a, const ReassignOwnedStmt *b)
 static bool
 _equalAlterTSDictionaryStmt(const AlterTSDictionaryStmt *a, const AlterTSDictionaryStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_NODE_FIELD(dictname);
 	COMPARE_NODE_FIELD(options);
 
@@ -2110,6 +2306,8 @@ static bool
 _equalAlterTSConfigurationStmt(const AlterTSConfigurationStmt *a,
 							   const AlterTSConfigurationStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_NODE_FIELD(cfgname);
 	COMPARE_NODE_FIELD(tokentype);
@@ -2124,6 +2322,8 @@ _equalAlterTSConfigurationStmt(const AlterTSConfigurationStmt *a,
 static bool
 _equalCreatePolicyStmt(const CreatePolicyStmt *a, const CreatePolicyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(policy_name);
 	COMPARE_NODE_FIELD(table);
 	COMPARE_STRING_FIELD(cmd_name);
@@ -2138,6 +2338,8 @@ _equalCreatePolicyStmt(const CreatePolicyStmt *a, const CreatePolicyStmt *b)
 static bool
 _equalAlterPolicyStmt(const AlterPolicyStmt *a, const AlterPolicyStmt *b)
 {
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
 	COMPARE_STRING_FIELD(policy_name);
 	COMPARE_NODE_FIELD(table);
 	COMPARE_NODE_FIELD(roles);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 41dde50..475efcf 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -177,6 +177,7 @@ planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		result = (*planner_hook) (parse, cursorOptions, boundParams);
 	else
 		result = standard_planner(parse, cursorOptions, boundParams);
+
 	return result;
 }
 
@@ -410,6 +411,8 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	/* build the PlannedStmt result */
 	result = makeNode(PlannedStmt);
 
+	result->location = parse->location;
+	result->length = parse->length;
 	result->commandType = parse->commandType;
 	result->queryId = parse->queryId;
 	result->hasReturning = (parse->returningList != NIL);
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index a558083..018cc75 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -307,6 +307,11 @@ transformStmt(ParseState *pstate, Node *parseTree)
 	result->querySource = QSRC_ORIGINAL;
 	result->canSetTag = true;
 
+	/* keep track of location & length */
+	Assert(isParseNode(parseTree));
+	result->location = ((ParseNode*) parseTree)->location;
+	result->length = ((ParseNode*) parseTree)->length;
+
 	return result;
 }
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 08cf5b7..c65f3b5 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -178,6 +178,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
 			   bool *deferrable, bool *initdeferred, bool *not_valid,
 			   bool *no_inherit, core_yyscan_t yyscanner);
 static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
+static Node *stmtWithLocation(Node *node, core_yyscan_t yyscanner, int start);
 
 %}
 
@@ -762,14 +763,14 @@ stmtblock:	stmtmulti
 stmtmulti:	stmtmulti ';' stmt
 				{
 					if ($3 != NULL)
-						$$ = lappend($1, $3);
+						$$ = lappend($1, stmtWithLocation($3, yyscanner, @2+1));
 					else
 						$$ = $1;
 				}
 			| stmt
 				{
 					if ($1 != NULL)
-						$$ = list_make1($1);
+						$$ = list_make1(stmtWithLocation($1, yyscanner, 0));
 					else
 						$$ = NIL;
 				}
@@ -4080,7 +4081,7 @@ CreateTableSpaceStmt: CREATE TABLESPACE name OptTableSpaceOwner LOCATION Sconst
 					CreateTableSpaceStmt *n = makeNode(CreateTableSpaceStmt);
 					n->tablespacename = $3;
 					n->owner = $4;
-					n->location = $6;
+					n->location_dir = $6;
 					n->options = $7;
 					$$ = (Node *) n;
 				}
@@ -15284,6 +15285,31 @@ makeRecursiveViewSelect(char *relname, List *aliases, Node *query)
 	return (Node *) s;
 }
 
+/*
+ * Set query location & length for statement "node" starting at "start"
+ *
+ *  Computing the length depends on what triggered the stmtmulti reduction, which may be:
+ * - a ';', in which case statement ends at this last semicolon
+ * - the end of input, in which case statement ends at end of string
+ */
+static Node *
+stmtWithLocation(Node *node, core_yyscan_t yyscanner, int start)
+{
+	base_yy_extra_type *extra = pg_yyget_extra(yyscanner);
+	ParseNode *pn = (ParseNode *) node;
+	Assert(isParseNode(node));
+
+	pn->location = start;
+	if (extra->last_semicolon == -1 || start == (extra->last_semicolon + 1))
+		/* reduction triggered by end of input */
+		pn->length = strlen(extra->core_yy_extra.scanbuf) - start;
+	else
+		/* reduction triggered by ';' */
+		pn->length = extra->last_semicolon - start;
+
+	return node;
+}
+
 /* parser_init()
  * Initialize to parse one query string
  */
@@ -15291,4 +15317,5 @@ void
 parser_init(base_yy_extra_type *yyext)
 {
 	yyext->parsetree = NIL;		/* in case grammar forgets to set it */
+	yyext->last_semicolon = -1;
 }
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index acd9269..470a697 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -351,7 +351,8 @@ not_equals		"!="
  * If you change either set, adjust the character lists appearing in the
  * rule for "operator"!
  */
-self			[,()\[\].;\:\+\-\*\/\%\^\<\>\=]
+semicolon		;
+self			[,()\[\].\:\+\-\*\/\%\^\<\>\=]
 op_chars		[\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=]
 operator		{op_chars}+
 
@@ -845,7 +846,11 @@ other			.
 					SET_YYLLOC();
 					return NOT_EQUALS;
 				}
-
+{semicolon}		{
+					SET_YYLLOC();
+					pg_yyget_extra(yyscanner)->last_semicolon = *yylloc;
+					return yytext[0];
+				}
 {self}			{
 					SET_YYLLOC();
 					return yytext[0];
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 201f248..66e049e 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -308,7 +308,6 @@ typedef enum NodeTag
 	T_UpdateStmt,
 	T_SelectStmt,
 	T_AlterTableStmt,
-	T_AlterTableCmd,
 	T_AlterDomainStmt,
 	T_SetOperationStmt,
 	T_GrantStmt,
@@ -406,7 +405,6 @@ typedef enum NodeTag
 	T_AlterPolicyStmt,
 	T_CreateTransformStmt,
 	T_CreateAmStmt,
-	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
@@ -459,6 +457,8 @@ typedef enum NodeTag
 	T_PartitionSpec,
 	T_PartitionBoundSpec,
 	T_PartitionRangeDatum,
+	T_AlterTableCmd,
+	T_PartitionCmd,
 
 	/*
 	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 9d8ef77..561ed01 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -78,6 +78,24 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 /* Currently, SELECT ... FOR [KEY] UPDATE/SHARE requires UPDATE privileges */
 #define ACL_SELECT_FOR_UPDATE	ACL_UPDATE
 
+/*
+ * A ParseNode is a Node with additional location information.
+ * Zero qlengh means not set.
+ * If non-zero, then location is within to the initial query string.
+ */
+typedef struct ParseNode
+{
+	NodeTag		type;
+	int			location;
+	int			length;
+} ParseNode;
+
+/*
+ * All high-level statements coming out of the parser are ParseNode,
+ * plus Query & PlannedStmt.
+ */
+#define isParseNodeTag(tag)	((T_Query <= (tag)) && ((tag) < T_A_Expr))
+#define isParseNode(nodeptr) isParseNodeTag(nodeTag(nodeptr))
 
 /*****************************************************************************
  *	Query Tree
@@ -99,6 +117,8 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 typedef struct Query
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
@@ -1322,6 +1342,8 @@ typedef struct TriggerTransition
 typedef struct InsertStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to insert into */
 	List	   *cols;			/* optional: names of the target columns */
 	Node	   *selectStmt;		/* the source SELECT/VALUES, or NULL */
@@ -1337,6 +1359,8 @@ typedef struct InsertStmt
 typedef struct DeleteStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to delete from */
 	List	   *usingClause;	/* optional using clause for more tables */
 	Node	   *whereClause;	/* qualifications */
@@ -1351,6 +1375,8 @@ typedef struct DeleteStmt
 typedef struct UpdateStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to update */
 	List	   *targetList;		/* the target list (of ResTarget) */
 	Node	   *whereClause;	/* qualifications */
@@ -1383,6 +1409,8 @@ typedef enum SetOperation
 typedef struct SelectStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 
 	/*
 	 * These fields are used only in "leaf" SelectStmts.
@@ -1450,6 +1478,8 @@ typedef struct SelectStmt
 typedef struct SetOperationStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	SetOperation op;			/* type of set op */
 	bool		all;			/* ALL specified? */
 	Node	   *larg;			/* left child */
@@ -1541,6 +1571,8 @@ typedef enum ObjectType
 typedef struct CreateSchemaStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *schemaname;		/* the name of the schema to create */
 	RoleSpec   *authrole;		/* the owner of the created schema */
 	List	   *schemaElts;		/* schema components (list of parsenodes) */
@@ -1560,6 +1592,8 @@ typedef enum DropBehavior
 typedef struct AlterTableStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* table to work on */
 	List	   *cmds;			/* list of subcommands */
 	ObjectType	relkind;		/* type of object */
@@ -1637,6 +1671,8 @@ typedef enum AlterTableType
 typedef struct ReplicaIdentityStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char		identity_type;
 	char	   *name;
 } ReplicaIdentityStmt;
@@ -1665,6 +1701,8 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 typedef struct AlterDomainStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char		subtype;		/*------------
 								 *	T = alter column default
 								 *	N = alter column drop not null
@@ -1712,6 +1750,8 @@ typedef enum GrantObjectType
 typedef struct GrantStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
 	GrantTargetType targtype;	/* type of the grant target */
 	GrantObjectType objtype;	/* kind of object being operated on */
@@ -1762,6 +1802,8 @@ typedef struct AccessPriv
 typedef struct GrantRoleStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *granted_roles;	/* list of roles to be granted/revoked */
 	List	   *grantee_roles;	/* list of member roles to add/delete */
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
@@ -1777,6 +1819,8 @@ typedef struct GrantRoleStmt
 typedef struct AlterDefaultPrivilegesStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *options;		/* list of DefElem */
 	GrantStmt  *action;			/* GRANT/REVOKE action (with objects=NIL) */
 } AlterDefaultPrivilegesStmt;
@@ -1792,6 +1836,8 @@ typedef struct AlterDefaultPrivilegesStmt
 typedef struct CopyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* the relation to copy */
 	Node	   *query;			/* the query (SELECT or DML statement with
 								 * RETURNING) to copy */
@@ -1823,6 +1869,8 @@ typedef enum
 typedef struct VariableSetStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	VariableSetKind kind;
 	char	   *name;			/* variable to be set */
 	List	   *args;			/* List of A_Const nodes */
@@ -1836,6 +1884,8 @@ typedef struct VariableSetStmt
 typedef struct VariableShowStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *name;
 } VariableShowStmt;
 
@@ -1853,6 +1903,8 @@ typedef struct VariableShowStmt
 typedef struct CreateStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation to create */
 	List	   *tableElts;		/* column definitions (list of ColumnDef) */
 	List	   *inhRelations;	/* relations to inherit from (list of
@@ -1980,15 +2032,19 @@ typedef struct Constraint
 typedef struct CreateTableSpaceStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	RoleSpec   *owner;
-	char	   *location;
+	char	   *location_dir;
 	List	   *options;
 } CreateTableSpaceStmt;
 
 typedef struct DropTableSpaceStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	bool		missing_ok;		/* skip error if missing? */
 } DropTableSpaceStmt;
@@ -1996,6 +2052,8 @@ typedef struct DropTableSpaceStmt
 typedef struct AlterTableSpaceOptionsStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *tablespacename;
 	List	   *options;
 	bool		isReset;
@@ -2004,6 +2062,8 @@ typedef struct AlterTableSpaceOptionsStmt
 typedef struct AlterTableMoveAllStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *orig_tablespacename;
 	ObjectType	objtype;		/* Object type to move */
 	List	   *roles;			/* List of roles to move objects of */
@@ -2019,6 +2079,8 @@ typedef struct AlterTableMoveAllStmt
 typedef struct CreateExtensionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *extname;
 	bool		if_not_exists;	/* just do nothing if it already exists? */
 	List	   *options;		/* List of DefElem nodes */
@@ -2028,6 +2090,8 @@ typedef struct CreateExtensionStmt
 typedef struct AlterExtensionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *extname;
 	List	   *options;		/* List of DefElem nodes */
 } AlterExtensionStmt;
@@ -2035,6 +2099,8 @@ typedef struct AlterExtensionStmt
 typedef struct AlterExtensionContentsStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *extname;		/* Extension's name */
 	int			action;			/* +1 = add object, -1 = drop object */
 	ObjectType	objtype;		/* Object's type */
@@ -2050,6 +2116,8 @@ typedef struct AlterExtensionContentsStmt
 typedef struct CreateFdwStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2058,6 +2126,8 @@ typedef struct CreateFdwStmt
 typedef struct AlterFdwStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *fdwname;		/* foreign-data wrapper name */
 	List	   *func_options;	/* HANDLER/VALIDATOR options */
 	List	   *options;		/* generic options to FDW */
@@ -2071,6 +2141,8 @@ typedef struct AlterFdwStmt
 typedef struct CreateForeignServerStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *servertype;		/* optional server type */
 	char	   *version;		/* optional server version */
@@ -2081,6 +2153,8 @@ typedef struct CreateForeignServerStmt
 typedef struct AlterForeignServerStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *servername;		/* server name */
 	char	   *version;		/* optional server version */
 	List	   *options;		/* generic options to server */
@@ -2094,7 +2168,7 @@ typedef struct AlterForeignServerStmt
 
 typedef struct CreateForeignTableStmt
 {
-	CreateStmt	base;
+	CreateStmt	base;			/* is a ParseNode */
 	char	   *servername;
 	List	   *options;
 } CreateForeignTableStmt;
@@ -2107,6 +2181,8 @@ typedef struct CreateForeignTableStmt
 typedef struct CreateUserMappingStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleSpec   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2115,6 +2191,8 @@ typedef struct CreateUserMappingStmt
 typedef struct AlterUserMappingStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleSpec   *user;			/* user role */
 	char	   *servername;		/* server name */
 	List	   *options;		/* generic options to server */
@@ -2123,6 +2201,8 @@ typedef struct AlterUserMappingStmt
 typedef struct DropUserMappingStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleSpec   *user;			/* user role */
 	char	   *servername;		/* server name */
 	bool		missing_ok;		/* ignore missing mappings */
@@ -2143,6 +2223,8 @@ typedef enum ImportForeignSchemaType
 typedef struct ImportForeignSchemaStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *server_name;	/* FDW server name */
 	char	   *remote_schema;	/* remote schema name to query */
 	char	   *local_schema;	/* local schema to create objects in */
@@ -2158,6 +2240,8 @@ typedef struct ImportForeignSchemaStmt
 typedef struct CreatePolicyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	char	   *cmd_name;		/* the command name the policy applies to */
@@ -2174,6 +2258,8 @@ typedef struct CreatePolicyStmt
 typedef struct AlterPolicyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *policy_name;	/* Policy's name */
 	RangeVar   *table;			/* the table name the policy applies to */
 	List	   *roles;			/* the roles associated with the policy */
@@ -2188,6 +2274,8 @@ typedef struct AlterPolicyStmt
 typedef struct CreateAmStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *amname;			/* access method name */
 	List	   *handler_name;	/* handler function name */
 	char		amtype;			/* type of access method */
@@ -2200,6 +2288,8 @@ typedef struct CreateAmStmt
 typedef struct CreateTrigStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	RangeVar   *relation;		/* relation trigger is on */
 	List	   *funcname;		/* qual. name of function to call */
@@ -2227,6 +2317,8 @@ typedef struct CreateTrigStmt
 typedef struct CreateEventTrigStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char	   *eventname;		/* event's identifier */
 	List	   *whenclause;		/* list of DefElems indicating filtering */
@@ -2240,6 +2332,8 @@ typedef struct CreateEventTrigStmt
 typedef struct AlterEventTrigStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *trigname;		/* TRIGGER's name */
 	char		tgenabled;		/* trigger's firing configuration WRT
 								 * session_replication_role */
@@ -2253,6 +2347,8 @@ typedef struct AlterEventTrigStmt
 typedef struct CreatePLangStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	char	   *plname;			/* PL name */
 	List	   *plhandler;		/* PL call handler function (qual. name) */
@@ -2280,6 +2376,8 @@ typedef enum RoleStmtType
 typedef struct CreateRoleStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleStmtType stmt_type;		/* ROLE/USER/GROUP */
 	char	   *role;			/* role name */
 	List	   *options;		/* List of DefElem nodes */
@@ -2288,6 +2386,8 @@ typedef struct CreateRoleStmt
 typedef struct AlterRoleStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleSpec   *role;			/* role */
 	List	   *options;		/* List of DefElem nodes */
 	int			action;			/* +1 = add members, -1 = drop members */
@@ -2296,6 +2396,8 @@ typedef struct AlterRoleStmt
 typedef struct AlterRoleSetStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RoleSpec   *role;			/* role */
 	char	   *database;		/* database name, or NULL */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
@@ -2304,6 +2406,8 @@ typedef struct AlterRoleSetStmt
 typedef struct DropRoleStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *roles;			/* List of roles to remove */
 	bool		missing_ok;		/* skip error if a role is missing? */
 } DropRoleStmt;
@@ -2316,6 +2420,8 @@ typedef struct DropRoleStmt
 typedef struct CreateSeqStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to create */
 	List	   *options;
 	Oid			ownerId;		/* ID of owner, or InvalidOid for default */
@@ -2325,6 +2431,8 @@ typedef struct CreateSeqStmt
 typedef struct AlterSeqStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *sequence;		/* the sequence to alter */
 	List	   *options;
 	bool		missing_ok;		/* skip error if a role is missing? */
@@ -2337,6 +2445,8 @@ typedef struct AlterSeqStmt
 typedef struct DefineStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	kind;			/* aggregate, operator, type */
 	bool		oldstyle;		/* hack to signal old CREATE AGG syntax */
 	List	   *defnames;		/* qualified name (list of Value strings) */
@@ -2351,6 +2461,8 @@ typedef struct DefineStmt
 typedef struct CreateDomainStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *domainname;		/* qualified name (list of Value strings) */
 	TypeName   *typeName;		/* the base type */
 	CollateClause *collClause;	/* untransformed COLLATE spec, if any */
@@ -2364,6 +2476,8 @@ typedef struct CreateDomainStmt
 typedef struct CreateOpClassStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *opclassname;	/* qualified name (list of Value strings) */
 	List	   *opfamilyname;	/* qualified name (ditto); NIL if omitted */
 	char	   *amname;			/* name of index AM opclass is for */
@@ -2397,6 +2511,8 @@ typedef struct CreateOpClassItem
 typedef struct CreateOpFamilyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 } CreateOpFamilyStmt;
@@ -2408,6 +2524,8 @@ typedef struct CreateOpFamilyStmt
 typedef struct AlterOpFamilyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *opfamilyname;	/* qualified name (list of Value strings) */
 	char	   *amname;			/* name of index AM opfamily is for */
 	bool		isDrop;			/* ADD or DROP the items? */
@@ -2422,6 +2540,8 @@ typedef struct AlterOpFamilyStmt
 typedef struct DropStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *objects;		/* list of sublists of names (as Values) */
 	List	   *arguments;		/* list of sublists of arguments (as Values) */
 	ObjectType	removeType;		/* object type */
@@ -2437,6 +2557,8 @@ typedef struct DropStmt
 typedef struct TruncateStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *relations;		/* relations (RangeVars) to be truncated */
 	bool		restart_seqs;	/* restart owned sequences? */
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
@@ -2449,6 +2571,8 @@ typedef struct TruncateStmt
 typedef struct CommentStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2462,6 +2586,8 @@ typedef struct CommentStmt
 typedef struct SecLabelStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	objtype;		/* Object's type */
 	List	   *objname;		/* Qualified name of the object */
 	List	   *objargs;		/* Arguments if needed (eg, for functions) */
@@ -2491,6 +2617,8 @@ typedef struct SecLabelStmt
 typedef struct DeclareCursorStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	int			options;		/* bitmask of options (see above) */
 	Node	   *query;			/* the raw SELECT query */
@@ -2503,6 +2631,8 @@ typedef struct DeclareCursorStmt
 typedef struct ClosePortalStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *portalname;		/* name of the portal (cursor) */
 	/* NULL means CLOSE ALL */
 } ClosePortalStmt;
@@ -2526,6 +2656,8 @@ typedef enum FetchDirection
 typedef struct FetchStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	FetchDirection direction;	/* see above */
 	long		howMany;		/* number of rows, or position argument */
 	char	   *portalname;		/* name of portal (cursor) */
@@ -2546,6 +2678,8 @@ typedef struct FetchStmt
 typedef struct IndexStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *idxname;		/* name of new index, or NULL for default */
 	RangeVar   *relation;		/* relation to build index on */
 	char	   *accessMethod;	/* name of access method (eg. btree) */
@@ -2574,6 +2708,8 @@ typedef struct IndexStmt
 typedef struct CreateFunctionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	bool		replace;		/* T => replace if already exists */
 	List	   *funcname;		/* qualified name of function to create */
 	List	   *parameters;		/* a list of FunctionParameter */
@@ -2604,6 +2740,8 @@ typedef struct FunctionParameter
 typedef struct AlterFunctionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	FuncWithArgs *func;			/* name and args of function */
 	List	   *actions;		/* list of DefElem */
 } AlterFunctionStmt;
@@ -2617,6 +2755,8 @@ typedef struct AlterFunctionStmt
 typedef struct DoStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *args;			/* List of DefElem nodes */
 } DoStmt;
 
@@ -2635,6 +2775,8 @@ typedef struct InlineCodeBlock
 typedef struct RenameStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	renameType;		/* OBJECT_TABLE, OBJECT_COLUMN, etc */
 	ObjectType	relationType;	/* if column name, associated relation type */
 	RangeVar   *relation;		/* in case it's a table */
@@ -2654,6 +2796,8 @@ typedef struct RenameStmt
 typedef struct AlterObjectDependsStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_FUNCTION, OBJECT_TRIGGER, etc */
 	RangeVar   *relation;		/* in case a table is involved */
 	List	   *objname;		/* name of the object */
@@ -2668,6 +2812,8 @@ typedef struct AlterObjectDependsStmt
 typedef struct AlterObjectSchemaStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2683,6 +2829,8 @@ typedef struct AlterObjectSchemaStmt
 typedef struct AlterOwnerStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ObjectType	objectType;		/* OBJECT_TABLE, OBJECT_TYPE, etc */
 	RangeVar   *relation;		/* in case it's a table */
 	List	   *object;			/* in case it's some other object */
@@ -2698,6 +2846,8 @@ typedef struct AlterOwnerStmt
 typedef struct AlterOperatorStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *opername;		/* operator name */
 	List	   *operargs;		/* operator's argument TypeNames */
 	List	   *options;		/* List of DefElem nodes */
@@ -2711,6 +2861,8 @@ typedef struct AlterOperatorStmt
 typedef struct RuleStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation the rule is for */
 	char	   *rulename;		/* name of the rule */
 	Node	   *whereClause;	/* qualifications */
@@ -2727,6 +2879,8 @@ typedef struct RuleStmt
 typedef struct NotifyStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to notify */
 	char	   *payload;		/* the payload string, or NULL if none */
 } NotifyStmt;
@@ -2738,6 +2892,8 @@ typedef struct NotifyStmt
 typedef struct ListenStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *conditionname;	/* condition name to listen on */
 } ListenStmt;
 
@@ -2748,6 +2904,8 @@ typedef struct ListenStmt
 typedef struct UnlistenStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *conditionname;	/* name to unlisten on, or NULL for all */
 } UnlistenStmt;
 
@@ -2772,6 +2930,8 @@ typedef enum TransactionStmtKind
 typedef struct TransactionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	TransactionStmtKind kind;	/* see above */
 	List	   *options;		/* for BEGIN/START and savepoint commands */
 	char	   *gid;			/* for two-phase-commit related commands */
@@ -2784,6 +2944,8 @@ typedef struct TransactionStmt
 typedef struct CompositeTypeStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *typevar;		/* the composite type to be created */
 	List	   *coldeflist;		/* list of ColumnDef nodes */
 } CompositeTypeStmt;
@@ -2795,6 +2957,8 @@ typedef struct CompositeTypeStmt
 typedef struct CreateEnumStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *vals;			/* enum values (list of Value strings) */
 } CreateEnumStmt;
@@ -2806,6 +2970,8 @@ typedef struct CreateEnumStmt
 typedef struct CreateRangeStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	List	   *params;			/* range parameters (list of DefElem) */
 } CreateRangeStmt;
@@ -2817,6 +2983,8 @@ typedef struct CreateRangeStmt
 typedef struct AlterEnumStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *typeName;		/* qualified name (list of Value strings) */
 	char	   *oldVal;			/* old enum value's name, if renaming */
 	char	   *newVal;			/* new enum value's name */
@@ -2839,6 +3007,8 @@ typedef enum ViewCheckOption
 typedef struct ViewStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *view;			/* the view to be created */
 	List	   *aliases;		/* target column names */
 	Node	   *query;			/* the SELECT query */
@@ -2854,6 +3024,8 @@ typedef struct ViewStmt
 typedef struct LoadStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *filename;		/* file to load */
 } LoadStmt;
 
@@ -2864,6 +3036,8 @@ typedef struct LoadStmt
 typedef struct CreatedbStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to create */
 	List	   *options;		/* List of DefElem nodes */
 } CreatedbStmt;
@@ -2875,6 +3049,8 @@ typedef struct CreatedbStmt
 typedef struct AlterDatabaseStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *dbname;			/* name of database to alter */
 	List	   *options;		/* List of DefElem nodes */
 } AlterDatabaseStmt;
@@ -2882,6 +3058,8 @@ typedef struct AlterDatabaseStmt
 typedef struct AlterDatabaseSetStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *dbname;			/* database name */
 	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
 } AlterDatabaseSetStmt;
@@ -2893,6 +3071,8 @@ typedef struct AlterDatabaseSetStmt
 typedef struct DropdbStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *dbname;			/* database to drop */
 	bool		missing_ok;		/* skip error if db is missing? */
 } DropdbStmt;
@@ -2904,6 +3084,8 @@ typedef struct DropdbStmt
 typedef struct AlterSystemStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	VariableSetStmt *setstmt;	/* SET subcommand */
 } AlterSystemStmt;
 
@@ -2914,6 +3096,8 @@ typedef struct AlterSystemStmt
 typedef struct ClusterStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	RangeVar   *relation;		/* relation being indexed, or NULL if all */
 	char	   *indexname;		/* original index defined */
 	bool		verbose;		/* print progress info */
@@ -2942,6 +3126,8 @@ typedef enum VacuumOption
 typedef struct VacuumStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	int			options;		/* OR of VacuumOption flags */
 	RangeVar   *relation;		/* single table to process, or NULL */
 	List	   *va_cols;		/* list of column names, or NIL for all */
@@ -2958,6 +3144,8 @@ typedef struct VacuumStmt
 typedef struct ExplainStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	List	   *options;		/* list of DefElem nodes */
 } ExplainStmt;
@@ -2978,6 +3166,8 @@ typedef struct ExplainStmt
 typedef struct CreateTableAsStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	Node	   *query;			/* the query (see comments above) */
 	IntoClause *into;			/* destination table */
 	ObjectType	relkind;		/* OBJECT_TABLE or OBJECT_MATVIEW */
@@ -2992,6 +3182,8 @@ typedef struct CreateTableAsStmt
 typedef struct RefreshMatViewStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	bool		concurrent;		/* allow concurrent access? */
 	bool		skipData;		/* true for WITH NO DATA */
 	RangeVar   *relation;		/* relation to insert into */
@@ -3004,6 +3196,8 @@ typedef struct RefreshMatViewStmt
 typedef struct CheckPointStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 } CheckPointStmt;
 
 /* ----------------------
@@ -3022,6 +3216,8 @@ typedef enum DiscardMode
 typedef struct DiscardStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	DiscardMode target;
 } DiscardStmt;
 
@@ -3032,6 +3228,8 @@ typedef struct DiscardStmt
 typedef struct LockStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *relations;		/* relations to lock */
 	int			mode;			/* lock mode */
 	bool		nowait;			/* no wait mode */
@@ -3044,6 +3242,8 @@ typedef struct LockStmt
 typedef struct ConstraintsSetStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *constraints;	/* List of names as RangeVars */
 	bool		deferred;
 } ConstraintsSetStmt;
@@ -3068,6 +3268,8 @@ typedef enum ReindexObjectType
 typedef struct ReindexStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	ReindexObjectType kind;		/* REINDEX_OBJECT_INDEX, REINDEX_OBJECT_TABLE,
 								 * etc. */
 	RangeVar   *relation;		/* Table or index to reindex */
@@ -3082,6 +3284,8 @@ typedef struct ReindexStmt
 typedef struct CreateConversionStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *conversion_name;	/* Name of the conversion */
 	char	   *for_encoding_name;		/* source encoding name */
 	char	   *to_encoding_name;		/* destination encoding name */
@@ -3096,6 +3300,8 @@ typedef struct CreateConversionStmt
 typedef struct CreateCastStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	TypeName   *sourcetype;
 	TypeName   *targettype;
 	FuncWithArgs *func;
@@ -3110,6 +3316,8 @@ typedef struct CreateCastStmt
 typedef struct CreateTransformStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	bool		replace;
 	TypeName   *type_name;
 	char	   *lang;
@@ -3124,6 +3332,8 @@ typedef struct CreateTransformStmt
 typedef struct PrepareStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *name;			/* Name of plan, arbitrary */
 	List	   *argtypes;		/* Types of parameters (List of TypeName) */
 	Node	   *query;			/* The query itself (as a raw parsetree) */
@@ -3138,6 +3348,8 @@ typedef struct PrepareStmt
 typedef struct ExecuteStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to execute */
 	List	   *params;			/* Values to assign to parameters */
 } ExecuteStmt;
@@ -3150,6 +3362,8 @@ typedef struct ExecuteStmt
 typedef struct DeallocateStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	char	   *name;			/* The name of the plan to remove */
 	/* NULL means DEALLOCATE ALL */
 } DeallocateStmt;
@@ -3160,6 +3374,8 @@ typedef struct DeallocateStmt
 typedef struct DropOwnedStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *roles;
 	DropBehavior behavior;
 } DropOwnedStmt;
@@ -3170,6 +3386,8 @@ typedef struct DropOwnedStmt
 typedef struct ReassignOwnedStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *roles;
 	RoleSpec   *newrole;
 } ReassignOwnedStmt;
@@ -3180,6 +3398,8 @@ typedef struct ReassignOwnedStmt
 typedef struct AlterTSDictionaryStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	List	   *dictname;		/* qualified name (list of Value strings) */
 	List	   *options;		/* List of DefElem nodes */
 } AlterTSDictionaryStmt;
@@ -3199,6 +3419,8 @@ typedef enum AlterTSConfigType
 typedef struct AlterTSConfigurationStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;		/* query length, 0 if unset */
 	AlterTSConfigType kind;		/* ALTER_TSCONFIG_ADD_MAPPING, etc */
 	List	   *cfgname;		/* qualified name (list of Value strings) */
 
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index e2fbc7d..7d139a3 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -36,6 +36,8 @@
 typedef struct PlannedStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;			/* query length, 0 if unset */
 
 	CmdType		commandType;	/* select|insert|update|delete */
 
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 6d8e493..e373ab2 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -49,6 +49,8 @@ typedef struct base_yy_extra_type
 	char	   *lookahead_end;	/* end of current token */
 	char		lookahead_hold_char;	/* to be put back at *lookahead_end */
 
+	int			last_semicolon;	/* for query length computation */
+
 	/*
 	 * State variables that belong to the grammar.
 	 */

From 20b34be19e51b878c33306d13a453bdd05da23bc Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 12 Jan 2017 21:51:34 +0900
Subject: [PATCH 1/2] Fix current query string of query tree.

---
 src/backend/catalog/pg_proc.c      |  2 +-
 src/backend/commands/extension.c   |  2 +-
 src/backend/commands/foreigncmds.c |  3 ++-
 src/backend/commands/prepare.c     |  2 +-
 src/backend/commands/tablecmds.c   |  2 +-
 src/backend/executor/functions.c   |  2 +-
 src/backend/executor/spi.c         |  4 ++--
 src/backend/nodes/copyfuncs.c      | 15 +++++++++++++++
 src/backend/nodes/equalfuncs.c     | 13 +++++++++++++
 src/backend/parser/analyze.c       |  4 ++++
 src/backend/parser/gram.y          | 20 ++++++++++++++++++--
 src/backend/parser/parse_type.c    |  2 +-
 src/backend/tcop/postgres.c        | 22 ++++++++++++++++------
 src/backend/tcop/pquery.c          |  1 +
 src/include/nodes/nodes.h          |  1 +
 src/include/nodes/parsenodes.h     | 20 ++++++++++++++++++++
 src/include/nodes/plannodes.h      |  2 ++
 17 files changed, 100 insertions(+), 17 deletions(-)

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 6d8f17d..6d9e639 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -934,7 +934,7 @@ fmgr_sql_validator(PG_FUNCTION_ARGS)
 			querytree_list = NIL;
 			foreach(lc, raw_parsetree_list)
 			{
-				Node	   *parsetree = (Node *) lfirst(lc);
+				Node	   *parsetree = (Node *) stripParseNode(lfirst(lc));
 				List	   *querytree_sublist;
 
 				querytree_sublist = pg_analyze_and_rewrite_params(parsetree,
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index be52148..36ebf93 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -712,7 +712,7 @@ execute_sql_string(const char *sql, const char *filename)
 	 */
 	foreach(lc1, raw_parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(lc1);
+		Node	   *parsetree = (Node *) stripParseNode(lfirst(lc1));
 		List	   *stmt_list;
 		ListCell   *lc2;
 
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
index 06b4bc3..12fa20f 100644
--- a/src/backend/commands/foreigncmds.c
+++ b/src/backend/commands/foreigncmds.c
@@ -1572,7 +1572,8 @@ ImportForeignSchema(ImportForeignSchemaStmt *stmt)
 		 */
 		foreach(lc2, raw_parsetree_list)
 		{
-			CreateForeignTableStmt *cstmt = lfirst(lc2);
+			CreateForeignTableStmt *cstmt =
+				(CreateForeignTableStmt *) stripParseNode(lfirst(lc2));
 
 			/*
 			 * Because we only allow CreateForeignTableStmt, we can skip parse
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index d768cf8..5f6e8e4 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -255,7 +255,7 @@ ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause,
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("prepared statement is not a SELECT")));
-		pstmt = (PlannedStmt *) linitial(plan_list);
+		pstmt = (PlannedStmt *) stripParseNode(linitial(plan_list));
 		if (!IsA(pstmt, PlannedStmt) ||
 			pstmt->commandType != CMD_SELECT ||
 			pstmt->utilityStmt != NULL)
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 42558ec..5b01cf7 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -9285,7 +9285,7 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, char *cmd,
 	querytree_list = NIL;
 	foreach(list_item, raw_parsetree_list)
 	{
-		Node	   *stmt = (Node *) lfirst(list_item);
+		Node	   *stmt = (Node *) stripParseNode(lfirst(list_item));
 
 		if (IsA(stmt, IndexStmt))
 			querytree_list = lappend(querytree_list,
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 0a1bb9d..46c2388 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -695,7 +695,7 @@ init_sql_fcache(FmgrInfo *finfo, Oid collation, bool lazyEvalOK)
 	flat_query_list = NIL;
 	foreach(lc, raw_parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(lc);
+		Node	   *parsetree = (Node *) stripParseNode(lfirst(lc));
 		List	   *queryTree_sublist;
 
 		queryTree_sublist = pg_analyze_and_rewrite_params(parsetree,
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index ee7a7e2..2f35f6b 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1757,7 +1757,7 @@ _SPI_prepare_plan(const char *src, SPIPlanPtr plan)
 
 	foreach(list_item, raw_parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(list_item);
+		Node	   *parsetree = (Node *) stripParseNode(lfirst(list_item));
 		List	   *stmt_list;
 		CachedPlanSource *plansource;
 
@@ -1859,7 +1859,7 @@ _SPI_prepare_oneshot_plan(const char *src, SPIPlanPtr plan)
 
 	foreach(list_item, raw_parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(list_item);
+		Node	   *parsetree = (Node *) stripParseNode(lfirst(list_item));
 		CachedPlanSource *plansource;
 
 		plansource = CreateOneShotCachedPlan(parsetree,
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 930f2f1..47d6934 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -2771,6 +2771,18 @@ _copyQuery(const Query *from)
 	return newnode;
 }
 
+static ParseNode *
+_copyParseNode(const ParseNode *from)
+{
+	ParseNode	   *newnode = makeNode(ParseNode);
+
+	COPY_SCALAR_FIELD(location);
+	COPY_SCALAR_FIELD(length);
+	COPY_NODE_FIELD(stmt);
+
+	return newnode;
+}
+
 static InsertStmt *
 _copyInsertStmt(const InsertStmt *from)
 {
@@ -4728,6 +4740,9 @@ copyObject(const void *from)
 		case T_Query:
 			retval = _copyQuery(from);
 			break;
+		case T_ParseNode:
+			retval = _copyParseNode(from);
+			break;
 		case T_InsertStmt:
 			retval = _copyInsertStmt(from);
 			break;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index a27e5ed..a81bf87 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -951,6 +951,16 @@ _equalQuery(const Query *a, const Query *b)
 }
 
 static bool
+_equalParseNode(const ParseNode *a, const ParseNode *b)
+{
+	COMPARE_SCALAR_FIELD(location);
+	COMPARE_SCALAR_FIELD(length);
+	COMPARE_NODE_FIELD(stmt);
+
+	return true;
+}
+
+static bool
 _equalInsertStmt(const InsertStmt *a, const InsertStmt *b)
 {
 	COMPARE_NODE_FIELD(relation);
@@ -3015,6 +3025,9 @@ equal(const void *a, const void *b)
 		case T_Query:
 			retval = _equalQuery(a, b);
 			break;
+		case T_ParseNode:
+			retval = _equalParseNode(a, b);
+			break;
 		case T_InsertStmt:
 			retval = _equalInsertStmt(a, b);
 			break;
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 5116cbb..909734d 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -183,6 +183,8 @@ parse_sub_analyze(Node *parseTree, ParseState *parentParseState,
 Query *
 transformTopLevelStmt(ParseState *pstate, Node *parseTree)
 {
+	parseTree = stripParseNode(parseTree);
+
 	if (IsA(parseTree, SelectStmt))
 	{
 		SelectStmt *stmt = (SelectStmt *) parseTree;
@@ -224,6 +226,8 @@ transformStmt(ParseState *pstate, Node *parseTree)
 {
 	Query	   *result;
 
+	Assert(!IsA(parseTree, ParseNode));
+
 	/*
 	 * We apply RAW_EXPRESSION_COVERAGE_TEST testing to basic DML statements;
 	 * we can't just run it on everything because raw_expression_tree_walker()
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 9eef550..45ac3ae 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -761,15 +761,31 @@ stmtblock:	stmtmulti
 /* the thrashing around here is to discard "empty" statements... */
 stmtmulti:	stmtmulti ';' stmt
 				{
+					if ($1 != NULL)
+					{
+						ParseNode *last = (ParseNode *) llast($1);
+						last->length = @2 - last->location + 1;
+					}
 					if ($3 != NULL)
-						$$ = lappend($1, $3);
+					{
+						ParseNode *pn = makeNode(ParseNode);
+						pn->stmt = $3;
+						pn->location = @3;
+						$$ = lappend($1, pn);
+					}
 					else
 						$$ = $1;
 				}
 			| stmt
 				{
 					if ($1 != NULL)
-						$$ = list_make1($1);
+					{
+						ParseNode *pn = makeNode(ParseNode);
+						pn->location = @1;
+						pn->length = 0;
+						pn->stmt = $1;
+						$$ = list_make1(pn);
+					}
 					else
 						$$ = NIL;
 				}
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index e2c884c..f9001a0 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -720,7 +720,7 @@ typeStringToTypeName(const char *str)
 	 */
 	if (list_length(raw_parsetree_list) != 1)
 		goto fail;
-	stmt = (SelectStmt *) linitial(raw_parsetree_list);
+	stmt = (SelectStmt *) stripParseNode(linitial(raw_parsetree_list));
 	if (stmt == NULL ||
 		!IsA(stmt, SelectStmt) ||
 		stmt->distinctClause != NIL ||
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 05b2e57..1e5b50f 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -881,7 +881,6 @@ exec_simple_query(const char *query_string)
 	bool		isTopLevel;
 	char		msec_str[32];
 
-
 	/*
 	 * Report query to various monitoring facilities.
 	 */
@@ -955,7 +954,8 @@ exec_simple_query(const char *query_string)
 	 */
 	foreach(parsetree_item, parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(parsetree_item);
+		ParseNode  *raw_parsetree = (ParseNode *) lfirst(parsetree_item);
+		Node	   *parsetree = stripParseNode(raw_parsetree);
 		bool		snapshot_set = false;
 		const char *commandTag;
 		char		completionTag[COMPLETION_TAG_BUFSIZE];
@@ -964,7 +964,16 @@ exec_simple_query(const char *query_string)
 		Portal		portal;
 		DestReceiver *receiver;
 		int16		format;
+		char	   *current_query_string = (char *)query_string;
 
+		if (list_length(parsetree_list) > 1)
+		{
+			current_query_string = palloc(raw_parsetree->length + 1);
+			memcpy(current_query_string,
+				   query_string + raw_parsetree->location,
+				   raw_parsetree->length + 1);
+			current_query_string[raw_parsetree->length] = 0;
+		}
 		/*
 		 * Get the command name for use in status display (it also becomes the
 		 * default completion tag, down inside PortalRun).  Set ps_status and
@@ -1016,7 +1025,8 @@ exec_simple_query(const char *query_string)
 		 */
 		oldcontext = MemoryContextSwitchTo(MessageContext);
 
-		querytree_list = pg_analyze_and_rewrite(parsetree, query_string,
+		querytree_list = pg_analyze_and_rewrite(parsetree,
+												current_query_string,
 												NULL, 0);
 
 		plantree_list = pg_plan_queries(querytree_list,
@@ -1044,7 +1054,7 @@ exec_simple_query(const char *query_string)
 		 */
 		PortalDefineQuery(portal,
 						  NULL,
-						  query_string,
+						  current_query_string,
 						  commandTag,
 						  plantree_list,
 						  NULL);
@@ -1279,7 +1289,7 @@ exec_parse_message(const char *query_string,	/* string to execute */
 		bool		snapshot_set = false;
 		int			i;
 
-		raw_parse_tree = (Node *) linitial(parsetree_list);
+		raw_parse_tree = (Node *) stripParseNode(linitial(parsetree_list));
 
 		/*
 		 * Get the command name for possible use in status display.
@@ -2064,7 +2074,7 @@ check_log_statement(List *stmt_list)
 	/* Else we have to inspect the statement(s) to see whether to log */
 	foreach(stmt_item, stmt_list)
 	{
-		Node	   *stmt = (Node *) lfirst(stmt_item);
+		Node	   *stmt = stripParseNode(lfirst(stmt_item));
 
 		if (GetCommandLogLevel(stmt) <= log_statement)
 			return true;
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 3b5da73..9ddfc55 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -31,6 +31,7 @@
  * if there are several).
  */
 Portal		ActivePortal = NULL;
+char *portal_query_string = NULL;
 
 
 static void ProcessQuery(PlannedStmt *plan,
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index a1bb0ac..928da44 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -302,6 +302,7 @@ typedef enum NodeTag
 	 * TAGS FOR STATEMENT NODES (mostly in parsenodes.h)
 	 */
 	T_Query,
+	T_ParseNode,
 	T_PlannedStmt,
 	T_InsertStmt,
 	T_DeleteStmt,
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 7ceaa22..23bbfc8 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -78,6 +78,26 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
 /* Currently, SELECT ... FOR [KEY] UPDATE/SHARE requires UPDATE privileges */
 #define ACL_SELECT_FOR_UPDATE	ACL_UPDATE
 
+/*
+ * A ParseNode is a Node with additional location information.
+ * Zero qlengh means not set.
+ * If non-zero, then location is within to the initial query string.
+ */
+typedef struct ParseNode
+{
+	NodeTag		type;
+	int			location;
+	int			length;
+	Node		*stmt;
+} ParseNode;
+
+/*
+ * All high-level statements coming out of the parser are ParseNode,
+ * plus Query & PlannedStmt.
+ */
+#define isParseNodeTag(tag)	((T_Query <= (tag)) && ((tag) < T_A_Expr))
+#define isParseNode(nodeptr) IsA((nodeptr), ParseNode)
+#define	stripParseNode(nodeptr) (isParseNode(nodeptr)? ((ParseNode *)(nodeptr))->stmt : (Node *) (nodeptr))
 
 /*****************************************************************************
  *	Query Tree
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 692a626..921d04c 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -36,6 +36,8 @@
 typedef struct PlannedStmt
 {
 	NodeTag		type;
+	int			location;		/* query location */
+	int			length;			/* query length, 0 if unset */
 
 	CmdType		commandType;	/* select|insert|update|delete */
 
-- 
2.9.2

From cddfc4d9d7e3d51d19e8ed80c60c34c159869d20 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 12 Jan 2017 21:52:14 +0900
Subject: [PATCH 2/2] Change regtest of pg_stat_statements.

This is just the same as Fabien's patch, but fails in somewhat bogus
way..
---
 .../expected/pg_stat_statements.out                | 362 ++++++++++++++++++++-
 .../pg_stat_statements/sql/pg_stat_statements.sql  | 183 ++++++++++-
 2 files changed, 530 insertions(+), 15 deletions(-)

diff --git a/contrib/pg_stat_statements/expected/pg_stat_statements.out b/contrib/pg_stat_statements/expected/pg_stat_statements.out
index 3573c19..06f6ffe 100644
--- a/contrib/pg_stat_statements/expected/pg_stat_statements.out
+++ b/contrib/pg_stat_statements/expected/pg_stat_statements.out
@@ -1,21 +1,363 @@
 CREATE EXTENSION pg_stat_statements;
-CREATE TABLE test (a int, b char(20));
--- test the basic functionality of pg_stat_statements
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+SELECT 'world' AS "text";
+ text  
+-------
+ world
+(1 row)
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+ int 
+-----
+   1
+(1 row)
+
+SELECT 'hello' AS "text";
+ text  
+-------
+ hello
+(1 row)
+
+COMMIT;
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+ ?column? 
+----------
+        5
+(1 row)
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+ i 
+---
+ 1
+ 2
+(2 rows)
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
+  f  
+-----
+ 1.0
+ 2.0
+(2 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                  query                  | calls | rows 
+-----------------------------------------+-------+------
+ SELECT ? || ?                           |     1 |    1
+ SELECT ? AS "float"                     |     1 |    1
+ SELECT pg_stat_statements_reset()       |     1 |    1
+ SELECT ? + ?                            |     2 |    2
+ SELECT ? AS "int"                       |     2 |    2
+ SELECT ? AS i UNION SELECT ? ORDER BY i |     1 |    2
+ WITH t(f) AS (                         +|     1 |    2
+   VALUES (?), (?)                      +|       | 
+ )                                      +|       | 
+   SELECT f FROM t ORDER BY f            |       | 
+ SELECT ? + ? + ? AS "add"               |     3 |    3
+ SELECT ?                               +|     4 |    4
+                                        +|       | 
+   AS "text"                             |       | 
+(9 rows)
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
  pg_stat_statements_reset 
 --------------------------
  
 (1 row)
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
-                       query                        | calls | rows 
-----------------------------------------------------+-------+------
- SELECT pg_stat_statements_reset();                 |     1 |    1
- UPDATE test SET b = ? WHERE a > ?;                 |     1 |    5
- INSERT INTO test VALUES(generate_series(?, ?), ?); |     1 |   10
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+ a |          b           
+---+----------------------
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(4 rows)
+
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+ a | b 
+---+---
+(0 rows)
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+ a |          b           
+---+----------------------
+ 1 | 111                 
+ 2 | 222                 
+ 3 | 333                 
+ 4 | 444                 
+ 5 | 555                 
+ 6 | 666                 
+ 7 | aaa                 
+ 8 | bbb                 
+ 9 | bbb                 
+(9 rows)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                       query                       | calls | rows 
+---------------------------------------------------+-------+------
+ DELETE FROM test WHERE a > ?                      |     1 |    1
+ SELECT pg_stat_statements_reset()                 |     1 |    1
+ UPDATE test SET b = ? WHERE a > ?                 |     1 |    3
+ SELECT * FROM test WHERE a > ? ORDER BY a         |     2 |    4
+ UPDATE test SET b = ? WHERE a = ?                 |     6 |    6
+ SELECT * FROM test ORDER BY a                     |     1 |    9
+ INSERT INTO test VALUES(generate_series(?, ?), ?) |     1 |   10
+(7 rows)
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SELECT 1 AS "one";
+ one 
+-----
+   1
+(1 row)
+
+SELECT 1 + 1 AS "two";
+ two 
+-----
+   2
+(1 row)
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+ query | calls | rows 
+-------+-------+------
+(0 rows)
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'top';
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(3);
+ plus_two 
+----------
+        5
+(1 row)
+
+SELECT PLUS_TWO(7);
+ plus_two 
+----------
+        9
+(1 row)
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(8);
+ plus_one 
+----------
+        9
+(1 row)
+
+SELECT PLUS_ONE(10);
+ plus_one 
+----------
+       11
+(1 row)
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+       query        | calls | rows 
+--------------------+-------+------
+ SELECT ?::TEXT     |     1 |    1
+ SELECT PLUS_ONE(?) |     2 |    2
+ SELECT PLUS_TWO(?) |     2 |    2
 (3 rows)
 
-DROP TABLE test;
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track = 'all';
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+SELECT PLUS_TWO(-1);
+ plus_two 
+----------
+        1
+(1 row)
+
+SELECT PLUS_TWO(2);
+ plus_two 
+----------
+        4
+(1 row)
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+SELECT PLUS_ONE(3);
+ plus_one 
+----------
+        4
+(1 row)
+
+SELECT PLUS_ONE(1);
+ plus_one 
+----------
+        2
+(1 row)
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+               query               | calls | rows 
+-----------------------------------+-------+------
+ SELECT pg_stat_statements_reset() |     1 |    1
+ SELECT (i + ? + ?)::INTEGER       |     2 |    2
+ SELECT PLUS_ONE(?)                |     2 |    2
+ SELECT PLUS_TWO(?)                |     2 |    2
+(4 rows)
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
+SET pg_stat_statements.track_utility = TRUE;
+SELECT 1;
+ ?column? 
+----------
+        1
+(1 row)
+
+CREATE INDEX test_b ON test(b);
+DROP TABLE test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION PLUS_ONE(INTEGER);
+NOTICE:  table "test" does not exist, skipping
+DROP TABLE IF EXISTS test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER);
+NOTICE:  table "test" does not exist, skipping
+NOTICE:  table "test" does not exist, skipping
+NOTICE:  function plus_one(pg_catalog.int4) does not exist, skipping
+DROP FUNCTION PLUS_TWO(INTEGER);
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+                   query                   | calls | rows 
+-------------------------------------------+-------+------
+ CREATE INDEX test_b ON test(b)            |     1 |    0
+ DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER) |     1 |    0
+ DROP FUNCTION PLUS_ONE(INTEGER)           |     1 |    0
+ DROP FUNCTION PLUS_TWO(INTEGER)           |     1 |    0
+ DROP TABLE IF EXISTS test                 |     3 |    0
+ DROP TABLE test                           |     1 |    0
+ SELECT ?                                  |     1 |    1
+ SELECT pg_stat_statements_reset()         |     1 |    1
+(8 rows)
+
 DROP EXTENSION pg_stat_statements;
diff --git a/contrib/pg_stat_statements/sql/pg_stat_statements.sql b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
index 7e2b263..2a32f23 100644
--- a/contrib/pg_stat_statements/sql/pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/pg_stat_statements.sql
@@ -1,15 +1,188 @@
 CREATE EXTENSION pg_stat_statements;
 
-CREATE TABLE test (a int, b char(20));
+--
+--
+-- simple and compound statements
+--
+SET pg_stat_statements.track_utility = FALSE;
+SELECT pg_stat_statements_reset();
+
+SELECT 1 AS "int";
+
+
+SELECT 'hello'
+  -- multiline
+  AS "text";
+SELECT 'world' AS "text";
+
+-- transaction
+BEGIN;
+SELECT 1 AS "int";
+SELECT 'hello' AS "text";
+COMMIT;
+
+-- compound transaction
+BEGIN \;
+SELECT 2.0 AS "float" \;
+SELECT 'world' AS "text" \;
+COMMIT;
+
+-- compound with empty statements and spurious leading spacing
+\;\;   SELECT 3 + 3 \;\;\;   SELECT ' ' || ' !' \;\;   SELECT 1 + 4 \;;
+
+-- non ;-terminated statements
+SELECT 1 + 1 + 1 AS "add" \gset
+SELECT :add + 1 + 1 AS "add" \;
+SELECT :add + 1 + 1 AS "add" \gset
+
+-- set operator
+SELECT 1 AS i UNION SELECT 2 ORDER BY i;
+
+-- cte
+WITH t(f) AS (
+  VALUES (1.0), (2.0)
+)
+  SELECT f FROM t ORDER BY f;
 
--- test the basic functionality of pg_stat_statements
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- CRUD: INSERT SELECT UPDATE DELETE on test table
+--
 SELECT pg_stat_statements_reset();
 
+-- utility "create table" must not show
+CREATE TABLE test (a int, b char(20));
+
 INSERT INTO test VALUES(generate_series(1, 10), 'aaa');
-UPDATE test SET b = 'bbb' WHERE a > 5;
+UPDATE test SET b = 'bbb' WHERE a > 7;
+DELETE FROM test WHERE a > 9;
+
+-- explicit transaction
+BEGIN;
+UPDATE test SET b = '111' WHERE a = 1 ;
+COMMIT;
+
+BEGIN \;
+UPDATE test SET b = '222' WHERE a = 2 \;
+COMMIT ;
+
+UPDATE test SET b = '333' WHERE a = 3 \;
+UPDATE test SET b = '444' WHERE a = 4 ;
+
+BEGIN \;
+UPDATE test SET b = '555' WHERE a = 5 \;
+UPDATE test SET b = '666' WHERE a = 6 \;
+COMMIT ;
+
+-- SELECT with constants
+SELECT * FROM test WHERE a > 5 ORDER BY a ;
+SELECT *
+  FROM test
+  WHERE a > 9
+  ORDER BY a ;
+
+-- SELECT without constants
+SELECT * FROM test ORDER BY a;
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = none
+--
+SET pg_stat_statements.track = 'none';
+SELECT pg_stat_statements_reset();
+SELECT 1 AS "one";
+SELECT 1 + 1 AS "two";
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = top
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'top';
+
+DO LANGUAGE plpgsql $$
+BEGIN
+  -- this is a SELECT
+  PERFORM 'hello world'::TEXT;
+END;
+$$;
+
+-- PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(3);
+SELECT PLUS_TWO(7);
+
+-- SQL function
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(8);
+SELECT PLUS_ONE(10);
+
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
+
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- pg_stat_statements.track = all
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track = 'all';
+
+-- recreate PL/pgSQL function
+CREATE FUNCTION PLUS_TWO(i INTEGER) RETURNS INTEGER AS $$
+DECLARE
+  r INTEGER;
+BEGIN
+  SELECT (i + 1 + 1.0)::INTEGER INTO r;
+  RETURN r;
+END; $$ LANGUAGE plpgsql;
+
+SELECT PLUS_TWO(-1);
+SELECT PLUS_TWO(2);
+
+-- SQL function nesting
+CREATE FUNCTION PLUS_ONE(i INTEGER) RETURNS INTEGER AS
+$$ SELECT (i + 1.0)::INTEGER $$ LANGUAGE SQL;
+
+SELECT PLUS_ONE(3);
+SELECT PLUS_ONE(1);
+
+-- bug? PLUS_ONE expansion is missing
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
+
+--
+--
+-- utility commands
+--
+SELECT pg_stat_statements_reset();
+SET pg_stat_statements.track_utility = TRUE;
+
+SELECT 1;
+CREATE INDEX test_b ON test(b);
+DROP TABLE test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION PLUS_ONE(INTEGER);
+DROP TABLE IF EXISTS test \;
+DROP TABLE IF EXISTS test \;
+DROP FUNCTION IF EXISTS PLUS_ONE(INTEGER);
+DROP FUNCTION PLUS_TWO(INTEGER);
 
-SELECT query, calls, rows from pg_stat_statements ORDER BY rows;
+SELECT query, calls, rows FROM pg_stat_statements ORDER BY rows, query;
 
-DROP TABLE test;
 
 DROP EXTENSION pg_stat_statements;
-- 
2.9.2

���wXstmt-list-rewrite-1.patch�=�w�F�?���_O
6��7q��&�w;x�=�=!P-$"�8�6���{g$������+m������;�ah�F��`l�L?4�w���l��|��?|�m�;��f���0����}6����=��X���Z�X
k��VcZ�T�V�����6�o/�"��BYc����N���f�_{�����[�s��v��w����|��,�3��l�������|�T�O8��i���6|��u��o�3J
�����'�����=��8c��*2_���4�:7����E����[�R �����v77�6w
x������V^�lW��]����S$u��{@��lw0�����;m����
��>��{[`�nY^
1���u�)sa���v����B/�U��
�i,���_��w�e5�Rp��&�5�F��
�^�RC �2�e�������@r���
;�\�S������j�V��ZL����D����9�Y�����t������!�)E�}W7��s�$�z�^�w���-S��e��L`�'O��6����q���M�!��!%$Y���;����R# �tn��lN���$P����zg��q\k��j������mO'��o�.�n��������g=ioC�I����`[.�h�����N�j�P�6}���0>���)�����]��{������P��~;�
U[�Wa�����]���?���n����PFdzi8�|j����b.k)�������6��P4e�	��@�1(E���4:Z�B�A�%sfh�7!J&��@�0,��09e�L���3-KKL�
������s�<�u������@�S����#��s�����#��F,&�����8�~�@/�{���\����9�Iw��o����^���}�Y���T��vVO�[���o�+�+�r9��WY��z��PV�zV�{%�S1&�c��?�����]�����������r%�R��v��=���JTl#%����%;�{J\��gJ\��6���t�N�q��*C�S�o`~��@X\�|��1
���N�����3���%`=����
��\�<�r��
%��uT����i�z8#jIK��h�� �q�����������,�W�RQ{U�P�V��U�V�ZM�T[��^��M��J9��� ���a/�+�H�toFZ5P4L������=
������8��5��)���]���8�=��L��"��=m�ez��W�b:f}�6$)Z]��T���
�N�CO��Z�Q�kj]
�@,S��������V&-$g��-��/����lX�5,���x�2`��I����w�h���y�BX
�.��ke����Qh���d�I>,�:)�	�v���R	�P�a��B���o�T�q������L�^���SX�M����Lh�Exyz���/�\�i��5{,���A������1�_��Q��v��e��L�����g�����/N���ex���p6���<��G��W'=\,�;���{�/s&����v'�:��U����������N�Pq������M�:����g
 2��pb�
�!���'��"�a���*�+�=I@�5
�R�F*Q��{���ah�;����p����	/����0�
��� �����[��L�i*�V-��y'
��e-H����euHq�PbI�Gh��!�W����PZ��g�_�-��a`���Xh�E,L������(���`I?���z���G�B�[�
c�j
�6mh�p�gQI=Jo��R�|�F�@[�xj��pyM@���
W�����VxM@���(I��`�q}x�r���w-�pYL��N���u������[��m�-���g��_i��0�i��D�ZI���(<{����u{�d�rpq�;;i?c"[��4�����(c�?��_`��9����u�\�����v��
�PD��}�r�E�����4Y�F� ����(�b���jfI�������b���]�����"��m(&���X6����m����5��Ck��yZ1�z�����%�A�5*�|hT����%��\y1�W�	�z����#����3T�g��5�a�����C�������d'���|�g�{�n������Zo>[�;�)$K=�q�1?
�j���U�)�Q�`�

�^���s������A:���m��r�R�4����`\�U��s����L��M��&*������0���b�w�cp��E��
*���(�M�"��� 3�� '��"�G��^`�tW���9�G��7/�X�np�#�C�nF��'�,������"�*e��D�&���(����9����_��[����w�zNu�H���
K���3Q��29�bP��,�3�[ n!�J����T`���]��������QB�6_�G#�^y �lo0��S����|
����l�w���8YnU@h��B��B�0��Sd�����vc�-�!H��
���:Fe}��@(TP������������9�J�Z�T����}��fn.c�6�����r��	N�\�)�G�R!	v�����Nu�`�'bg\�&H
I��`�^���L��m����z:2-�o���v���'U�+���
�q�PO:�R����E����P�
_�y
21\��I�%{4s`aFqK_���w�M�	^A'�m���f����r���8<s�rbVE#�����c/X)O�E1�3j{�b����kp�������1s�V���LbFu`����������N��^�H�Eif
I_���&9��;�IS��L}q���L�l��
"d��QEiJ�����p�T*�
[[�{(T��}L8O=d8L��%_9����P���
#�	#��B���?����\S�a�"��}3A=������x6b������}r�kG'��?���t"���]�)E�zs�nIh6����"c=���-SB��d��=�
'��|���nKn���d�A�Uh�K�l���5\%�������G�����<�yF�������T5\C?�"6J�V���E ��%��5
��&nh	��bX`I������G�a�wF���b���n�����m���^����i_�r�C��Z
���v6�<BjE������K����CL����`����T����D_�`'D_R�VZP�-���1n����/}��(����H~4�V������p|

.������j%�]�RU��7P�������&�������^T��W���I/�
��0�j��!�P�����Q��l��s��<'�&�:�B�
M��u��
IKBI��&�}H�&n/na����
��g��g��In8w��Fi��E��D��m��B�4#����}0�D�y��� ���O�&:����,5�M���C�
��Z���T6�	x�k����XbE�mHd�60������p�����P�7&�Rc�XDz��9]��hJl�
�UE������E�������U\��]�,o_�os���Fe�S��3���P���Y~&�P"�E�<l�
���}=BZ�,:@-Rx���qM�����|�Zs�	9��
��z31���d��DZ��-��B�r���v)�E�&�?	@���(\����	�*�
?�Ly
�8m�/�.��W�"5��y+������(�~/������ zn���E�fLk�<d�z>���C�Mq%�	��i���_R�
n���5�$7((��c��&n�=�*��AId�H}C��A��*�%�P����:H��-Ks���!�����������m�2G}���������S.��*Gy���]�m��%�'L��x��{�6CD��u9�����B (�w�]c"3�P]��#mCA�+�|6��<��U�F<��&���)&iN{d��9s01���Ce2�rX����0����P���(Z�H`drf�K0��.n�9���H3z*����M���f�+�rG�h�0�� �1���rs��vn��Aa:N?�s��sF�jl���IP����h3E����cQ	<<��f����Z�M�n{l���SP!��,#9
[�q�����{�	�,�?����
���7��_��X� 4�p0�7���d�����?��������
!kx/�.���{���|�7���,9=����GU�����2�.z;Y��:�J�8
RI\-����~������
*�P��������.�'�����_H�R�mL��y��h{l�d����F}�vv��O���uU�B��CZ�
�9���Z=��4��J���������q�
����K^O��,����w}�}U���������H`�?%b�X���� }l|����t����w9��OS�H��?���7r���+����h��E��l�1?�y`�����8	�@�(�c6����Z����"��q<�
���5���j�����T�?��~���P�X����fM=�Jyq����

q�PO���aAx<���h���"3��Y��������-�5��z`����p6b�#�������<\'��m�[�Cwl�}l��]�0f{J)�h%����b�,��'2839��6�I��	�8��|���6���o��I%��s�6Ea�/4O/��f,�O��s�a
�/�n��w��c�%"�;�w]�
�8�J�O������A��������x��1����p4�4��: ���"�GA:���8*�;��v
r�w�\�������Z����8zY�
e<���W�lM�G&��H��������w$������x�|�������R
�T0�(��� P�zP���0��Vd��scBTw	
q\sl�K=���B�\��"a����|4�P������a,G������P�P$$�
,�Q`/���5�&([	�����XQ��"��+��S�������
n#�1�}A������6
G��<X�$�LN0q�VY�=�n����� c���5�(o�(�z�<�����`p$e��,��%�
,<�\A�iEj�T3[����M�~��H�C�ZnA��
��\��iW����	a
���
��='OZ�d������8�
j�9�*���G�2�J��BQ��uB�Y�X�.���A*���Zr
��g"4���@j�M�I-�J�M
�S�E��d�UB�j���ZPTo�l��5���dH��-���"[�c�t-0�n����y�����)F�}��8��Y_��`�&���t��
��I*3�U0���@I�������)�{�v]~����D�W�����6��k�%���m������(r�c� w�.�������~��7���	o�D� R8����X�SB���\`��w�u��y%.�(�*���@�91u&���������
�����E�p*<
�c(�=@�E�/u&826
�g�<�L`O���tp�P&@A��
t�Y��S�W�8��'�7�]����`�������-:}�� 9��UJZ�P)UjJ����_�����/���chR�4���x6�T��J���UJu,jD�Bd������p`QpG����si8j�K�������9/,���=_�w����V���x���~��#�
^���b���M���#�K �|0zI��h�jw��������gZ���U{�_X!()��q������;��c_�/���_���s��������������~�����~���I�M���~��.�y�+����}�5�V������ o|g�c][��7�?������E����_������3�r�b4x����������������=��n����8�^�/��uE��u����:�����j��������S^R��\�����������n;�8i�!^|��0Q#SuZmT-
��b�V���Az�.�7��K�.��$���7�����"v���Z���9�
���(�g0���f�X<8����0�j��.r
x�\�����q�*��z���ex2s��+�����!6a�����'�q�]O4�,�X����*ZI��c����Zv�I0���on}�y�G>������Gw��D��y{hn�{������"�r��(G��Vw����v�q$����������"�}�^���(��)�M����sN(�h
(�
�i����r�w��=sl�������.W7�d(�^6��Bd���
x�7#��W?m+L������!I� ���I����s�"��`[p�������Y�\N���3���r�����{�,�����m2�������S0
�}Z������������To��F��%R"��xZ}��Hl>^ �AP����z�_�)��J��F���
�����$=���� Y�c�����<��
�����@
����1����5����������'�u1/�
�1��r��T�x�l���~������Fk	�����T�L�h�a4
`�#��|���Z��@	����:%_���m+���|�|����,L8�M>���;�0H
�������y��Q�C���N�1�{��X!4"�X!
*���j����k��|>
&!.��������P�{�
������D��,~<��gH�`��w���,��@�������:�3��
5g<B��Y��G�2�H>����-)��Ll�)�IxG��UTN�S����d��0�&Q0�)��f� !��j�N�2�Et%GXs5/�QD�����6J��������9J�}(����s.Fs��,���#4��)K�P�<���
%^ ��g *db^�.�dB�W�R$z�<{:qA��@	�hZ��V��!��\q�u�4�
�V�V�La3�A����d����LVz�	���k~7JxIv��:o��)+h+<���������,�dI���@��Z�,#�Y����7]lJ��DV��)��f��3l5�I�#-9�]
�����z�R��p��sD����h�x������)��;fo|�%�]�(��V��}��n���
�����4��B����M	�Q�#�7Pj*F~~
�s��(�:+|�S���lX8�ysO��
��������	�O:���:�&_kC28�o��&4��0���8��%�q�Ms��7���S8�C�e�

�4��lG;��
,[~�[��EI��Xo5�j����jc�49:������D�w�����C����8~
x����,����^�����j4[~����z��Z��T��P�C������`|�a��`jS��u(�/	�w����Ao��������d�~*oz����w����?�`� �D�
�������h��]������D(i�n�^���Ej�tm+�!�������B���pf8Nr�r@0�H���#
����l��5����<����v��������H'o�m������5�m~?�Z�G��L�M�&i4����1�u������0
��%>1�B�b�v8�C�\��a��1X�/f�X�3�2[w�Si�������s���G,��U8��'���P���/�����g����T���z|l4)�cX#�����+�y�/I*�FE9���jUM1�`�<�-����@��8��Yjr���fE�e
F�bN�
���Vmx^)���]i��k0��b	�F�~���Gc��^�����TB��7���?!!����{pt�����a��>�����G����wz����5x��
�h?(���O��(��<�W�E:��V��8��A�uh�{����r�JyF��/���_����j8�����HJ\�@0S��q�{'Q|��Jl�z)����g�g�Y<[k4�Z�Bo��P>�5����~�,T."c������M������C��0a`2�f��I$�q�8�q4�G�$�&Q���Z�s���~n:Kr�u����Y��������_g�����oJ����kS�.Fv�;�E/Q�&�X
x�b|V~
��E�����(��i$�)��q���:��t������S�U�W�T�����zt�v��J.`>m�m�B�0��|%��/@c�8�:��8c��{p�:�x{RC�"DJ�r�y%C��6�W��S�n��!���_oV�B`O:/���4��������M`�f�\5{HdJ�c%g5�+�\�����xo�"���KF��JW�����=
��f��[�z�)Nx����[L�
�#Na���vpa��n���"���[N�-��IW����`
a��*�H��b����#���� ��I&�!�P)��kF��]�j\������4OUWA@�9��zI0�g�J���>�Y������n�X��{�?�Lsmz�8I�>I�Sw]O���5�ze��';%�T���*�e/���+�\���7�g���Z�t����!��vU�P�(�Y�}��T�
�/J���@�v��5C����
@,�Q�|�_5���S����R��X���{�������
Z��|s�;�j�����%.K��0�-��EC�:Z�^����~|�����������fU������@@��xa�l!��~�0F�v�p���N����U?(5�a�&����pA%��,�S���/F"�I�����9�=0P��Rs�c$CK���Or#�IJn�(���m�/t�e�7f_��z�������4k������m��~�^3�WP��B�LB��qPe���'��6�`b�eM���d�-J��r�Y�..	 ����7-�IO��f�f�+wu�=�d�r�������1��h8��������{�j�%����3p'�4�).'����@���6e�p�B�IXOD���O�F��7���q��hX�2���0����U�F�(��V�oX�R�d8.&t4�bh��x�r5��9��K�]�/���������
H��$��bY
�T;�/�����qy��?�VM���[GX=n��y���U�|���x���f������V��Y����N���M��������x�m�1cX���j&����Wc���_3����Rq9�E��9B�~MW�Q�3P�7����o3�������������V�==�����>�3���R�?��<30(Fm���~�������9|Ka�1�	~�=z��{��s���^�����������w�i��������[�.F�d�&�Q��GS*����K��h6��iywwy�"�}����%���"���#���4���8/������7�x/�L�|��#�+�rs��g�Iy�
�*��SS�{���m>�A�2���[�~�
t@nr~�y�f��r���h�j�����/:cT���������L�{\��[����&�_�:����`��e�xC��\���}�ly�BJ���.����o<��x�2�RY��A�. ������*e�����N~���2k����KU��������~�����&y��_��cx1�S)B���JJ0����I���^>	����I[S�G��~��-�
����<N���%~����ebP�o��*����e��
���L��_
E^j��B�8��i������|i;��@G��>	W��(����OK���F��VZ���~�\n�[A�V_Cuu�Y���
�[j�R�=�a��r~;�-�l�|�G����]E����[�'�[��r���_�*�`*�������x���h�.k�<�N�v��|*��'E�nm��z3/5���������
�D���N�;�K�M�bK`q�B�-�3_AC_�������<����F��H���e����`Hj<X�����8���� ~)�#Lc�3Q����eU'���yv����s�.��x��������c}0�v�@��-��
_�p#�]GgzK��C������U�0a�aY����	����xk�I����T�`z
JkpaN����z���-�Y$j��n��mN�ZtV�=��>�p_�����F
rW[��y�\��a�[[�4szYr�9����km�n��?����Q�����������(�V�Q�`NE�y��k��\�n������Lg�~4����4�
=�`�s�=d�d{N�?��&`M.���D�7���R5���N���\��S����D-�g��w�}��]���^"q@��/�I��w0%*��+@�~�d�����l`�,��e	|�k�`P�xDG!�Q���?�x�}��`8
���g��$�)C�R��AR���
#�$v�,�������s������|8�c�pS�o��C8�b
����vm=�[T�.e�e��`�Fb�z/34S{N��n�M���
I�$��I��[R�@^�#
���x��K�!�
����	�7�m�Tv��^�E�v��A'���@d^��b/��;�������u�����s��
�m�]�Q=@uEv���O+���`�������5N�������F��Y`w�ar���n�l��B�p��b-=�t�`��~���K�[�+V�e���@*��K�����,�)���)D������0�q��k|"����D'��i[��@��Hm���0�;��0�������hu�j��������5;��,3��c�t�
�Jt��DB��q(���=�0��KJ-K��&o�jKrz�#�����q$X�������G�l�d1��x�G�"M
�8�r����~���l��g�9�1�+���4���	�`j
a�!�k,�x5;�D�)#��AN�4��Uy�� 1<m�����tF7�A��<-���xj���2
��~)��"	S�(�^�'_��]���a����xM�����P���
��.�K�9���C(_K����.|�:}��A�>�� Bv��(�����4|���$��}L@�c'��������Nx`
	{j-�7e
eN�'��R_�b1*����������i�]��Dx����bz�Kf��>J�6�mbj(����`�k�_��+����O[g���;q*p4Ub����g���iQ��*�����o`g����8��y�bN^��_��+Y����'Gh��1��G�����`�%���C�)��J��eT�O3�l���� ������d;�3iS�0����w^fx|��o�I��L�j�d�>b"=nAL~������K����h ��A���;�r����[�:�-��2��n����D2&�{*�Q.��N�.��jZ���b:�|�����d�x���7�b�N�]
B�H6��L!�Z97�59����M�H1)�(dHb�^�*�!�b\!��Q18����@��H��h3r�_"��� rX���9�W�xD�sU�5G�[�B��W�A�L��V��D0��kF�V6��S�XZ&���,��O6�P'r���00�s�)��55�fS'x���EY����oLRE+���^Z�#�����5T��O�\;v�7[~��p��LT�/'G�?��~�_�(��~=��4"#x`[	�����b���U&�JY;d2�}�[}��u�����,.f�a������,.�d��Z����>�����9�a-���x:b��ots(<�V����:"7vyl���`�<J��R���0��,wbI�[�P6}6OD����u�L#.
�W��?A�����
�/�OI��V����N��TA��A�YN�c��j-��_e�m�O��lU��r�~^o��s����D�w��)"��h�q5GW�0��T��O�j����������`9}s���y
w�oy`�jJ�+8A���!G��a����0_�O������I4�V4t�$^{������
_)��#���S���h���J��>�hB-q}��B�	
1�X���j��(8��-w$�l*&<E��VY9��I������8�q�>�h���9��3��6��8CW}#D���S����^�8�X��_um����?���^=	�%�c0yUp������^nF���N�p;r$� �2��<�)����h���,��j��)��~R
E���8�!�
���p;9"m_�
c����_�V �o���_�g�������+1h�=���CoMVF��GK�����85�.?PM?w�NM|�n��8�m>��z�*]=����_Wkt��\������5���_.7���`�\C��;Y�F����r��8J��? ;�mv	�=���9��zy��wk]�;,,��#����{w����:���nz�>�6)2C#w�A�>��C23#��mfk�[�����������������UUJ��j��A�|��4�u|���e\�ekwLA ����Y��/
�~�� �i_icH��U?Yp�!Lp}0OG!�-l��qw2��`������]T~��W��}����p��U|��(����������%�P�3����i�]��b���}3��~������3y��q��^m[9�:p���LE�3K>���l���+���>���2]�K��X�9G�3����b�����H	��w���G'{�?z����0Z��[q�9��U�Y�v,h��!��7������ �(*f��L��(9����b�*�U-�_����!Gyb&X-�?���b��OE0�����o�`n��j�Nm8y�T���u�7xX������VQ
����_$�L��7to�m��|��;�~����#�R�T����s��'�;�-���AnrS�j�|
�VD����>���Jh5]��e���hZ1A�.��s�%([��H����:� �T�
��g����k��q�c�-��q��������0���!i]s�<w��u��r�I�9���|-h%r��t�� g��J��Y�.�'+o�Z�����1���1�B��{{,W�/[>h&��j������Q�*j�R�#LzV�-��T P[^~��.��r���m/�����Q
�7M�Q�M��9OGSP���I��(�=�?�1��E�K	���
�Q����`J��.�x%��
�8��J�Z����F7pFS��bLS��g�M�j�����m���������r�yZ��f�B��C��j��"��b�g5Q�A���6��_���5D���yg7K;��CLsX����#��]_����B�$��"�z��/�8a�F�KV�J�KF�����h�����U�P�{�s�\��!wO�p����{�p�r@�B8\Q���[���0P�20��m3�%��b<V0�<]��<������&�I�!�)�����	6��.�;1=�{�U����������L�n��v�~�f��9���m	R�R�|"�����Q���{5
��������(���nP�F6_W�3�5~�N��>rk���/��N��
3�H{�s�0h�V���R��	v�C���/�C��x;H3���C�X����0&�#�nX����"��
�����n
�/��������?	53�<V#M(kR-���ss��f�o�Y9;����jN>9���{!���t	G�Hzxr��vZAL=����Tu
b}���O��J�����\N��E�q�������?c���hL`�i��/T76H��n���H�~)
&���@��u������a��e�`a���4&��U`8�`|����6K��N3��kOA���v��"�n�����w���ndt���j����x�#�����%s�� c���:fL���7���tz��'5�'>����7[�i�e�
5��<�@Xkc&Y�pLje���P;7��rN�����Y�>������%U7�0�f9����lq$(�����=�j���R<���+�_���X�0a�g*������h�[�<E�uH�"�N��o8��i��(���J�'1`��#�������4�v���A^��W�����4���>��\
y��������=I9�_� �V��4Q�0���?�T��0��9t���
�Q��1�p�����n��TM^���E�c��}m�=�TZ&���o�50�u'v���%I�w~��m���OIgRO�g������PaMX���9��m��7t��Sc���v�Gh�JgA���|eK1�{
�NtEUO����Ir�����T���zZM`�
�K��s�c���Q�w���!?�Jr�S17�k�W!�����SV0�>I�I>��y�Y�����o�})
E�E8����Cg�a
M	�G-�nm���d��$c��!:qv�-����������{SA�>y���fy��cq+�rKQW_�6��z�����X���W��������!&T�VZ��R\������v�9�������a��������u����:%�������D=�l�`��:�
G������KF�V��c�A�P�7���|��*@��`�
;4L��|&6Yu!��,���F��q-�u#�_o6�@�o�
Pu@��B0s�Ee�Uxf�j��T�2������d6*����*�/l��V.���v���},���&�����x��8+=`��I<���
'Wk���0!'��D�m����T��������M�l�����r��f.
��g�~��C;A����tk��9����?���qO5:�������V3����o^��>������e3��	��>iwG�l��[kT[YOmVXP-����N�l�?�	�x��j�USk������vWwaN��os���gt=1��%6���^3������b�k��p4_3�\���!b��<j�Y��<,Yt��JK��x,)�M04���-&n�B��!����4�m�������.=lK��%?t������B��m���H���,����yi�i�DP�n��	�_F�!&z�mF��1�9����p��y�)ryG�FX�F�R�*S���g�����-]�h�;4o�y�;M��v����J.X��ix
3Z�>@���~c=������j�����9P��O#4���7��;�7��U�Nbrc��x{�C������m5�r�����)PV��0��\-eO��ml�$l�K^����Sz���|�E|�h�����*��_�4�U������r��������^��Q�{��c��?��ST��L�(?[n��F��� �U~�J�YU(9Fh��UNN�}��%juL"�mGr$��a@TK��^���l�
c�%m��N�q7�];�kjP�	�����~�i���0����<=�+�9@��xv���"s�i8�������M�s�7���fRn��w�F�&�G�����<���h��0��vm-o�dU%{cr��)�
GH�����������������q��:	L���m��fT��{����Vi����w��=$����C�F�n���X�`�)@��;�p=���C�
La�f�L�e��>H`�}���f�
Kn
��$@��ci%s~����{C���D���A&N�H�)��6"�M�+����6�����-?m�1tos���������<����g��
���'����6hhk�o)*���p[�|�GI"�:
������q�:F��L�Q�p���V[~�Zs��{&���?�$$
R(;�d�����K����Tu'�4��V`���2�&�lC���n����3�*�;I���n�<p�;O��X�i2+!2�8D��W%�����&;��5�b}�=!�m�zF�M��F��j�������Q��j�7kdJ�$��<JzI8�s�������{��B�������Gz�$�"�����i
i�F]l
�.P������p{�^{M��zhPw5����j{�		��L��As�r�?����27��s���H���W��V�
�4afo9GOZ�	���	��2O�5<*��<�&���wJ�Hi�X��7�$�YK����U�-�E��~��c��yj�L�%���n�U�l#�	��Y���s�s��+���Z.�������8�-�C6�-�&����RK���QT��*��V�j�< C�����������z����x
���;����nd{_r{Q�<����>�����Y@=c����������z~��s�s"-���e�Mx�K����
Q��6����^�9������j�d���U�������e\�����������^���
��DM����:���O�����3X���YA,���J���'�z>M��@#z"%?��D���Z�1����O������mxy���!��q�����'34����h�-D�F�����p.��g=b�7|�q�;P�b8�V��sP_?2���-TzC���W� =��z���?��;��y�7��g��"/;@�r��v��r�o�
�_u�:]�N�����9�;P���7�����Uu���U=l����^��3���z�Y�n���l�%-�{�����H��D������9�{?�H�~���8�Z%4g�4����z���9��z�����Z��?����,`��;�b6������Cs���{�z�6w�XVl�h1_���c�BZi
*A�\�+A��\�������$�����3� ���.S�+
d�f��������^���ylkj��y�q�UF;��p�9~��:�����7��e��5:n�t���E��j�Hk�pz`Z��(�z%���E��v"8����-�`��J���h��&�����WPY�6��`isN�L��y��r!��'������*x�d4�������U��rL#I�����wR[�V	_�([&}���x�QT��WUj�A��J��=�_�M�I�!s	NH�$����+�"�����b>H?�a�t����j&(nf�)�swK��(�>�i�
PM���q
�I�
��-��y�w��eN��j9b���!uo�Y��n�������]
plT;@�z��u���j�^�3��
ejB`2��0�F�n�;[a���H�Z�]�V����[o��W(a;�
���9�W�� 6x�p'Idq�KJ����:�
jQ�����x����L�p��D�"��K	`^$"s�@��c@U5���g
=#��=[VB�{;��7t�@�3O}�]�q�C��l�Ig-�2Mp-��&��k(����5a��qt�R
�M��$<�
�b>�����%9A+��O�8A�t��[�>��`�MF��1�#����d
�y��X�jW��wZ�Z���n.�����c��7	���D���4�����k��&�$��{s�}w����������ze����H���$�c�O��F��G=A���:������g��{�OT��/����X��F����U�F�l*�Ny�y4�����q�����������n��o��S�����qAO�w>`�G����a��� �_���v�=��j����v�)����Nk���5?9-�*
�2[�B|D��y��u��>���{�Ds�YZ��C��G��9��bq`)��]K���7�V�4�4��u_3mM�v[G=�����`�e:J��(*�asP�%u��z��������T[�i�
�Lz�Cz������o�;	�b�T��pW[6��A8�6�����L���0v1��
�U�R�:/(�C���U�+����L���a���+�G�$S�JM��������<�W{1EP.8���-�,��U�M'w������'(����2H[�B@����� 	�~mS��I�P�]C"��A�_$a�D���D�U+���_/���~0l�#�R-�z��Y���h�T���930gx��R�����]��]>];�^?��:��gxz�mk3u�'��w..��'�y�����opF�b�'��9����5�Uo��K��JP�
�����x
��7+�,��30�xklr���
Zq��_ym���
q_�����d�~�K�R�e���x��{�
�=8�G��eo6��V���f5�������� �'3MrL;u�����,����AeI<���'R�����#�z)vfC#�Y���25�%��
h��!����kw8��}~�kG
�Wz�����9]LH;N6�'U����3v[pD
�K3h�U���%lv��7�O:�(���W��~��������p���p:FQ6���
��#$�����}
b��������H*��;�������)j��|
ZK1oP�J)��&����aO���
z�h�LF`l�v���v��!�E��O����NU���0�M��"���&T_���MT��w��5W%mQ��Xw���������~Z���s6�C�B�GU*"^�a=�El5��=:Jx
�y���h��EC�����z��x�1��*����T::Dw��S�Z����c���]�R��|/��m���!��\��ND1���z�7�G�	|�*�?T���%3��h<����b
�8�'�"�_N&���Q��lN���fx������vS����l
�y@���y;�!s�����j���7��(�Z����>���iw�J�����D%���@�a�n�'_e�G��f��t�l�8�n2�������f���r���H�W���R�&o��;�B�x�-�)(�&9�R������4S�g[g�L�(��TP��
v��G)8�c�l`�M�?����~�_�k{�A�n��-]�F�"0��Y>������Nk_�<�������������������������f'���U�~��G����Z#�������5v�R�~Q}�"�~���E&��_L��X���j���lKH�p$���T�E&
����#�)����v)���L�R�TP-B%R�o�f����
|8b�]�Y2ET�+~�Q�t��d�1t�y*���6����Bx�����Y�c�w�ILx&:B9���FC�<��&�S�4`3*J��X�
{������9�B}w�3��L0�����ot�=g<x����!	$�t}�����DM`�f3�����
���yRL��7]�I�j`�N��^�>�����^4��{�I��5���a=[���6/��p���i��dCD@�QyA��?<�;a���t`@�G������Mb��|s�<�8�e>���y�J�� �$�m_�b�N�[�U�	�]^��Xi�����(Oy%��0����;LFS���9h���
1/�
�|�x�>�E��LBlsy8�/U��;$��/�~�+zBB�JtkD��{�"���H�)"�_������LGs�
?��dK0C|��f��xFh�����G��4�(]`D6���O������pL��1�v�3��KB��	%~heByKx$WF�D���Wte�)�
v�|z2g���_zRTG{x���I������A����*rx;�}�pN�PD!^9%�k��'�		pg�����%�������aZ,��6�
�z�b,?5����XLat�X���p����Fk>���C�}so���)|���	t�%�x�g'����P�d*B��?��
��P���[�<Z4�`��_{��������{�LD|��bi;�}��������Iu�w{���1(YC�iP7�(�xx���x�@��1j�r��	���G����1�]V�kv0#C���uc�N��Z���EY�I�<�]����U��Ru��^*T��0���Wh,?$�L�<�Lw���_��
�m��d�Z���rj?�o����"^�.�~������F��"'`)��1	a 
)`��2����l=�o}8�%��<�>@���g7�=�PN��LMf"K^A�BNj�M�t��2O�?xk���::�?����	�:�����q]������;
���Dpf�f��o�:?K���S�;��/�l���2������e6����	F>�
��5Pg�
a��0�	�
/�����i/H8{����$��W�n�]Z)M�M1!Uo:�0a����?E�
����&:hsc����_��W[I�XjU���Zl!����Y��~��wZk4�O�H����,������6i����k�����:k��
X-W�,�=W��C=����$/��]�{��g��
��oA�;�n��V���������2����GS$}&�������=��c���[�����:���p�w���Go�vl�n�q���������v�nm������u����|cJ��.+�����5�EY�A)p�Q����d]�e�����.��i�����:s^���!�rG^�B*
S�3u������1�>�5K����������������/�]�5�NB������v����
��Gt��[=s
��V��sb�:�X��v�\�<&MR�r��#S!���W�%4����W�-����z-�oz?���
�Cy��b8�K[�d7�&J�S]*�n3���?8}V�=aD�:?��)��06��r�q~^�6��	O�va��<O�:��������D$`�Fp��2A��.@i��z���#l�)����f1�x0���i�a��1����99��c�^8��/��BL���8��7�m�#B�[�%� ���/�����}a��o���p|�+�{��'	�/���i������*�E�};cl/�X�iB��E,_���
9��@���0OK\��W�v'�*+d��������
���mY�5�Z�[!����3�
�rl��0g����.�(�������e�@��p���_�zK�����MR��]���/(p )*�����`�u���v��
*1z��PX��������h/Bw~>8��>0
��xN.�F
"�p�_Fe�@	������`��E����(�������(ER��(A�$��!��Xz����H��������0M�2(�c8��
/���W��e��!��k����\/"H"
����>a���P^0�`; &|����5�WX2����j�c����X���
�;��w}
6f�`��~=�����0�.���f����
km�^'��h�MK��#($a>$��&�eQ�����U�����K�K��zr���n4^L�'�����Gc��=�
���!���iy������_D�x7H�d������C������?�c� i�����4�	hC#Z�v����V�f)[)z�E�*t	��1m$�g��=U��{I����	k��I����o����4�(�S��^(��O��X���{���4ve1n���)�C����k���aY]\�*�Y�����5�(X[�m���ds��M"9|3���s$���Tp�����E��@X�������3F�^}�O��mL@�� F7�MK5:p�p2�Ic$l��j����\�[�o�1����������_u��,qU�S� %����UJ��u!	Y�x%j1������Q�u�,E�y����4q0�����Q���7���
r��,�A�/�������A�?��Y�?�|�>�P�2�����������C��x�L��������n�?�T���VEb�b�Y~E�D"���j�9c�����������MM��w�-��T����^u���3QesmQ����*�����s�M���B{(������N8����<u2�T�/=��
:��A�#eq��n��!Uw��FI�d�w���u�z�7�s�]K\��v��8��n��Y~�nzotv��N0����Q)!���eU���U	R�t0&�`w���Oo���7'�o�����r�_3D�]:����&�Yy�I��S#�������A!)%���U�L�m�YSF{d�j=����R�N����������wxt���}�����p_�������Vhe��m�����2~l?<?~��W6Sv�@h���!�at]�8,���OO���J6WQ��3�	Gv*pRt��<y��	����e�x�$\��H�J#_F��@<=�V+��<���|����2�k�]>�V+�����L�y5}!�� �n����������~�^\�C~����8
�=����(����=s�������
����U��P���&r��G����4�|������w��szw\�:���(Z��:ti������Pq��j��������Z�V��j-��Og������q��H�f�h��w��b�(�&,����?��Mg>N�����~5����S+��"���v
��6��$��-��:��#���@g�����}�}��Ov��|�V����P��v�W
�����0�V���p[�\ivs�Q��:M8�:mK��*�u��?��U�h=��=�j�S�}z�����������4�����*�	���)��1$��������.���I����O�L����f����F�=�G���z��������W-_��e���[���5���qVz���F6�tl�X��o{'?��=�6���8����Y�?�-}�p8��G�n~��m������n�Vj~�k��x�e����-���]�|4��`��Mo�c��C���O��`8��`u*eF7��u�
��
�r��HM�z����(��~MMd)G/]7���-��m����.[���
PD��������g�B��CX��D��ng�qmx���'��v�RF,u��k�Xw{�
���Z!�f���:<��]�P'"p]�{}����
���U�V���.�~�� �������Up�P0�����H�C��2Ikiy����ae���sE@;�J��+�g���&���������H)�����}�������e$�X��a��������������D
��.O(��j�%�� ��o��l���*t��S[y���xK���X�a`�OU������
^���	��-�C�(�!�&�,^L5����9
�����_�4�T�p)�9��Cfa,�}M<L
bl��<OF��#������d4_p��tFA�/�V�0���o=��<�_b�v���	�*��t����� �K_�&3��5�RzM)jZ���ZB��W��^���xi_�����
��e�hF�����9�`����2e>#�yO������@�bL9�]���q��y�L��D�xEV�A��+-.��
(��9�?cp}������b��d1	��nA��H?�����U3�$"s����U�ei�B�t��g��M�����
�s����g'-)Z�*mt(���|��&�0@��9d��R�]w��it4���ug^��eQ��f�{����G�[O�����K8suL65K���a~�a����������WnN&������<���7�A8c5	����,R�����A��Y�����8���Z��F28�Ng8�������%�R�fr��Q�vs�j|fR���$X���.i����`#P���Xd{?>��e���"��_�iK�Y��6�I�P��2�'��0��U����M0B�MfQ��	���CT���N�F�ge�O_�6�D�k�X����2���KM)������C����\���(8k�W��i�KkR���~�4]o�#m��on!�{������\n���a�����>V�miU\dq~0�~�E9�gl�v��i�������dk����?�����t�r��e������M����-~{��/�f�3Kw�`NE��!!�i���,�S���,��-�z������[�,	k�N��/�[�V�[��)K���DZ��#3��Y��\KN��y�%��������*M��[�%,�K_DB�
�&.R5S"X@�����e������*�AUM�����*����j;�^F��\��M�M�)�������d��Ji�i����Ds�;�J��-�k��y������ �99a����V�M�XP&~�$��R`�m��y�����)���\��2
v�J.��^(����p���tK�@��J:Z�;�6��0��n1J����,���5Bn�?	#T5���D���%u�I�rk`gR��$���udB��w/����V��x�[��r���W��E�dy��e�Z
��v�M��EX
�g�zW����{fu��/M��!A_�)H��Q�
a�BUKZ��Yi��C����D��#r�
�l�?<=C�DU�iS��RFp?��
7�������he�M�z*���<���v�|~����a��H����Y�r����

����>"�\�@(��I�>�5S��]}?k��A�8�d�J����A������X���O�X�|��hn]��c��VV�E%�X��j���W���NhG��b�rc���>��������n+.���x�s��9��4���"D�)���:���}�]0_��_����"����A��p5�+�e%�MTzw<��<a��#^��%�a�p�#������V�2���)����j�V v����O�t|���	���7
��b�lj�1\�D]����z�|�F2s�
���p&�, Q>�0n�x%d���`JW��p��q'�T
f'��G��`��P��������T��5*]��
����F���(m�&#��h���1���V{t�:!���	�A�jT��	�s&�N��C�
-B�=���P��9X��QT_��T�3��'3L�+��
��#���(�
5
�c�.&�h�SM.d��������v+�>��s�d��`>i��V�f�	��S�! 
G�	�PoL����Y���6q81�FG���V�
�W7>)0�	,u��o�����;p$0���
�<��s���'�'W��T�����	�!�0j��w��q�c8
i�`OHe,g	0�bJ�A��H��!j�-��x��c�����{QR�au�7�4H����-��N@�
��q��S��Q��*�[�6�����h�%�bQ|$Imbl�?F�C-���	��ZK�w'+-!-��S������l��=�l����E�f@q3��� ���=����Jj�w����Y������1�7`A����)��@�U�<%�]���W�>$�e���X�U���N��V
[��d3}���Z"�y1_�8zC9d��
v|�+A�����p��\o��^�����K����[��N�
�aBwt5l^}����jQ��sf]L*���aW���v�`
��Ypa�Z��4t�\����8W+�S1/��L�p��=
����S���X��s�E��w[�����Rs�
����R�����-��&���&�Ec�:
f�e4�a����m^qr=�_���	�������=,��;�������O������t�V
��I��x�v��3c�V�9L�n���������+
����p^��h+n���`K]���w����������.��ZY;{_���TQ0P����d;��	��Y��g8�������"�x�3��U��3���vZ~�[s�U�
�fa��\��z��g�~�sN��,�����������7,
_���������{�������;;�9<��u�:[��9���l���*��^Jf]��u��������wb�j���I���Lxqp�`�����J��g0W�+T[{��g8<�-U[IH^����y����N�]��Ck~{�i$��p|s���(�D�BY�J�U�3l;WS?Cf�{��	?X5��1B�R���������.�f%�Us�X�����z�k�L�AR.�5��1!%����I�E�(�Xu4��V+]�I����z=��s�=�8���0�d��
�Z��C8���]���<������3��n�h<�6�mSW$���j�%�������T��6��Kx�z[8@[�4Z�}����r�U���Z�X_�4O'4���z7^��a��V��*�/z��z3�3t�~uU�&E%�D�1t+�QV+��tx"��`�|�x� �D�r��7�5��CX(��I{�`�C
���6����p6��
je����y�f���ie��({G�6�j�R}�7�vO��jH���h���������t����k�I;��s~���l-����?���)�������]��ji���;�(Qs	��M���]FQb�f��f�i�o�i
�<�d3�����D<��8_�e�RO�j�b��E���H��;��4j+�1#x�#j����L��@�
�`cb��'2H2��n5'�)��bg��6����u;���;�\��ZZA�D�4+�y%�P;�����Fh���.uun9�)���[l�X��3:G��������}� ���
^d���&x�Q��Y�� W�2�}30pF���_vW�W��2�W���Ct#��w����cW����r?��4�:�Oa�����b�����Y�<��k�f���Xg��l0����k��H������Y��8��5�Lc���LaBE���$	A�����i�t�U'�d�s����E�P�~�������;9���FY�O�� �_�I$��9��r�]i�����H~�vQ�z^��M���w����������C=��2�@�oX>�
���I�G�k
/��Ph�����������mP����{�hz
�����*���N�����.�?��^b��A%g���KK�pN��������C��?���f����>`�ojt�@�5@o_e�[�Y�6��
�����+{8�l@)q�����U����0���H�q��|LC���e����tK�?`�-n-��m�������PfH"��Y_N�u|��n����rv[/�A���A�c�f%�l�^�-�e��d_���G����V�[GW�Z�/�h�F�qO���Cz����x�>�q���[:��w���[(Ji�s8�z���T&��[_Mc�s�UN�
���XJF�FC����<�U6�AX����Y�$�eP�/f��Gf��>7n����~%	1d��g�)�� z[���.�����h1�-���M/���!;[Gg�G!V�mq������Q��M��A�d���:��@aB����8^jh7]p�w��Q8�2�xq~-.
D=�R������*��!����R�f��yx>�����K�
��/��
)~&���*��%����W
���������Z���v:��e%!�sf����m>P��b��4�<�f���b��	��o+��L%X��kY<Y%�1
��f�F8���o�����1cO�P
Wb�>N�����p.�w�B���Wt�n�����|Yf����k�����\����)�$$�d9��I�&b�V�u�&G��y�q/4�d�/A���+!/�;'�-�,�/��C�O�=�3�d�b���A��p����]�������<g��
�:��xHV������]p��N&��������iK��>���G�k����yx��r�u�~�Z���Y*�<g��}�=6��G_������������N���1�Z�[�;B�j��U��Z'9>���U#���4
������'���?��!���-f��n�~>8�������_�T�3,_��"�������d�_�1`�i_��_��������7�k�J���*l���}����0b�Hq1�h`���x�9x�{����)��D��.��N��kM��TU��d~�Z��?+����&e��_�1�r��	�[m[TsO�n4��3���qH��Gp
��u�K��G �-��G�S��QH����E�{���md|x5JB?}��r�(��9X�k����4N[Vjy"�B`����������/i
�](�fI�;��hc�Qak�Wr��9Z��m�JD��G!�$"K(gT�&��B"#g�h��uM�C���*������2Kwo//ff�c8?���2��cJ�������pD��3���5��4o����|��j���]i�I�IW�����Q��I�/������C$���c�zU�N����n��2])'�H�%��l<�������� �N�u�<���0���D�IZ��G���3T��I�^b3q-r?Ys?oW��B���������[������������W������5j�L���[���������<��p���6��q�����&�f4�t<)
�k�l�1�|�]���.�vS�h������Z��]�����A�	aq����R�Xa���C�{���p���=�4w�N�p����O����Y�����V{������j�k��e.����LT�s��8����l�������]z�h"����LI�UWt��V�/&�G�0w�!����JK�l
P���(�f��7��xS,��#M�nl@��Ny\�u������hH0�CAD(�6��bBr�X�8)� d�Ea�_!j
9-��x4�G1��i;��?�k����{�o9�\!y����7�@��6���v4+���&�K 
m�Zi�RD�C�7(@)�(~�������kk+�h6��m�Q��O���t�T�3D���U`5[��$
�\d.��,���S���I�-Io��j�Y��o�h�3]�p4�Gr)�#7���/�]���T�L�T9�j��z�Z����x��J"�k+]����S�V�/�8Z����Q]�k��b�q��}���:�c%��;�����sI���������S%y{gG�{�;��d�[.��oNY���j$L�e$�
'�2�SN�pq�"q�j
KZ��q�pn�G 8\�p\'�����n����B��>(]La������R����|����v��{t��?<�;9������M!�j/�T,��N�K�Y ��B!�]���C�U�m*����%������^�������=��%~���}o���������Yi���A��P
{(�<�Z�6a���"��5�|���g���"Bn����6���u���������@�:O�+�)���@�8��=0^��Easg�J5h�f��
����[)���������PG�����K�!.��������:����� %�*��%����I����e9,Icw����VpS/��T}����4\���K�'U*���Ea�mD����u�����_������P�;��
�>��'	�d���~K�J[��������}���9R��h�F�2�g��h�f�B�;�"�d���-U����-2�m��}*O!�0��lE����8�����������T��X�V�x��4���gBb�m6�X�����?!�m=&��A���]fw���Y�2��4H�P� �����i��A��STW�A��!M���F���b��U���m�>��������>��_���qt�WV�zH/�K����:���U�|NA�	���.'����:u��'�#)�~~�I�4��#�<y�?��s���c�N31��*��������Xq5l��F|��"�$�����(
����M<�P� �]����)(X$��:���\��"l��v�P����w�H�P�
I���''0�#h=��OA�8��m�@��h�!����^)�#u��HM2W9o�-~1��>��D�i�;7����������������������m���9�Z�j���x����R��D�����i�M��`&�#z��u��t��,��;��n��[�����BtQ�eG"u��1��7��*�c�5R�k�RZ�[���� ���0\F!�/�|��M��@�����������H	OU0c�=��z[������,go�]���,e�`g�������j�t_ez_���M��S�[*wG�o��~2=�_������|�������eg�{V_,,A��?���'RN<��b��?H=��_7aO^Z��
�J��LLl6��>=�pH�.�K�����#�:����b�~!��rVr4T��7D�x���0�M+����0J�,t������1����yQ����@���x�qY�j�MQ/���35�5�8:�����&����^�u��u�#���xQIp�sr����+,�(�V� �N�~�Z���e+�5��BuY=�C6�#Xr''�50�H]��P&�ru�
&�uIW�����������&��5�f�x��/�rK<�����)��>$\T\�� ��T'�i��s�U����G�m�����?�~�J��
�@Z%)��|���������MC��G��}�����Y��-[�����-[#
�������/�������\�1��X�a��%R.��5�%#�[���y%
��]��5s@����y��
�Tx����5��H.� ��!�(���[S�w��7+M7�����+�^�Dp��l1&}M��{C6�S�Y�D]k��5������
X��tT�o�9���+vPR�0RuIxu�F�}�#j�K#V�+��Y�g=�1�����k�w,����[TWV����u���y�Jy����i�D�K�=:c���+����\���p��u����R�w��[	�HY�����F7�.���]�R*t03�R���z���.	���y�iW6M����|g���
�����w�n4���"J�W������k/���p#j$��a>t�^~�<;��������K�����Vc=>��n�?N��u@�FN����������N�J��5��/<*���:������	?��<O��2�������}���xt
V�);\z��k��a#b-:�^���sq��n�j.�`�����\;�q��[*�y�n�
p�T�@�����h�T]Hz��_VET���k@���X�/-�����=C�8�
og������
 ��l�����w76�7�����I��\u��������##��~�^��������'wru6v��0�i���t���������5*�������D���Z@�V���N���$($����x�:��n
�=_=s�kU��,�]M�8����?,��Z@�Z���I�9ku��]G��2T�KD���S�y��2Ip�p��]["��������8"�yQ���T��N*{�pw��n��g:~�4����%��������5��6��������
0S����aj
�hg<ftHe�p�G����t��
���,��r����b�l��s1�xs\��w�������u+�)����8��2�����Mw�6U/�r�\�����.?y�~�	Yf1��v`��������fk�q����ty,J���Nm�NmU]��3Vw���k��7J�~�`t��R��o�4xs�����U�b�>3w�1V9!��s���n��
8rL
�����{��]a�pz��/T+��_���8����0�e���%�_�����gwK)�h;��'�0y�n�mH�:]�@��E*I���9�����v�e���m0�N�a����-?%��
����x���I�1D�e�uX(�2�����k�S��sr��F. L����V�A��\�^�y%���H������r��U�4�j���\�&0����H0L�K,q�s5�3�]��{��@X	R�~@QFe�����-F��s� { �l�Y��R�&��lC��,5S�������>w��nN�������zv�{�-�������}����mt�1c�EXx�����`�_07���:],8/��3���JEo��e��t�]�,�|D�i�}�sz��HW������=��/Q���(�8�d�I��[+F����`"e��v���t��j��s��RJ��E���eo1#
*�B5�����`�99���-���%zy���G�&�V�RW���|A]��.CO��e�aUq.��Ig���v�R�ZW��QSdP�'L7B��K)I����^G���g;R[�J��
���I�<�U���m�%�o�*h�������A�{�gcx��'�yZm
f�-�az}�kE��\�#����]D�?��'[R�eI�S�v�9_0�
��,8c�(����"%���;�7��d8"'[@I���tKeQ[T��R���k)H*,@y����qHI��������h����O
4���b�S���6���L��������,�T*qy�pF�9������p�l��FH{7i�\�B:�/����_u���|��m�pI������'���Z���5���b�]H��������-��WpsR�2#/�����O,
#g�k�N�b�IaK��OQbX��������ooI�Z���k�j�5�0KM��pT���� �������l�_4�r�_�������=�-H�R���K�*���K������HG�����6QT+����%qtK�
���p-..Pq'�O��70b����;1!�Iby�^��w]�Q�9���l�h�2��?�]�7���ak���_jpy����5��k���h�p�_�]������NX1X�mi��!;����)�uv���s3��E���#
��Q�����7�Z�QM+�?�sy� ��+�|�U�	�o��xk�e�{�!iwe�����\'�����	�H�w��E��Gf�92�����O���2���#���	����i�k�S5��h�g�1�����Db���p'��
V%�_�$�O����f`�!������r!QYR��X��V��j0����,���a�T����	�O���f&2�+\�$��7a������f�%;�`]{Mf�1�
�d����|��.]��Mp�W=r��,�q!�V����yv_G?��}8��p�
]���n�:N���@.��I���^����-K@���*����z���G�2�l����m���1�y�`�"!��m�4�m�=_��`#��N�iw��~��oU����E�dA��Z�8�A�1	�
���)�Eo?93H*�����nz�#
K�oi�M���
<4�����������7R��+l�K��?T��m�!�<��2	>����.N|��>�ob9�rX4d��@�D3�m���/G6��W?,F����D�)1g>0����E����Q�2����5��f�kH �4a
��L��f
	C�� Z��E�=��{�(���i������?^��/1I�In`�_��T�7��u���%��'�=)�q�?&�=����iQ����,F��F����t�f�}�jqD��*�s�	����b��!c~4���I�EA���.4�~����_
�/��������������l������P�	O�%n|����������Y6\��'��6>b�N�U4&��zi��4\p4
O/�������"��"�j�*L��4����
����NA��l�Mf|��f�_&�S��v-�|��m����6p�#���
,bt����J�~�7��Y���_��67��;��5[0s�`y�3Wk��&�f�\} g��"�[~�S[Z���X^l�w�rv��fNu��M�L�b�9����/e��t��gMh����]P���e�o3'�����?���+��>%A��*���W�������<�(V��h�i�o%������t����7�kF=�����
�^��5����������>�~�XW�~������`jv���7p
��A�3Tx-a4���L$�� �m�$�����������������Ov�zv~���8�������39:<�vv�k�|>���������5uk�?�=��
-+��3�w1g$��\G������c��d`�O<��$J�<��g�w�o_���Ps�a�)�w��.�������)�R���rq���R&��=��O��V�k`S5���V��e���%!�Z��b���%���'Xqf]����wRn���J�7����$3U���C��c�JR���}m1pgQ�����(E�y�$�~6������f�a��?��e�f$"���p<F!1��Uxu�����^��PQg�/�O!I��T1���/�1�)�g�%�|�/����f�dS�t���i��iY`W���0����.�j��U�3
�5��u�l���������p��J��A���D���&������i	���3\>zgMo�z�����
��h�����bJ�DJ�P%��O�TX������2]8�����fg�&)����F�����M��������`|u��+�k�?�w7w�y&�Gy(1�z1O����3J����-'=Zr�_#������AI.v��L�����������A��p�w�w�3]4I�������fkf��3�t�C�e�<
X�u��57�5gz�b��r���E�(�*:m"=
��$��.�7-�w�|��3���F�=���h$��X�v7Sq��v�mM��%U�%�����)i�@�M�{���6$H��
����,U�����0�E`Q��a�R�����<���+mon�E�+����������(����j�Sqr�oMn|��_�����V]��U������\n�:��;5a���lz3
����L.�m�G
<[�n$Q����r9����FkUTD�����L��h>��>&�SC��R���u���1s�F,:�%�t���jx/��MX�
le���y�@c7sw�y
���,�f��|�y���.��@[0'��"H*$��pt�bD�lN=���]s_}T�����Z�
�Q	�����1������3O$���
�������98"t4v<'X��f�%��HA�'��;!!�9�O�O)^���������P���7��?_�H/�k�����A.�������+�j���y�*����+��r�tz�e'�UY�D�-!�:�"���~Ik���������f*��
�d1�7�
A.�~�L7"GEg���JLr��%#J�z5.:�P���Z�����6�K�7�]��Km9)=������8n,�aQ��}������2^Fa���m���1�._��]�TT�F��l�����U��aVE(z��E-�%k�n�r<��:(�
�}B`��>+X��1�����_�?eQ������T�ANC��S}HC��p�"�@�BB���3��	�
�p4C�M��T�X����
uIAE|����W!��&����E��)�^���Ih2?au�����
2~D��
d�	3���n�[
��5���b�N2��vj]5���kv�f�D���M+AX�'��P��xq1B��Y[h����z=�2<ci��)Z���T+�p�#_��c_��/����P�Jo�>)#j�?�G*s�����^�9��o��>(��AR�v��Jv��`u����o��N/K�i�'h���o��C��^���o�/_23�6~�_�@�W��Z�L�_z����P����\�������+
g-l~�Y�������W�pB��y�n�x�������J;�w�k����v���p�7�0f51�VO�O���i�e�E2����]�R�PI-�����A	��sB����Y��<����W���m!�r#I�
s�gX0��0`�_�Uk�r����A�Z��y}d�/�����1����oR��)1)g�0�c�����h@h������N���������k0�|���@���-r���R3�M0
f��S�t
�X�o��h/������7M'<x��8\���'�{��,�5|E���J������/TC���A����q� ��?�L�����=��3(�Pj0vC�x�|:>�+X>D�F��\;�} Q��U/Dz����h�"�� �
[U��^�,9�Q��r��g��������<���m�s����Y����&��0W��O�&��aZ@�������o(��H��p
R�#�{�����~���hU���	���.9�R��y&<���W�~���7���y�w���n�y����	�i�v���+-+!�~0������;?�z��N��3������# �W������N�M~�46q�YO�(���
/�����n 4o�� ����h��
�w+h�tQDx�Qn�_�3�T�eB�}	�cp�}��M�HCP[<	6�����Z(�@�qo��N�j��p3���1�����]]�S�?OVO�V���s_��)_�����2��F�=�}�cGc�����))j��������|��%��MP	���Z��S�"O�z��8������6�f��c-f�g�W�V"�� m�?v���8@5���v���2�w%wSr|{
�c����������>5	�d3X0�2�^i�)����p/��t>^#qL��UP�,tAn�-�T��yd��G�$D'[��0�"	�1��$H>z�����V�8rp��EL�|����A�K;�Cl��@)+������w��0
l1��x2�x1
6�^@��Nl1��<`h�>��`��h���!2����b2�.�>R���]�Y�
�^�
����:t����z�;P����
����9��K:	���`x{�\(���'0r�����:xF�;�ht}kh�6��w)����x��)K�\z-T���������Az��%��12%��W��a�����XQD�>�����\�yp��d0��y����eQ����O������W�kiR�$���r"!UoQ����
k)������+d@�p
#�n���@�o�
q*oR��2��� [q���c}Vk��j�m���qUmg*O���.�k�`�;d�te
��]t"���^���M��F`~N�����i�R��W�j
��k����9��+
�������f��CU�[��sXz�*��H|~�ke�Fr���E��X����EJ�t�W���i��<Y�oIN
t��N��$���iO!2`��OG�c����[UTPh�/����j���m��`�r�S�
?GR�pt���$��P��!iu���x/��e"�d����%��*��r!�B�������+��#+�-���9�K����*�>�d�
��@�
`k���aN
�&����	�o[_����_-f���5�h��m��yh��
F]�?<�,e������}�9��������������_��pj����{���8P�{�����>� �����8j��Z����1��b����N�� ��6���fYUL=>3#�>(��b��(�(s@���8��([�l�m])��R+Gh�D�z�,���)�6�&Y.�9�<�@��Csc��u����@6B?��������Z�*$8���b�Si����j�

���C�"
�PS���\mV@�6�FRZk���=���H������$J'}Q��T9��U�]e1��z����A��C�!�D�K�n��������*��t�T_e���vO�@=��v~8��vN�(�e�%o�:�eK�+	iE�LG��P�'(����LV�d�_~>�M�
�QL����v��\Y�67f`c^����C��2\
]���������U������$*),������CW��IM��'l0`I�cA�J�`�G��T�`��lA����c����+t��/��h��S�`$z���'��4_/�V�S����_kt*V��V��d��G�c����l��p#�_�^�3;�CZ;�������:�C'�]�$�\1����R���3�~�E����w��Fp����XXF
B��[��������������J�����(�5+m��4^�{ �Y��@�������M�u�(�x���}	�y�b4��bXo�7y�hfRw3��qn6)6||\'����"&^�I6���X��#��I��ads��A�>��PLna���_j��]bW��f=J�<�%��z�;���x�y�)�\%�q�EVY7�_����Y��cA���F�>�����P5	����y;:�`����+�-�F���K��>�>�����O����z�G�x����h��rN����x��vk_VN�����i��8����q�N���������%"�^BB�b�
����i�M�������_<���G�Ztv�-���-a�� �2M�k��*������7�{����$��N������qm��c����{��������o����#��v�@�nu]���HZ�|��\��V)�����z�^[�h�c
7���k��pd�A����*U�/(�����9z�JJ��������LM�T�H�V���1g�U�}���8���:���N�H�ff]<�UA:���bt�s	�iukA��*�[�je�����z(��������~���Q�$�
5T�_������Qv�J<���e�73d��o}�/���v6�%�#sQ���^��w�m���,��5��:�I���}Db�w�T��D*�GR����YP8���#�W	�������X��������3%�qZ�>Mf�Q�p*��'&�k��� @C{Q�/b��|/���p��)���#��'�5J�9����	�d����/!:=S�s\S��:{�#��:	�����|X�w+��~Xw��gM��s+~�(�+nI�u/�r7�]l�O�=!Z������489S�R�-�������&Y�X$ST�T�����~	?chQB��K���3t,���`��N�h0�3��'��Cx^���/���t�n�W8�7\�v�ow���@f����,c��A8���>�y��@3�M��S�bF4)����S<�9����Pd�tN�a���o�f'��eS�,������3�e��8&A?�8h���R�S�!!���0���pC��*M�*#����BS?6���\�a��l+4���L�IoK*����/�H��:ohG������`���y�o��T��m:����Z�5���~HQ��R��+Ri��!�/�n�e[�~��)�9C������3�~e�N
s>r�x�N�6h�����$Mbz[4=����X5�=�3m(���p@��=n��6o8��n�P9���Sw}��3$.#k$b<�I3������;�=�	_������O�b��K��Me��������R�$qyWD`��u��O��n�����������1<��Tx��A���h�9vSO�[c��[�r�����K�'��g�t�eV2�FT	�\Em�)�����8f"�)��w�~Q�=XD=	>M�b�WVxB�r})�������V�C���x{�`�.f�13;��
_YOw������~��pw����yO�8y�y��Y���r�����m�����Z.7��A�Y_����[�4X��k
��o��������o1��P�mJ�w93E�n	G��iL�9n/|az1�/'�����C���m��T4��98M)
���6oc��Rz,�~~�r���Qc��Azw>U����o�t���A�O�
\0
�]�/�rh��m����QwB
~�=B)���$���Zc��nS�xt��%c�r�9f��������h:����A�+��O����3id9��:�b�"!(W'7�Kd��:�
��yL�N���
�8��=d5�l�"x2;�����P�6�P��2A	�X��0�/��`Ky���,fy�����U�+P^;�k�l����
sK�ml�������Vn[�j������N�����'��M��tXw�z�\����������q���pk�Rr������������u��94v�R~)U����,[
<U�E��`%lpx rAO�0�=��k'<�����K�N����wt��#�������_����r���01��r��x��%2�|�x��������P"
��a�)[
��An��M'�o���ih��(��}I�
����*��
��(���[c8�J�t@e4t|c.�F����=j�����uaVo��]��_#)���������zdN���?PLr�%[n�q���]=�G+^������Q��[`H�����}��Z~�<���7��\�U�� �����P��N��mTA�����?X�U��Uj�`U��C|oI������!9&�Q��F�q)�W����
��t�?:���MC4&�������>
��5�����Y�>|�s�p�U����/���}��0�&( ��tPK��&��c�g6I�����g���"~���"KN�'����N�R�k�N��(��T��(�����p3����`�!�DX�����w/������}�)X,��1��:�?yG��w�~�������?�rf�4���3�5�$�0��)��D���Z�czz�������XW�i���)��*��>F�%>�~����Q������S�\�U�;����3G>9�������z����D�%z���u����P��G�Ql���*s������������C1���=Vu���yX.�����J�ta�/l��6a�G!������@������_z!t
n���[k���������X
�������d���:
��nL)v�M�����7��]��w�w����X��jDX_,Q!������R�y�����Z�s����Y�����(���5�cBxO)�]�x$|���toT�_��?���: