Skip to content

WIP Fix tests #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aelaa wants to merge 2 commits into
base: ecto3
Choose a base branch
from
Open

WIP Fix tests #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce4f5bb
Fix wrong case matching
aelaa May 11, 2020
2bf7d71
Fix from expression
aelaa May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/redshift_ecto/connection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ if Code.ensure_loaded?(Postgrex) do
], exprs}
end

defp from(%{from: from} = query, sources) do
defp from(%{from: %Ecto.Query.FromExpr{source: from}} = query, sources) do
Copy link
Author

@aelaa aelaa May 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ecto 3 introduced FromExpr contains source: SubQuery, unlike just SubQuery like before.

{from, name} = get_source(query, sources, 0, from)
[" FROM ", from, " AS " | name]
end
Expand Down Expand Up @@ -546,15 +546,15 @@ if Code.ensure_loaded?(Postgrex) do
defp create_names(prefix, sources, pos, limit) when pos < limit do
current =
case elem(sources, pos) do
Copy link
Author

@aelaa aelaa May 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very strange one. As case should work, it should match {table, schema, _alias} pattern even if there is :fragment in the beginning. That somehow worked in the original code, and had been broken after dependencies updating.

{table, schema, _alias} ->
name = [create_alias(table) | Integer.to_string(pos)]
{quote_table(prefix, table), name, schema}

{:fragment, _, _} ->
{nil, [?f | Integer.to_string(pos)], nil}

%Ecto.SubQuery{} ->
{nil, [?s | Integer.to_string(pos)], nil}

{table, schema, _alias} ->
name = [create_alias(table) | Integer.to_string(pos)]
{quote_table(prefix, table), name, schema}
end

[current | create_names(prefix, sources, pos + 1, limit)]
Expand Down