Merge pull request #4494 from Aircloak/cristian/bugfix/misc

Fix execution of queries over analyst tables.

VERSION

@@ -1 +1 @@
-20.1.3
+20.1.4

air/docs/book.json

@@ -1,6 +1,6 @@
 {
   "author": "Aircloak GmbH",
-  "description": "This copy of the Aircloak user guide describes the features of, and how to configure and work with Aircloak Insights version 20.1.3.",
+  "description": "This copy of the Aircloak user guide describes the features of, and how to configure and work with Aircloak Insights version 20.1.4.",
   "gitbook": "3.2.2",
   "language": "en",
   "plugins": [
@@ -13,5 +13,5 @@
   "styles": {
     "website": "styles/website.css"
   },
-  "title": "Aircloak User Guide – version 20.1.3"
+  "title": "Aircloak User Guide – version 20.1.4"
 }

air/docs/content/SUMMARY.md

@@ -4,7 +4,7 @@
 ---- This way the mix task compiling the docs will be able to insert the current
 ---- version number when it changes.
 ---- Please check the automatically adjusted header into version control.
-## Aircloak Insights - version 20.1.3
+## Aircloak Insights - version 20.1.4
 ---- Please only cautiously edit the line above.
 
 - [Introduction](README.md)

air/lib/air_web/templates/changelog/changelog.html.md

@@ -1,3 +1,9 @@
+## Version 20.1.4
+
+### Bugfixes
+
+- Fixed invalid optimization when executing queries over analyst tables.
+
 ## Version 20.1.3
 
 ### Bugfixes

cloak/lib/cloak/sql/compiler/helpers.ex

@@ -107,7 +107,7 @@ defmodule Cloak.Sql.Compiler.Helpers do
       |> function.()
       |> update_in(
         [Query.Lenses.direct_subqueries(opts) |> Lens.key(:ast)],
-        &apply_top_down(&1, function)
+        &apply_top_down(&1, function, opts)
       )
 
   @doc "Runs the given function for its side-effects on the given query and all of its subqueries."

cloak/lib/cloak/sql/compiler/noise_layers.ex

@@ -281,7 +281,7 @@ defmodule Cloak.Sql.Compiler.NoiseLayers do
       {_, nil} ->
         index = Enum.find_index(all_expressions, expression_matcher)
         true = index != nil
-        %Expression{expression | alias: "#{prefix()}#{index}"}
+        %Expression{expression | alias: "#{prefix()}#{index}", synthetic?: true}
 
       {_, _} ->
         existing_expression

cloak/test/cloak/query/noise_layer_test.exs

@@ -343,6 +343,38 @@ defmodule Cloak.Query.NoiseLayerTest do
       assert_analyst_table_consistent(query, subquery)
     end
 
+    test "[Issue #4492] analyst table with multiple select *" do
+      :ok = insert_rows(_user_ids = 1..10, "noise_layers", ["number", "other"], [10, 10])
+
+      query = "SELECT count(*) FROM (SELECT * FROM $subquery) t"
+
+      subquery = """
+        SELECT * FROM (
+          SELECT user_id, number
+          FROM noise_layers
+          GROUP BY 1, 2
+        ) t
+      """
+
+      assert_analyst_table_consistent(query, subquery)
+    end
+
+    test "[Issue #4490] analyst table with select * and unselected grouping" do
+      :ok = insert_rows(_user_ids = 1..10, "noise_layers", ["number"], [10])
+
+      query = "SELECT count(*) FROM $subquery"
+
+      subquery = """
+        SELECT * FROM (
+          SELECT user_id
+          FROM noise_layers
+          GROUP BY user_id, number
+        ) t
+      """
+
+      assert_analyst_table_consistent(query, subquery)
+    end
+
     def assert_analyst_table_consistent(query, subquery) do
       regular_query = query |> String.replace("$subquery", "(#{subquery}) AS foo")
       analyst_query = query |> String.replace("$subquery", "foo")