Removing parentheses from generated Query when converting to string.

cakephp · Mar 30, 2014 · 6342328 · 6342328
1 parent 03103d4
commit 6342328
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -79,8 +79,7 @@ public function disconnect() {
  */
 	public function prepare($query) {
 		$this->connect();
-		$sql = $query instanceof Query ? $query->sql() : $query;
-		$statement = $this->_connection->prepare($sql);
+		$statement = $this->_connection->prepare((string)$query);
 		return new PDOStatement($statement, $this);
 	}
 

diff --git a/src/Database/Driver/Sqlite.php b/src/Database/Driver/Sqlite.php
@@ -88,8 +88,7 @@ public function enabled() {
  */
 	public function prepare($query) {
 		$this->connect();
-		$sql = $query instanceof Query ? $query->sql() : $query;
-		$statement = $this->_connection->prepare($sql);
+		$statement = $this->_connection->prepare((string)$query);
 		return new SqliteStatement(new PDOStatement($statement, $this), $this);
 	}
 

diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -1822,7 +1822,7 @@ protected function _dirty() {
  * @return string
  */
 	public function __toString() {
-		return sprintf('(%s)', $this->sql());
+		return $this->sql();
 	}
 
 /**

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2396,6 +2396,20 @@ public function testQuotingInsert() {
 		$this->assertQuotedQuery('INSERT INTO <foo> \(\(bar\)\)', $sql);
 	}
 
+/**
+ * Tests converting a query to a string
+ *
+ * @return void
+ */
+	public function testToString() {
+		$query = new Query($this->connection);
+		$query
+			->select(['title'])
+			->from('articles');
+		$result = (string)$query;
+		$this->assertQuotedQuery('SELECT <title> FROM <articles>', $result, true);
+	}
+
 /**
  * Tests __debugInfo
  *