Move QgsHanaConnectionRef class to qgshanaconnectionpool.h

qgis · Dec 7, 2020 · fc69781 · fc69781
1 parent 06f3ddf
commit fc69781
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 37 deletions.
diff --git a/src/providers/hana/qgshanacolumntypethread.cpp b/src/providers/hana/qgshanacolumntypethread.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include "qgshanacolumntypethread.h"
 #include "qgshanaconnection.h"
+#include "qgshanaconnectionpool.h"
 #include "qgshanautils.h"
 #include "qgsmessagelog.h"
 #include "qgslogger.h"

diff --git a/src/providers/hana/qgshanaconnection.cpp b/src/providers/hana/qgshanaconnection.cpp
@@ -23,7 +23,6 @@
 #include "qgshanadriver.h"
 #include "qgshanaexception.h"
 #include "qgshanaresultset.h"
-#include "qgshanasettings.h"
 #include "qgshanatablemodel.h"
 #include "qgshanautils.h"
 #include "qgsmessagelog.h"
@@ -770,22 +769,3 @@ PreparedStatementRef QgsHanaConnection::createPreparedStatement( const QString &
   }
   return stmt;
 }
-
-QgsHanaConnectionRef::QgsHanaConnectionRef( const QgsDataSourceUri &uri )
-{
-  mConnection = std::unique_ptr<QgsHanaConnection>(
-                  QgsHanaConnectionPool::instance()->acquireConnection( QgsHanaUtils::connectionInfo( uri ) ) );
-}
-
-QgsHanaConnectionRef::QgsHanaConnectionRef( const QString &name )
-{
-  QgsHanaSettings settings( name, true );
-  mConnection = std::unique_ptr<QgsHanaConnection>(
-                  QgsHanaConnectionPool::instance()->acquireConnection( QgsHanaUtils::connectionInfo( settings.toDataSourceUri() ) ) );
-}
-
-QgsHanaConnectionRef::~QgsHanaConnectionRef()
-{
-  if ( mConnection && QgsHanaConnectionPool::hasInstance() )
-    QgsHanaConnectionPool::instance()->releaseConnection( mConnection.release() );
-}
diff --git a/src/providers/hana/qgshanaconnection.h b/src/providers/hana/qgshanaconnection.h
@@ -83,20 +83,4 @@ class QgsHanaConnection : public QObject
     QString mUserName;
 };
 
-class QgsHanaConnectionRef
-{
-  public:
-    QgsHanaConnectionRef() = default;
-    QgsHanaConnectionRef( const QString &name );
-    QgsHanaConnectionRef( const QgsDataSourceUri &uri );
-    ~QgsHanaConnectionRef();
-
-    bool isNull() const { return mConnection.get() == nullptr; }
-    QgsHanaConnection &operator*() { return *mConnection; }
-    QgsHanaConnection *operator->() { return mConnection.get(); }
-
-  private:
-    std::unique_ptr<QgsHanaConnection> mConnection;
-};
-
 #endif  // QGSHANACONNECTION_H
diff --git a/src/providers/hana/qgshanaconnectionpool.cpp b/src/providers/hana/qgshanaconnectionpool.cpp
@@ -16,6 +16,8 @@
  ***************************************************************************/
 #include "qgshanaconnection.h"
 #include "qgshanaconnectionpool.h"
+#include "qgshanasettings.h"
+#include "qgshanautils.h"
 
 QgsHanaConnectionPoolGroup::QgsHanaConnectionPoolGroup( const QString &name )
   : QgsConnectionPoolGroup<QgsHanaConnection*>( name )
@@ -53,3 +55,22 @@ QgsHanaConnectionPool::~QgsHanaConnectionPool()
 {
   QgsDebugCall;
 }
+
+QgsHanaConnectionRef::QgsHanaConnectionRef( const QgsDataSourceUri &uri )
+{
+  mConnection = std::unique_ptr<QgsHanaConnection>(
+                  QgsHanaConnectionPool::instance()->acquireConnection( QgsHanaUtils::connectionInfo( uri ) ) );
+}
+
+QgsHanaConnectionRef::QgsHanaConnectionRef( const QString &name )
+{
+  QgsHanaSettings settings( name, true );
+  mConnection = std::unique_ptr<QgsHanaConnection>(
+                  QgsHanaConnectionPool::instance()->acquireConnection( QgsHanaUtils::connectionInfo( settings.toDataSourceUri() ) ) );
+}
+
+QgsHanaConnectionRef::~QgsHanaConnectionRef()
+{
+  if ( mConnection && QgsHanaConnectionPool::hasInstance() )
+    QgsHanaConnectionPool::instance()->releaseConnection( mConnection.release() );
+}
diff --git a/src/providers/hana/qgshanaconnectionpool.h b/src/providers/hana/qgshanaconnectionpool.h
@@ -81,4 +81,20 @@ class QgsHanaConnectionPool
     static QgsHanaConnectionPool *sInstance;
 };
 
+class QgsHanaConnectionRef
+{
+  public:
+    QgsHanaConnectionRef() = default;
+    QgsHanaConnectionRef( const QString &name );
+    QgsHanaConnectionRef( const QgsDataSourceUri &uri );
+    ~QgsHanaConnectionRef();
+
+    bool isNull() const { return mConnection.get() == nullptr; }
+    QgsHanaConnection &operator*() { return *mConnection; }
+    QgsHanaConnection *operator->() { return mConnection.get(); }
+
+  private:
+    std::unique_ptr<QgsHanaConnection> mConnection;
+};
+
 #endif // QGSHANACONNECTIONPOOL_H
diff --git a/src/providers/hana/qgshanadataitemguiprovider.cpp b/src/providers/hana/qgshanadataitemguiprovider.cpp
@@ -15,6 +15,7 @@
  *
  ***************************************************************************/
 #include "qgshanaconnection.h"
+#include "qgshanaconnectionpool.h"
 #include "qgshanadataitems.h"
 #include "qgshanadataitemguiprovider.h"
 #include "qgshananewconnection.h"

diff --git a/src/providers/hana/qgshanadataitems.cpp b/src/providers/hana/qgshanadataitems.cpp
@@ -17,6 +17,7 @@
 #include "qgsapplication.h"
 #include "qgsdatasourceuri.h"
 #include "qgshanaconnection.h"
+#include "qgshanaconnectionpool.h"
 #include "qgshanaexception.h"
 #include "qgshananewconnection.h"
 #include "qgshanadataitems.h"

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -17,6 +17,7 @@
 #include "qgsexception.h"
 #include "qgsgeometry.h"
 #include "qgsgeometryfactory.h"
+#include "qgshanaconnection.h"
 #include "qgshanaexception.h"
 #include "qgshanaexpressioncompiler.h"
 #include "qgshanafeatureiterator.h"

diff --git a/src/providers/hana/qgshanafeatureiterator.h b/src/providers/hana/qgshanafeatureiterator.h
@@ -18,7 +18,7 @@
 #define QGSHANAFEATUREITERATOR_H
 
 #include "qgsfeatureiterator.h"
-#include "qgshanaconnection.h"
+#include "qgshanaconnectionpool.h"
 #include "qgshanaprovider.h"
 #include "qgshanaresultset.h"