Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8d38e1c3 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8d38e1c3 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8d38e1c3 Branch: refs/heads/master Commit: 8d38e1c3493be8c11970846873341a2108259870 Parents: e608894 Author: Aleksey Pleshkanev <priest...@hotmail.com> Authored: Sat Mar 10 22:39:25 2018 +0300 Committer: Aleksey Pleshkanev <priest...@hotmail.com> Committed: Sat Mar 10 22:39:25 2018 +0300 ---------------------------------------------------------------------- .../dbsync/reverse/configuration/ToolsModule.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d38e1c3/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java index ceb1e11..3d3a1bd 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java @@ -30,10 +30,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptorLoader; import org.apache.cayenne.configuration.DataMapLoader; import org.apache.cayenne.configuration.DefaultRuntimeProperties; import org.apache.cayenne.configuration.RuntimeProperties; -import org.apache.cayenne.configuration.server.DataSourceFactory; -import org.apache.cayenne.configuration.server.DbAdapterFactory; -import org.apache.cayenne.configuration.server.DefaultDbAdapterFactory; -import org.apache.cayenne.configuration.server.ServerModule; +import org.apache.cayenne.configuration.server.*; import org.apache.cayenne.configuration.xml.DataChannelMetaData; import org.apache.cayenne.configuration.xml.DefaultDataChannelMetaData; import org.apache.cayenne.configuration.xml.HandlerFactory; @@ -52,7 +49,9 @@ import org.apache.cayenne.dba.openbase.OpenBaseSniffer; import org.apache.cayenne.dba.oracle.OracleSniffer; import org.apache.cayenne.dba.postgres.PostgresSniffer; import org.apache.cayenne.dba.sqlite.SQLiteSniffer; +import org.apache.cayenne.dba.sqlserver.SQLServerPkGenerator; import org.apache.cayenne.dba.sqlserver.SQLServerSniffer; +import org.apache.cayenne.dba.sybase.SybasePkGenerator; import org.apache.cayenne.dba.sybase.SybaseSniffer; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Binder; @@ -70,6 +69,9 @@ import org.apache.cayenne.resource.ResourceLocator; import org.slf4j.Logger; import org.xml.sax.XMLReader; +import static org.apache.cayenne.dba.DbVersion.MS_SQL_2008; +import static org.apache.cayenne.dba.DbVersion.MS_SQL_2012; + /** * A DI module to bootstrap DI container for Cayenne Ant tasks and Maven * plugins. @@ -112,7 +114,12 @@ public class ToolsModule implements Module { .add(SQLServerSniffer.class).add(OracleSniffer.class).add(PostgresSniffer.class) .add(MySQLSniffer.class); + ServerModule.contributePkGenerators(binder) + .put(String.valueOf(MS_SQL_2008), SybasePkGenerator.class) + .put(String.valueOf(MS_SQL_2012), SQLServerPkGenerator.class); + binder.bind(DbAdapterFactory.class).to(DefaultDbAdapterFactory.class); + binder.bind(PkGeneratorFactory.class).to(DefaultPkGeneratorFactory.class); binder.bind(DataSourceFactory.class).to(DriverDataSourceFactory.class); binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
