Merge pull request #117 from ulule/fix/panic-if-condition-is-nil

fix: panic if condition is nil on WHERE / AND clauses

Author: thoas

builder/select.go

@@ -144,6 +144,9 @@ func (b Select) With(args ...stmt.WithQuery) Select {
 
 // Where adds WHERE clauses.
 func (b Select) Where(condition stmt.Expression) Select {
+	if condition == nil {
+		panic("loukoum: condition must be not nil")
+	}
 	if b.query.Where.IsEmpty() {
 		b.query.Where = stmt.NewWhere(condition)
 		return b
@@ -154,6 +157,9 @@ func (b Select) Where(condition stmt.Expression) Select {
 
 // And adds AND WHERE conditions.
 func (b Select) And(condition stmt.Expression) Select {
+	if condition == nil {
+		panic("loukoum: condition must be not nil")
+	}
 	b.query.Where = b.query.Where.And(condition)
 	return b
 }

builder/select_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	loukoum "github.com/ulule/loukoum/v3"
 	"github.com/ulule/loukoum/v3/builder"
 	"github.com/ulule/loukoum/v3/stmt"
@@ -1630,3 +1631,21 @@ func TestSelect_Extra(t *testing.T) {
 		},
 	})
 }
+
+func TestSelect_NilCondition(t *testing.T) {
+	is := require.New(t)
+	is.Panics(func() {
+		var nilcond stmt.Expression
+		loukoum.Select("col").
+			From("table").
+			Where(loukoum.Condition("col").Equal("value")).
+			And(nilcond)
+	})
+
+	is.Panics(func() {
+		var nilcond stmt.Expression
+		loukoum.Select("col").
+			From("table").
+			Where(nilcond)
+	})
+}