Fix wrong query generation with bookshelf

[Convly]

fix #8225

Fix wrong behaviour from bookshelf's populate which was extending custom populate queries for each part of the deep path instead of only extending the full path and binding populate queries to the rest.

The fix consist of extending the original query only for the full path. Binding only populate queries otherwise.

[alexandrebodin]

LGTM, waiting for the tests

[codecov]

Codecov Report

Merging #8228 into master will increase coverage by 0.07%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #8228      +/-   ##
==========================================
+ Coverage   32.96%   33.03%   +0.07%     
==========================================
  Files        1197     1219      +22     
  Lines       13020    13563     +543     
  Branches     1286     1348      +62     
==========================================
+ Hits         4292     4481     +189     
- Misses       7885     8200     +315     
- Partials      843      882      +39     

Flag	Coverage Δ
#front	24.71% <ø> (-0.35%)	⬇️
#unit	54.10% <ø> (+0.21%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...rapi-admin/admin/src/hooks/useFetchRole/reducer.js	80.00% <0.00%> (-20.00%)	⬇️
...min/admin/src/components/Roles/Permissions/init.js	80.00% <0.00%> (-20.00%)	⬇️
packages/strapi-admin/services/permission.js	77.57% <0.00%> (-14.00%)	⬇️
...in/src/containers/Users/ProtectedEditPage/index.js	87.50% <0.00%> (-12.50%)	⬇️
...t-type-builder/controllers/validation/relations.js	50.00% <0.00%> (-12.50%)	⬇️
.../admin/src/components/Roles/Permissions/reducer.js	85.41% <0.00%> (-12.15%)	⬇️
...ages/strapi/lib/services/entity-validator/index.js	54.11% <0.00%> (-9.78%)	⬇️
packages/strapi/lib/core-api/service.js	64.44% <0.00%> (-4.79%)	⬇️
.../admin/src/containers/Webhooks/EditView/reducer.js	82.35% <0.00%> (-4.32%)	⬇️
...admin/admin/src/containers/Roles/EditPage/index.js	55.17% <0.00%> (-4.09%)	⬇️
... and 106 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e0287c8...92aae44. Read the comment docs.