Schema scoping using PostgreSQL in master branch & explicit scoping using database field in database_field branch