Replace the database class with the one from database-lib

2 jobs for 34-switch-to-database-lib in 50 seconds (queued for 2 seconds)