completed refactoring of Joins and ColumnPairs, A lot of code cleanup
fixed declared query, remove columnpair in favor of simple Pair
use builder pattern in query to make it more fluent
Fix issue building using enumerated column
Code cleanup usage of enums instead of String constants
refactor to use sql instead of sql1