Fix #35: Sort tooltip may incorrectly show Descending

Caused because we tested for @ascending = 1, but @ascending = 'true' can also happen - both are valid.
JustinPealing · Apr 26, 2017 · eea1459 · eea1459
1 parent 8a756b8
commit eea1459
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/src/qp.xslt b/src/qp.xslt
@@ -314,6 +314,7 @@
       <div>
         <xsl:apply-templates select="s:ColumnReference" mode="ObjectName" />
         <xsl:choose>
+          <xsl:when test="@Ascending = 'true'"> Ascending</xsl:when>
           <xsl:when test="@Ascending = 1"> Ascending</xsl:when>
           <xsl:otherwise> Descending</xsl:otherwise>
         </xsl:choose>

diff --git a/test/qp_test.js b/test/qp_test.js
@@ -12,6 +12,8 @@ var plan_StmtUseDb = require('raw!../test_plans/StmtUseDb.sqlplan');
 var plan_StmtCond = require('raw!../test_plans/StmtCond.sqlplan');
 var plan_NestedLoops = require('raw!../test_plans/nested loops.sqlplan');
 var plan_MyCommentScoreDistribution = require('raw!../test_plans/stack overflow/my comment score distribution.sqlplan');
+var plan_KeysetCursor = require('raw!../test_plans/cursors/keyset Cursor.sqlplan');
+var plan_UpvotesForEachTag = require('raw!../test_plans/stack overflow/How many upvotes do I have for each tag.sqlplan');
 
 describe('qp.js', () => {
 
@@ -307,6 +309,50 @@ describe('qp.js', () => {
             });
 
         });
+
+        describe('Tooltip Order By', () => {
+
+            it('Shows Ascending with @Ascending = true', () => {
+
+                var container = document.createElement('div');
+                QP.showPlan(container, plan_KeysetCursor);
+
+                var sort = helper.findNodeById(container, '4', '2');
+                assert.equal('[Northwind].[dbo].[Employee].EmpName Ascending', helper.getToolTipSection(sort, 'Order By'));
+
+            });
+
+            it('Shows Descending with @Ascending = false', () => {
+
+                var container = document.createElement('div');
+                QP.showPlan(container, plan_NestedLoops);
+
+                var sort = helper.findNodeById(container, '1', '1');
+                assert.equal('[DataExplorer].[dbo].[Queries].FirstRun Descending', helper.getToolTipSection(sort, 'Order By'));
+
+            });
+
+            it('Shows Ascending with @Ascending = 1', () => {
+
+                var container = document.createElement('div');
+                QP.showPlan(container, plan_UpvotesForEachTag);
+
+                var sort = helper.findNodeById(container, '4', '1');
+                assert.equal('[StackOverflow.Exported].[dbo].[Tags].TagName Ascending', helper.getToolTipSection(sort, 'Order By'));
+
+            });
+
+            it('Shows Descending with @Ascending = 0', () => {
+
+                var container = document.createElement('div');
+                QP.showPlan(container, plan_UpvotesForEachTag);
+
+                var sort = helper.findNodeById(container, '0', '1');
+                assert.equal('Expr1012 Descending', helper.getToolTipSection(sort, 'Order By'));
+
+            });
+
+        });
 
     });