Skip to content

Advance to "Allow dynamic fields on distinct and group_by" commit. #18

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.

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

Merged
merged 2 commits into from
Jan 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ defmodule Sqlite.Ecto.Mixfile do
defp deps do
[{:coverex, "~> 1.4.11", only: :coverage},
{:ex_doc, "~> 0.14.5", only: :dev},
{:ecto, git: "https://github.com/scouten/ecto.git", ref: "312f929b447f0762b0f1bfddb42dbfe4106da399"},
{:ecto, git: "https://github.com/scouten/ecto.git", ref: "ad3a455aa3d5e4f932a5bb8ae1590b21d95cce54"},
{:poison, "~> 1.0"},
{:sqlitex, git: "https://github.com/scouten/sqlitex.git", ref: "c997c613a69ece59d8dd6b7e7ee557d4c4a1c709"}]
end
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"coverex": {:hex, :coverex, "1.4.11", "fb963586be173e0e5253b200ca624e2708ed5dbe58b90ddbed27184a1f46d61e", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, optional: false]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
"decimal": {:hex, :decimal, "1.1.1", "a8ff5b673105e6cdaca96f799aeefc6f07142881b616c65db16e14e556b16e76", [:mix], []},
"earmark": {:hex, :earmark, "1.0.3", "89bdbaf2aca8bbb5c97d8b3b55c5dd0cff517ecc78d417e87f1d0982e514557b", [:mix], []},
"ecto": {:git, "https://github.com/scouten/ecto.git", "312f929b447f0762b0f1bfddb42dbfe4106da399", [ref: "312f929b447f0762b0f1bfddb42dbfe4106da399"]},
"ecto": {:git, "https://github.com/scouten/ecto.git", "ad3a455aa3d5e4f932a5bb8ae1590b21d95cce54", [ref: "ad3a455aa3d5e4f932a5bb8ae1590b21d95cce54"]},
"esqlite": {:hex, :esqlite, "0.2.1", "0e2896f177180b33e5a8fe65342b4e81de46e0db59e4cbf6e8b9101e98d423fd", [:make, :rebar], []},
"ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
"hackney": {:hex, :hackney, "1.6.5", "8c025ee397ac94a184b0743c73b33b96465e85f90a02e210e86df6cbafaa5065", [:rebar3], [{:certifi, "0.7.0", [hex: :certifi, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
Expand Down
14 changes: 7 additions & 7 deletions test/sqlite_ecto_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -568,16 +568,16 @@ defmodule Sqlite.Ecto.Test do
end

test "interpolated values" do
query = Model
query = "model"
|> select([], ^0)
|> join(:inner, [], Model2, ^true)
|> join(:inner, [], Model2, ^false)
|> where([], ^true)
|> where([], ^false)
|> group_by([], ^1)
|> group_by([], ^2)
|> having([], ^true)
|> having([], ^false)
|> where([], fragment("?", ^true))
|> where([], fragment("?", ^false))
|> having([], fragment("?", ^true))
|> having([], fragment("?", ^false))
|> group_by([], fragment("?", ^1))
|> group_by([], fragment("?", ^2))
|> order_by([], fragment("?", ^3))
|> order_by([], ^:x)
|> limit([], ^4)
Expand Down