Merge pull request #2661 from metabase/2635-failing-test

src/metabase/driver.clj

src/metabase/driver/generic_sql.clj

src/metabase/driver/generic_sql/query_processor.clj

src/metabase/query_processor.clj

src/metabase/query_processor/annotate.clj

src/metabase/query_processor/interface.clj

src/metabase/query_processor/resolve.clj

src/metabase/util/honeysql_extensions.clj

test/metabase/query_processor/expand_resolve_test.clj

test/metabase/query_processor_test.clj

test/metabase/test/data/dataset_definitions.clj

.../metabase/test/data/dataset_definitions/avian-singles.edn

test/metabase/test/util.clj

test/metabase/test_setup.clj