diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2016-06-02 11:56:10 +0200 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-06-03 17:08:32 +0000 |
| commit | de899f0b350e51b1932fa4674f7ce2ae386cd1ce (patch) | |
| tree | f0e9222273bc395930dd6fe926a84f6a8642e4e9 /dbaccess | |
| parent | faaacb997b3c404048bd986caf9e4b5f5263cb3c (diff) | |
connectivity: firebird: use ODS12 test database for Firebird 3
Firebird 3.0 uses new database file format (ODS, On Disk Structure) so
that we need to use either ODS11 or ODS12 version of test database for
dbaccess_firebird test, depending on whether building against Firebird
2.5 or 3.0 libraries.
Change-Id: Idecdc35b0ac87ab7f46cb79b5c044c65423a2c7e
Reviewed-on: https://gerrit.libreoffice.org/25846
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb | bin | 0 -> 75701 bytes | |||
| -rw-r--r-- | dbaccess/qa/unit/firebird.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb b/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb Binary files differnew file mode 100644 index 000000000000..95691ed20585 --- /dev/null +++ b/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx index c9ee575f9b7f..da0bed760d2e 100644 --- a/dbaccess/qa/unit/firebird.cxx +++ b/dbaccess/qa/unit/firebird.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XStatement.hpp> #include <svtools/miscopt.hxx> +#include <config_firebird.h> using namespace ::com::sun::star; using namespace ::com::sun::star::sdb; @@ -65,7 +66,11 @@ void FirebirdTest::testEmptyDBConnection() void FirebirdTest::testIntegerDatabase() { uno::Reference< XOfficeDatabaseDocument > xDocument = +#if HAVE_FIREBIRD_30 + getDocumentForFileName("firebird_integer_x64le_ods12.odb"); +#else getDocumentForFileName("firebird_integer_x64le.odb"); +#endif uno::Reference< XConnection > xConnection = getConnectionForDocument(xDocument); |