bugfix: handling of ANDed join predicates

[systay]

Description

We recently did work to handle derived tables better, and in that change set, a bug snuck in when handling complex join predicates with ANDs in them. When it was possible to merge everything back into a single route, we did not mark the argument form of the join predicates correctly because of the AND and it would show up in the final query sent down to the tablets.

Related Issue(s)

Fixes #15547
Bug introduced in #14974

Checklist

• "Backport to:" labels have been added if this change should be back-ported to release branches
• If this change is to be back-ported to previous releases, a justification is included in the PR description
• Tests were added or are not required
• Did the new or modified tests pass consistently locally and on CI?
• Documentation was added or is not required

[vitess-bot]

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

• Ensure that the Pull Request has a descriptive title.
• Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

• Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

• Apply the release notes (needs details) label if users need to know about this change.
• New features should be documented.
• There should be some code comments as to why things are implemented the way they are.
• There should be a comment at the top of each new or modified test to explain what the test does.

New flags

• Is this flag really necessary?
• Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

• Each item in Jobs should be named in order to mark it as required.
• If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

• Protobuf changes should be wire-compatible.
• Changes to _vt tables and RPCs need to be backward compatible.
• RPC changes should be compatible with vitess-operator
• If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
• vtctl command output order should be stable and awk-able.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.73%. Comparing base (c830723) to head (f027bed).

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #15551   +/-   ##
=======================================
  Coverage   65.73%   65.73%           
=======================================
  Files        1560     1560           
  Lines      194590   194593    +3     
=======================================
+ Hits       127910   127925   +15     
+ Misses      66680    66668   -12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.