Fix CS and phpstan

Author: sclubricants

system/Database/BaseBuilder.php

@@ -163,6 +163,7 @@ class BaseBuilder
      *
      * @phpstan-var array{
      *   updateFieldsAdditional?: array,
+     *   tableIdentity?: string,
      *   updateFields?: array,
      *   constraints?: array,
      *   fromQuery?: string,

system/Database/SQLSRV/Builder.php

@@ -634,23 +634,16 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
             $constraints = $this->QBOptions['constraints'] ?? [];
 
-            $tableIdentity = $this->QBOptions['tableIdentity'] ?? [];
-
-            if (empty($tableIdentity)) {
-                $sql = "SELECT name from syscolumns where id = Object_ID('" . $table . "') and colstat = 1";
-
-                if (($query = $this->db->query($sql)) === false) {
-                    throw new DatabaseException('Failed to get table identity'); // @codeCoverageIgnore
-                }
-
-                $query = $query->getResultObject();
-
-                foreach ($query as $row) {
-                    $tableIdentity = '"' . $row->name . '"';
-                }
-
-                $this->QBOptions['tableIdentity'] = $tableIdentity;
+            $tableIdentity = $this->QBOptions['tableIdentity'] ?? '';
+            $sql = "SELECT name from syscolumns where id = Object_ID('" . $table . "') and colstat = 1";
+            if (($query = $this->db->query($sql)) === false) {
+                throw new DatabaseException('Failed to get table identity'); 
+            }
+            $query = $query->getResultObject();
+            foreach ($query as $row) {
+                $tableIdentity = '"' . $row->name . '"';
             }
+            $this->QBOptions['tableIdentity'] = $tableIdentity;
 
             $identityInFields = in_array($tableIdentity, $keys, true);
 

user_guide_src/source/database/query_builder/111.php

@@ -16,7 +16,7 @@
 ];
 
 $additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
-        
+
 $sql = $builder->setData($data)->updateFields($additionalUpdateField, true)->upsertBatch();
 /* MySQLi produces:
     INSERT INTO `db_user` (`country`, `email`, `name`)