Fix incorrect query rewrite in replication mode.

diff --git a/src/rewrite/pool_timestamp.c b/src/rewrite/pool_timestamp.c
index f36dd807e7ddb2db952503d05985f0800c799620..45e7ea4a5c3c8058aa3540f9e7b0968e86d8e551 100644 (file)
--- a/src/rewrite/pool_timestamp.c
+++ b/src/rewrite/pool_timestamp.c
@@ -908,7 +908,7 @@ rewrite_timestamp(POOL_CONNECTION_POOL * backend, Node *node,
                /*
                 * CREATE TABLE t1 AS SELECT now();
                 */
-               if (IsA(c_stmt->query, SelectStmt))
+               if (IsA(c_stmt->query, SelectStmt) && c_stmt->relkind == OBJECT_TABLE)
                {
                        /* rewrite params */
                        raw_expression_tree_walker(
@@ -925,16 +925,12 @@ rewrite_timestamp(POOL_CONNECTION_POOL * backend, Node *node,
                /*
                 * SELECT now() INTO t1;
                 */
-               raw_expression_tree_walker(
-                                                                  (Node *) s_stmt,
-                                                                  rewrite_timestamp_walker, (void *) &ctx);
-
-               /*
-                * WITH ins AS ( INSERT INTO t1 SELECT now()) SELECT;
-                */
-               raw_expression_tree_walker(
-                                                                  (Node *) s_stmt->withClause,
-                                                                  rewrite_timestamp_walker, (void *) &ctx);
+               if (s_stmt->intoClause)
+               {
+                       raw_expression_tree_walker(
+                                                                          (Node *) s_stmt,
+                                                                          rewrite_timestamp_walker, (void *) &ctx);
+               }
 
                rewrite = ctx.rewrite;
        }