BS-7563, add tenantId in index
sqlserver and oracle syntax