diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.db/src')
14 files changed, 109 insertions, 249 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java index 493e0fd066..1e9ddbfa9b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java @@ -15,6 +15,7 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Skips; import org.eclipse.emf.cdo.tests.db.verifier.DBStoreVerifier; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -35,6 +36,8 @@ import java.sql.ResultSet; * * @author Kai Schlamp */ +// XXX PSQL fails, too - need to investigate +@Skips("Postgresql") public class DBAnnotationsTest extends AbstractCDOTest { private static int modelCounter; @@ -65,14 +68,10 @@ public class DBAnnotationsTest extends AbstractCDOTest session.close(); } + // HSQL does not support length annotations + @Skips("Hsqldb") public void testLengthAnnotationNegative() throws Exception { - // HSQL does not support length annotations - skipTest(getRepositoryConfig() instanceof HsqldbConfig); - - // XXX PSQL fails, too - need to investigate - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - msg("Opening session"); EPackage model1 = createModel(); addLengthAnnotation(model1, "8"); @@ -110,9 +109,6 @@ public class DBAnnotationsTest extends AbstractCDOTest public void testLengthAnnotationByMetaData() throws CommitException { - // XXX [PSQL] disabled because of Bug 290095 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - msg("Opening session"); final EPackage model1 = createModel(); addLengthAnnotation(model1, "8"); @@ -149,14 +145,10 @@ public class DBAnnotationsTest extends AbstractCDOTest }.verify(); } + // HSQL does not support type annotations + @Skips("Hsqldb") public void testTypeAnnotationByMetaData() throws CommitException { - // XXX [PSQL] disabled because of Bug 290095 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - - // HSQL does not support type annotations - skipTest(getRepositoryConfig() instanceof HsqldbConfig); - msg("Opening session"); final EPackage model1 = createModel(); addTypeAnnotation(model1, "CLOB"); @@ -195,9 +187,6 @@ public class DBAnnotationsTest extends AbstractCDOTest public void testTableNameAnnotationByMetaData() throws CommitException { - // XXX [PSQL] disabled because of Bug 290095 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - msg("Opening session"); EPackage model1 = createModel(); addTableNameAnnotation(model1, "Subject"); @@ -235,9 +224,6 @@ public class DBAnnotationsTest extends AbstractCDOTest public void testColumnNameAnnotationByMetaData() throws CommitException { - // XXX [PSQL] disabled because of Bug 290095 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - msg("Opening session"); final EPackage model1 = createModel(); addColumnNameAnnotation(model1, "TOPIC"); @@ -274,14 +260,10 @@ public class DBAnnotationsTest extends AbstractCDOTest }.verify(); } + // HSQL does not support type annotations + @Skips("Hsqldb") public void testColumnNameTypeAnnotationByMetaData() throws CommitException { - // HSQL does not support type annotations - skipTest(getRepositoryConfig() instanceof HsqldbConfig); - - // XXX [PSQL] disabled because of Bug 290095 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - msg("Opening session"); final EPackage model1 = createModel(); addColumnNameAndTypeAnnoation(model1, "TOPIC", "CLOB"); diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java index 907ea8bf89..3cbcbea4ea 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java @@ -27,12 +27,17 @@ import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; +import java.util.Set; /** * @author Eike Stepper */ public abstract class DBConfig extends RepositoryConfig { + public static final String CAPABILITY_RANGES = "DB.ranges"; + + public static final String CAPABILITY_COPY_ON_BRANCH = "DB.copy.on.branch"; + private static final long serialVersionUID = 1L; private boolean withRanges; @@ -47,6 +52,31 @@ public abstract class DBConfig extends RepositoryConfig this.copyOnBranch = copyOnBranch; } + @Override + public void initCapabilities(Set<String> capabilities) + { + super.initCapabilities(capabilities); + capabilities.add(getDBAdapterName()); + + if (isWithRanges()) + { + capabilities.add(CAPABILITY_RANGES); + } + + if (isCopyOnBranch()) + { + capabilities.add(CAPABILITY_COPY_ON_BRANCH); + } + } + + protected abstract String getDBAdapterName(); + + @Override + protected String getStoreName() + { + return "DB"; + } + public boolean isWithRanges() { return withRanges; diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java index 5330d75a6d..87a1c98377 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java @@ -12,17 +12,12 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.tests.AllConfigs; -import org.eclipse.emf.cdo.tests.AttributeTest; import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.AuditTest; import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.ExternalReferenceTest; -import org.eclipse.emf.cdo.tests.FeatureMapTest; import org.eclipse.emf.cdo.tests.MEMStoreQueryTest; import org.eclipse.emf.cdo.tests.MergingTest; -import org.eclipse.emf.cdo.tests.XATransactionTest; -import org.eclipse.emf.cdo.tests.XRefTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_303807_Test; import org.eclipse.emf.cdo.tests.config.IScenario; @@ -63,29 +58,30 @@ public abstract class DBConfigs extends AllConfigs testClasses.remove(Bugzilla_252214_Test.class); } - // fails because of Bug 284109 - testClasses.remove(XATransactionTest.class); - testClasses.add(DISABLE_XATransactionTest.class); + // // fails because of Bug 284109 + // testClasses.remove(XATransactionTest.class); + // testClasses.add(DISABLE_XATransactionTest.class); // XXX Range-based audit mapping does not support queryXRefs for now - testClasses.remove(XRefTest.class); - testClasses.add(DISABLE_XRefTest.class); + // testClasses.remove(XRefTest.class); + // testClasses.add(DISABLE_XRefTest.class); // ------------ tests below only fail for PostgreSQL // ------------ therefore they are overridden and // ------------ skipConfig for PSQL is used temporarily - // XXX [PSQL] disabled because of Bug 289445 - testClasses.remove(AttributeTest.class); - testClasses.add(DISABLE_AttributeTest.class); - testClasses.remove(FeatureMapTest.class); - testClasses.add(DISABLE_FeatureMapTest.class); + // // XXX [PSQL] disabled because of Bug 289445 + // testClasses.remove(AttributeTest.class); + // testClasses.add(DISABLE_AttributeTest.class); + + // testClasses.remove(FeatureMapTest.class); + // testClasses.add(DISABLE_FeatureMapTest.class); // XXX [PSQL] disabled because of Bug 290095 // using skipconfig in DBAnnotationTest - // XXX [PSQL] disabled because of Bug 290097 - testClasses.remove(ExternalReferenceTest.class); - testClasses.add(DISABLE_ExternalReferenceTest.class); + // // XXX [PSQL] disabled because of Bug 290097 + // testClasses.remove(ExternalReferenceTest.class); + // testClasses.add(DISABLE_ExternalReferenceTest.class); } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_AttributeTest.java deleted file mode 100644 index a0b73b3969..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_AttributeTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.db; - -import org.eclipse.emf.cdo.tests.AttributeTest; - -/** - * @author Eike Stepper - */ -public class DISABLE_AttributeTest extends AttributeTest -{ - @Override - public void testByteArray() throws Exception - { - // XXX disabled because of Bug 289445 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testByteArray(); - } - - @Override - public void testByteArrayEmpty() throws Exception - { - // XXX disabled because of Bug 289445 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testByteArrayEmpty(); - } - - @Override - public void testByteArrayNull() throws Exception - { - // XXX disabled because of Bug 289445 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testByteArrayNull(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_ExternalReferenceTest.java deleted file mode 100644 index 453ff8e059..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_ExternalReferenceTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.db; - -import org.eclipse.emf.cdo.tests.ExternalReferenceTest; - -/** - * @author Stefan Winkler - */ -public class DISABLE_ExternalReferenceTest extends ExternalReferenceTest -{ - @Override - public void testOneXMIResourceManyViewsOnOneResourceSet() throws Exception - { - // XXX disabled because of Bug 290097 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testOneXMIResourceManyViewsOnOneResourceSet(); - } - - @Override - public void testManyViewsOnOneResourceSet() throws Exception - { - // XXX disabled because of Bug 290097 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testManyViewsOnOneResourceSet(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_FeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_FeatureMapTest.java deleted file mode 100644 index 7a2b73443f..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_FeatureMapTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.db; - -import org.eclipse.emf.cdo.tests.FeatureMapTest; - -/** - * @author Eike Stepper - */ -public class DISABLE_FeatureMapTest extends FeatureMapTest -{ - // underscore-disabled because parent is also disabled because of Bug 293405 - @Override - public void testFeatureMaps() throws Exception - { - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testFeatureMaps(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java deleted file mode 100644 index 4b00c5e31f..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.db; - -import org.eclipse.emf.cdo.tests.XATransactionTest; - -/** - * @author Eike Stepper - */ -public class DISABLE_XATransactionTest extends XATransactionTest -{ - @Override - public void testNotUsingXATransaction_Exception() throws Exception - { - // XXX test disabled - } - - @Override - public void testCommitFromTransactionDisabled() throws Exception - { - // XXX disabled because of Bug 290097 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.testCommitFromTransactionDisabled(); - } - - @CleanRepositoriesBefore - @Override - public void test_ExceptionInReadingStream() throws Exception - { - // XXX disabled because of Bug 290097 - skipTest(getRepositoryConfig() instanceof PostgresqlConfig); - super.test_ExceptionInReadingStream(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java deleted file mode 100644 index 0118ffb72b..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.db; - -import org.eclipse.emf.cdo.tests.XRefTest; - -/** - * @author Eike Stepper - */ -public class DISABLE_XRefTest extends XRefTest -{ - @Override - protected void doSetUp() throws Exception - { - super.doSetUp(); - // skipConfig(H2Config.RANGE_INSTANCE); - } - - // @Override - // public void testCrossReferenceMultivalueEReferenceQuery() throws Exception - // { - // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - // super.testCrossReferenceMultivalueEReferenceQuery(); - // } - // - // @Override - // public void testXRefsToMany() throws Exception - // { - // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - // super.testXRefsToMany(); - // } - // - // @Override - // public void testXRefsToOne() throws Exception - // { - // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - // super.testXRefsToOne(); - // } -} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java index eb5e003dcd..7ddff8806f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java @@ -33,6 +33,8 @@ import java.util.HashMap; */
public class DerbyConfig extends DBConfig
{
+ public static final String DB_ADAPTER_NAME = "Derby";
+
private static final long serialVersionUID = 1L;
private static HashMap<String, File> dbFolders = new HashMap<String, File>();
@@ -41,7 +43,13 @@ public class DerbyConfig extends DBConfig public DerbyConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
{
- super("Derby", supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ }
+
+ @Override
+ protected String getDBAdapterName()
+ {
+ return DB_ADAPTER_NAME;
}
public Collection<File> getDBFolders()
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java index 600b0c34e3..870ac95618 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java @@ -31,6 +31,8 @@ import java.sql.Statement; */
public class H2Config extends DBConfig
{
+ public static final String DB_ADAPTER_NAME = "H2";
+
private static final long serialVersionUID = 1L;
private static File reusableFolder;
@@ -42,7 +44,13 @@ public class H2Config extends DBConfig public H2Config(boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch,
IDGenerationLocation idGenerationLocation)
{
- super("H2", supportingAudits, supportingBranches, withRanges, copyOnBranch, idGenerationLocation);
+ super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, withRanges, copyOnBranch, idGenerationLocation);
+ }
+
+ @Override
+ protected String getDBAdapterName()
+ {
+ return DB_ADAPTER_NAME;
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2OfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2OfflineConfig.java index 9f851003f5..ff5a88a14a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2OfflineConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2OfflineConfig.java @@ -57,6 +57,12 @@ public class H2OfflineConfig extends OfflineConfig this.copyOnBranch = copyOnBranch;
}
+ @Override
+ protected String getStoreName()
+ {
+ return MEMConfig.STORE_NAME;
+ }
+
public boolean isWithRanges()
{
return withRanges;
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java index 0bab24ad70..b9bc2b38fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java @@ -37,6 +37,8 @@ import java.util.Map; */
public class HsqldbConfig extends DBConfig
{
+ public static final String DB_ADAPTER_NAME = "Hsqldb";
+
private static final long serialVersionUID = 1L;
public static boolean USE_VERIFIER = false;
@@ -45,7 +47,13 @@ public class HsqldbConfig extends DBConfig public HsqldbConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
{
- super("Hsqldb", supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ }
+
+ @Override
+ protected String getDBAdapterName()
+ {
+ return DB_ADAPTER_NAME;
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java index 07a59f7845..0b6fb53431 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java @@ -33,11 +33,7 @@ import java.util.Map; */
public class MysqlConfig extends DBConfig
{
- private static final long serialVersionUID = 1L;
-
- private transient DataSource setupDataSource;
-
- private transient List<String> databases = new ArrayList<String>();
+ public static final String DB_ADAPTER_NAME = "Mysql";
/**
* Instructions to test with MySQL: - create a mysql instance - set HOST to the host where the DB is running
@@ -50,9 +46,21 @@ public class MysqlConfig extends DBConfig public static final String PASS = "root";
+ private static final long serialVersionUID = 1L;
+
+ private transient DataSource setupDataSource;
+
+ private transient List<String> databases = new ArrayList<String>();
+
public MysqlConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
{
- super("Mysql", supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ }
+
+ @Override
+ protected String getDBAdapterName()
+ {
+ return DB_ADAPTER_NAME;
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java index 29a9a7b3da..8e0516a56e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java @@ -31,6 +31,8 @@ import java.sql.SQLException; */
public class PostgresqlConfig extends DBConfig
{
+ public static final String DB_ADAPTER_NAME = "Postgresql";
+
private static final long serialVersionUID = 1L;
private transient Jdbc3SimpleDataSource dataSource;
@@ -42,7 +44,13 @@ public class PostgresqlConfig extends DBConfig public PostgresqlConfig(boolean supportingAudits, boolean supportingBranches,
IDGenerationLocation idGenerationLocation)
{
- super("Postgresql", supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation);
+ }
+
+ @Override
+ protected String getDBAdapterName()
+ {
+ return DB_ADAPTER_NAME;
}
@Override
|