lib/activefacts/generators/cql.rb in activefacts-generators-1.7.1 vs lib/activefacts/generators/cql.rb in activefacts-generators-1.8.0

- old
+ new

@@ -366,10 +366,11 @@ # For all other presence constraints any subtyping step is over the counterpart player role_proximity = c.min_frequency == 1 && [nil, 1].include?(c.max_frequency) ? :proximate : :counterpart if role_proximity == :proximate verbaliser.role_refs_have_subtype_steps(c.role_sequence) else - join_over, joined_roles = ActiveFacts::Metamodel.plays_over(c.role_sequence.all_role_ref.map{|rr|rr.role}, role_proximity) + roles = c.role_sequence.all_role_ref.map{|rr|rr.role} + join_over, joined_roles = ActiveFacts::Metamodel.plays_over(roles, role_proximity) verbaliser.roles_have_same_player(joined_roles) if join_over end verbaliser.prepare_role_sequence(c.role_sequence, join_over) # REVISIT: Need to discount role_adjuncts in here, since this constraint uses loose binding: