Fix encoding of domains over composite types (#771)

Author: greg-rychlewski

lib/postgrex/types.ex

@@ -93,7 +93,7 @@ defmodule Postgrex.Types do
         ARRAY (
           SELECT a.atttypid
           FROM pg_attribute AS a
-          WHERE a.attrelid = t.typrelid AND a.attnum > 0 AND NOT a.attisdropped
+          WHERE a.attrelid = coalesce(d.typrelid, t.typrelid) AND a.attnum > 0 AND NOT a.attisdropped
           ORDER BY a.attnum
         )
         """

test/query_test.exs

@@ -84,6 +84,16 @@ defmodule QueryTest do
     assert [[^uuid]] = query("SELECT 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid", [])
   end
 
+  @tag min_pg_version: "11.0"
+  test "decode composite domain", context do
+    assert [[{"a", 1}]] = query("SELECT '(a, 1)'::composite_domain", [])
+  end
+
+  @tag min_pg_version: "11.0"
+  test "decode arrays of composite domain", context do
+    assert [[[{"a", 1}]]] = query("SELECT ARRAY['(a, 1)']::composite_domain[]", [])
+  end
+
   test "decode arrays", context do
     assert [[[]]] = query("SELECT ARRAY[]::integer[]", [])
     assert [[[1]]] = query("SELECT ARRAY[1]", [])
@@ -121,6 +131,16 @@ defmodule QueryTest do
     assert [[^points_string]] = query("SELECT $1::points_domain::text", [points])
   end
 
+  @tag min_pg_version: "11.0"
+  test "encode composite domain", context do
+    assert [[{"a", 1}]] = query("SELECT $1::composite_domain", [{"a", 1}])
+  end
+
+  @tag min_pg_version: "11.0"
+  test "encode arrays of composite domain", context do
+    assert [[[{"a", 1}]]] = query("SELECT $1::composite_domain[]", [[{"a", 1}]])
+  end
+
   test "decode interval", context do
     assert [[%Postgrex.Interval{months: 0, days: 0, secs: 0, microsecs: 0}]] =
              query("SELECT interval '0'", [])

test/test_helper.exs

@@ -72,7 +72,20 @@ replication_exclude =
   end
 
 version_exclude =
-  [{8, 4}, {9, 0}, {9, 1}, {9, 2}, {9, 3}, {9, 4}, {9, 5}, {10, 0}, {13, 0}, {14, 0}, {17, 0}]
+  [
+    {8, 4},
+    {9, 0},
+    {9, 1},
+    {9, 2},
+    {9, 3},
+    {9, 4},
+    {9, 5},
+    {10, 0},
+    {11, 0},
+    {13, 0},
+    {14, 0},
+    {17, 0}
+  ]
   |> Enum.filter(fn x -> x > pg_version end)
   |> Enum.map(fn {major, minor} -> {:min_pg_version, "#{major}.#{minor}"} end)
 
@@ -127,6 +140,20 @@ sql_test =
     sql_test
   end
 
+sql_test =
+  if pg_version >= {11, 0} do
+    sql_test <>
+      """
+      DROP TYPE IF EXISTS composite_test;
+      CREATE TYPE composite_test AS (a text, b integer);
+
+      DROP DOMAIN IF EXISTS composite_domain;
+      CREATE DOMAIN composite_domain AS composite_test CHECK ((VALUE).a is NOT NULL);
+      """
+  else
+    sql_test
+  end
+
 sql_test_with_schemas = """
 DROP SCHEMA IF EXISTS test;
 CREATE SCHEMA test;