fix dialyser and rebase issues

electric-sql · Sep 18, 2023 · 0bc620f · 0bc620f
1 parent 2646c2e
commit 0bc620f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/components/electric/lib/electric/postgres/dialect/builder.ex b/components/electric/lib/electric/postgres/dialect/builder.ex
@@ -1,6 +1,7 @@
 defmodule Electric.Postgres.Dialect.Builder do
   alias Electric.Postgres.Schema.Proto
   alias PgQuery, as: Pg
+  alias Electric.Postgres.Dialect
 
   @type stmt() :: [binary() | sql() | nil]
   @type sql() :: Dialect.sql()

diff --git a/...ectric/postgres/extension/migrations/20230918115714_add_unique_constraint_ddl_commands.ex b/...ectric/postgres/extension/migrations/20230918115714_add_unique_constraint_ddl_commands.ex
@@ -16,7 +16,7 @@ defmodule Electric.Postgres.Extension.Migrations.Migration_20230918115714_DDLCom
       """
       ALTER TABLE #{ddl_table}
         ADD CONSTRAINT ddl_table_unique_migrations
-        UNIQUE (txid, txts ,version, query); 
+        UNIQUE (txid, txts, query); 
       """,
       """
       CREATE OR REPLACE FUNCTION #{schema}.create_active_migration(

diff --git a/components/electric/lib/electric/postgres/proxy/injector.ex b/components/electric/lib/electric/postgres/proxy/injector.ex
@@ -16,6 +16,7 @@ defmodule Electric.Postgres.Proxy.Injector do
   @type msgs() :: [M.t()]
   @type response() :: {:ok, state(), backend_msgs :: msgs(), frontend_msgs :: msgs()}
   @type quote_mark() :: String.t()
+  @type t :: module()
 
   @callback capture_ddl_query(query :: binary()) :: binary()
   @callback capture_version_query(version :: binary()) :: binary()

diff --git a/components/electric/lib/electric/postgres/proxy/prisma.ex b/components/electric/lib/electric/postgres/proxy/prisma.ex
@@ -5,17 +5,19 @@ defmodule Electric.Postgres.Proxy.Prisma do
 
   alias Electric.Postgres.Proxy.Injector
 
+  require Logger
+
   def parse_query("SELECT version()" <> _rest) do
     {:ok, Electric.Postgres.Proxy.Prisma.Query.VersionV5_2}
   end
 
   def parse_query(sql) do
     with [stmt] <- Electric.Postgres.parse!(sql) do
-      analyse_stmt(stmt)
+      analyse_stmt(stmt, sql)
     end
   end
 
-  defp analyse_stmt(%PgQuery.SelectStmt{} = stmt) do
+  defp analyse_stmt(%PgQuery.SelectStmt{} = stmt, sql) do
     case target_list_names(stmt) do
       ["", "", "numeric_version"] ->
         {:ok, Electric.Postgres.Proxy.Prisma.Query.NamespaceVersionV5_2}
@@ -124,6 +126,13 @@ defmodule Electric.Postgres.Proxy.Prisma do
         "cache_size"
       ] ->
         {:ok, Electric.Postgres.Proxy.Prisma.Query.SequenceV5_2}
+
+      columns ->
+        Logger.error(
+          "Received unknown prisma introspection query: #{inspect(sql)} with columns #{inspect(columns)}"
+        )
+
+        :error
     end
   end
 

diff --git a/components/electric/lib/electric/postgres/proxy/prisma/query.ex b/components/electric/lib/electric/postgres/proxy/prisma/query.ex
@@ -1,12 +1,12 @@
 defmodule Electric.Postgres.Proxy.Prisma.Query do
   alias Electric.Postgres.Proxy.Prisma
-  alias Electric.Postgres.Extension.SchemaLoader
+  alias Electric.Postgres.Schema
   alias PgProtocol.Message, as: M
 
   @type data_row() :: [binary()]
   @callback parameter_description(Prisma.t()) :: [integer()]
   @callback row_description(Prisma.t()) :: [M.RowDescription.Field.t()]
-  @callback data_rows([term()], SchemaLoader.t(), Prisma.t()) :: [data_row()]
+  @callback data_rows([term()], Schema.t(), Prisma.t()) :: [data_row()]
 
   # PG_VERSION_NUM => sprintf("%d%04d", $majorver, $minorver)
   defguard is_major_version(config, v)
@@ -99,7 +99,7 @@ defmodule Electric.Postgres.Proxy.Prisma.Query.VersionV5_2 do
     ]
   end
 
-  def data_rows(_binds, _loader, config) do
+  def data_rows(_binds, _schema, config) do
     [[server_version_string(config)]]
   end
 end

diff --git a/components/electric/test/electric/satellite/ws_validations_test.exs b/components/electric/test/electric/satellite/ws_validations_test.exs
@@ -91,8 +91,8 @@ defmodule Electric.Satellite.WsValidationsTest do
       migrate(
         ctx.db,
         vsn,
-        "public.foo",
-        "CREATE TABLE public.foo (id TEXT PRIMARY KEY, b BOOLEAN)"
+        "CREATE TABLE public.foo (id TEXT PRIMARY KEY, b BOOLEAN)",
+        electrify: "public.foo"
       )
 
     valid_records = [
@@ -369,8 +369,8 @@ defmodule Electric.Satellite.WsValidationsTest do
       migrate(
         ctx.db,
         vsn,
-        "public.foo",
-        "CREATE TABLE public.foo (id TEXT PRIMARY KEY, t1 timestamp, t2 timestamptz)"
+        "CREATE TABLE public.foo (id TEXT PRIMARY KEY, t1 timestamp, t2 timestamptz)",
+        electrify: "public.foo"
       )
 
     valid_records = [