add drain name convertion
fixed version number
fixed table name
Porting to dog 3
Merge branch 'postgres'