Added Select::forUpdate

Author: rkrx

src/Kir/MySQL/Builder/Select.php

@@ -47,14 +47,19 @@ class Select extends Statement {
 	 */
 	private $calcFoundRows = false;
 
+	/**
+	 * @var bool
+	 */
+	private $forUpdate = false;
+
 	/**
 	 * @param string $expression
 	 * @param string $alias
 	 * @return $this
 	 */
 	public function field($expression, $alias = null) {
 		if(is_object($expression)) {
-			$expression = (string) $expression;
+			$expression = (string)$expression;
 		}
 		if($alias === null) {
 			$this->fields[] = $expression;
@@ -197,6 +202,15 @@ public function offset($offset) {
 		return $this;
 	}
 
+	/**
+	 * @param bool $enabled
+	 * @return $this
+	 */
+	public function forUpdate($enabled = true) {
+		$this->forUpdate = $enabled;
+		return $this;
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -234,6 +248,7 @@ public function __toString() {
 		$query = $this->buildConditions('HAVING', $this->having, $query);
 		$query = $this->buildOrder($query);
 		$query = $this->buildLimit($query);
+		$query = $this->buildForUpdate($query);
 		$query .= ";\n";
 		return $query;
 	}
@@ -274,7 +289,7 @@ private function buildFields($query) {
 		} else {
 			$fields[] = "\t*";
 		}
-		return $query . join(",\n", $fields) . "\n";
+		return $query.join(",\n", $fields)."\n";
 	}
 
 	/**
@@ -285,12 +300,12 @@ private function buildFrom($query) {
 		$arr = array();
 		foreach($this->tables as $table) {
 			if($table['type'] == 'FROM') {
-				$arr[] = "\t" . $this->buildTableName($table['alias'], $table['name']);
+				$arr[] = "\t".$this->buildTableName($table['alias'], $table['name']);
 			}
 		}
 		if(count($arr)) {
 			$query .= "FROM\n";
-			$query .= join(",\n", $arr) . "\n";
+			$query .= join(",\n", $arr)."\n";
 		}
 		return $query;
 	}
@@ -303,16 +318,16 @@ private function buildJoins($query) {
 		$arr = array();
 		foreach($this->tables as $table) {
 			if($table['type'] != 'FROM') {
-				$join = $table['type'] . " JOIN\n";
-				$join .= "\t" . $this->buildTableName($table['alias'], $table['name']);
+				$join = $table['type']." JOIN\n";
+				$join .= "\t".$this->buildTableName($table['alias'], $table['name']);
 				if($table['expression']) {
-					$join .= " ON " . $this->buildExpression($table['expression'], $table['arguments']);
+					$join .= " ON ".$this->buildExpression($table['expression'], $table['arguments']);
 				}
 				$arr[] = $join;
 			}
 		}
 		if(count($arr)) {
-			$query .= join("\n", $arr) . "\n";
+			$query .= join("\n", $arr)."\n";
 		}
 		return $query;
 	}
@@ -335,7 +350,7 @@ private function buildConditions($type, array $conditions, $query) {
 			$arr[] = "\t{$expr}";
 		}
 		$query .= join("\n\tAND\n", $arr);
-		return $query . "\n";
+		return $query."\n";
 	}
 
 	/**
@@ -352,7 +367,7 @@ private function buildOrder($query) {
 			list($expression, $direction) = $order;
 			$arr[] = sprintf("\t%s %s", $expression, strtoupper($direction));
 		}
-		return $query . join(",\n", $arr) . "\n";
+		return $query.join(",\n", $arr)."\n";
 	}
 
 	/**
@@ -368,7 +383,7 @@ private function buildGroups($query) {
 		foreach($this->groupBy as $expression) {
 			$arr[] = "\t{$expression}";
 		}
-		return $query . join(",\n", $arr) . "\n";
+		return $query.join(",\n", $arr)."\n";
 	}
 
 	/**
@@ -386,6 +401,17 @@ private function buildLimit($query) {
 		return $query;
 	}
 
+	/**
+	 * @param string $query
+	 * @return string
+	 */
+	private function buildForUpdate($query) {
+		if($this->forUpdate) {
+			$query .= "FOR UPDATE\n";
+		}
+		return $query;
+	}
+
 	/**
 	 * @param string $alias
 	 * @param string $name

tests/Kir/MySQL/Builder/SelectTest.php

@@ -123,4 +123,13 @@ public function testOffset() {
 		->asString();
 		$this->assertEquals('SELECT a FROM test t ;', $str);
 	}
+
+	public function testForUpdate() {
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->forUpdate()
+		->asString();
+		$this->assertEquals('SELECT a FROM test t FOR UPDATE ;', $str);
+	}
 }