update to the latest oatpp API version.

Author: lganzzzo

CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 ## use these variables to configure module installation
 
 set(OATPP_THIS_MODULE_NAME oatpp-postgresql) ## name of the module (also name of folders in installation dirs)
-set(OATPP_THIS_MODULE_VERSION "1.2.5") ## version of the module (also sufix of folders in installation dirs)
+set(OATPP_THIS_MODULE_VERSION "1.3.0") ## version of the module (also sufix of folders in installation dirs)
 set(OATPP_THIS_MODULE_LIBRARIES oatpp-postgresql) ## list of libraries to find when find_package is called
 set(OATPP_THIS_MODULE_TARGETS oatpp-postgresql) ## list of targets to install
 set(OATPP_THIS_MODULE_DIRECTORIES oatpp-postgresql) ## list of directories to install

azure-pipelines.yml

@@ -4,11 +4,11 @@
 # https://aka.ms/yaml
 
 jobs:
-  - job: ubuntu_16_04
-    displayName: 'Build - Ubuntu 16.04'
+  - job: ubuntu_20_04
+    displayName: 'Build - Ubuntu 20.04'
     continueOnError: false
     pool:
-      vmImage: 'Ubuntu 16.04'
+      vmImage: 'ubuntu-20.04'
     workspace:
       clean: all
     steps:

src/oatpp-postgresql/Connection.hpp

@@ -68,21 +68,21 @@ class ConnectionImpl : public Connection {
 
 struct ConnectionAcquisitionProxy : public provider::AcquisitionProxy<Connection, ConnectionAcquisitionProxy> {
 
-  ConnectionAcquisitionProxy(const std::shared_ptr<Connection> &resource,
+  ConnectionAcquisitionProxy(const provider::ResourceHandle<Connection> &resource,
                              const std::shared_ptr<PoolInstance> &pool)
     : provider::AcquisitionProxy<Connection, ConnectionAcquisitionProxy>(resource, pool)
   {}
 
   PGconn* getHandle() override {
-    return _obj->getHandle();
+    return _handle.object->getHandle();
   }
 
   void setPrepared(const oatpp::String& statementName) override {
-    _obj->setPrepared(statementName);
+    _handle.object->setPrepared(statementName);
   }
 
   bool isPrepared(const oatpp::String& statementName) override {
-    return _obj->isPrepared(statementName);
+    return _handle.object->isPrepared(statementName);
   }
 
 };

src/oatpp-postgresql/ConnectionProvider.cpp

@@ -26,11 +26,17 @@
 
 namespace oatpp { namespace postgresql {
 
+void ConnectionProvider::ConnectionInvalidator::invalidate(const std::shared_ptr<orm::Connection> &resource) {
+  (void) resource;
+  //Do nothing.
+}
+
 ConnectionProvider::ConnectionProvider(const oatpp::String& connectionString)
-  : m_connectionString(connectionString)
+  : m_invalidator(std::make_shared<ConnectionInvalidator>())
+  , m_connectionString(connectionString)
 {}
 
-std::shared_ptr<Connection> ConnectionProvider::get() {
+provider::ResourceHandle<orm::Connection> ConnectionProvider::get() {
 
   auto handle = PQconnectdb(m_connectionString->c_str());
 
@@ -41,18 +47,14 @@ std::shared_ptr<Connection> ConnectionProvider::get() {
                              "Error. Can't connect. " + errMsg);
   }
 
-  return std::make_shared<ConnectionImpl>(handle);
+  return provider::ResourceHandle<orm::Connection>(std::make_shared<ConnectionImpl>(handle), m_invalidator);
 
 }
 
-async::CoroutineStarterForResult<const std::shared_ptr<Connection>&> ConnectionProvider::getAsync() {
+async::CoroutineStarterForResult<const provider::ResourceHandle<orm::Connection>&> ConnectionProvider::getAsync() {
   throw std::runtime_error("[oatpp::postgresql::ConnectionProvider::getAsync()]: Error. Not implemented!");
 }
 
-void ConnectionProvider::invalidate(const std::shared_ptr<Connection>& resource) {
-  // DO nothing
-}
-
 void ConnectionProvider::stop() {
   // DO nothing
 }

src/oatpp-postgresql/ConnectionProvider.hpp

@@ -35,8 +35,16 @@ namespace oatpp { namespace postgresql {
 /**
  * Connection provider.
  */
-class ConnectionProvider : public provider::Provider<Connection> {
+class ConnectionProvider : public provider::Provider<orm::Connection> {
 private:
+
+  class ConnectionInvalidator : public provider::Invalidator<orm::Connection> {
+  public:
+    void invalidate(const std::shared_ptr<orm::Connection>& resource) override;
+  };
+
+private:
+  std::shared_ptr<ConnectionInvalidator> m_invalidator;
   oatpp::String m_connectionString;
 public:
 
@@ -50,19 +58,13 @@ class ConnectionProvider : public provider::Provider<Connection> {
    * Get Connection.
    * @return - resource.
    */
-  std::shared_ptr<Connection> get() override;
+  provider::ResourceHandle<orm::Connection> get() override;
 
   /**
    * Get Connection in Async manner.
    * @return - &id:oatpp::async::CoroutineStarterForResult; of `Connection`.
    */
-  async::CoroutineStarterForResult<const std::shared_ptr<Connection>&> getAsync() override;
-
-  /**
-   * Invalidate Connection that was previously created by this provider. <br>
-   * @param resource
-   */
-  void invalidate(const std::shared_ptr<Connection>& resource) override;
+  async::CoroutineStarterForResult<const provider::ResourceHandle<orm::Connection>&> getAsync() override;
 
   /**
    * Stop provider and free associated resources.
@@ -77,7 +79,7 @@ class ConnectionProvider : public provider::Provider<Connection> {
  * - &id:oatpp::postgresql::ConnectionAcquisitionProxy;.
  */
 typedef oatpp::provider::Pool<
-  provider::Provider<Connection>,
+  provider::Provider<orm::Connection>,
   Connection,
   ConnectionAcquisitionProxy
 > ConnectionPool;