rename addPartitioningFromSubquery
Also, a general comment to apply to this changeset: a PartitioningForStatement is not a statement, it is  a partitioning -- so it's confusing to have variables of this type named "...Stmt" -- better to name them "...Partitioning".