I'll almost always drink water in the terminal, however in the air I like to ask for Ginger Ale. I find that most US airlines can cater for this, but in AUS no-one has it so I end up getting a Ginger beer instead.