Fix ambiguity bug in getCommentsByRepoIDSince (#665)

ethantkoenig · lunny · commit a6f5efa0bb7b · 2017-01-14T10:21:30.000+08:00
diff --git a/models/issue_comment.go b/models/issue_comment.go
@@ -420,9 +420,11 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro
 
 func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) {
 	comments := make([]*Comment, 0, 10)
-	sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("created_unix")
+	sess := e.Where("issue.repo_id = ?", repoID).
+		Join("INNER", "issue", "issue.id = comment.issue_id").
+		Asc("comment.created_unix")
 	if since > 0 {
-		sess.And("updated_unix >= ?", since)
+		sess.And("comment.updated_unix >= ?", since)
 	}
 	return comments, sess.Find(&comments)
 }

Original file line number	Diff line number	Diff line change
`@@ -420,9 +420,11 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro`
`420`	`420`
`421`	`421`	`func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) {`
`422`	`422`	`comments := make([]*Comment, 0, 10)`
`423`		`- sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("created_unix")`
	`423`	`+ sess := e.Where("issue.repo_id = ?", repoID).`
	`424`	`+ Join("INNER", "issue", "issue.id = comment.issue_id").`
	`425`	`+ Asc("comment.created_unix")`
`424`	`426`	`if since > 0 {`
`425`		`- sess.And("updated_unix >= ?", since)`
	`427`	`+ sess.And("comment.updated_unix >= ?", since)`
`426`	`428`	`}`
`427`	`429`	`return comments, sess.Find(&comments)`
`428`	`430`	`}`