Revert "fix Database class"
Revert "fix Database class"

This reverts commit 879da26fa3e72817389b0cf3bdaf9e22895b79ac.

geomorillo/prestomvc,danielnavram/cjmvc,geomorillo/prestomvc,danielnavram/cjmvc,geomorillo/prestomvc,danielnavram/cjmvc