Then David the king went in, and sat before Yahweh; and he said, Who am I, Yahweh God, and what is my house, that you have brought me thus far?
The critical notion that this text teaches that Solomon would be the builder of that promised "house" is effectively refuted by  1 Chronicles 17:25, above, in which David made it crystal clear that he understood the builder of that house to be, not Solomon, or any other mortal, but God Himself.