If you have a way of 'presetting' in advance the number of tenants. You could use Postgres's partial indexes. (basically an index scoped per tenant). Your 'WH

If you have a way of 'presetting' in advance the number of tenants. You could use Postgres's partial indexes. (basically an index scoped per tenant). Your 'WHERE' clauses would need to include the field indexed by those partial indexes. https://devcenter.heroku.com/articles/postgresql-indexes#partial-indexes https://devcenter.heroku.com/articles/postgresql-indexes#par... I have not thought more though this, but may be combining that with the PG 11s partitioning, would get me even closer to tenant-specific archiving/backup and other admin tasks beyond query.