diff options
author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-03-25 13:26:57 +0200 |
---|---|---|
committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-07 17:08:26 +0200 |
commit | 159dd28651788a19848eae56693ad06ed947414d (patch) | |
tree | b69013db1c0fa45677b59d58999ce0d8ebebd76c /dbaccess/qa | |
parent | 1a9bfdd8976d28fa3a56726bdcae9f2b294d6c6d (diff) |
dbaccess: Enable hsql migration by default
Also make Firebird driver not experimental anymore.
With hsql migration enabled, the hsqldb related unit tests can be
reused, because the underlying DBMS is transparent. To achieve that, I
added firebird_sdbc component to hsqldb CppunitTest_* files.
This commit also contains fixes for upcoming bugs while migrating from
hsqldb to firebird, shown by hsqldb related unit tests:
- null values: in case of null values, the setNull method should be used
instead of nothing. (malformed string otherwise)
Remove DBACCESS_HSQL_MIGRATION environment variable, since migration is
default from now on.
JunitTest_dbaccess_complex was based on HSQLDB. This commit replaces
"if exists" hsql specific solution with firebird specific. Also disable
test for queries with named parameters.
Change-Id: Ieb68f5ad3a11389599c4f268ea4df82a83643b82
Reviewed-on: https://gerrit.libreoffice.org/52008
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'dbaccess/qa')
-rw-r--r-- | dbaccess/qa/complex/dbaccess/ApplicationController.java | 8 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/DataSource.java | 4 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/Query.java | 2 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/RowSet.java | 18 | ||||
-rw-r--r-- | dbaccess/qa/extras/testdocuments/RowSetClones.odb | bin | 33734 -> 33726 bytes | |||
-rw-r--r-- | dbaccess/qa/unit/data/hsqldb_migration_test.odb | bin | 3949 -> 4019 bytes | |||
-rw-r--r-- | dbaccess/qa/unit/firebird.cxx | 9 | ||||
-rw-r--r-- | dbaccess/qa/unit/hsql_binary_import.cxx | 10 |
8 files changed, 17 insertions, 34 deletions
diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java index eafc32dba65f..459571db067c 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.HsqlDatabase; +import connectivity.tools.FirebirdDatabase; import connectivity.tools.HsqlTableDescriptor; import java.io.IOException; @@ -47,7 +47,7 @@ import static org.junit.Assert.*; public class ApplicationController extends TestCase { - private HsqlDatabase m_database; + private FirebirdDatabase 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 HsqlDatabase(getMSF()) - : new HsqlDatabase(getMSF(), _documentURL); + ? new FirebirdDatabase(getMSF()) + : new FirebirdDatabase(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 0413a6e07b69..d2b1d3f4263b 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.HsqlDatabase; +import connectivity.tools.FirebirdDatabase; // ---------- junit imports ----------------- import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.*; public class DataSource extends TestCase { - HsqlDatabase m_database; + FirebirdDatabase m_database; connectivity.tools.DataSource m_dataSource; diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java index 8881bb3edecb..a8357ed7bcb3 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.HsqlDatabase m_database; + connectivity.tools.FirebirdDatabase m_database; private void createTestCase() diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java index 4c5fcc6da793..e1e5f9b191f8 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.HsqlDatabase; +import connectivity.tools.FirebirdDatabase; 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"; - HsqlDatabase m_database; + FirebirdDatabase m_database; DataSource m_dataSource; XRowSet m_rowSet; XResultSet m_resultSet; @@ -220,8 +220,10 @@ public class RowSet extends TestCase void createStructure() throws SQLException { - m_database.executeSQL("DROP TABLE \"TEST1\" IF EXISTS"); - m_database.executeSQL("CREATE TABLE \"TEST1\" (\"ID\" integer not null primary key, \"col2\" varchar(50) )"); + 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"); final Connection connection = m_database.defaultConnection(); final XPreparedStatement prep = connection.prepareStatement("INSERT INTO \"TEST1\" values (?,?)"); @@ -931,12 +933,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 Binary files differindex 91ed328ac8e9..a0e6a8cfa2b4 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 Binary files differindex 99b6b5d9a69d..b20adbfbcc92 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/firebird.cxx b/dbaccess/qa/unit/firebird.cxx index f7361ac76548..db907d857b45 100644 --- a/dbaccess/qa/unit/firebird.cxx +++ b/dbaccess/qa/unit/firebird.cxx @@ -30,21 +30,12 @@ public: void testEmptyDBConnection(); void testIntegerDatabase(); - virtual void setUp() override; - CPPUNIT_TEST_SUITE(FirebirdTest); CPPUNIT_TEST(testEmptyDBConnection); CPPUNIT_TEST(testIntegerDatabase); CPPUNIT_TEST_SUITE_END(); }; -void FirebirdTest::setUp() -{ - DBTestBase::setUp(); - SvtMiscOptions aMiscOptions; - aMiscOptions.SetExperimentalMode(true); -} - /** * Test the loading of an "empty" file, i.e. the embedded database has not yet * been initialised (as occurs when a new .odb is created and opened by base). diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx index 1378dcd7c549..33f63db60e10 100644 --- a/dbaccess/qa/unit/hsql_binary_import.cxx +++ b/dbaccess/qa/unit/hsql_binary_import.cxx @@ -27,8 +27,6 @@ class HsqlBinaryImportTest : public DBTestBase public: void testBinaryImport(); - virtual void setUp() override; - CPPUNIT_TEST_SUITE(HsqlBinaryImportTest); CPPUNIT_TEST(testBinaryImport); @@ -36,14 +34,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void HsqlBinaryImportTest::setUp() -{ - DBTestBase::setUp(); - SvtMiscOptions aMiscOptions; - aMiscOptions.SetExperimentalMode(true); - osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData); -} - void HsqlBinaryImportTest::testBinaryImport() { uno::Reference<XOfficeDatabaseDocument> xDocument |