Define primary table, add getter

Author: MGatner

system/Database/BaseBuilder.php

@@ -185,6 +185,15 @@ class BaseBuilder
 	 */
 	protected $db;
 
+	/**
+	 * Name of the primary table for this instance.
+	 * Tracked separately because $QBFrom gets escaped
+	 * and prefixed.
+	 *
+	 * @var string
+	 */
+	protected $tableName;
+
 	/**
 	 * ORDER BY random keyword
 	 *
@@ -286,6 +295,7 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 
 		$this->db = $db;
 
+		$this->tableName = $tableName;
 		$this->from($tableName);
 
 		if (! empty($options))
@@ -330,6 +340,18 @@ public function testMode(bool $mode = true)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Gets the name of the primary table.
+	 *
+	 * @return string
+	 */
+	public function getTable(): string
+	{
+		return $this->tableName;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Returns an array of bind values and their
 	 * named parameters for binding in the Query object later.

tests/system/Database/Builder/BaseTest.php

@@ -26,4 +26,32 @@ public function testDbReturnsConnection()
 
 		$this->assertInstanceOf(MockConnection::class, $result);
 	}
+
+	//--------------------------------------------------------------------
+
+	public function testGetTableReturnsTable()
+	{
+		$builder = $this->db->table('jobs');
+
+		$result = $builder->getTable();
+		$this->assertEquals('jobs', $result);
+	}
+
+	public function testGetTableIgnoresFrom()
+	{
+		$builder = $this->db->table('jobs');
+
+		$builder->from('foo');
+		$result = $builder->getTable();
+		$this->assertEquals('jobs', $result);
+	}
+
+	public function testGetTableRespectsFrom()
+	{
+		$builder = $this->db->table('jobs');
+
+		$builder->from('foo', true);
+		$result = $builder->getTable();
+		$this->assertEquals('foo', $result);
+	}
 }