Don't require an alias for Select::from

Author: rkrx

src/Builder/Delete.php

@@ -18,9 +18,7 @@ class Delete extends Statement {
 	use LimitBuilder;
 	use OffsetBuilder;
 
-	/**
-	 * @var string[]
-	 */
+	/** @var string[] */
 	private $aliases = array();
 
 	/**
@@ -31,9 +29,7 @@ class Delete extends Statement {
 	 * @return $this
 	 */
 	public function from($alias, $table = null) {
-		if($table === null) {
-			list($alias, $table) = [$table, $alias];
-		} else {
+		if($table !== null) {
 			$this->aliases[] = $alias;
 		}
 		$this->addTable($alias, $table);

src/Builder/Select.php

@@ -13,9 +13,7 @@
 
 class Select extends Statement {
 	use TableNameBuilder;
-	use TableBuilder {
-		addTable as addFrom;
-	}
+	use TableBuilder;
 	use JoinBuilder;
 	use WhereBuilder;
 	use HavingBuilder;
@@ -79,16 +77,6 @@ public function getFields() {
 		return $this->fields;
 	}
 
-	/**
-	 * @param string $alias
-	 * @param string $table
-	 * @return $this
-	 */
-	public function from($alias, $table) {
-		$this->addFrom($alias, $table);
-		return $this;
-	}
-
 	/**
 	 * @param bool $enabled
 	 * @return $this
@@ -118,6 +106,16 @@ public function setCalcFoundRows($calcFoundRows = true) {
 		return $this;
 	}
 
+	/**
+	 * @param string $alias
+	 * @param string $tableName
+	 * @return $this
+	 */
+	public function from($alias, $tableName = null) {
+		$this->addTable($alias, $tableName);
+		return $this;
+	}
+
 	/**
 	 * @return string
 	 */

src/Builder/Traits/TableBuilder.php

@@ -14,7 +14,10 @@ trait TableBuilder {
 	 * @param string $table
 	 * @return $this
 	 */
-	public function addTable($alias, $table) {
+	protected function addTable($alias, $table = null) {
+		if($table === null) {
+			list($alias, $table) = [$table, $alias];
+		}
 		$this->tables[] = array('alias' => $alias, 'name' => $table);
 		return $this;
 	}

src/Builder/Update.php

@@ -30,9 +30,6 @@ class Update extends InsertUpdateStatement {
 	 * @return $this
 	 */
 	public function table($alias, $table = null) {
-		if($table === null) {
-			list($alias, $table) = [$table, $alias];
-		}
 		$this->addTable($alias, $table);
 		return $this;
 	}