Merge "ORM: pass some __METHOD__ to database functions"