mirror of
https://github.com/dolthub/dolt.git
synced 2026-01-24 03:09:22 -06:00
- Resolves conflicts in sql.go by integrating both: 1. Main branch's query catalog refactoring (direct SQL queries, no dEnv dependency) 2. Binary-as-hex parameter support from feature branch - Maintains SaveQuery function name from main branch - Preserves binaryAsHex parameter threading through all query execution paths - Updates function signatures to match main branch's simplified approach