Merge 1.x into 2.x

Author: SonataCI

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.17.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.16.1...1.17.0) - 2024-04-13
+### Changed
+- [[#612](https://github.com/sonata-project/EntityAuditBundle/pull/612)] Multiple queries to tables have been replaced with a single one ([@SavageDays](https://github.com/SavageDays))
+
 ## [1.16.1](https://github.com/sonata-project/EntityAuditBundle/compare/1.16.0...1.16.1) - 2024-01-22
 ### Fixed
 - [[#599](https://github.com/sonata-project/EntityAuditBundle/pull/599)] Objects now no longer show as different when their values are the same. This restores some of the old behaviour of the EntityAuditBundle ([@befresh-mweimerskirch](https://github.com/befresh-mweimerskirch))

src/EventListener/LogRevisionsListener.php

@@ -115,6 +115,9 @@ public function postFlush(PostFlushEventArgs $eventArgs): void
                 continue;
             }
 
+            $sql = 'UPDATE '.$this->config->getTableName($meta).' ';
+            $params = $types = [];
+
             foreach ($updateData[$meta->table['name']] as $column => $value) {
                 $field = $meta->getFieldName($column);
                 $fieldName = $meta->getFieldForColumn($column);
@@ -128,13 +131,15 @@ public function postFlush(PostFlushEventArgs $eventArgs): void
                     }
                 }
 
-                $sql = 'UPDATE '.$this->config->getTableName($meta).' '.
-                    'SET '.$field.' = '.$placeholder.' '.
-                    'WHERE '.$this->config->getRevisionFieldName().' = ? ';
+                if ($column === array_key_first($updateData[$meta->table['name']])) {
+                    $sql .= 'SET ';
+                } else {
+                    $sql = trim($sql).', ';
+                }
 
-                $params = [$value, $this->getRevisionId($conn)];
+                $sql .= $field.' = '.$placeholder.' ';
 
-                $types = [];
+                $params[] = $value;
 
                 if (\array_key_exists($column, $meta->fieldNames)) {
                     $types[] = $meta->getTypeOfField($fieldName);
@@ -161,29 +166,31 @@ public function postFlush(PostFlushEventArgs $eventArgs): void
 
                     $types[] = $type;
                 }
+            }
 
-                $types[] = $this->config->getRevisionIdFieldType();
-
-                foreach ($meta->identifier as $idField) {
-                    if (isset($meta->fieldMappings[$idField])) {
-                        $columnName = $meta->fieldMappings[$idField]['columnName'];
-                        $types[] = $meta->fieldMappings[$idField]['type'];
-                    } elseif (isset($meta->associationMappings[$idField]['joinColumns'])) {
-                        $columnName = $meta->associationMappings[$idField]['joinColumns'][0]['name'];
-                        $types[] = $meta->associationMappings[$idField]['type'];
-                    } else {
-                        throw new \RuntimeException('column name not found  for'.$idField);
-                    }
-
-                    $reflField = $meta->reflFields[$idField];
-                    \assert(null !== $reflField);
-                    $params[] = $reflField->getValue($entity);
-
-                    $sql .= ' AND '.$columnName.' = ?';
+            $sql .= 'WHERE '.$this->config->getRevisionFieldName().' = ? ';
+            $params[] = $this->getRevisionId($conn);
+            $types[] = $this->config->getRevisionIdFieldType();
+
+            foreach ($meta->identifier as $idField) {
+                if (isset($meta->fieldMappings[$idField])) {
+                    $columnName = $meta->fieldMappings[$idField]['columnName'];
+                    $types[] = $meta->fieldMappings[$idField]['type'];
+                } elseif (isset($meta->associationMappings[$idField]['joinColumns'])) {
+                    $columnName = $meta->associationMappings[$idField]['joinColumns'][0]['name'];
+                    $types[] = $meta->associationMappings[$idField]['type'];
+                } else {
+                    throw new \RuntimeException('column name not found  for'.$idField);
                 }
 
-                $em->getConnection()->executeQuery($sql, $params, $types);
+                $reflField = $meta->reflFields[$idField];
+                \assert(null !== $reflField);
+                $params[] = $reflField->getValue($entity);
+
+                $sql .= ' AND '.$columnName.' = ?';
             }
+
+            $em->getConnection()->executeQuery($sql, $params, $types);
         }
 
         foreach ($this->deferredChangedManyToManyEntityRevisionsToPersist as $deferredChangedManyToManyEntityRevisionToPersist) {