JDBC AND operator push down

For simple AND such as
select * from test where THEID = 1 AND NAME = 'fred',
The filters pushed down to JDBC layers are EqualTo(THEID,1), EqualTo(Name,fred). These are handled OK by the current code.

For query such as
SELECT * FROM foobar WHERE THEID = 1 OR NAME = 'mary' AND THEID = 2" ,
the filter is Or(EqualTo(THEID,1),And(EqualTo(NAME,mary),EqualTo(THEID,2)))

So need to add And filter in JDBC layer.