END-013 - Fixes and unit tests for querying table w/ schema prefixes

.credo.exs

@@ -107,7 +107,7 @@ alias Credo.Check
           {Check.Readability.SinglePipe, []},
           {Check.Readability.StrictModuleLayout, []},
           {Check.Readability.WithCustomTaggedTuple, []},
-          {Check.Refactor.ABCSize, [max_size: 60]},
+          {Check.Refactor.ABCSize, [max_size: 80]},
           {Check.Refactor.DoubleBooleanNegation, []},
           {Check.Refactor.FilterReject, []},
           {Check.Refactor.MapMap, []},

lib/endo/adapters/postgres.ex

@@ -23,12 +23,13 @@ defmodule Endo.Adapters.Postgres do
 
   @spec list_tables(repo :: module(), opts :: Keyword.t()) :: [Table.t()]
   def list_tables(repo, opts \\ []) when is_atom(repo) do
+    opts = Keyword.put_new(opts, :prefix, Endo.table_schema())
     preloads = [:columns, table_constraints: [:key_column_usage, :constraint_column_usage]]
 
     derive_preloads = fn %Table{table_name: name} = table ->
       indexes = PgClass.query(collate_indexes: true, relname: name)
       metadata = PgClass.query(relname: name, relkind: ~w(r t m f p))
-      size = Size.query(relname: name)
+      size = Size.query(relname: name, prefix: opts[:prefix])
 
       %Table{
         table

lib/endo/adapters/postgres/size.ex

@@ -3,8 +3,10 @@ defmodule Endo.Adapters.Postgres.Size do
 
   import Ecto.Query
 
-  @spec query([{:relname, String.t()}]) :: Ecto.Queryable.t()
-  def query(relname: relname) do
+  @spec query([{:relname, String.t()}, {:prefix, String.t()}]) :: Ecto.Queryable.t()
+  def query(opts) do
+    relname = Enum.join([opts[:prefix], opts[:relname]], ".")
+
     select(
       with_cte("virtual_table", "virtual_table",
         as:

lib/endo/adapters/postgres/table.ex

@@ -58,9 +58,7 @@ defmodule Endo.Adapters.Postgres.Table do
 
   @impl Endo.Queryable
   def query(base_query \\ base_query(), filters) do
-    filters
-    |> Keyword.put_new(:prefix, Endo.table_schema())
-    |> Enum.reduce(base_query, fn
+    Enum.reduce(filters, base_query, fn
       {:prefix, prefix}, query when is_binary(prefix) ->
         from(x in query, where: x.table_schema == ^prefix)
 

lib/endo/queryable.ex

@@ -34,6 +34,10 @@ defmodule Endo.Queryable do
   @callback query(base_query :: Ecto.Queryable.t(), Keyword.t()) :: Ecto.Queryable.t()
 
   @spec apply_filter(Ecto.Queryable.t(), field :: atom(), value :: any()) :: Ecto.Queryable.t()
+  def apply_filter(query, :prefix, value) do
+    from(x in query, prefix: ^value)
+  end
+
   def apply_filter(query, :preload, value) do
     from(x in query, preload: ^value)
   end

priv/repo/migrations/20221221123643_bootstrap_testing_env.exs

@@ -5,6 +5,20 @@ defmodule Test.Postgres.Repo.Migrations.BootstrapTestingEnv do
     create_accounts()
     create_repos()
     create_orgs()
+    create_prefix_table()
+  end
+
+  def create_prefix_table do
+    execute("CREATE SCHEMA debug")
+
+    flush()
+
+    create table(:events, prefix: "debug") do
+      add(:type, :string, null: false)
+      add(:data, :map, null: false)
+
+      timestamps()
+    end
   end
 
   defp create_accounts do

test/endo_test.exs

@@ -69,6 +69,19 @@ defmodule EndoTest do
     test "given invalid table name, but valid repo, returns nil" do
       assert is_nil(Endo.get_table(Test.Postgres.Repo, "passports"))
     end
+
+    test "returns nothing when querying table belonging to non-default prefix when not specified" do
+      assert is_nil(Endo.get_table(Test.Postgres.Repo, "events"))
+    end
+
+    test "returns nothing when querying table belonging to incorrectly specified prefix" do
+      assert is_nil(Endo.get_table(Test.Postgres.Repo, "events", prefix: "something_random"))
+    end
+
+    test "returns table belonging to non-default prefix if specified correctly" do
+      assert %Endo.Table{name: "events"} =
+               Endo.get_table(Test.Postgres.Repo, "events", prefix: "debug")
+    end
   end
 
   describe "list_tables/2 (Postgres)" do