Merge pull request #6871 from kenjis/disable-BaseBuilder-setAlias

feat: disable BaseBuilder::setAlias()

Author: kenjis

system/Database/BaseBuilder.php

@@ -1971,7 +1971,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
     /**
      * Set table alias for dataset sudo table.
      */
-    public function setAlias(string $alias): BaseBuilder
+    private function setAlias(string $alias): BaseBuilder
     {
         if ($alias !== '') {
             $this->db->addTableAlias($alias);

tests/system/Database/Live/UpdateTest.php

@@ -396,8 +396,8 @@ public function testUpdateBatchUpdateFieldsAndAlias()
         $this->db->table('user')
             ->updateFields($updateFields)
             ->onConstraint(['email', new RawSql("{$esc}db_user{$esc}.{$esc}country{$esc} = {$esc}_update{$esc}.{$esc}country{$esc}")])
-            ->setAlias('_update')
-            ->updateBatch($data);
+            ->setData($data, null, '_update')
+            ->updateBatch();
 
         $result = $this->db->table('user')->get()->getResultArray();
 

user_guide_src/source/database/query_builder.rst

@@ -1842,16 +1842,6 @@ Class Reference
 
         Used for ``*Batch()`` methods to set data for insert, update, upsert.
 
-    .. php:method:: setAlias($alias)
-
-        :param string $alias: Alias for table
-        :returns:   ``BaseBuilder`` instance (method chaining)
-        :rtype:     ``BaseBuilder``
-
-        .. versionadded:: 4.3.0
-
-        This allows setting an alias for the psuedo table generated with ``setData()``.
-
     .. php:method:: setUpdateBatch($key[, $value = ''[, $escape = null]])
 
         :param mixed $key: Field name or an array of field/value pairs

user_guide_src/source/database/query_builder/092.php

@@ -21,8 +21,7 @@
 $builder->setData($data)->onConstraint('title, author')->updateBatch();
 
 // OR
-$builder->setData($data)
-    ->setAlias('u')
+$builder->setData($data, null, 'u')
     ->onConstraint(['`mytable`.`title`' => '`u`.`title`', 'author' => new RawSql('`u`.`author`')])
     ->updateBatch();
 

user_guide_src/source/database/query_builder/110.php

@@ -7,7 +7,7 @@
     'country' => 'Afghanistan',
 ];
 
-$builder->updateFields('name, country')->setAlias('_upsert')->upsert($data);
+$builder->updateFields('name, country')->setData($data, null, '_upsert')->upsert();
 /* SQLSRV produces:
     MERGE INTO "test"."dbo"."db_user"
     USING (