Merge pull request #1055 from fancyweb/collector-handle-runnable

[DoctrineDataCollector] Handle runnable flag
doctrine · Nov 17, 2019 · f91e0c3 · f91e0c3
2 parents 6ccdc89 + 461cc0a
commit f91e0c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -137,6 +137,8 @@ public function collect(Request $request, Response $response, Exception $excepti
         foreach ($this->data['queries'] as &$queries) {
             foreach ($queries as &$query) {
                 $query['params'] = $this->cloneVar($query['params']);
+                // To be removed when the required minimum version of symfony/doctrine-bridge is >= 4.4
+                $query['runnable'] = $query['runnable'] ?? true;
             }
         }
 

diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
@@ -246,9 +246,10 @@
                                 <div class="text-small font-normal">
                                     <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#formatted-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide formatted query">View formatted query</a>
 
-                                    &nbsp;&nbsp;
-
-                                    <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#original-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide runnable query">View runnable query</a>
+                                    {% if query.runnable %}
+                                        &nbsp;&nbsp;
+                                        <a href="#" {{ profiler_markup_version == 1 ? 'onclick="return toggleRunnableQuery(this);"' }} class="sf-toggle link-inverse" data-toggle-selector="#original-query-{{ i }}-{{ loop.parent.loop.index }}" data-toggle-alt-content="Hide runnable query">View runnable query</a>
+                                    {% endif %}
 
                                     {% if query.explainable %}
                                         &nbsp;&nbsp;
@@ -265,9 +266,11 @@
                                     {{ query.sql|doctrine_pretty_query }}
                                 </div>
 
-                                <div id="original-query-{{ i }}-{{ loop.parent.loop.index }}" class="sql-runnable hidden">
-                                    {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
-                                </div>
+                                {% if query.runnable %}
+                                    <div id="original-query-{{ i }}-{{ loop.parent.loop.index }}" class="sql-runnable hidden">
+                                        {{ (query.sql ~ ';')|doctrine_replace_query_parameters(query.params)|doctrine_pretty_query(highlight_only = true) }}
+                                    </div>
+                                {% endif %}
 
                                 {% if query.explainable %}
                                     <div id="explain-{{ i }}-{{ loop.parent.loop.index }}" class="sql-explain"></div>