dbaccess: Enable hsql migration by default

Desktop / LibreOffice - Tamas Bunth [collabora.co.uk] - 7 April 2018 15:08 EDT

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

159dd2865178 dbaccess: Enable hsql migration by default
connectivity/Jar_ConnectivityTools.mk | 1 +
.../qa/connectivity/tools/CRMDatabase.java | 16 +-
.../qa/connectivity/tools/FirebirdDatabase.java | 205 +++++++++++++++++++++
connectivity/source/drivers/firebird/Driver.cxx | 6 +-
.../source/drivers/firebird/PreparedStatement.cxx | 2 +
.../drivers/firebird/StatementCommonBase.cxx | 2 +
dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 1 +
dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 2 +
dbaccess/Module_dbaccess.mk | 11 +-
dbaccess/README.vars | 1 -
.../qa/complex/dbaccess/ApplicationController.java | 8 +-
dbaccess/qa/complex/dbaccess/DataSource.java | 4 +-
dbaccess/qa/complex/dbaccess/Query.java | 2 +-
dbaccess/qa/complex/dbaccess/RowSet.java | 18 +-
dbaccess/qa/extras/testdocuments/RowSetClones.odb | Bin 33734 -> 33726 bytes
dbaccess/qa/unit/data/hsqldb_migration_test.odb | Bin 3949 -> 4019 bytes
dbaccess/qa/unit/firebird.cxx | 9 -
dbaccess/qa/unit/hsql_binary_import.cxx | 10 -
dbaccess/source/core/dataaccess/datasource.cxx | 20 +-
dbaccess/source/filter/hsqldb/fbcreateparser.cxx | 2 +-
dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx | 2 +-
dbaccess/source/filter/hsqldb/hsqlbinarynode.hxx | 3 +-
dbaccess/source/filter/hsqldb/hsqlimport.cxx | 81 +++++---
dbaccess/source/filter/hsqldb/hsqlimport.hxx | 7 +-
dbaccess/source/filter/hsqldb/parseschema.cxx | 18 +-
dbaccess/source/filter/hsqldb/parseschema.hxx | 6 +-
dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 6 +-
dbaccess/source/filter/hsqldb/rowinputbinary.hxx | 4 +-
28 files changed, 333 insertions(+), 114 deletions(-)

Upstream: cgit.freedesktop.org


  • Share