fixed issue with SQLite update function overwritting doc

Author: dstpierre

database/sqlite/base.go

@@ -278,6 +278,15 @@ func (sl *SQLite) GetDocumentsByIDs(auth model.Auth, dbName, col string, ids []s
 }
 
 func (sl *SQLite) UpdateDocument(auth model.Auth, dbName, col, id string, doc map[string]interface{}) (map[string]interface{}, error) {
+	orig, err := sl.GetDocumentByID(auth, dbName, col, id)
+	if err != nil {
+		return nil, err
+	}
+
+	for key, val := range doc {
+		orig[key] = val
+	}
+
 	where := secureWrite(auth, col)
 
 	qry := fmt.Sprintf(`
@@ -286,7 +295,7 @@ func (sl *SQLite) UpdateDocument(auth model.Auth, dbName, col, id string, doc ma
 		%s AND id = $3
 	`, dbName, model.CleanCollectionName(col), where)
 
-	b, err := json.Marshal(doc)
+	b, err := json.Marshal(orig)
 	if err != nil {
 		return nil, err
 	}
@@ -297,6 +306,7 @@ func (sl *SQLite) UpdateDocument(auth model.Auth, dbName, col, id string, doc ma
 
 	updated, err := sl.GetDocumentByID(auth, dbName, col, id)
 	if err != nil {
+		fmt.Println("DEBUG: in getbyid", err)
 		return nil, err
 	}
 

db_test.go

@@ -148,6 +148,54 @@ func TestDBCreate(t *testing.T) {
 	}
 }
 
+func TestDBUpdateShouldNotOverwriteDoc(t *testing.T) {
+	task :=
+		Task{
+			Title:   "item created",
+			Created: time.Now(),
+		}
+
+	resp := dbReq(t, db.add, "POST", "/db/tasks", task)
+	defer resp.Body.Close()
+
+	if resp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, resp))
+	}
+
+	var saved Task
+	if err := parseBody(resp.Body, &saved); err != nil {
+		t.Fatal(err)
+	} else if task.Title != saved.Title {
+		t.Errorf("expected title to be %s go %s", task.Title, saved.Title)
+	}
+
+	update := new(struct {
+		Done bool `json:"done"`
+	})
+	update.Done = true
+
+	uresp := dbReq(t, db.update, "PUT", "/db/tasks/"+saved.ID, update)
+	defer uresp.Body.Close()
+
+	if uresp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, uresp))
+	}
+
+	resp = dbReq(t, db.get, "GET", "/db/tasks/"+saved.ID, nil)
+	defer resp.Body.Close()
+
+	if resp.StatusCode > 299 {
+		t.Fatal(GetResponseBody(t, resp))
+	}
+
+	var afterUpdate Task
+	if err := parseBody(resp.Body, &afterUpdate); err != nil {
+		t.Fatal(err)
+	} else if task.Title != afterUpdate.Title {
+		t.Errorf("expected title to be '%s' got '%s'", task.Title, afterUpdate.Title)
+	}
+}
+
 func TestDBListCollections(t *testing.T) {
 	req := httptest.NewRequest("GET", "/sudolistall", nil)
 	w := httptest.NewRecorder()