The line from Rye Whiskey about "If the river was whiskey and I was a duck, I'd dive to the bottom and I'd never come up" is also in a song by (in my collection) Charlie Poole and the North Carolina Ramblers, going on thus:

Oh tell me how long have I got to wait?
Can I get you now - must I hesitate?
If the river was whiskey and the bank was wine
You could see me on the bottom just any old time,
O tell me how long...

And I don't recall the rest.

Also the one about Whiskey when I'm Dry, the version I know (perhaps also Charlie Poole?) goes on "Greenbacks when I'm hard up, cold pickle when I die." I always like the visual on the pickle...