Merge "rdbms: refactored code into separate Database::getClass method"