[these two ifs](https://github.com/bar/cakephp/blob/2603546c311ecd3cc5408f1866baa86ffa406fe7/lib/Cake/Model/Datasource/DboSource.php#L2398-L2399) can be stuck together, but [this whole chunk](https://github.com/bar/cakephp/blob/2603546c311ecd3cc5408f1866baa86ffa406fe7/lib/Cake/Model/Datasource/DboSource.php#L2398-L2417) would be better off as a seperate function IMO i.e.

    if (!$allFields) {
        $fields = $this->_appropriateName($fields);
    }

Probably with a good dose of return-early.