Adding possiblity to directly create a request from the UI

Author: moufmouf

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

@@ -50,21 +50,15 @@ public function defaultAction($name, $selfedit="false") {
 	}
 
 	/**
-	 * This action generates the DAOs and Beans for the TDBM service passed in parameter. 
+	 * This action generates the objects from the SQL query and applies it to the existing SELECT object. 
 	 * 
 	 * @Action
+	 * @param string $name
 	 * @param string $sql
 	 * @param string $selfedit
 	 */
 	public function parse($name, $sql,$selfedit="false") {
 		$this->initController($name, $selfedit);
-
-		//require_once __DIR__.'/../../../../php-sql-parser/php-sql-parser.php';
-		
-		/*$parser = new \PHPSQLParser();
-		$parsed = $parser->parse($sql);
-		print_r($parsed);
-		exit;*/
 
 		$parser = new SQLParser();
 		$parsed = $parser->parse($sql);
@@ -79,8 +73,37 @@ public function parse($name, $sql,$selfedit="false") {
 		$select->overwriteInstanceDescriptor($name, $moufManager);
 		$moufManager->rewriteMouf();
 
-		// TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
 		header("Location: ".ROOT_URL."ajaxinstance/?name=".urlencode($name)."&selfedit=".$selfedit);
 	}
 
+	/**
+	 * Admin page used to create a new SQL query.
+	 *
+	 * @Action
+	 */
+	public function createQuery($selfedit="false") {	
+		$this->content->addFile(dirname(__FILE__)."/../../../../views/createQuery.php", $this);
+		$this->template->toHtml();
+	}
+	
+	/**
+	 * This action generates the objects from the SQL query and creates a new SELECT instance.
+	 *
+	 * @Action
+	 * @param string $name
+	 * @param string $sql
+	 * @param string $selfedit
+	 */
+	public function doCreateQuery($name, $sql,$selfedit="false") {
+		$parser = new SQLParser();
+		$parsed = $parser->parse($sql);
+		$select = StatementFactory::toObject($parsed);
+		
+		$moufManager = MoufManager::getMoufManagerHiddenInstance();
+		$instanceDescriptor = $select->toInstanceDescriptor($moufManager);
+		$instanceDescriptor->setName($name);
+		$moufManager->rewriteMouf();
+		
+		header("Location: ".ROOT_URL."ajaxinstance/?name=".urlencode($name)."&selfedit=".$selfedit);
+	}
 }

src/Mouf/Database/QueryWriter/QueryResult.php

@@ -1,6 +1,8 @@
 <?php
 namespace Mouf\Database\QueryWriter;
 
+use Mouf\Utils\Value\ValueUtils;
+
 use SQLParser\Query\Select;
 
 use Mouf\Utils\Common\PaginableInterface;
@@ -30,6 +32,13 @@ class QueryResult implements ArrayValueInterface, PaginableInterface {
 	 */
 	private $connection;
 
+	/**
+	 * The list of parameters to apply to the SQL request.
+	 * 
+	 * @var array<string, string>|ArrayValueInterface
+	 */
+	private $parameters = array();
+	
 	private $limit;
 	private $offset;
 
@@ -43,13 +52,22 @@ public function __construct(Select $select, ConnectionInterface $connection) {
 		$this->connection = $connection;
 	}
 
+	/**
+	 * The list of parameters to apply to the SQL request.
+	 * 
+	 * @param array<string, string>|ArrayValueInterface $parameters
+	 */
+	public function setParameters($parameters) {
+		$this->parameters = $parameters;
+	}
+	
 	/**
 	 * (non-PHPdoc)
 	 * @see \Mouf\Utils\Value\ArrayValueInterface::val()
 	 */
 	public function val() {
-		// FIXME: add support for params!
-		$pdoStatement = $this->connection->query($this->select->toSql($this->connection), $this->offset, $this->limit);
+		$parameters = ValueUtils::val($this->parameters);
+		$pdoStatement = $this->connection->query($this->select->toSql($this->connection, $parameters), $this->offset, $this->limit);
 		return new ResultSet($pdoStatement);
 	}
 

src/QueryWriterAdmin.php

@@ -2,6 +2,10 @@
 use Mouf\MoufManager;
 use Mouf\MoufUtils;
 
+MoufUtils::registerMainMenu('dbMainMenu', 'DB', null, 'mainMenu', 70);
+MoufUtils::registerMenuItem('dbQueryWriterAdminSubMenu', 'SQL queries', null, 'dbMainMenu', 80);
+MoufUtils::registerMenuItem('dbQueryWriterCreateQueryAdminSubMenu', 'Create SQL query', 'parseselect/createQuery', 'dbQueryWriterAdminSubMenu', 0);
+
 
 // Controller declaration
 $moufManager = MoufManager::getMoufManager();

src/views/createQuery.php

@@ -0,0 +1,23 @@
+<?php
+/* @var $this Mouf\Database\QueryWriter\Controllers\SelectController */
+?>
+<h1>Create a new SQL query</h1>
+
+<form action="doCreateQuery" method="post">
+	<div class="control-group">
+		<label class="control-label">Instance name:</label>
+		<div class="controls">
+			<input type="text" name="name" value="<?php echo plainstring_to_htmlprotected($this->instanceName) ?>" />
+		</div>
+	</div>
+	
+
+	<label class="control-label">SQL query:</label>
+	<textarea rows=10 name="sql" class="span10"><?php echo plainstring_to_htmlprotected($this->sql) ?></textarea>
+	<div class="control-group">
+		<div class="controls">
+			<button name="action" value="parse" type="submit" class="btn btn-danger">Create SQL query object</button>
+		</div>
+	</div>
+		
+</form>