Repository: cayenne Updated Branches: refs/heads/master f4866e589 -> 78b0a653b
Changed SybaseAdapter to allow identity (generated) columns Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ba6d053f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ba6d053f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ba6d053f Branch: refs/heads/master Commit: ba6d053fe8f042568bdba1af40d44876e7008041 Parents: f4866e5 Author: Lon Varscsak <lon.varsc...@gmail.com> Authored: Tue Aug 1 13:06:51 2017 -0700 Committer: Lon Varscsak <lon.varsc...@gmail.com> Committed: Tue Aug 1 13:06:51 2017 -0700 ---------------------------------------------------------------------- .../org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 7 ++----- .../java/org/apache/cayenne/dba/sybase/SybaseAdapter.java | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba6d053f/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java index 1a32cf4..8ac5014 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java @@ -19,6 +19,8 @@ package org.apache.cayenne.dba.sqlserver; +import java.util.List; + import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.translator.select.QualifierTranslator; import org.apache.cayenne.access.translator.select.QueryAssembler; @@ -37,8 +39,6 @@ import org.apache.cayenne.query.SQLAction; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.resource.ResourceLocator; -import java.util.List; - /** * <p> * Cayenne DbAdapter implementation for <a @@ -88,9 +88,6 @@ public class SQLServerAdapter extends SybaseAdapter { @Inject ValueObjectTypeRegistry valueObjectTypeRegistry) { super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories, resourceLocator, valueObjectTypeRegistry); - // TODO: i wonder if Sybase supports generated keys... - // in this case we need to move this to the super. - this.setSupportsGeneratedKeys(true); this.setSupportsBatchUpdates(true); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba6d053f/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java index 891995e..93c7554 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java @@ -61,6 +61,8 @@ public class SybaseAdapter extends JdbcAdapter { @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator, @Inject ValueObjectTypeRegistry valueObjectTypeRegistry) { super(runtimeProperties, defaultExtendedTypes, userExtendedTypes, extendedTypeFactories, resourceLocator, valueObjectTypeRegistry); + + this.setSupportsGeneratedKeys(true); } @Override
