Rework detection of HANA ODBC driver

qgis · Dec 7, 2020 · b87b63d · b87b63d
1 parent b1ff0a5
commit b87b63d
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 29 deletions.
diff --git a/src/providers/hana/qgshanadriver.cpp b/src/providers/hana/qgshanadriver.cpp
@@ -17,40 +17,67 @@
 #include "qgshanadriver.h"
 #include "qgslogger.h"
 
+#include <QDir>
+#include <QFileInfo>
+
 #include "odbc/Connection.h"
 #include "odbc/Environment.h"
 
 using namespace odbc;
 
 QgsHanaDriver *QgsHanaDriver::sInstance = nullptr;
 
+static QString detectDriverPath( EnvironmentRef &env, const QString &libName, const QString &defaultPath )
+{
+  QString path = defaultPath + QDir::separator() + libName;
+  if ( QFileInfo::exists( path ) )
+    return path;
+
+  std::vector<DriverInformation> drivers = env->getDrivers();
+  for ( const DriverInformation &drv : drivers )
+  {
+    for ( const DriverInformation::Attribute &attr : drv.attributes )
+    {
+      if ( QString::compare( QString::fromStdString( attr.name ), "DRIVER", Qt::CaseInsensitive ) == 0 )
+      {
+        QString path = QString::fromStdString( attr.value );
+        if ( path.endsWith( libName ) && QFileInfo::exists( path ) )
+          return path;
+      }
+    }
+  }
+  return QString();
+}
+
 QgsHanaDriver::QgsHanaDriver()
+  : mEnv( Environment::create() )
 {
   QgsDebugCall;
-  mEnv = Environment::create();
-#ifdef Q_OS_WIN
-#ifdef Q_OS_WIN64
-  mIsInstalled = mEnv->isDriverInstalled( "HDBODBC" );
+#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN64)
+  mDriver = mEnv->isDriverInstalled( "HDBODBC" ) ? "HDBODBC" : "";
 #else
-  mIsInstalled = mEnv->isDriverInstalled( "HDBODBC32" );
+  mDriver = mEnv->isDriverInstalled( "HDBODBC32" ) ? "HDBODBC32" : "";
 #endif
+#elif defined(Q_OS_MAC)
+  mDriver = detectDriverPath( mEnv, "libodbcHDB.dylib", "/Applications/sap/hdbclient" );
 #else
-  mIsInstalled = true;
+  mDriver = detectDriverPath( mEnv, "libodbcHDB.so", "/usr/sap/hdbclient" );
 #endif
 }
 
+QgsHanaDriver::~QgsHanaDriver()
+{
+  QgsDebugCall;
+}
+
 QgsHanaDriver *QgsHanaDriver::instance()
 {
   if ( !sInstance )
     sInstance = new QgsHanaDriver();
   return sInstance;
 }
 
-QgsHanaDriver::~QgsHanaDriver()
-{
-  QgsDebugCall;
-}
-
 void QgsHanaDriver::cleanupInstance()
 {
   delete sInstance;
@@ -61,3 +88,8 @@ ConnectionRef QgsHanaDriver::createConnection()
 {
   return mEnv->createConnection();
 }
+
+QString QgsHanaDriver::getDriver() const
+{
+  return mDriver;
+}
diff --git a/src/providers/hana/qgshanadriver.h b/src/providers/hana/qgshanadriver.h
@@ -18,27 +18,27 @@
 #define QGSHANADRIVER_H
 
 #include <qglobal.h>
+#include <QString>
 #include "odbc/Forwards.h"
 
 class QgsHanaDriver
 {
+    QgsHanaDriver();
+    ~QgsHanaDriver();
+
   public:
     odbc::ConnectionRef createConnection();
-    bool isInstalled() const { return mIsInstalled; }
+    QString getDriver() const;
 
     static QgsHanaDriver *instance();
     static void cleanupInstance();
 
   protected:
     Q_DISABLE_COPY( QgsHanaDriver )
 
-  private:
-    QgsHanaDriver();
-    ~QgsHanaDriver();
-
   private:
     odbc::EnvironmentRef mEnv;
-    bool mIsInstalled;
+    QString mDriver;
 
     static QgsHanaDriver *sInstance;
 };

diff --git a/src/providers/hana/qgshananewconnection.cpp b/src/providers/hana/qgshananewconnection.cpp
@@ -15,6 +15,7 @@
  *
  ***************************************************************************/
 #include "qgsauthmanager.h"
+#include "qgshanadriver.h"
 #include "qgshanaconnection.h"
 #include "qgshananewconnection.h"
 #include "qgshanasettings.h"
@@ -54,11 +55,8 @@ QgsHanaNewConnection::QgsHanaNewConnection(
   connect( btnConnect, &QPushButton::clicked, this, &QgsHanaNewConnection::btnConnect_clicked );
   connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsHanaNewConnection::showHelp );
 
-#ifdef Q_OS_WIN
-  txtDriver->setText( QLatin1String( "HDBODBC" ) );
-#else
-  txtDriver->setText( QLatin1String( "/usr/sap/hdbclient/libodbcHDB.so" ) );
-#endif
+  txtDriver->setText( QgsHanaDriver::instance()->getDriver() );
+
   cbxCryptoProvider->addItem( tr( "openssl" ), QLatin1String( "openssl" ) );
   cbxCryptoProvider->addItem( tr( "commoncrypto" ), QLatin1String( "commoncrypto" ) );
   cbxCryptoProvider->addItem( tr( "sapcrypto" ), QLatin1String( "sapcrypto" ) );

diff --git a/src/providers/hana/qgshanaprovider.cpp b/src/providers/hana/qgshanaprovider.cpp
@@ -1711,11 +1711,5 @@ QgsVectorLayerExporter::ExportError QgsHanaProviderMetadata::createEmptyLayer(
 
 QGISEXTERN QgsProviderMetadata *providerMetadataFactory()
 {
-  if ( QgsHanaDriver::instance()->isInstalled() )
-    return new QgsHanaProviderMetadata();
-  else
-  {
-    QgsMessageLog::logMessage( QStringLiteral( "HANA ODBC driver cannot be found" ), QStringLiteral( "HANA" ) );
-    return nullptr;
-  }
+  return new QgsHanaProviderMetadata();
 }