Move SQL function templates into priv/

...so that they are available in the packaged Elixir release to be loaded and evaluated at run time.
electric-sql · Dec 22, 2023 · a4eab72 · a4eab72
1 parent 42eed14
commit a4eab72
Show file tree

Hide file tree

Showing 29 changed files with 9 additions and 8 deletions.
diff --git a/components/electric/Dockerfile b/components/electric/Dockerfile
@@ -24,9 +24,10 @@ COPY mix.* /app/
 RUN mix deps.get
 RUN mix deps.compile
 
+COPY config/*runtime.exs /app/config/
 COPY lib /app/lib/
 COPY src /app/src/
-COPY config/*runtime.exs /app/config/
+COPY priv /app/priv
 
 ARG ELECTRIC_VERSION=local
 ARG MAKE_RELEASE_TASK=release

diff --git a/components/electric/lib/electric/postgres/extension/functions.ex b/components/electric/lib/electric/postgres/extension/functions.ex
@@ -9,14 +9,14 @@ defmodule Electric.Postgres.Extension.Functions do
 
   require EEx
 
-  sql_files =
-    "functions/**/*.sql.eex"
-    |> Path.expand(__DIR__)
-    |> Path.wildcard()
+  @template_dir "priv/sql_function_templates"
+
+  template_dir_path = Application.app_dir(:electric, @template_dir)
+  sql_template_paths = Path.wildcard(template_dir_path <> "/**/*.sql.eex")
 
   function_paths =
-    for path <- sql_files do
-      relpath = Path.relative_to(path, Path.expand("./functions", __DIR__))
+    for path <- sql_template_paths do
+      relpath = Path.relative_to(path, template_dir_path)
       name = path |> Path.basename(".sql.eex") |> String.to_atom()
       {relpath, name}
     end
@@ -64,7 +64,7 @@ defmodule Electric.Postgres.Extension.Functions do
   end
 
   defp eval_template(relpath) do
-    Path.join([Path.expand(__DIR__), "functions", relpath])
+    Path.join(Application.app_dir(:electric, @template_dir), relpath)
     |> EEx.compile_file()
     |> Code.eval_quoted([], __ENV__)
     |> elem(0)

diff --git a/.../extension/functions/__pg_version.sql.eex → ...l_function_templates/__pg_version.sql.eex b/.../extension/functions/__pg_version.sql.eex → ...l_function_templates/__pg_version.sql.eex
diff --git a/...sion/functions/__primary_key_list.sql.eex → ...tion_templates/__primary_key_list.sql.eex b/...sion/functions/__primary_key_list.sql.eex → ...tion_templates/__primary_key_list.sql.eex
diff --git a/...ctions/__resolve_table_from_names.sql.eex → ...plates/__resolve_table_from_names.sql.eex b/...ctions/__resolve_table_from_names.sql.eex → ...plates/__resolve_table_from_names.sql.eex
diff --git a/...ctions/__session_replication_role.sql.eex → ...plates/__session_replication_role.sql.eex b/...ctions/__session_replication_role.sql.eex → ...plates/__session_replication_role.sql.eex
diff --git a/...xtension/functions/__table_schema.sql.eex → ...function_templates/__table_schema.sql.eex b/...xtension/functions/__table_schema.sql.eex → ...function_templates/__table_schema.sql.eex
diff --git a/...sion/functions/alter_shadow_table.sql.eex → ...tion_templates/alter_shadow_table.sql.eex b/...sion/functions/alter_shadow_table.sql.eex → ...tion_templates/alter_shadow_table.sql.eex
diff --git a/.../functions/assign_default_version.sql.eex → ..._templates/assign_default_version.sql.eex b/.../functions/assign_default_version.sql.eex → ..._templates/assign_default_version.sql.eex
diff --git a/...unctions/assign_migration_version.sql.eex → ...emplates/assign_migration_version.sql.eex b/...unctions/assign_migration_version.sql.eex → ...emplates/assign_migration_version.sql.eex
diff --git a/...s/extension/functions/capture_ddl.sql.eex → ...ql_function_templates/capture_ddl.sql.eex b/...s/extension/functions/capture_ddl.sql.eex → ...ql_function_templates/capture_ddl.sql.eex
diff --git a/.../functions/current_transaction_id.sql.eex → ..._templates/current_transaction_id.sql.eex b/.../functions/current_transaction_id.sql.eex → ..._templates/current_transaction_id.sql.eex
diff --git a/...tension/functions/current_xact_id.sql.eex → ...unction_templates/current_xact_id.sql.eex b/...tension/functions/current_xact_id.sql.eex → ...unction_templates/current_xact_id.sql.eex
diff --git a/...tension/functions/current_xact_ts.sql.eex → ...unction_templates/current_xact_ts.sql.eex b/...tension/functions/current_xact_ts.sql.eex → ...unction_templates/current_xact_ts.sql.eex
diff --git a/...s/extension/functions/ddlx/assign.sql.eex → ...ql_function_templates/ddlx/assign.sql.eex b/...s/extension/functions/ddlx/assign.sql.eex → ...ql_function_templates/ddlx/assign.sql.eex
diff --git a/.../extension/functions/ddlx/disable.sql.eex → ...l_function_templates/ddlx/disable.sql.eex b/.../extension/functions/ddlx/disable.sql.eex → ...l_function_templates/ddlx/disable.sql.eex
diff --git a/...s/extension/functions/ddlx/enable.sql.eex → ...ql_function_templates/ddlx/enable.sql.eex b/...s/extension/functions/ddlx/enable.sql.eex → ...ql_function_templates/ddlx/enable.sql.eex
diff --git a/...es/extension/functions/ddlx/grant.sql.eex → ...sql_function_templates/ddlx/grant.sql.eex b/...es/extension/functions/ddlx/grant.sql.eex → ...sql_function_templates/ddlx/grant.sql.eex
diff --git a/...extension/functions/ddlx/unassign.sql.eex → ..._function_templates/ddlx/unassign.sql.eex b/...extension/functions/ddlx/unassign.sql.eex → ..._function_templates/ddlx/unassign.sql.eex
diff --git a/...res/extension/functions/electrify.sql.eex → .../sql_function_templates/electrify.sql.eex b/...res/extension/functions/electrify.sql.eex → .../sql_function_templates/electrify.sql.eex
diff --git a/.../__validate_table_column_defaults.sql.eex → .../__validate_table_column_defaults.sql.eex b/.../__validate_table_column_defaults.sql.eex → .../__validate_table_column_defaults.sql.eex
diff --git a/...ify/__validate_table_column_types.sql.eex → ...ify/__validate_table_column_types.sql.eex b/...ify/__validate_table_column_types.sql.eex → ...ify/__validate_table_column_types.sql.eex
diff --git a/...ension/functions/find_fk_to_table.sql.eex → ...nction_templates/find_fk_to_table.sql.eex b/...ension/functions/find_fk_to_table.sql.eex → ...nction_templates/find_fk_to_table.sql.eex
diff --git a/...ns/install_functions_and_triggers.sql.eex → ...es/install_functions_and_triggers.sql.eex b/...ns/install_functions_and_triggers.sql.eex → ...es/install_functions_and_triggers.sql.eex
diff --git a/...nsion/functions/migration_version.sql.eex → ...ction_templates/migration_version.sql.eex b/...nsion/functions/migration_version.sql.eex → ...ction_templates/migration_version.sql.eex
diff --git a/...m_reordered_op_installer_function.sql.eex → ...m_reordered_op_installer_function.sql.eex b/...m_reordered_op_installer_function.sql.eex → ...m_reordered_op_installer_function.sql.eex
diff --git a/.../extension/functions/string_utils.sql.eex → ...l_function_templates/string_utils.sql.eex b/.../extension/functions/string_utils.sql.eex → ...l_function_templates/string_utils.sql.eex
diff --git a/...functions/tx_has_assigned_version.sql.eex → ...templates/tx_has_assigned_version.sql.eex b/...functions/tx_has_assigned_version.sql.eex → ...templates/tx_has_assigned_version.sql.eex
diff --git a/...ns/upsert_acknowledged_client_lsn.sql.eex → ...es/upsert_acknowledged_client_lsn.sql.eex b/...ns/upsert_acknowledged_client_lsn.sql.eex → ...es/upsert_acknowledged_client_lsn.sql.eex