4 commits

Author	SHA1	Message	Date
Alex Grintsvayg	99a3a1d091	make merge compatible with an existing transaction	2017-08-01 13:00:14 -04:00
Alex Grintsvayg	05c7f7d06a	switch to more complete null package, implement nicer sql logging	2017-07-06 15:15:00 -04:00
Alex Grintsvayg	912a689701	added unique key detection (mysql only for now), improved merging	2017-05-12 06:56:48 -04:00
Alex Grintsvayg	31fe8b6e1d	model merging	2017-05-10 15:35:05 -04:00