feature[ats_19SHU]: Use HyperSql for with clause support

Change-Id: Ifcdd38a9d17bbb17c155139751ab3ff017cf2a5f

2 files changed, 16 insertions, 17 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/DbInfo.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/DbInfo.java
index 69bbc1b47e6..c60fdfd3867 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/DbInfo.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/DbInfo.java
@@ -22,12 +22,17 @@ public class DbInfo implements IDatabaseInfo {
    private final int port;
    private final String connectionId;
    private final String dbPath;
+   private final Properties properties;
 
    public DbInfo(String connectionId, int port, String dbPath) {
       super();
       this.port = port;
       this.connectionId = connectionId;
       this.dbPath = dbPath;
+      properties = new Properties();
+      properties.setProperty("user", getDatabaseLoginName());
+      properties.put("password", "");
+      properties.put("hsqldb.tx", "MVCC");
    }
 
    @Override
@@ -37,31 +42,26 @@ public class DbInfo implements IDatabaseInfo {
 
    @Override
    public String getDatabaseName() {
-      return "osee.h2.db";
+      return "osee.hsql.db";
    }
 
    @Override
    public String getDatabaseLoginName() {
-      return "osee";
+      return "public";
    }
 
    @Override
    public String getDriver() {
-      return "org.h2.Driver";
+      return "org.hsqldb.jdbc.JDBCDriver";
    }
 
    @Override
    public String getConnectionUrl() {
-      return String.format(
-         "jdbc:h2:tcp://127.0.0.1:%s/%s/osee.h2.db;IGNORECASE=TRUE;SCHEMA_SEARCH_PATH=OSEE,PUBLIC;MVCC=TRUE;LOG=2",
-         port, dbPath);
+      return String.format("jdbc:hsqldb:hsql://127.0.0.1:%s/osee.hsql.db", port);
    }
 
    @Override
    public Properties getConnectionProperties() {
-      Properties properties = new Properties();
-      properties.setProperty("user", getDatabaseLoginName());
-      properties.put("password", "osee");
       return properties;
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
index 7339f1b09bd..64536d96da2 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
@@ -19,9 +19,9 @@ import org.eclipse.osee.framework.core.data.IDatabaseInfo;
 import org.eclipse.osee.framework.database.IOseeDatabaseService;
 import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
 import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.h2.H2DbServer;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.network.PortUtil;
+import org.eclipse.osee.hsqldb.HyperSqlDbServer;
 import org.eclipse.osee.orcs.db.mock.OseeDatabase;
 import org.junit.Assert;
 import org.junit.runners.model.FrameworkMethod;
@@ -68,16 +68,15 @@ public class TestDatabase {
       tempFolder = createTempFolder(method, target);
       Assert.assertNotNull("TempFolder cannot be null", tempFolder);
 
-      addResource(tempFolder, bundle, "data/h2.zip");
+      addResource(tempFolder, bundle, "data/hsql.zip");
       addResource(tempFolder, bundle, "data/binary_data.zip");
 
-      checkExist(tempFolder, "h2");
+      checkExist(tempFolder, "hsql");
       checkExist(tempFolder, "attr");
 
-      String dbPath = getDbHomePath(tempFolder, "h2");
+      String dbPath = getDbHomePath(tempFolder, "hsql");
 
       int port = PortUtil.getInstance().getConsecutiveValidPorts(2);
-      int webPort = port + 1;
 
       IDatabaseInfo databaseInfo = new DbInfo(connectionId, port, dbPath);
       TestDbProvider provider = new TestDbProvider(databaseInfo);
@@ -89,7 +88,7 @@ public class TestDatabase {
       IOseeDatabaseService dbService = OsgiUtil.getService(IOseeDatabaseService.class);
       Assert.assertNotNull(dbService);
 
-      H2DbServer.startServer("0.0.0.0", port, webPort);
+      HyperSqlDbServer.startServer("0.0.0.0", port, port + 1, databaseInfo);
 
       OseeConnection connection = dbService.getConnection();
       try {
@@ -105,7 +104,7 @@ public class TestDatabase {
    }
 
    private String getDbHomePath(File tempFolder, String dbFolder) {
-      return String.format("~/%s/%s", tempFolder.getName(), dbFolder);
+      return String.format("file:~/%s/%s/osee.hsql.db", tempFolder.getName(), dbFolder);
    }
 
    private void checkExist(File tempFolder, String name) {
@@ -132,7 +131,7 @@ public class TestDatabase {
 
       System.setProperty("osee.application.server.data", "");
       System.setProperty("osee.db.embedded.server", "");
-      H2DbServer.stopServer();
+      HyperSqlDbServer.stopServer();
       Runtime.getRuntime().addShutdownHook(new Thread() {
          @Override
          public void run() {