Skip to content
New issue

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

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

Already on GitHub? # to your account

Remove unique filter of where clauses #518

Merged
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
21 changes: 12 additions & 9 deletions spec/query_builder_spec.cr
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
require "./spec_helper"

describe Avram::QueryBuilder do
it "ensures uniqueness for where, orders, and joins" do
it "ensures uniqueness for orders, and joins" do
query = new_query
.where(Avram::Where::Equal.new(:name, "Paul"))
.where(Avram::Where::Equal.new(:name, "Paul"))
.where(Avram::Where::Raw.new("name = ?", "Mikias"))
.where(Avram::Where::Raw.new("name = ?", "Mikias"))
.where(Avram::Where::Raw.new("name = ?", args: ["Mikias"]))
.join(Avram::Join::Inner.new(:users, :posts))
.join(Avram::Join::Inner.new(:users, :posts))
.order_by(Avram::OrderBy.new(:my_column, :asc))
.order_by(Avram::OrderBy.new(:my_column, :asc))

query.wheres.size.should eq(2)
query.joins.size.should eq(1)
query.statement.should eq "SELECT * FROM users INNER JOIN posts ON users.id = posts.user_id WHERE name = $1 AND name = 'Mikias' ORDER BY my_column ASC"
query.args.should eq ["Paul"]
query.statement.should eq "SELECT * FROM users INNER JOIN posts ON users.id = posts.user_id ORDER BY my_column ASC"
end

it "does not remove potentially duplicate where clauses" do
query = new_query
.where(Avram::Where::Equal.new(:name, "Paul"))
.where(Avram::Where::Equal.new(:age, "18"))
.or(&.where(Avram::Where::Equal.new(:name, "Paul"))
.where(Avram::Where::Equal.new(:age, "100")))

query.statement.should eq "SELECT * FROM users WHERE name = $1 AND age = $2 OR name = $3 AND age = $4"
end

it "can reset order" do
Expand Down
2 changes: 1 addition & 1 deletion src/avram/query_builder.cr
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ class Avram::QueryBuilder
end

def wheres
@wheres.uniq
@wheres
end

@[Deprecated("Use `#wheres` instead. Raw wheres are included.")]
Expand Down
16 changes: 0 additions & 16 deletions src/avram/where.cr
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ module Avram::Where

abstract def prepare(placeholder_supplier : Proc(String)) : String

def ==(other : Condition)
prepare(->{ "unused" }) == other.prepare(->{ "unused" })
end

def ==(other)
false
end

def clone
self
end
Expand All @@ -50,14 +42,6 @@ module Avram::Where

def initialize(@column, @value)
end

def ==(other : ValueHoldingSqlClause)
(prepare(->{ "unused" }) + value.to_s) == (other.prepare(->{ "unused" }) + other.value.to_s)
end

def ==(other : Condition)
false
end
end

abstract class NullSqlClause < SqlClause
Expand Down