Polymorphism spec
Nonstandard associations spec
Merge branch 'kyan/sql_updates'