resolve the conflict of logbcak-test.xml
sort-3 passed (fixed the type in the SQLGenerator)
fixed push types
+comment
found problem when adding triple mappings to the result
Merge branch 'feature/leftjoin' into feature/aggregates2