Handle extra AND in where clause of dimension partition condition