cachedb_sql: properly fix git conflict (from f7d30b6e)