That sounds more like a tooling problem. Actually, I started to put SQL directly into my source code. IntelliJ, for instance, has really good support for embed

That sounds more like a tooling problem. Actually, I started to put SQL directly into my source code. IntelliJ, for instance, has really good support for embedded SQL code (syntax highlighting, auto-completion, executing queries including placeholders etc.).