Begin work on prepared statements

Rework affected rows (must be retrieved from statement)
Handle Prepared from migrations
Handle possible exisiting QueryExpression statement values
Try to detect early bind issues

Limit to simple cases for now
Fix prepared IN, fix buildUpdate
Try to get extra information on failure

rawAnalyzeCrit (maybe to remove)

Author: trasher

install/migrations/update_9.4.3_to_9.4.5.php

@@ -50,15 +50,15 @@ function update943to945()
     $migration->setVersion('9.4.5');
 
     /** Add OLA TTR begin date field to Tickets */
-    $iterator = new DBmysqlIterator(null);
+    $iterator = new DBmysqlIterator($DB);
     $migration->addField(
         'glpi_tickets',
         'ola_ttr_begin_date',
         'datetime',
         [
             'after'     => 'olalevels_id_ttr',
             'update'    => $DB->quoteName('date'), // Assign ticket creation date by default
-            'condition' => 'WHERE ' . $iterator->analyseCrit(['NOT' => ['olas_id_ttr' => '0']]),
+            'condition' => 'WHERE ' . $iterator->rawAnalyseCrit(['NOT' => ['olas_id_ttr' => '0']]), //FIXME: maybe just make it RAW sql instead of using an iterator here
         ]
     );
     /** /Add OLA TTR begin date field to Tickets */

src/AbstractQuery.php

@@ -39,6 +39,8 @@
 abstract class AbstractQuery
 {
     protected ?string $alias = null;
+    /** @var array<int, mixed> */
+    protected array $values = [];
 
     /**
      * Create a query
@@ -74,4 +76,21 @@ public function __toString()
     {
         return $this->getQuery();
     }
+
+    /**
+    * @return array<int, mixed>
+    */
+    public function getValues(): array
+    {
+        return $this->values;
+    }
+
+    /**
+     * @param array<int, mixed> $values
+     */
+    public function setValues(array $values): static
+    {
+        $this->values = $values;
+        return $this;
+    }
 }

src/Cartridge.php

@@ -252,7 +252,7 @@ public function backToStock(array $input, $history = true)
                 'id' => $input['id'],
             ]
         );
-        return $result && ($DB->affectedRows() > 0);
+        return $result && ($DB->getAffectedRows() > 0);
     }
 
     // SPECIFIC FUNCTIONS
@@ -297,7 +297,7 @@ public function install($pID, $tID)
                     'date_use'  => null,
                 ]
             );
-            if ($result && ($DB->affectedRows() > 0)) {
+            if ($result && ($DB->getAffectedRows() > 0)) {
                 $changes = [
                     '0',
                     '',
@@ -342,7 +342,7 @@ public function uninstall($ID)
 
             if (
                 $result
-                && ($DB->affectedRows() > 0)
+                && ($DB->getAffectedRows() > 0)
             ) {
                 $changes = [
                     '0',

src/CartridgeItem.php

@@ -202,7 +202,7 @@ public static function addCompatibleType($cartridgeitems_id, $printermodels_id)
             ];
             $result = $DB->insert('glpi_cartridgeitems_printermodels', $params);
 
-            if ($result && ($DB->affectedRows() > 0)) {
+            if ($result && ($DB->getAffectedRows() > 0)) {
                 return true;
             }
         }

src/CommonDBTM.php

@@ -734,7 +734,7 @@ public function updateInDB($updates, $oldvalues = [])
             $tobeupdated,
             ['id' => $this->fields['id']]
         );
-        $affected_rows = $DB->affectedRows();
+        $affected_rows = $DB->getAffectedRows();
 
         if (count($oldvalues) && $affected_rows > 0) {
             Log::constructHistory($this, $oldvalues, $this->fields);
@@ -801,9 +801,8 @@ public function restoreInDB()
                 $params['date_mod'] = $_SESSION["glpi_currenttime"];
             }
 
-            if ($DB->update(static::getTable(), $params, ['id' => $this->fields['id']])) {
-                return true;
-            }
+            $DB->update(static::getTable(), $params, ['id' => $this->fields['id']]);
+            return true;
         }
         return false;
     }
@@ -1896,7 +1895,15 @@ protected function manageLocks()
             );
             foreach ($fields as $field) {
                 try {
-                    $DB->executeStatement($stmt, [$field]);
+                    $DB->executeStatement(
+                        $stmt,
+                        [
+                            'itemtype'        => static::class,
+                            'items_id'        => $this->fields['id'],
+                            'date_creation'   => $_SESSION["glpi_currenttime"],
+                            'field'           => $field,
+                        ]
+                    );
                 } catch (StatementException $e) {
                     if ($e->getCode() != 1062) {
                         throw new RuntimeException('Unable to add locked field!', code: $e->getCode(), previous: $e);

src/CronTask.php

@@ -262,7 +262,7 @@ public function start()
             ]
         );
 
-        if ($DB->affectedRows() > 0) {
+        if ($DB->getAffectedRows() > 0) {
             $this->timer  = microtime(true);
             $this->volume = 0;
             $log = new CronTaskLog();
@@ -346,7 +346,7 @@ public function end($retcode, int $log_state = CronTaskLog::STATE_STOP)
             ]
         );
 
-        if ($DB->affectedRows() > 0) {
+        if ($DB->getAffectedRows() > 0) {
             // No gettext for log but add gettext line to be parsed for pot generation
             // order is important for insertion in english in the database
             if ($log_state === CronTaskLog::STATE_ERROR) {

src/CronTaskLog.php

@@ -76,7 +76,7 @@ public static function cleanOld($id, $days)
             ]
         );
 
-        return $result ? $DB->affectedRows() : 0;
+        return $result ? $DB->getAffectedRows() : 0;
     }