Merge branch '3.0' of git://github.com/thecodingmachine/database.querywriter into 3.0

Author: moufmouf

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

@@ -191,7 +191,7 @@ public function getParameterizedQuery($name,$parameters,$selfedit="false") {
 	 * @param int $offset
 	 * @param int $limit
 	 */
-	public function runQuery($name, $parameters, $offset = null, $limit = null) {
+	public function runQuery($name, $parameters = array(), $offset = null, $limit = null) {
 		$select = new InstanceProxy($name);
 		$sql = $select->toSql($parameters);
 

src/SQLParser/Node/NodeFactory.php

@@ -41,6 +41,7 @@
 use SQLParser\Query\StatementFactory;
 
 use SQLParser\ExpressionType;
+use Mouf\MoufException;
 
 /**
  * This class has the ability to create instances implementing NodeInterface based on a descriptive array.
@@ -131,7 +132,35 @@ public static function toObject(array $desc) {
 			case ExpressionType::TABLE:
 				$expr = new Table();
 				$expr->setTable(str_replace('`', '',$desc['table']));
-				$expr->setJoinType($desc['join_type']);
+				switch ($desc['join_type']) {
+					case "CROSS":
+						$joinType = "CROSS JOIN";
+						break;
+					case "JOIN":
+						$joinType = "JOIN";
+						break;
+					case "LEFT":
+						$joinType = "LEFT JOIN";
+						break;
+					case "RIGHT":
+						$joinType = "RIGHT JOIN";
+						break;
+					case "INNER":
+						$joinType = "INNER JOIN";
+						break;
+					case "OUTER":
+						$joinType = "OUTER JOIN";
+						break;
+					case "NATURAL":
+						$joinType = "NATURAL JOIN";
+						break;
+					case ",":
+						$joinType = ",";
+						break;
+					default:
+						throw new \Exception("Unexpected join type: '".$desc['join_type']."'");
+				}
+				$expr->setJoinType($joinType);
 
 				if (isset($desc['alias'])) {
 					$expr->setAlias($desc['alias']['name']);

src/views/createQuery.php

@@ -33,6 +33,11 @@
 
 </form>
 
+<div class="alert">If you are performing JOINs, avoid doing a `SELECT * FROM ...`. You may have
+several columns with the same name in different tables and this might confuse QueryWritter, especially
+if you are using the `CountNbResult` class.</div>
+
+
 <script type="text/javascript">
 $(function () { $("input,select,textarea").not("[type=submit]").jqBootstrapValidation(); } );
 </script>

src/views/parseSql.php

@@ -21,4 +21,8 @@
 		</div>
 	</div>
 
-</form>
+</form>
+
+<div class="alert">If you are performing JOINs, avoid doing a `SELECT * FROM ...`. You may have
+several columns with the same name in different tables and this might confuse QueryWritter, especially
+if you are using the `CountNbResult` class.</div>

src/views/tryQuery.php

@@ -5,13 +5,14 @@
 
 <pre id="mainQuery"><code><?php echo $this->sql; ?></code></pre>
 
+<form action="" class="form-horizontal" id="parametersform">
+	<input type="hidden" name="name" value="<?php echo plainstring_to_htmlprotected($this->instanceName); ?>" />
+
 <?php if (!empty($this->parameters)): ?>
 <div class="row">
 	<div class="span6">
 		<h2>Configure parameters</h2>
 
-		<form action="" class="form-horizontal" id="parametersform">
-			<input type="hidden" name="name" value="<?php echo plainstring_to_htmlprotected($this->instanceName); ?>" />
 		<?php foreach ($this->parameters as $parameter) { ?>
 			<div class="control-group">
 				<label class="control-label"><?php echo plainstring_to_htmlprotected($parameter); ?>: </label>
@@ -20,7 +21,6 @@
 				</div>
 			</div>
 		<?php } ?>
-		</form>
 	</div>
 	<div class="span6">
 		<h2>Query with parameters</h2>
@@ -54,10 +54,13 @@ function updateQuery() {
 
 <div class="form-actions">
 	<a href=".?name=<?php echo urlencode($this->instanceName) ?>" class="btn">&lt; Edit Query</a>
-	<button type="button" class="btn btn-primary" id="runQueryButton">Run Query</button>
+	<button type="submit" class="btn btn-primary" id="runQueryButton">Run Query</button>
 	<a href="<?php echo ROOT_URL ?>ajaxinstance/?name=<?php echo urlencode($this->instanceName) ?>" class="btn">View instance &gt;</a>
 </div>
 
+</form>
+
+
 <div id="resultsContainer"></div>
 
 <script type="text/javascript">
@@ -73,9 +76,9 @@ function updateQuery() {
 	    });
 	});
 
-	$("#runQueryButton").click(function() {
+	/*$("#runQueryButton").click(function() {
 		$("#parametersform").trigger("submit");
-	});
+	});*/
 
 });
 </script>