mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Query MySQL schema name when pasting table

Browse Source 
In case of a MySQL direct connection the current schema in use cannot be
queried with the getUserName() method of the DatabaseMetadata interface,
because the user name and the schema name can (and usually do) differ.

Instead, we can always query for the current schema with the DATABASE()
SQL function.

Change-Id: Ibb026519e1a63e29c5a7c9b04ab64901faec0f85
Reviewed-on: https://gerrit.libreoffice.org/78297
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
This commit is contained in:
Tamas Bunth
2019-08-30 14:01:19 +02:00
committed by Tamás Bunth
parent f5c09ac048
commit c635364120
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbaccess/source/ui/misc/WCopyTable.cxx
View File

@@ -35,6 +35,7 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/sdbcx/XAppend.hpp>
@@ -1205,7 +1206,18 @@ Reference< XPropertySet > OCopyTableWizard::createTable()
if ( sSchema.isEmpty() && xMetaData->supportsSchemasInTableDefinitions() )
{
// query of current schema is quite inconsistent. In case of some
// DBMS's each user has their own schema.
sSchema = xMetaData->getUserName();
// In case of mysql it is not that simple
if(xMetaData->getDatabaseProductName() == "MySQL")
{
Reference< XStatement > xSelect = m_xDestConnection->createStatement();
Reference< XResultSet > xRs = xSelect->executeQuery("select database()");
xRs->next(); // first and only result
Reference< XRow > xRow( xRs, UNO_QUERY_THROW );
sSchema = xRow->getString(1);
}
}
xTable->setPropertyValue(PROPERTY_CATALOGNAME,makeAny(sCatalog));