Migrating to DBAL

Author: moufmouf

src/Mouf/Database/QueryWriter/Controllers/SelectController.php

@@ -1,6 +1,7 @@
 <?php
 namespace Mouf\Database\QueryWriter\Controllers;
 
+use Mouf\ClassProxy;
 use Mouf\Database\QueryWriter\Utils\FindParametersService;
 
 use Mouf\MoufPropertyDescriptor;
@@ -196,9 +197,9 @@ public function runQuery($name, $parameters = array(), $offset = null, $limit =
 		$sql = $select->toSql($parameters);
 
 		// TODO: point to the right dbConnection
-		$dbConnection = new InstanceProxy("dbConnection");
-		$results = $dbConnection->getAll($sql, \PDO::FETCH_ASSOC, "stdClass", $offset, $limit);
-		
+		$dbHelper = new ClassProxy("Mouf\\Database\\QueryWriter\\Utils\\DbHelper");
+		$results = $dbHelper->getAll($sql, $offset, $limit);
+
 		$evolugridResultSet = new EvoluGridResultSet();
 		$evolugridResultSet->setResults($results);
 

src/Mouf/Database/QueryWriter/QueryResult.php

@@ -1,6 +1,7 @@
 <?php
 namespace Mouf\Database\QueryWriter;
 
+use Mouf\Database\QueryWriter\Utils\DbHelper;
 use Mouf\Utils\Value\ValueUtils;
 
 use SQLParser\Query\Select;
@@ -72,27 +73,10 @@ public function setParameters($parameters) {
 	 */
 	public function val() {
 		$parameters = ValueUtils::val($this->parameters);
-		$pdoStatement = $this->connection->query($this->select->toSql($parameters, $this->connection).$this->getFromLimitString($this->offset, $this->limit));
+		$pdoStatement = $this->connection->query($this->select->toSql($parameters, $this->connection).DbHelper::getFromLimitString($this->offset, $this->limit));
 		return new ResultSet($pdoStatement);
 	}
 
-	private static function getFromLimitString($from = null, $limit = null) {
-		if ($limit !== null) {
-			$limitInt = (int)$limit;
-			$queryStr = " LIMIT ".$limitInt;
-
-			if ($from !== null) {
-				$fromInt = (int)$from;
-				$queryStr .= " OFFSET ".$fromInt;
-			}
-			return $queryStr;
-		}
-		else
-		{
-			return "";
-		}
-	}
-	
 	/**
 	 * Returns the SQL for this query-result (without pagination, but with parameters accounted for)
 	 * @return string

src/Mouf/Database/QueryWriter/Utils/DbHelper.php

@@ -0,0 +1,40 @@
+<?php
+namespace Mouf\Database\QueryWriter\Utils;
+
+
+use Mouf\MoufManager;
+
+class DbHelper
+{
+    public static function getAll($sql, $offset, $limit) {
+        $dbalConnection = MoufManager::getMoufManager()->get('dbalConnection');
+        /* @var $dbalConnection \Doctrine\DBAL\Connection */
+        $sql .= self::getFromLimitString($offset, $limit);
+        $statement = $dbalConnection->executeQuery($sql);
+        $results = $statement->fetchAll();
+
+        $array = [];
+
+        foreach ($results as $result) {
+            $array[] = $result;
+        }
+        return $array;
+    }
+
+    public static function getFromLimitString($from = null, $limit = null) {
+        if ($limit !== null) {
+            $limitInt = (int)$limit;
+            $queryStr = " LIMIT ".$limitInt;
+
+            if ($from !== null) {
+                $fromInt = (int)$from;
+                $queryStr .= " OFFSET ".$fromInt;
+            }
+            return $queryStr;
+        }
+        else
+        {
+            return "";
+        }
+    }
+}

src/SQLParser/Node/ConstNode.php

@@ -86,7 +86,7 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
 		if ($this->value === null) {
 			return 'NULL';
 		} elseif ($dbConnection != null) {
-			return $dbConnection->quoteSmart($this->value);
+			return $dbConnection->quote($this->value);
 		} else {
 			return "'".addslashes($this->value)."'";
 		}

src/SQLParser/Node/NodeFactory.php

@@ -647,7 +647,7 @@ public static function toSql($nodes, Connection $dbConnection = null, array $par
 	 */
 	public static function escapeDBItem($str, Connection $dbConnection = null) {
 		if ($dbConnection) {
-			return $dbConnection->escapeDBItem($str);
+			return $dbConnection->quoteIdentifier($str);
 		} else {
 			return '`'.$str.'`';
 		}

src/SQLParser/Node/Parameter.php

@@ -143,7 +143,7 @@ public function toInstanceDescriptor(MoufManager $moufManager) {
 	public function toSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $ignoreConditions = false) {
 		if (isset($parameters[$this->name])) {
 			if ($dbConnection) {
-				return $dbConnection->quoteSmart($this->autoPrepend.$parameters[$this->name].$this->autoAppend);
+				return $dbConnection->quote($this->autoPrepend.$parameters[$this->name].$this->autoAppend);
 			} else {
 				if ($parameters[$this->name] === null) {
 					return NULL;