Skip to content

Adds OrWhere select statement #2

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
davidbanham wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds OrWhere select statement #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dec319
Add OrWhere clause alongside AndWhere
davidbanham Oct 11, 2017
34f8106
DRY up AndOrWhere
davidbanham Oct 11, 2017
97b1e99
Add AndWhere and OrWhere to test
davidbanham Oct 11, 2017
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
14 changes: 11 additions & 3 deletions select.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,25 @@ func (s *SelectStatement) Where(where AsExpr) *SelectStatement {
}

func (s *SelectStatement) AndWhere(where AsExpr) *SelectStatement {
return andOrWhere(where, s, "AND")
}

func (s *SelectStatement) OrWhere(where AsExpr) *SelectStatement {
return andOrWhere(where, s, "OR")
}

func andOrWhere(where AsExpr, s *SelectStatement, operator string) *SelectStatement {
c := s.clone()

if c.where == nil {
c.where = where
} else {
expr := c.where

if bexpr, ok := expr.(*BooleanOperatorExpr); ok && bexpr.operator == "AND" {
c.where = BooleanOperator("AND", append(bexpr.elements[:], where)...)
if bexpr, ok := expr.(*BooleanOperatorExpr); ok && bexpr.operator == operator {
c.where = BooleanOperator(operator, append(bexpr.elements[:], where)...)
} else {
c.where = BooleanOperator("AND", expr, where)
c.where = BooleanOperator(operator, expr, where)
}
}

Expand Down
8 changes: 6 additions & 2 deletions sqlbuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ func TestSelect(t *testing.T) {
AliasColumn(InfixOperator("+", Literal("1"), Literal("2"), Literal("3")), "Five"),
).Where(
In(tbl.C("PartNo"), s.BindAllAsExpr(1000, 1001, 1002)...),
).AndWhere(
In(tbl.C("Grade"), s.BindAllAsExpr("A", "B")...),
).OrWhere(
In(tbl.C("Finish"), s.BindAllAsExpr("HeapsGood", "TopNotch")...),
).OrderBy(
OrderAsc(tbl.C("Type")),
OrderAsc(tbl.C("Product")),
Expand All @@ -94,8 +98,8 @@ func TestSelect(t *testing.T) {
qs, qv, err := s.F(q.AsStatement).ToSQL()

a.NoError(err)
a.Equal("SELECT p.PartNo, p.Type, p.Product, p.Grade, p.Coating, p.Finish, p.Thickness, p.Width, p.Length, p.Dim1, p.Dim2, p.ClassFBR, p.ClassFME, p.ClassFSY, @p3 AS ClassFHO, p.SLOB, dbo.productAvailablePlusALTOAmountOnHand(p.PartNo, @p1) AS OnHandAmount, dbo.productAvailableWeightOnHand(p.PartNo, @p1) AS OnHandWeight, dbo.productReservedAmount(p.PartNo, @p1) AS ReservedAmount, dbo.productALTOAmount(p.PartNo, @p1) AS ALTO, dbo.getPartAvgCost(p.PartNo) AS AverageCost, dbo.productOnOrderAmount(p.PartNo, @p1) AS OnOrderAmount, dbo.productOnOrderWeight(p.PartNo, @p1) AS OnOrderWeight, dbo.getListPriceGivenAvgCost(@p2, p.PartNo, dbo.getPartAvgCost(p.PartNo)) AS MinimumPrice, dbo.customerLastPrice(p.PartNo, @p2) AS CustomerLastPrice, CONVERT(VARCHAR(23), dbo.customerLastSoldDate(p.PartNo, @p2), 126) AS CustomerLastSoldDate, (1 + 2 + 3) AS Five FROM tblproducts p WHERE p.PartNo IN (@p4, @p5, @p6) ORDER BY p.Type ASC, p.Product ASC, p.Grade ASC, p.Coating ASC, p.Finish ASC, p.Thickness ASC, p.Width ASC, p.Dim1 ASC, p.Dim2 ASC, p.Length ASC OFFSET @p7 ROWS FETCH NEXT @p8 ROWS ONLY", qs)
a.Equal([]interface{}{"REGION_1", "CUSTOMER_1", "D", 1000, 1001, 1002, 30, 30}, qv)
a.Equal("SELECT p.PartNo, p.Type, p.Product, p.Grade, p.Coating, p.Finish, p.Thickness, p.Width, p.Length, p.Dim1, p.Dim2, p.ClassFBR, p.ClassFME, p.ClassFSY, @p3 AS ClassFHO, p.SLOB, dbo.productAvailablePlusALTOAmountOnHand(p.PartNo, @p1) AS OnHandAmount, dbo.productAvailableWeightOnHand(p.PartNo, @p1) AS OnHandWeight, dbo.productReservedAmount(p.PartNo, @p1) AS ReservedAmount, dbo.productALTOAmount(p.PartNo, @p1) AS ALTO, dbo.getPartAvgCost(p.PartNo) AS AverageCost, dbo.productOnOrderAmount(p.PartNo, @p1) AS OnOrderAmount, dbo.productOnOrderWeight(p.PartNo, @p1) AS OnOrderWeight, dbo.getListPriceGivenAvgCost(@p2, p.PartNo, dbo.getPartAvgCost(p.PartNo)) AS MinimumPrice, dbo.customerLastPrice(p.PartNo, @p2) AS CustomerLastPrice, CONVERT(VARCHAR(23), dbo.customerLastSoldDate(p.PartNo, @p2), 126) AS CustomerLastSoldDate, (1 + 2 + 3) AS Five FROM tblproducts p WHERE ((p.PartNo IN (@p4, @p5, @p6) AND p.Grade IN (@p7, @p8)) OR p.Finish IN (@p9, @p10)) ORDER BY p.Type ASC, p.Product ASC, p.Grade ASC, p.Coating ASC, p.Finish ASC, p.Thickness ASC, p.Width ASC, p.Dim1 ASC, p.Dim2 ASC, p.Length ASC OFFSET @p11 ROWS FETCH NEXT @p12 ROWS ONLY", qs)
a.Equal([]interface{}{"REGION_1", "CUSTOMER_1", "D", 1000, 1001, 1002, "A", "B", "HeapsGood", "TopNotch", 30, 30}, qv)
}

func TestJoin(t *testing.T) {
Expand Down