Merge pull request #19308 from kamil-tekiela/formatSingleLine

MauricioFauth · web-flow · commit 5d699d99ef39 · 2024-10-08T20:39:49.000-03:00
Implement Format in a single line Closes #17480
diff --git a/resources/js/src/sql.ts b/resources/js/src/sql.ts
@@ -263,7 +263,7 @@ const insertQuery = function (queryType) {
         setQuery('');
 
         return;
-    } else if (queryType === 'format') {
+    } else if (queryType === 'format' || queryType === 'formatSingleLine') {
         if (window.codeMirrorEditor) {
             $('#querymessage').html(window.Messages.strFormatting +
                 '&nbsp;<img class="ajaxIcon" src="' +
@@ -272,7 +272,8 @@ const insertQuery = function (queryType) {
             var params = {
                 'ajax_request': true,
                 'sql': window.codeMirrorEditor.getValue(),
-                'server': CommonParams.get('server')
+                'server': CommonParams.get('server'),
+                'formatSingleLine': queryType === 'formatSingleLine'
             };
             $.ajax({
                 type: 'POST',
diff --git a/resources/templates/sql/query.twig b/resources/templates/sql/query.twig
@@ -38,6 +38,7 @@
                   <input type="button" value="{{ t('Clear') }}" id="clear" class="btn btn-secondary button sqlbutton">
                   {% if codemirror_enable %}
                     <input type="button" value="{{ t('Format') }}" id="format" class="btn btn-secondary button sqlbutton">
+                    <input type="button" value="{{ t('Format as a single line') }}" id="formatSingleLine" class="btn btn-secondary button sqlbutton">
                   {% endif %}
                 </div>
 
diff --git a/src/Controllers/Database/SqlFormatController.php b/src/Controllers/Database/SqlFormatController.php
@@ -23,7 +23,11 @@ public function __invoke(ServerRequest $request): Response
     {
         /** @var string $query */
         $query = $request->getParsedBodyParam('sql', '');
-        $this->response->addJSON(['sql' => Formatter::format($query)]);
+        if ($request->getParsedBodyParam('formatSingleLine') === 'true') {
+            $this->response->addJSON(['sql' => Formatter::format($query, ['line_ending' => ' ', 'indentation' => ''])]);
+        } else {
+            $this->response->addJSON(['sql' => Formatter::format($query)]);
+        }
 
         return $this->response->response();
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,11 @@ public function __invoke(ServerRequest $request): Response`
`23`	`23`	`{`
`24`	`24`	`/** @var string $query */`
`25`	`25`	`$query = $request->getParsedBodyParam('sql', '');`
`26`		`- $this->response->addJSON(['sql' => Formatter::format($query)]);`
	`26`	`+ if ($request->getParsedBodyParam('formatSingleLine') === 'true') {`
	`27`	`+ $this->response->addJSON(['sql' => Formatter::format($query, ['line_ending' => ' ', 'indentation' => ''])]);`
	`28`	`+ } else {`
	`29`	`+ $this->response->addJSON(['sql' => Formatter::format($query)]);`
	`30`	`+ }`
`27`	`31`
`28`	`32`	`return $this->response->response();`
`29`	`33`	`}`