diff MySQL/Plugins/MySQLIndex.h @ 226:a4918d57435c

DatabaseManager doesn't IDatabaseFactory anymore
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 02 Apr 2021 19:23:36 +0200
parents 94c9908e6aca
children 35598014f140
line wrap: on
line diff
--- a/MySQL/Plugins/MySQLIndex.h	Thu Apr 01 19:18:19 2021 +0200
+++ b/MySQL/Plugins/MySQLIndex.h	Fri Apr 02 19:23:36 2021 +0200
@@ -29,39 +29,9 @@
   class MySQLIndex : public IndexBackend 
   {
   private:
-    class Factory : public IDatabaseFactory
-    {
-    private:
-      MySQLIndex&  that_;
-
-    public:
-      Factory(MySQLIndex& that) :
-      that_(that)
-      {
-      }
-
-      virtual Dialect GetDialect() const
-      {
-        return Dialect_MySQL;
-      }
-
-      virtual IDatabase* Open()
-      {
-        return that_.OpenInternal();
-      }
-
-      virtual void GetConnectionRetriesParameters(unsigned int& maxConnectionRetries, unsigned int& connectionRetryInterval)
-      {
-        maxConnectionRetries = that_.parameters_.GetMaxConnectionRetries();
-        connectionRetryInterval = that_.parameters_.GetConnectionRetryInterval();
-      }
-    };
-
     MySQLParameters        parameters_;
     bool                   clearAll_;
 
-    IDatabase* OpenInternal();
-
   public:
     MySQLIndex(OrthancPluginContext* context,
                const MySQLParameters& parameters);
@@ -71,11 +41,10 @@
       clearAll_ = clear;
     }
 
-    virtual IDatabaseFactory* CreateDatabaseFactory() ORTHANC_OVERRIDE
-    {
-      return new Factory(*this);
-    }
+    virtual IDatabase* OpenDatabaseConnection() ORTHANC_OVERRIDE;
 
+    virtual void ConfigureDatabase(IDatabase& database) ORTHANC_OVERRIDE;
+ 
     virtual int64_t CreateResource(DatabaseManager& manager,
                                    const char* publicId,
                                    OrthancPluginResourceType type)