refactor: remove the 'always true' condition

TsmygGeorgy · Dec 27, 2021 · 9f4fdd3 · 9f4fdd3
1 parent 420a698
commit 9f4fdd3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/builder.go b/builder.go
@@ -87,9 +87,7 @@ func (s *ResourceSelectBuilder) Build(
  if err != nil {
  return nil, err
  }
- if len(conditions) == 0 && len(b.WhereParts) == 0 {
- b.Where(alwaysTrue)
- } else {
+ if len(conditions) > 0 {
  b.Where(conditions...)
  }
  sortList := make([]qparser.Sort, len(query.Sort))

diff --git a/builder_test.go b/builder_test.go
@@ -34,13 +34,13 @@ var resourceBuilderTests = []resourceBuilderTest{
  {
  title: "Default fields, no conditions",
  query: "",
- sql: fmt.Sprintf("SELECT * FROM %s WHERE 1 = 1", resourceName),
+ sql: fmt.Sprintf("SELECT * FROM %s", resourceName),
  args: []interface{}{},
  },
  {
  title: "Specific fields, no conditions",
  query: fmt.Sprintf("fields[%s]=%s,%s", resourceName, resourceFieldID, resourceFieldTitle),
- sql: fmt.Sprintf("SELECT %s, %s FROM %s WHERE 1 = 1", resourceFieldID, resourceFieldTitle, resourceName),
+ sql: fmt.Sprintf("SELECT %s, %s FROM %s", resourceFieldID, resourceFieldTitle, resourceName),
  args: []interface{}{},
  },
  {

diff --git a/expr.go b/expr.go
@@ -8,8 +8,6 @@ import (
  "github.com/velmie/qparser"
 )
 
-const alwaysTrue = RawSql("1 = 1")
-
 // Sqlizer return an SQL with the list of arguments
 type Sqlizer interface {
  ToSql() (string, []interface{}, error)