Merge master into develop

[Rory-Powell]

Description

Fixing the conflict in #4566

[github-actions]

CLA Assistant Lite bot:

Thank you for your submission - we really appreciate it ❤️. Like many open-source projects, we ask that you all sign a Contributor License Agreement before we can accept your contribution.

You can sign the CLA by just posting a Pull Request Comment, the same as the text below.

If you are contributing on behalf of a company, your company should contact us to sign a Corporate Contributor License Agreement, via community@budibase.com.

---

I have read the CLA Document and I hereby sign the CLA

---

5 out of 6 committers have signed the CLA.
✅ @mike12345567
✅ @shogunpurple
✅ @mslourens
✅ @aptkingston
✅ @Rory-Powell
❌ @Budibase Release Bot
Budibase Release Bot seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You can retrigger this bot by commenting recheck in this Pull Request}

[codecov-commenter]

Codecov Report

Merging #4567 (65092a4) into develop (c7877af) will increase coverage by 0.02%.
The diff coverage is 25.00%.

❗ Current head 65092a4 differs from pull request most recent head 982babb. Consider uploading reports for the commit 982babb to get more accurate results

@@             Coverage Diff             @@
##           develop    #4567      +/-   ##
===========================================
+ Coverage    67.89%   67.92%   +0.02%     
===========================================
  Files          144      144              
  Lines         4922     4923       +1     
  Branches       761      761              
===========================================
+ Hits          3342     3344       +2     
  Misses        1105     1105              
+ Partials       475      474       -1     

Impacted Files	Coverage Δ
packages/server/src/api/controllers/dev.js	28.57% <0.00%> (ø)
...s/server/src/api/controllers/row/internalSearch.js	5.26% <0.00%> (ø)
packages/server/src/db/client.js	94.11% <0.00%> (ø)
...ges/server/src/api/controllers/query/validation.js	100.00% <100.00%> (ø)
packages/server/src/middleware/joi-validator.js	76.47% <0.00%> (ø)
packages/server/src/api/controllers/query/index.js	75.78% <0.00%> (+1.05%)	⬆️

---

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 59a2e0c...982babb. Read the comment docs.