No need to follow onConflict here
Revert "No need to follow onConflict here"

This reverts commit c65a4878caebc965d9836433f14c006bd9aea768.
Revert "Revert "No need to follow onConflict here""

This reverts commit 2054b6cb343fe29f74dbd911e172512d66ae55ce.
Revert "Unify sublink state in auxiliary Query"

This reverts commit f8323cf4bd17c168ec340d074f08a7e82f926a67.
Revert "Revert "Unify sublink state in auxiliary Query""

This reverts commit 897f680bfa4e1f2034222c96f28d1b003011e410.
Failing subquery regression test