Merge pull request #26 from twharmon/update-query-bug-fix

Fix update query bug

README.md

@@ -2,7 +2,7 @@
 Query builder with some handy utility functions.
 
 ## Documentation
-For full documentation see the [godoc](https://godoc.org/github.com/twharmon/gosql) or [GitBook](https://twharmon.gitbook.io/gosql/).
+For full documentation see the [pkg.go.dev](https://pkg.go.dev/github.com/twharmon/gosql?tab=doc) or [GitBook](https://twharmon.gitbook.io/gosql/).
 
 ## Examples
 ```go

db_test.go

@@ -40,6 +40,38 @@ func TestUpdate(t *testing.T) {
 	check(t, mock.ExpectationsWereMet())
 }
 
+func TestUpdateThreeFields(t *testing.T) {
+	db, mock, err := getMockDB()
+	check(t, err)
+	type T struct {
+		ID    int `gosql:"primary"`
+		Name  string
+		Email string
+	}
+	check(t, db.Register(T{}))
+	updateModel := T{5, "foo", "foo@example.com"}
+	mock.ExpectExec(`^update t set name = \?, email = \? where id = \?$`).WithArgs(updateModel.Name, updateModel.Email, updateModel.ID).WillReturnResult(sqlmock.NewResult(0, 1))
+	_, err = db.Update(&updateModel)
+	check(t, err)
+	check(t, mock.ExpectationsWereMet())
+}
+
+func TestUpdateThreeFieldsTwoPrimaries(t *testing.T) {
+	db, mock, err := getMockDB()
+	check(t, err)
+	type T struct {
+		ID    int `gosql:"primary"`
+		Name  string
+		Email string `gosql:"primary"`
+	}
+	check(t, db.Register(T{}))
+	updateModel := T{5, "foo", "foo@example.com"}
+	mock.ExpectExec(`^update t set name = \? where id = \? and email = \?$`).WithArgs(updateModel.Name, updateModel.ID, updateModel.Email).WillReturnResult(sqlmock.NewResult(0, 1))
+	_, err = db.Update(&updateModel)
+	check(t, err)
+	check(t, mock.ExpectationsWereMet())
+}
+
 func TestBegin(t *testing.T) {
 	db, mock, err := getMockDB()
 	check(t, err)

model.go

@@ -79,7 +79,7 @@ func (m *model) getUpdateQuery() string {
 		}
 		query.WriteString(m.fields[i])
 		query.WriteString(" = ?")
-		if i < len(m.fields)-1 {
+		if i < len(m.fields)-1 && !isIntIn(i+1, m.primaryFieldIndecies) {
 			query.WriteString(", ")
 		}
 	}