Query execution pipeline tidying + support for multiple result sets

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */

App/StackExchange.DataExplorer.Tests/Helpers/TestParsedQuery.cs

@@ -31,7 +31,7 @@ public void TestSimpleReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nPosts", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -51,7 +51,7 @@ public void TestCommentReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Users", query.ExecutionSql);
+ Assert.AreEqual("SELECT\nTOP 10 *\nFROM\nUsers", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -66,7 +66,7 @@ public void TestMultiLineStringReductionParsing()
 
  var query = new ParsedQuery(sql, null);
 
- Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%' WHERE Id > 10", query.ExecutionSql);
+ Assert.AreEqual("SELECT TOP 10 * FROM Posts WHERE Body LIKE '%\n }%'\nWHERE\nId > 10", query.ExecutionSql);
  }
 
  [TestMethod]
@@ -83,7 +83,7 @@ public void TestBatchSplitting() {
 
  Assert.AreEqual(2, batches.Length);
  Assert.AreEqual("SELECT 1", batches[0]);
- Assert.AreEqual("SELECT 2 1", batches[1]);
+ Assert.AreEqual("SELECT 2\n1", batches[1]);
  }
 
  [TestMethod]
@@ -99,7 +99,7 @@ public void TestBatchSplittingIgnoresComments() {
  var batches = query.ExecutionSqlBatches.ToArray();
 
  Assert.AreEqual(1, batches.Length);
- Assert.AreEqual("SELECT 1\nSELECT 2 1", batches[0]);
+ Assert.AreEqual("SELECT 1\nSELECT 2\n1", batches[0]);
 
  }
 
@@ -206,7 +206,7 @@ public void TestInvalidParameterType()
 
  var query = new ParsedQuery(sql, parameters);
 
- Assert.IsFalse(query.Parameters.ContainsKey("a"));
+ Assert.IsTrue(query.Parameters.ContainsKey("a"));
  Assert.AreEqual("a has unknown parameter type frog!", query.ErrorMessage);
  Assert.IsFalse(query.IsExecutionReady);
  }
@@ -337,7 +337,7 @@ public void TestInvalidTypedDefaultParameterValue()
 
  Assert.IsTrue(query.Parameters.ContainsKey("Reputation"));
  Assert.AreEqual(1, query.Errors.Count);
- Assert.AreEqual("Expected default value trees for Reputation to be a int!", query.Errors[0]);
+ Assert.AreEqual("Reputation's default value of trees is invalid for the type int!", query.Errors[0]);
  Assert.IsFalse(query.IsExecutionReady);
  }
 
@@ -363,7 +363,7 @@ public void TestCreateProcWithGoReduction()
 
  Assert.IsTrue(query.ExecutionSqlBatches.Any());
  Assert.AreEqual("CREATE TABLE #Test (id int IDENTITY(1,1) NOT NULL, v VARCHAR(MAX) NOT NULL);\n" +
- "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v" +
+ "go\nCREATE INDEX #IX_T on #Test(id)\ngo\nCREATE PROCEDURE #T_P2 @v VARCHAR(MAX) AS\nPRINT @v\n" +
  "RETURN\nGO\n#T_P2 'test'", query.ExecutionSql);
  }
 
@@ -381,7 +381,7 @@ public void TestFailingQuery()
 
  Assert.AreEqual("Select 'Select ''' + ''' As [DatabaseName], Case WHEN TagName IS NULL Then '''" +
  " + 'Null' + ''' WHEN TagName = '''' Then ''Empty'' ELSE ''Unexpected'' End As [Type]," +
- " Count(*) As [Count] from '+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
+ " Count(*) As [Count] from '\n+ '[' + ']' + '..Tags Where IsNull(TagName,'''')='''' Group" +
  " By TagName UNION'", query.ExecutionSql);
  }
  }

App/StackExchange.DataExplorer/AppSettings.cs

@@ -21,6 +21,12 @@ static AppSettings()
  [Default(2)]
  public static int ConcurrentQueries { get; private set; }
 
+ [Default(50000)]
+ public static int MaxResultsPerResultSet { get; private set; }
+
+ [Default(100000)]
+ public static int MaxTotalResults { get; private set; }
+
  [Default(true)]
  public static bool FetchDataInReadUncommitted { get; private set; }
 

App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

@@ -33,6 +33,7 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/master")
+ .Include("~/Scripts/es5-shim.js")
  .Include("~/Scripts/master.js")
  .Include("~/Scripts/jquery.autocomplete.js")
  );
@@ -46,20 +47,21 @@ private static void RegisterBundles(BundleCollection bundles)
  .Include("~/Scripts/codemirror/codemirror.js")
  .Include("~/Scripts/codemirror/sql.js")
  .Include("~/Scripts/codemirror/runmode.js")
- .Include("~/Scripts/query.js")
+ .Include("~/Scripts/flot/jquery.flot.js")
+ .Include("~/Scripts/flot/jquery.colorhelpers.js")
+ .Include("~/Scripts/query.parameterparser.js")
+ .Include("~/Scripts/query.resultset.js")
+ .Include("~/Scripts/query.graph.js")
  .Include("~/Scripts/qp.js")
  .Include("~/Scripts/query.siteswitcher.js")
+ .Include("~/Scripts/query.js")
  );
 
  bundles.Add(new ScriptBundle("~/assets/js/editor")
  .Include("~/Scripts/query.sidebar.js")
  .Include("~/Scripts/query.tablehelpers.js")
  );
 
- bundles.Add(new ScriptBundle("~/assets/js/flot")
- .Include("~/Scripts/flot/jquery.flot.js")
- );
-
  bundles.Add(new StyleBundle("~/assets/css/master")
  .Include("~/Content/font-awesome/css/font-awesome.min.css", new CssRewriteUrlTransform())
  .Include("~/Content/site.css")
@@ -70,11 +72,11 @@ private static void RegisterBundles(BundleCollection bundles)
  );
 
  bundles.Add(new StyleBundle("~/assets/css/query")
- .Include("~/Content/smoothness/jquery-ui-1.8.1.custom.css")
  .Include("~/Content/codemirror/codemirror.css")
  .Include("~/Content/codemirror/custom.css")
  .Include("~/Content/codemirror/theme.css")
- .Include("~/Content/slickgrid/slick.grid.css")
+ .Include("~/Content/slickgrid/slick.grid.css", new CssRewriteUrlTransform())
+ .Include("~/Content/query.css", new CssRewriteUrlTransform())
  .Include("~/Content/qp/qp.css")
  );
  }

App/StackExchange.DataExplorer/Content/query.css

@@ -0,0 +1,62 @@
+.tab-counter {
+ color: #B0B0B0;
+ display: none;
+ margin-left: 4px;
+}
+
+.youarehere .tab-counter:hover {
+ color: #0077CC;
+}
+
+#resultSets {
+ position: relative;
+}
+
+#resultSets .subpanel {
+ cursor: default;
+ display: none;
+ height: 500px;
+}
+
+.slick-header .slick-header-column {
+ background-color: #F7F7F7;
+ color: #606060;
+ border-bottom: 1px dotted #CCC;
+ display: block;
+ font-weight: bold;
+ padding: 6px 8px 5px 8px;
+ text-align: center;
+}
+
+.slick-header .slick-header-column-sorted {
+ color: #0C57A0;
+ font-style: normal;
+}
+
+.slick-sort-indicator {
+ background-image: url('./slickgrid/images/sort-asc-inactive.gif');
+ background-repeat: no-repeat;
+ height: 7px;
+}
+
+.slick-sort-indicator.slick-sort-indicator-asc {
+ background-image: url('./slickgrid/images/sort-asc.gif');
+}
+
+.slick-sort-indicator.slick-sort-indicator-desc {
+ background-image: url('./slickgrid/images/sort-desc.gif');
+}
+
+.slick-row.odd {
+ background-color: #FDFDFD;
+}
+
+.slick-cell {
+ padding: 6px 8px 5px 8px;
+ border-bottom: 1px dotted #CCC;
+ border-right: 1px dotted #CCC;
+}
+
+.slick-cell.number {
+ text-align: right;
+}

App/StackExchange.DataExplorer/Content/site.css

@@ -789,7 +789,7 @@ i.button {
  margin: 0px 5px 0px 0px;
 }
 
-#submit-query, #cancel-query {
+button.btn-normal {
  cursor: pointer;
  font-weight: bold;
  margin: 0px 6px 0px 0px;
@@ -907,7 +907,7 @@ ul.linkbar li {
  background: url('//cdn.sstatic.net/beta/img/icon-16.png') no-repeat scroll 3px center;
 }
 
-#error-message {
+.error-message {
  background-color: #F5E9E9;
  border: 1px solid #B50000;
  color: #B50000;
@@ -916,7 +916,7 @@ ul.linkbar li {
  padding: 10px 14px 10px 14px;
 }
 
-#error-message.notice {
+.error-message.notice {
  background-color: #E9F5E9;
  border: 1px solid #16B500;
  color: #209403;
@@ -1035,32 +1035,6 @@ ul.linkbar li {
  border: 1px solid #D3D3D3;
 }
 
-#resultSets {
- cursor: default;
- height: 500px;
-}
-
-#resultSets .slick-header {
- border-top-color: transparent;
-}
-
-#resultSets .slick-header-column {
- text-align: center;
-}
-
-#resultSets .slick-cell {
-
-}
-
-#resultSets .slick-row.even {
- background-image: none;
-}
-
-#resultSets .slick-row.odd {
- background-color: #FAFAFA;
- background-image: none;
-}
-
 #query-params .form-row {
  clear: both;
 }
@@ -1079,6 +1053,15 @@ ul.linkbar li {
  height: 500px;
 }
 
+.graph-tooltip {
+ background-color: #FEE;
+ border: 1px solid #fdd;
+ display: none;
+ opacity: 0.8;
+ padding: 3px;
+ position: absolute;
+}
+
 .offscreen {
  width: 400px;
  height: 0px;
@@ -1422,11 +1405,6 @@ pre {
  margin-left: 5px; 
 }
 
-.slick-cell.number {
- text-align: right; 
-
-}
-
 #user-filter {
  margin-bottom: 8px;
 }
@@ -1714,9 +1692,16 @@ a.cc-wiki-link
  width: 880px; 
 }
 
-#captcha h4
-{
- margin-bottom: 10px;
+#captcha {
+ margin-bottom: 10px;
+}
+
+#captcha h4 {
+ margin-bottom: 10px;
+}
+
+#captcha .btn-normal, #captcha .error-message {
+ margin-top: 6px;
 }
 
 /* Help Page Content */