Added javadoc for the OnConflict options.
Moved OnConflict into his own class.
Added test for the NOT NULL constraint.