Well I was thinking about the code obscurity that removing the sql queries from the source files will promote as well.
And I'm not so happy with the amount of overhead the new database API is adding to the program, one of my thoughts was to preserve the actual style :
db_1row query_name "
select u.first_names,
u.last_name,
s.something
from users u,
something_tbl s
where s.user_id = u.user_i
and based on the query name run at installation time a script that will parse the code and based on the query name will replace the query string based on the database in use.
That way we can work confortable with the code and run a utility script that will extract the query strings and add then to a repository.
And as a bonus there isn't so much overhead.