From 4cad09cb8d9945913b6f97a31b8a22fd4beb5cba Mon Sep 17 00:00:00 2001
From: Andy Coates <big-andy-coates@users.noreply.github.com>
Date: Fri, 11 Oct 2019 12:26:38 +0100
Subject: [PATCH] fix(3524): improve pull query error message

Fixes: #3524
---
 .../materialized-aggregate-static-queries.json                 | 2 +-
 .../ksql/rest/server/execution/StaticQueryExecutor.java        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ksql-functional-tests/src/test/resources/rest-query-validation-tests/materialized-aggregate-static-queries.json b/ksql-functional-tests/src/test/resources/rest-query-validation-tests/materialized-aggregate-static-queries.json
index 8d9683533944..ec7a19226378 100644
--- a/ksql-functional-tests/src/test/resources/rest-query-validation-tests/materialized-aggregate-static-queries.json
+++ b/ksql-functional-tests/src/test/resources/rest-query-validation-tests/materialized-aggregate-static-queries.json
@@ -738,7 +738,7 @@
       ],
       "expectedError": {
         "type": "io.confluent.ksql.rest.entity.KsqlStatementErrorMessage",
-        "message": "Table 'X' is not materialized. KSQL currently only supports static queries on materialized aggregate tables. i.e. those created by a 'CREATE TABLE AS SELECT <fields> FROM <sources> GROUP BY <key>' style statement.",
+        "message": "Table 'X' is not materialized. KSQL currently only supports static queries on materialized aggregate tables. i.e. those created by a 'CREATE TABLE AS SELECT <fields>, <aggregate_functions> FROM <sources> GROUP BY <key>' style statement.",
         "status": 400
       }
     },
diff --git a/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/StaticQueryExecutor.java b/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/StaticQueryExecutor.java
index 3740f489e2f2..a08cea9600d7 100644
--- a/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/StaticQueryExecutor.java
+++ b/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/StaticQueryExecutor.java
@@ -684,7 +684,8 @@ private static KsqlException notMaterializedException(final SourceName sourceTab
         "Table '" + sourceTable.toString(FormatOptions.noEscape()) + "' is not materialized."
             + " KSQL currently only supports static queries on materialized aggregate tables."
             + " i.e. those created by a"
-            + " 'CREATE TABLE AS SELECT <fields> FROM <sources> GROUP BY <key>' style statement.");
+            + " 'CREATE TABLE AS SELECT <fields>, <aggregate_functions> "
+            + "FROM <sources> GROUP BY <key>' style statement.");
   }
 
   private static KsqlException invalidWhereClauseException(