Merge pull request #5378 from kenjis/fix-4457-BaseBuilder-tableName

fix: Incorrect type `BaseBuilder::$tableName`

Author: kenjis

system/Database/BaseBuilder.php

@@ -158,6 +158,9 @@ class BaseBuilder
      * Tracked separately because $QBFrom gets escaped
      * and prefixed.
      *
+     * When $tableName to the constructor has multiple tables,
+     * the value is empty string.
+     *
      * @var string
      */
     protected $tableName;
@@ -261,7 +264,9 @@ class BaseBuilder
     /**
      * Constructor
      *
-     * @param array|string $tableName
+     * @param array|string $tableName tablename or tablenames with or without aliases
+     *
+     * Examples of $tableName: `mytable`, `jobs j`, `jobs j, users u`, `['jobs j','users u']`
      *
      * @throws DatabaseException
      */
@@ -276,7 +281,13 @@ public function __construct($tableName, ConnectionInterface &$db, ?array $option
          */
         $this->db = $db;
 
-        $this->tableName = $tableName;
+        // If it contains `,`, it has multiple tables
+        if (is_string($tableName) && strpos($tableName, ',') === false) {
+            $this->tableName = $tableName;  // @TODO remove alias if exists
+        } else {
+            $this->tableName = '';
+        }
+
         $this->from($tableName);
 
         if (! empty($options)) {

system/Database/BaseConnection.php

@@ -835,7 +835,7 @@ abstract protected function _transCommit(): bool;
     abstract protected function _transRollback(): bool;
 
     /**
-     * Returns an instance of the query builder for this connection.
+     * Returns a non-shared new instance of the query builder for this connection.
      *
      * @param array|string $tableName
      *

user_guide_src/source/changelogs/v4.1.6.rst

@@ -11,6 +11,7 @@ Release Date: Not released
 
 BREAKING
 ========
+- Multiple table names will no longer be stored in ``BaseBuilder::$tableName`` - an empty string will be used instead.
 
 Enhancements
 ============