[5/7] cayenne git commit: CAY-1946 CDbimport improvements

2014-11-26 Thread aadamchik
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2474202/cayenne-server/src/main/java/org/apache/cayenne/merge/DbMerger.java -- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/merge/DbMerger.java b/cayenne-server

[5/7] cayenne git commit: CAY-1946 CDbimport improvements

2014-11-16 Thread aadamchik
http://git-wip-us.apache.org/repos/asf/cayenne/blob/276f049c/cayenne-server/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java -- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java b/caye