Use the correct dataSource for modelFrom/modelTo
Merge pull request #254 from fabien/fix/has-one-fk

Use the correct dataSource for modelFrom/modelTo