This paper presents a method based on connectivity analysis of graph to solve structurally under-constrained constraint problems frequently occurred during design process in parametric CAD. We give a partial solution to the optimal wellconstrained completion problem, that is, adding automatically new constraints to the graph corresponding to an underconstrained geometric constraint problem G in such a way that G is well-constrained and the set of equations needed to be solved simultaneously in order to solve G has the smallest size. With this method, a connected, bi-connected, or tri-connected structurally under-constrained problem in 2D can be transformed into a structurally well-constrained one by adding new constraints automatically during the process of decomposing it into a decomposition tree.