Merge "db: Use $fname instead of __METHOD__ magic constant"