diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-12-29 18:16:29 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-01-05 13:32:07 +0100 |
| commit | d12094654d83f28b292200367939ca7e6144732b (patch) | |
| tree | 81a51fa70a006f7c395e458a8659e8c5cb84d816 | |
| parent | 411cc8af8490ba307245c689ed5714f612bb9d6f (diff) | |
tdf#146471: Firebird: impossible to delete an external table
See https://bugs.documentfoundation.org/show_bug.cgi?id=146471#c1
for full explanations
Change-Id: Ie75669cf951429654ff8e6c28508b9fee2ee03bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127715
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 13de0ade50bec34be612ba4a3196c2efd9ce3b4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127584
Reviewed-by: Lionel Mamane <lionel@mamane.lu>
Tested-by: Jenkins
| -rw-r--r-- | connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index f63468f0813f..262b6112c5b8 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1339,8 +1339,10 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( // TODO: GLOBAL TEMPORARY, LOCAL TEMPORARY, ALIAS, SYNONYM if (!types.hasElements() || (types.getLength() == 1 && types[0].match(wld))) { + // from Firebird: src/jrd/constants.h + // rel_persistent = 0, rel_view = 1, rel_external = 2 // All table types? I.e. includes system tables. - queryBuf.append("(RDB$RELATION_TYPE = 0 OR RDB$RELATION_TYPE = 1) "); + queryBuf.append("(RDB$RELATION_TYPE = 0 OR RDB$RELATION_TYPE = 1 OR RDB$RELATION_TYPE = 2) "); } else { @@ -1406,7 +1408,8 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } else { - if (nTableType == 0) + // see above about src/jrd/constants.h + if (nTableType == 0 || nTableType == 2) sTableType = "TABLE"; } |