Revert HSQLDB related unit tests

Revert changes making HSQLDB related unit tests test Firebird migration.
They should still test the HSQLDB driver.

It reverts part of 159dd28651788a19848eae56693ad06ed947414d

Change-Id: If2b9207e95055418bd1dc1dc6e472335de311d1e
Reviewed-on: https://gerrit.libreoffice.org/52873
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>

11 files changed, 38 insertions, 28 deletions

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index ddf69296cb28..98b23d539a95 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -67,7 +67,8 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
-    connectivity/source/drivers/firebird/firebird_sdbc \
+    connectivity/source/drivers/hsqldb/hsqldb \
+    connectivity/source/drivers/jdbc/jdbc \
     connectivity/source/manager/sdbc2 \
     dbaccess/util/dba \
     dbaccess/util/dbu \
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index bb4fd0c8e2d6..66f89c1b54c0 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \
     cppuhelper \
     dbaxml \
     dbtools \
-    firebird_sdbc \
+    jvmfwk \
     sal \
     subsequenttest \
     utl \
@@ -46,7 +46,8 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     connectivity/source/cpool/dbpool2 \
-    connectivity/source/drivers/firebird/firebird_sdbc \
+    connectivity/source/drivers/hsqldb/hsqldb \
+    connectivity/source/drivers/jdbc/jdbc \
     connectivity/source/manager/sdbc2 \
     dbaccess/util/dba \
     dbaccess/source/filter/xml/dbaxml \
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index bbef2fc119be..a97578c02508 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
 	CppunitTest_dbaccess_hsqlschema_import \
 ))
 
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
     CppunitTest_dbaccess_hsqldb_test \
 	CppunitTest_dbaccess_RowSetClones \
@@ -58,23 +58,20 @@ endif
 # This runs a suite of performance tests on embedded firebird and HSQLDB.
 # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
     CppunitTest_dbaccess_embeddeddb_performancetest \
 ))
 endif
-
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
-	JunitTest_dbaccess_complex \
-))
 endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
+	JunitTest_dbaccess_complex \
     JunitTest_dbaccess_unoapi \
 ))
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(ENABLE_FIREBIRD_SDBC),)
+ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	PythonTest_dbaccess_python \
 ))
diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java
index 459571db067c..eafc32dba65f 100644
--- a/dbaccess/qa/complex/dbaccess/ApplicationController.java
+++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java
@@ -30,7 +30,7 @@ import com.sun.star.sdbcx.XTablesSupplier;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import connectivity.tools.HsqlColumnDescriptor;
-import connectivity.tools.FirebirdDatabase;
+import connectivity.tools.HsqlDatabase;
 import connectivity.tools.HsqlTableDescriptor;
 import java.io.IOException;
 
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
 public class ApplicationController extends TestCase
 {
 
-    private FirebirdDatabase m_database;
+    private HsqlDatabase m_database;
     private XOfficeDatabaseDocument m_databaseDocument;
     private XDatabaseDocumentUI m_documentUI;
 
@@ -76,8 +76,8 @@ public class ApplicationController extends TestCase
 
         // create/load the new database document
         m_database = (_documentURL == null)
-                ? new FirebirdDatabase(getMSF())
-                : new FirebirdDatabase(getMSF(), _documentURL);
+                ? new HsqlDatabase(getMSF())
+                : new HsqlDatabase(getMSF(), _documentURL);
         m_databaseDocument = m_database.getDatabaseDocument();
 
         // load it into a frame
diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index d2b1d3f4263b..0413a6e07b69 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -21,7 +21,7 @@ import com.sun.star.container.XNameAccess;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XNamingService;
 import connectivity.tools.CRMDatabase;
-import connectivity.tools.FirebirdDatabase;
+import connectivity.tools.HsqlDatabase;
 
 // ---------- junit imports -----------------
 import org.junit.Test;
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
 public class DataSource extends TestCase
 {
 
-    FirebirdDatabase m_database;
+    HsqlDatabase m_database;
     connectivity.tools.DataSource m_dataSource;
 
 
diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java
index a8357ed7bcb3..8881bb3edecb 100644
--- a/dbaccess/qa/complex/dbaccess/Query.java
+++ b/dbaccess/qa/complex/dbaccess/Query.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
 public class Query extends TestCase
 {
 
-    connectivity.tools.FirebirdDatabase m_database;
+    connectivity.tools.HsqlDatabase m_database;
 
 
     private void createTestCase()
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index e1e5f9b191f8..4c5fcc6da793 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime;
 
 import connectivity.tools.CRMDatabase;
 import connectivity.tools.DataSource;
-import connectivity.tools.FirebirdDatabase;
+import connectivity.tools.HsqlDatabase;
 import connectivity.tools.sdb.Connection;
 import java.lang.reflect.Method;
 import java.util.Random;
@@ -59,7 +59,7 @@ public class RowSet extends TestCase
     static final int MAX_FETCH_ROWS = 10;
     private static final String NEXT = "next";
     private static final String TEST21 = "Test21";
-    FirebirdDatabase m_database;
+    HsqlDatabase m_database;
     DataSource m_dataSource;
     XRowSet m_rowSet;
     XResultSet m_resultSet;
@@ -220,10 +220,8 @@ public class RowSet extends TestCase
 
     void createStructure() throws SQLException
     {
-        m_database.executeSQL("EXECUTE BLOCK AS BEGIN"
-               + " if (not exists(select 1 from rdb$relations where rdb$relation_name = '\"TEST1\"')) then"
-               + " execute statement 'CREATE TABLE \"TEST1\" (\"ID\" integer not null primary key, \"col2\" varchar(50) )';"
-               + " END");
+        m_database.executeSQL("DROP TABLE \"TEST1\" IF EXISTS");
+        m_database.executeSQL("CREATE TABLE \"TEST1\" (\"ID\" integer not null primary key, \"col2\" varchar(50) )");
 
         final Connection connection = m_database.defaultConnection();
         final XPreparedStatement prep = connection.prepareStatement("INSERT INTO \"TEST1\" values (?,?)");
@@ -933,12 +931,12 @@ public class RowSet extends TestCase
         // use an own RowSet instance, not the one which is also used for the other cases
 
         testTableParameters();
-        //testParametrizedQuery();
-        //testParametersInFilter();
+        testParametrizedQuery();
+        testParametersInFilter();
 
-        //testParametersAfterNormalExecute();
+        testParametersAfterNormalExecute();
 
-        //testParametersInteraction();
+        testParametersInteraction();
     }
 }
 
diff --git a/dbaccess/qa/extras/testdocuments/RowSetClones.odb b/dbaccess/qa/extras/testdocuments/RowSetClones.odb
index a0e6a8cfa2b4..91ed328ac8e9 100644
--- a/dbaccess/qa/extras/testdocuments/RowSetClones.odb
+++ b/dbaccess/qa/extras/testdocuments/RowSetClones.odb
diff --git a/dbaccess/qa/unit/data/hsqldb_migration_test.odb b/dbaccess/qa/unit/data/hsqldb_migration_test.odb
index b20adbfbcc92..99b6b5d9a69d 100644
--- a/dbaccess/qa/unit/data/hsqldb_migration_test.odb
+++ b/dbaccess/qa/unit/data/hsqldb_migration_test.odb
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx
index 33f63db60e10..8bc81c0587b1 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -27,6 +27,8 @@ class HsqlBinaryImportTest : public DBTestBase
 public:
     void testBinaryImport();
 
+    virtual void setUp() override;
+
     CPPUNIT_TEST_SUITE(HsqlBinaryImportTest);
 
     CPPUNIT_TEST(testBinaryImport);
@@ -34,6 +36,13 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
+void HsqlBinaryImportTest::setUp()
+{
+    DBTestBase::setUp();
+    SvtMiscOptions aMiscOptions;
+    osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData);
+}
+
 void HsqlBinaryImportTest::testBinaryImport()
 {
     uno::Reference<XOfficeDatabaseDocument> xDocument
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index c1c4c0b04f7f..9093cd622925 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -582,7 +582,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
     Reference< XDriverManager > xManager;
 
     bool bNeedMigration = false;
-    if( m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb")
+    OUString sMigrEnvVal;
+    osl_getEnvironment(OUString("DBACCESS_HSQL_MIGRATION").pData,
+            &sMigrEnvVal.pData);
+    if( m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb" &&
+            !sMigrEnvVal.isEmpty())
     {
         m_pImpl->m_sConnectURL = "sdbc:embedded:firebird";
         bNeedMigration = true;