Adding SQLParser lib directly into database.querywriter and refactoring all the code to use that lib + making making SQLParser PSR0 compatible

Author: moufmouf

composer.json

@@ -21,7 +21,8 @@
     },
     "autoload": {
         "psr-0": {
-            "Mouf": "src/"
+            "Mouf": "src/",
+            "SQLParser": "src/"
         }
     },
     "extra": {

src/Mouf/Database/QueryWriter/Column.php

@@ -1,6 +1,10 @@
 <?php
 namespace Mouf\Database\QueryWriter\Controllers;
 
+use SQLParser\Query\StatementFactory;
+
+use SQLParser\SQLParser;
+
 use Mouf\Controllers\AbstractMoufInstanceController;
 
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
@@ -26,7 +30,9 @@ class SelectController extends AbstractMoufInstanceController {
 	 * @var HtmlBlock
 	 */
 	public $content;
-		
+
+	protected $sql;
+	
 	/**
 	 * Admin page used to display the DAO generation form.
 	 *
@@ -35,12 +41,9 @@ class SelectController extends AbstractMoufInstanceController {
 	 */
 	public function defaultAction($name, $selfedit="false") {
 		$this->initController($name, $selfedit);
-		require_once __DIR__.'/../../../../php-sql-parser/php-sql-parser.php';
 
-		$parser = new PHPSQLParser();
-		$parsed = $parser->parse("SELECT toto as tata FROM table");
-		print_r($parsed);
-		exit;
+		$select = MoufManager::getMoufManagerHiddenInstance()->getInstance($name);
+		$this->sql = $select->toSql(null); 
 
 		$this->content->addFile(dirname(__FILE__)."/../../../../views/parseSql.php", $this);
 		$this->template->toHtml();
@@ -50,12 +53,31 @@ public function defaultAction($name, $selfedit="false") {
 	 * This action generates the DAOs and Beans for the TDBM service passed in parameter. 
 	 * 
 	 * @Action
-	 * @param string $name
-	 * @param bool $selfedit
+	 * @param string $sql
+	 * @param string $selfedit
 	 */
-	public function generate($name, $sourcedirectory, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $keepSupport = 0,$selfedit="false") {
+	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);
+		//print_r($parsed);
+		$select = StatementFactory::toObject($parsed);
+		//var_dump(StatementFactory::toObject($parsed));
+		/*var_export($select);
+		var_dump($select->toInstanceDescriptor(MoufManager::getMoufManager()));
+		exit;*/
+		//var_export($parsed);exit;
+		$moufManager = MoufManager::getMoufManagerHiddenInstance();
+		$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);

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

@@ -1,6 +1,8 @@
 <?php
 namespace Mouf\Database\QueryWriter;
 
+use SQLParser\Query\Select;
+
 use Mouf\Utils\Value\IntValueInterface;
 
 use Mouf\Database\DBConnection\ConnectionInterface;
@@ -28,7 +30,7 @@ class CountNbResult implements IntValueInterface {
 	private $connection;
 
 	/**
-	 * 
+	 * @Important $select
 	 * @param Select $select
 	 * @param ConnectionInterface $connection
 	 */