Move createTableAppendColumn from SQLServerAdapter up to SybaseAdapter
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5adbd4f1 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5adbd4f1 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5adbd4f1 Branch: refs/heads/master Commit: 5adbd4f17430e061da540f4531b070a4417878d3 Parents: 6896b93 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Aug 2 12:13:48 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Aug 2 12:13:48 2017 +0300 ---------------------------------------------------------------------- .../cayenne/dba/sqlserver/SQLServerAdapter.java | 17 ----------------- .../apache/cayenne/dba/sybase/SybaseAdapter.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adbd4f1/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 8ac5014..6930094 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 @@ -32,7 +32,6 @@ import org.apache.cayenne.configuration.Constants; import org.apache.cayenne.configuration.RuntimeProperties; import org.apache.cayenne.dba.sybase.SybaseAdapter; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.SQLAction; @@ -120,20 +119,4 @@ public class SQLServerAdapter extends SybaseAdapter { return translator; } - /** - * Overrides super implementation to correctly set up identity columns. - * - * @since 1.2 - */ - @Override - public void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute column) { - - super.createTableAppendColumn(sqlBuffer, column); - - if (column.isGenerated()) { - // current limitation - we don't allow to set identity parameters... - sqlBuffer.append(" IDENTITY (1, 1)"); - } - } - } http://git-wip-us.apache.org/repos/asf/cayenne/blob/5adbd4f1/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 93c7554..71fa2d9 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 @@ -44,6 +44,7 @@ import org.apache.cayenne.dba.JdbcAdapter; import org.apache.cayenne.dba.PkGenerator; import org.apache.cayenne.dba.QuotingStrategy; import org.apache.cayenne.di.Inject; +import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.resource.ResourceLocator; @@ -152,4 +153,21 @@ public class SybaseAdapter extends JdbcAdapter { super.bindParameter(statement, binding); } } + + /** + * Overrides super implementation to correctly set up identity columns. + * + * @since 1.2 + * @since 4.1 moved from SQLServerAdapter to SybaseAdapter as it supports this too + */ + @Override + public void createTableAppendColumn(StringBuffer sqlBuffer, DbAttribute column) { + + super.createTableAppendColumn(sqlBuffer, column); + + if (column.isGenerated()) { + // current limitation - we don't allow to set identity parameters... + sqlBuffer.append(" IDENTITY (1, 1)"); + } + } }
