Simplify generated code

Author: spicychickensauce

lib/ecto/adapters/sqlite3/connection.ex

@@ -1556,19 +1556,22 @@ defmodule Ecto.Adapters.SQLite3.Connection do
 
   defp values_list(types, idx, num_rows) do
     rows = :lists.seq(1, num_rows, 1)
-    col_names = Enum.map_join(types, ", ", &elem(&1, 0))
-    table_name = "temp_#{:rand.uniform(100_000)}"
+
+    col_names =
+      Enum.map_join(Enum.with_index(types), ", ", fn {{k, _v}, i} ->
+        "column#{i + 1} AS #{k}"
+      end)
 
     [
-      "WITH #{table_name}(",
+      "SELECT ",
       col_names,
-      ") AS (VALUES ",
+      " FROM (VALUES ",
       intersperse_reduce(rows, ?,, idx, fn _, idx ->
         {value, idx} = values_expr(types, idx)
         {[?(, value, ?)], idx}
       end)
       |> elem(0),
-      ") SELECT * FROM #{table_name}"
+      ")"
     ]
   end
 

test/ecto/adapters/sqlite3/connection/join_test.exs

@@ -139,9 +139,6 @@ defmodule Ecto.Adapters.SQLite3.Connection.JoinTest do
     rows = [%{x: 1, y: 1}, %{x: 2, y: 2}]
     types = %{x: :integer, y: :integer}
 
-    # Seeding rand ensures we get temp_78027 as the CTE name
-    :rand.seed(:exsss, {1, 2, 3})
-
     query =
       Schema
       |> join(
@@ -153,14 +150,9 @@ defmodule Ecto.Adapters.SQLite3.Connection.JoinTest do
       |> select([p, q], {p.id, q.x})
       |> plan()
 
-    # We can't hardcode the columns of the CTE here,
-    # as the order changes for different Map implementations for OTP 25 and later
-    col_names = Map.keys(types) |> Enum.join(", ")
-
     assert ~s{SELECT s0."id", v1."x" FROM "schema" AS s0 } <>
-             ~s{INNER JOIN (WITH temp_78027(#{col_names}) AS (VALUES ($1::INTEGER,$2::INTEGER),($3::INTEGER,$4::INTEGER)) } <>
-             ~s{SELECT * FROM temp_78027) AS v1 } <>
-             ~s{ON (v1."x" = s0."x") AND (v1."y" = s0."y")} ==
+             ~s{INNER JOIN (SELECT column1 AS y, column2 AS x FROM (VALUES ($1::INTEGER,$2::INTEGER),($3::INTEGER,$4::INTEGER))) } <>
+             ~s{AS v1 ON (v1."x" = s0."x") AND (v1."y" = s0."y")} ==
              all(query)
   end