Skip to content

Commit 0c740d9

Browse files
committed
working through failing test issue
1 parent db81d2c commit 0c740d9

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

lib/logflare/endpoints.ex

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,25 @@ defmodule Logflare.Endpoints do
165165
{endpoint, query_string} =
166166
if SingleTenant.supabase_mode?() and SingleTenant.postgres_backend?() and
167167
endpoint_query.language != :pg_sql do
168+
IO.puts("single tenant postgres backend")
169+
168170
# translate the query
169171
schema_prefix = Keyword.get(SingleTenant.postgres_backend_adapter_opts(), :schema)
170172

173+
IO.inspect(transformed_query,
174+
label: "transformed_query",
175+
limit: :infinity,
176+
pretty: true
177+
)
178+
171179
{:ok, q} = Logflare.Sql.translate(:bq_sql, :pg_sql, transformed_query, schema_prefix)
172180

181+
IO.inspect(q,
182+
label: "translated_query",
183+
limit: :infinity,
184+
pretty: true
185+
)
186+
173187
{Map.put(endpoint_query, :language, :pg_sql), q}
174188
else
175189
{endpoint_query, transformed_query}
@@ -216,9 +230,12 @@ defmodule Logflare.Endpoints do
216230
"""
217231
@spec run_cached_query(Query.t(), map()) :: run_query_return()
218232
def run_cached_query(query, params \\ %{}) do
233+
IO.inspect(query, label: "query", limit: :infinity, pretty: true)
234+
219235
if query.cache_duration_seconds > 0 do
220236
query
221237
|> Resolver.resolve(params)
238+
|> IO.inspect(label: "resolver results", limit: :infinity, pretty: true)
222239
|> ResultsCache.query()
223240
else
224241
# execute the query directly

lib/logflare/endpoints/query.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ defmodule Logflare.Endpoints.Query do
7777
:backend_id
7878
])
7979
|> infer_language_from_backend()
80-
|> validate_required([:name, :query, :language, :backend_id])
80+
|> validate_required([:name, :query, :language])
8181
end
8282

8383
def update_by_user_changeset(query, attrs) do
@@ -103,7 +103,7 @@ defmodule Logflare.Endpoints.Query do
103103

104104
def default_validations(changeset) do
105105
changeset
106-
|> validate_required([:name, :query, :user, :language, :backend_id])
106+
|> validate_required([:name, :query, :user, :language])
107107
|> unique_constraint(:name, name: :endpoint_queries_name_index)
108108
|> unique_constraint(:token)
109109
|> validate_number(:max_limit, greater_than: 0, less_than: 10_001)

lib/logflare_web/controllers/endpoints_controller.ex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,12 @@ defmodule LogflareWeb.EndpointsController do
5555
def query(%{assigns: %{endpoint: endpoint}} = conn, params) do
5656
endpoint_query = Endpoints.map_query_sources(endpoint)
5757

58+
IO.inspect(endpoint_query, label: "endpoint query")
59+
5860
case Endpoints.run_cached_query(endpoint_query, params) do
5961
{:ok, result} ->
62+
IO.inspect(result, label: "cached_query_result")
63+
6064
Logger.debug("Endpoint cache result, #{inspect(result, pretty: true)}")
6165
render(conn, "query.json", result: result.rows)
6266

test/support/factory.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ defmodule Logflare.Factory do
223223

224224
def endpoint_factory(attrs \\ %{}) do
225225
user = attrs[:user] || insert(:user)
226-
backend = attrs[:backend] || insert(:backend, user: user, type: :bigquery)
227-
language = attrs[:language] || :bq_sql
226+
backend = Map.get(attrs, :backend)
227+
language = Map.get(attrs, :language, :bq_sql)
228228

229229
%Query{
230230
user: user,

0 commit comments

Comments
 (0)