Release v1.3.27

VERSION

@@ -1 +1 @@
-1.3.26
+1.3.27

lib/logflare/application.ex

@@ -60,7 +60,8 @@ defmodule Logflare.Application do
       {DynamicSupervisor,
        strategy: :one_for_one, name: Logflare.Backends.Adaptor.PostgresAdaptor.Supervisor},
       {Registry, name: Logflare.Backends.SourceRegistry, keys: :unique},
-      {Registry, name: Logflare.Backends.SourceDispatcher, keys: :duplicate}
+      {Registry, name: Logflare.Backends.SourceDispatcher, keys: :duplicate},
+      {Registry, name: Logflare.CounterRegistry, keys: :unique}
     ] ++ common_children()
   end
 
@@ -140,7 +141,8 @@ defmodule Logflare.Application do
       {DynamicSupervisor,
        strategy: :one_for_one, name: Logflare.Backends.Adaptor.PostgresAdaptor.Supervisor},
       {Registry, name: Logflare.Backends.SourceRegistry, keys: :unique},
-      {Registry, name: Logflare.Backends.SourceDispatcher, keys: :duplicate}
+      {Registry, name: Logflare.Backends.SourceDispatcher, keys: :duplicate},
+      {Registry, name: Logflare.CounterRegistry, keys: :unique}
     ] ++ conditional_children() ++ common_children()
   end
 

lib/logflare/backends/adaptor/postgres_adaptor/pg_repo.ex

@@ -56,9 +56,10 @@ defmodule Logflare.Backends.Adaptor.PostgresAdaptor.PgRepo do
   Retrieves the repo module. Requires `:source` to be preloaded.
   """
   @spec get_repo_module(SourceBackend.t()) :: Ecto.Repo.t()
-  def get_repo_module(%SourceBackend{source: %Source{token: token}}) do
-    token = token |> Atom.to_string() |> String.replace("-", "")
-    Module.concat([Logflare.Repo.Postgres, "Adaptor#{token}"])
+  def get_repo_module(%SourceBackend{config: config, source: %Source{}}) do
+    data = inspect(config)
+    sha256 = :crypto.hash(:sha256, data) |> Base.encode16() |> String.downcase()
+    Module.concat([Logflare.Repo.Postgres, "Adaptor#{sha256}"])
   end
 
   @doc """

lib/logflare/backends/adaptor/postgres_adaptor/repo/migrations/add_log_events.ex

@@ -25,7 +25,7 @@ defmodule Logflare.Backends.Adaptor.PostgresAdaptor.Repo.Migrations.AddLogEvents
           create table(unquote(table_name), primary_key: false) do
             add(:id, :string, primary_key: true)
             add(:body, :map)
-            add(:event_message, :string)
+            add(:event_message, :text)
             add(:timestamp, :utc_datetime_usec)
           end
         end

lib/logflare/endpoints.ex

@@ -9,6 +9,7 @@ defmodule Logflare.Endpoints do
   alias Logflare.Utils
   alias Logflare.Backends
   alias Logflare.Backends.Adaptor.PostgresAdaptor
+  alias Logflare.SingleTenant
 
   import Ecto.Query
   @typep run_query_return :: {:ok, %{rows: [map()]}} | {:error, String.t()}
@@ -163,10 +164,17 @@ defmodule Logflare.Endpoints do
 
     with {:ok, declared_params} <- Logflare.Sql.parameters(query_string),
          {:ok, transformed_query} <-
-           Logflare.Sql.transform(endpoint_query.language, transform_input, user_id),
-         {:ok, result} <-
-           exec_query_on_backend(endpoint_query, transformed_query, declared_params, params) do
-      {:ok, result}
+           Logflare.Sql.transform(endpoint_query.language, transform_input, user_id) do
+      {endpoint, query_string} =
+        if SingleTenant.supabase_mode?() and SingleTenant.postgres_backend_adapter_opts() != nil do
+          # translate the query
+          {:ok, q} = Logflare.Sql.translate(:bq_sql, :pg_sql, transformed_query)
+          {Map.put(endpoint_query, :language, :pg_sql), q}
+        else
+          {endpoint_query, transformed_query}
+        end
+
+      exec_query_on_backend(endpoint, query_string, declared_params, params)
     end
   end
 
@@ -213,10 +221,10 @@ defmodule Logflare.Endpoints do
   end
 
   defp exec_query_on_backend(
-         %Query{language: :pg_sql} = endpoint_query,
+         %Query{query: query_string, language: :pg_sql} = endpoint_query,
          transformed_query,
          _declared_params,
-         _params
+         params
        ) do
     # find compatible source backend
     # TODO: move this to Backends module
@@ -233,7 +241,20 @@ defmodule Logflare.Endpoints do
           other
       end)
 
-    with {:ok, rows} <- PostgresAdaptor.execute_query(source_backend, transformed_query) do
+    # convert params to PG params style
+    positions =
+      Logflare.Sql.parameter_positions(query_string)
+      |> then(fn {:ok, params} ->
+        params
+        |> Enum.sort_by(&{elem(&1, 0)})
+      end)
+
+    args =
+      for {_pos, parameter} <- positions do
+        Map.get(params, parameter)
+      end
+
+    with {:ok, rows} <- PostgresAdaptor.execute_query(source_backend, {transformed_query, args}) do
       {:ok, %{rows: rows}}
     end
   end

lib/logflare/single_tenant.ex

@@ -13,6 +13,7 @@ defmodule Logflare.SingleTenant do
   alias Logflare.Source.Supervisor
   alias Logflare.Source.BigQuery.Schema
   alias Logflare.LogEvent
+  alias Logflare.Backends
   require Logger
 
   @user_attrs %{
@@ -168,7 +169,11 @@ defmodule Logflare.SingleTenant do
 
     if user do
       for source <- Sources.list_sources_by_user(user) do
-        Supervisor.ensure_started(source.token)
+        if postgres_backend?() do
+          Backends.start_source_sup(source)
+        else
+          Supervisor.ensure_started(source.token)
+        end
       end
     end