implemented in and not in for PG query fix #41

Author: dstpierre

database/postgresql/base_test.go

@@ -17,6 +17,7 @@ type Task struct {
 	Done      bool      `json:"done"`
 	Likes     int64     `json:"likes"`
 	Todos     []Todo    `json:"todos"`
+	Tags      []string  `json:"tags"`
 	Created   time.Time `json:"created"`
 }
 
@@ -57,6 +58,7 @@ func newTask(title string, done bool) map[string]interface{} {
 		Title:   title,
 		Done:    done,
 		Todos:   []Todo{Todo{Title: "sub", Done: done}, Todo{Title: "sub2", Done: done}},
+		Tags:    []string{title, "unittest", "tag"},
 		Created: time.Now(),
 	})
 }
@@ -370,3 +372,66 @@ func TestQueryDocumentsWithNonExistingDB(t *testing.T) {
 		t.Fatalf("expected empty result but got %v", result)
 	}
 }
+
+func TestQueryWithInOperator(t *testing.T) {
+	redTask := newTask("red", false)
+	redTask, err := datastore.CreateDocument(adminAuth, confDBName, colName, redTask)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	blueTask := newTask("blue", false)
+	blueTask, err = datastore.CreateDocument(adminAuth, confDBName, colName, blueTask)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// test the "in" operator
+	var clauses [][]interface{}
+	clauses = append(clauses, []interface{}{"tags", "in", "red"})
+	clauses = append(clauses, []interface{}{"done", "=", false})
+
+	lp := model.ListParams{Page: 1, Size: 5}
+
+	filters, err := datastore.ParseQuery(clauses)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	result, err := datastore.QueryDocuments(adminAuth, confDBName, colName, filters, lp)
+	if err != nil {
+		t.Fatal(err)
+	} else if result.Total != 1 {
+		t.Fatalf("expected total to be 1 got %d", result.Total)
+	} else if id := result.Results[0]["ID"]; id != redTask["ID"] {
+		t.Fatalf("expected result item id to be %s got %s", redTask["ID"], id)
+	}
+
+	clauses = nil
+	clauses = append(clauses, []interface{}{"tags", "!in", "red"})
+	clauses = append(clauses, []interface{}{"done", "=", false})
+
+	filters, err = datastore.ParseQuery(clauses)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	result, err = datastore.QueryDocuments(adminAuth, confDBName, colName, filters, lp)
+	if err != nil {
+		t.Fatal(err)
+	} else if result.Total <= 1 {
+		t.Fatalf("expected total to be > 1 got %d", result.Total)
+	}
+
+	found := false
+	for _, task := range result.Results {
+		if task["ID"] == blueTask["ID"] {
+			found = true
+			break
+		}
+	}
+
+	if !found {
+		t.Errorf("expected to find blueTask ID in result set")
+	}
+}

database/postgresql/count_test.go

@@ -48,7 +48,10 @@ func TestCountWithNoFilter(t *testing.T) {
 	}
 
 	// Here we expect this count because after running all tests total count of documents will be 16 + 3
-	if count != 19 {
+	//TODO: Use a dedicated collection for testing the count, only this function
+	// will append row to the collection so this hardcoded value isn't dependent of
+	// previous test
+	if count != 21 {
 		t.Fatalf("expected 19 got %v", count)
 	}
 }

database/postgresql/query.go

@@ -21,6 +21,8 @@ func (mg *PostgreSQL) ParseQuery(clauses [][]interface{}) (map[string]interface{
 			return filter, fmt.Errorf("The %d query clause's field parameter must be a string: %v", i+1, clause[0])
 		}
 
+		origField := field
+
 		field = fmt.Sprintf(`data->>'%s'`, field)
 
 		op, ok := clause[1].(string)
@@ -36,8 +38,11 @@ func (mg *PostgreSQL) ParseQuery(clauses [][]interface{}) (map[string]interface{
 		case ">", "<", ">=", "<=":
 			filter[field+" "+op+" "] = clause[2]
 		case "in", "!in":
-			//TODO: Implement the value in array or value not in array
-			return filter, fmt.Errorf("array lookup is not implemented yet for PostgreSQL at %d op: %s.", i+1, op)
+			field = fmt.Sprintf("data->'%s' ? ", origField)
+			if strings.HasPrefix(op, "!") {
+				field = " NOT " + field
+			}
+			filter[field] = clause[2]
 		default:
 			return filter, fmt.Errorf("The %d query clause's operator: %s is not supported at the moment.", i+1, op)
 		}