Fix options parsing and SQL debug output (#694)

* Fix specifying multiple comma separated options * Show formatted SQL when debugging on cli
volkszaehler · Jun 16, 2018 · c66bc88 · c66bc88
1 parent 62d05d1
commit c66bc88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Controller/DataController.php b/lib/Controller/DataController.php
@@ -45,7 +45,7 @@ class DataController extends Controller {
 
 	public function __construct(Request $request, EntityManager $em, View $view) {
 		parent::__construct($request, $em, $view);
-		$this->options = (array) strtolower($this->getParameters()->get('options'));
+		$this->options = (array) explode(',', strtolower($this->getParameters()->get('options')));
 	}
 
 	/**

diff --git a/lib/Util/Debug.php b/lib/Util/Debug.php
@@ -152,6 +152,9 @@ public static function getParametrizedQuery($sql, $sqlParameters) {
 		while (count($sqlParameters)) {
 			$sql = preg_replace('/\?/', self::formatSQLParameter(array_shift($sqlParameters)), $sql, 1);
 		}
+		if (php_sapi_name() === 'cli' && class_exists('\SqlFormatter')) {
+			$sql = \SqlFormatter::format($sql, false);
+		}
 		return $sql;
 	}