,which, who, that??? Please help me

[annieachenn]

Dear teachers,
I wonder if you can help me figure out a question about grammar on our monthly exam. I hope I can get some information from native English speakers. (I teach Chinese students.) The following are the two questions.
1. Catherine had a violent quarrel with her boyfriend _____ made her feel heartbroken.
(A) which (B) who (C) that (D) ,which
2. Jenny received a bunch of roses from her secret admirer ____ put her in an excellent
mood.
(A) which (B) who (C) that (D) ,which
The anwers to these two questions are (D), but I wonder if (B) and (C) are also grammatical or acceptable. Would you please kindly take some time to answer my questions? Thank you very much.

[xiahuangtiao]

these two are "non-restrictive attributive clauses"
so pls Pay attention to the use of commas in the Non-restrictive Attributive Clause.
after the comma,"which" represents the sentence before the comma
i hope i've solved your problems

[harvest]

this material is relative pronoun or adjective clause.
there are some relative pronouns, they are :

who, replace human as subject
whom, replace human as object
whose, replace human as possession
which, thing or animal
where, place ( same with in which)
that can replace who, whom and which.

so to answer these two Questions, lets make questions.

Who made Catherine feel heartbroken or which made catherine feel heartbroken?

the same Question we can make for no.2

who put jenny in an excellent mood or which put jenny in excellent mood?

so I think the answer for these two questions are B

[mythguidedlife]

The answer depends on your intent. Do you want the reader to think that the violent quarrel (that) upset you, or that your boyfriend (who) upset you?