Migrate dolt cherry-pick
to only use SQL
#6259
+330
−179
Merged