It’s both, you’re mixing different phylogenies. Any alcohol prepared for consumption is a solution of water, ethanol, and various other substances (almost all water or alcohol soluble). Ethanol in aqueous solution is also a strong solvent (pure ethanol is a less effective solvent, but a solvent nonetheless).