Database: Simplify ildbpdo inheritance structure

Author: lscharmer

components/ILIAS/Database/classes/PDO/Details.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Database\PDO;
+
+use ilDBInterface;
+use ilAtomQuery;
+
+interface Details
+{
+    public function supportsTransactions(): bool;
+    public function atomQuery(ilDBInterface $db): ilAtomQuery;
+}

…abase/classes/PDO/ilDBPdoMySQLGalera.php …S/Database/classes/PDO/GaleraDetails.phpcomponents/ILIAS/Database/classes/PDO/ilDBPdoMySQLGalera.php renamed to components/ILIAS/Database/classes/PDO/GaleraDetails.php components/ILIAS/Database/classes/PDO/ilDBPdoMySQLGalera.php renamed to components/ILIAS/Database/classes/PDO/GaleraDetails.php

@@ -17,12 +17,14 @@
  *********************************************************************/
 
 declare(strict_types=1);
-/**
- * Class ilDBPdoMySQLInnoDB
- *
- * @author Fabian Schmid <fs@studer-raimann.ch>
- */
-class ilDBPdoMySQLGalera extends ilDBPdoMySQLInnoDB
+
+namespace ILIAS\Database\PDO;
+
+use ilAtomQuery;
+use ilAtomQueryTransaction;
+use ilDBInterface;
+
+class GaleraDetails implements Details
 {
     #[\Override]
     public function supportsTransactions(): bool
@@ -31,8 +33,8 @@ public function supportsTransactions(): bool
     }
 
     #[\Override]
-    public function buildAtomQuery(): ilAtomQuery
+    public function atomQuery(ilDBInterface $db): ilAtomQuery
     {
-        return new ilAtomQueryTransaction($this);
+        return new ilAtomQueryTransaction($db);
     }
 }

…abase/classes/PDO/ilDBPdoMySQLInnoDB.php …S/Database/classes/PDO/InnoDBDetails.phpcomponents/ILIAS/Database/classes/PDO/ilDBPdoMySQLInnoDB.php renamed to components/ILIAS/Database/classes/PDO/InnoDBDetails.php components/ILIAS/Database/classes/PDO/ilDBPdoMySQLInnoDB.php renamed to components/ILIAS/Database/classes/PDO/InnoDBDetails.php

@@ -17,32 +17,38 @@
  *********************************************************************/
 
 declare(strict_types=1);
+
+namespace ILIAS\Database\PDO;
+
+use ILIAS\Database\FieldDefinition;
+use PDO;
+use ilDBConstants;
+use ilDBInterface;
+use ilDBManager;
+use ilDBReverse;
+use ilDBPdoManager;
+use ilDBPdoReverse;
+use ilDBPdoMySQLFieldDefinition;
+use PDOException;
+use ilDatabaseException;
+use Exception;
+use ilAtomQuery;
+use ilAtomQueryLock;
+
 /**
- * Class ilDBPdoMySQLInnoDB
- *
  * @author Fabian Schmid <fs@studer-raimann.ch>
  */
-class ilDBPdoMySQLInnoDB extends ilDBPdoMySQL
+class InnoDBDetails implements Details
 {
-    protected string $storage_engine = 'InnoDB';
-
-    #[\Override]
-    public function supportsFulltext(): bool
-    {
-        return false;
-    }
-
-
     #[\Override]
     public function supportsTransactions(): bool
     {
         return false;
     }
 
-
     #[\Override]
-    public function addFulltextIndex(string $table_name, array $fields, string $name = 'in'): bool
+    public function atomQuery(ilDBInterface $db): ilAtomQuery
     {
-        return false; // NOT SUPPORTED
+        return new ilAtomQueryLock($db);
     }
 }

components/ILIAS/Database/classes/PDO/Internal.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Database\PDO;
+
+use ilDBInterface;
+use ilDBPdoInterface;
+
+interface Internal extends ilDBInterface, ilDBPdoInterface
+{
+    public function getFieldDefinition(): ?\ilDBPdoFieldDefinition;
+    public function getIndexName(string $index_name_base): string;
+}

components/ILIAS/Database/classes/PDO/Manager/ilDBPdoManager.php

@@ -19,6 +19,7 @@
 declare(strict_types=1);
 
 use ILIAS\Database\PDO\FieldDefinition\ForeignKeyConstraints;
+use ILIAS\Database\PDO\Internal;
 
 /**
  * Class ilDBPdoManager
@@ -28,10 +29,7 @@ class ilDBPdoManager implements ilDBManager, ilDBPdoManagerInterface
 {
     protected ?\ilQueryUtils $query_utils = null;
 
-    /**
-     * ilDBPdoManager constructor.
-     */
-    public function __construct(protected \PDO $pdo, protected \ilDBPdo $db_instance)
+    public function __construct(protected \PDO $pdo, protected Internal $db_instance)
     {
     }
 
@@ -44,7 +42,7 @@ public function getQueryUtils(): \ilQueryUtils
         return $this->query_utils;
     }
 
-    public function getDBInstance(): \ilDBPdo
+    public function getDBInstance(): Internal
     {
         return $this->db_instance;
     }

components/ILIAS/Database/classes/PDO/Reverse/ilDBPdoReverse.php

@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Database\PDO\Internal;
+
 /**
  * Class ilDBPdoReverse
  * @author Fabian Schmid <fs@studer-raimann.ch>
@@ -26,10 +28,7 @@ class ilDBPdoReverse implements ilDBReverse
 {
     protected ?\ilMySQLQueryUtils $query_utils = null;
 
-    /**
-     * ilDBPdoReverse constructor.
-     */
-    public function __construct(protected \PDO $pdo, protected \ilDBPdo $db_instance)
+    public function __construct(protected \PDO $pdo, protected Internal $db_instance)
     {
     }