ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly erroring out on some failing commands that were not already included (#882)

Browse Source 
* Excplitly erroring out on some failing commands that was not happening before

* Ensuring the error message goes through without getting converted to different error
This commit is contained in:
Udeesha Gautam
2019-10-25 15:41:59 -07:00
committed by GitHub
parent 22905c9c13
commit 57b7126ccf
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ExecutionEngine.cs
View File

@@ -485,7 +485,12 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode
} }
catch (BatchParserException ex) catch (BatchParserException ex)
{ {
if (ex.ErrorCode != ErrorCode.Aborted) if (ex.ErrorCode == ErrorCode.UnsupportedCommand)
{
result = ScriptExecutionResult.Failure;
RaiseScriptError(string.Format(CultureInfo.CurrentCulture, ex.Message), ScriptMessageType.FatalError);
}
else if (ex.ErrorCode != ErrorCode.Aborted)
{ {
result = ScriptExecutionResult.Failure; result = ScriptExecutionResult.Failure;
string info = ex.Text; string info = ex.Text;

21
src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Parser.cs
View File

@@ -370,12 +370,6 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser
LexerTokenType tokenType = LookaheadTokenType; LexerTokenType tokenType = LookaheadTokenType;
switch (tokenType) switch (tokenType)
{ {
case LexerTokenType.OnError:
RemoveLastWhitespaceToken();
Token onErrorToken = LookaheadToken;
Accept();
ParseOnErrorCommand(onErrorToken);
break;
case LexerTokenType.Eof: case LexerTokenType.Eof:
if (tokenBuffer.Count > 0) if (tokenBuffer.Count > 0)
{ {
@@ -387,11 +381,6 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser
Accept(); Accept();
ParseGo(); ParseGo();
break; break;
case LexerTokenType.Include:
RemoveLastWhitespaceToken();
Accept();
ParseInclude();
break;
case LexerTokenType.Comment: case LexerTokenType.Comment:
case LexerTokenType.NewLine: case LexerTokenType.NewLine:
case LexerTokenType.Text: case LexerTokenType.Text:
@@ -405,17 +394,21 @@ namespace Microsoft.SqlTools.ServiceLayer.BatchParser
Accept(); Accept();
ParseSetvar(setvarToken); ParseSetvar(setvarToken);
break; break;
// Supported by SSMS but not by ADS
case LexerTokenType.Include:
case LexerTokenType.OnError:
case LexerTokenType.Connect: case LexerTokenType.Connect:
case LexerTokenType.Ed:
case LexerTokenType.ErrorCommand: case LexerTokenType.ErrorCommand:
case LexerTokenType.Execute: case LexerTokenType.Execute:
case LexerTokenType.Exit: case LexerTokenType.Exit:
case LexerTokenType.Out:
case LexerTokenType.Quit:
// not supported on SSMS or ADS
case LexerTokenType.Ed:
case LexerTokenType.Help: case LexerTokenType.Help:
case LexerTokenType.List: case LexerTokenType.List:
case LexerTokenType.ListVar: case LexerTokenType.ListVar:
case LexerTokenType.Out:
case LexerTokenType.Perftrace: case LexerTokenType.Perftrace:
case LexerTokenType.Quit:
case LexerTokenType.Reset: case LexerTokenType.Reset:
case LexerTokenType.Serverlist: case LexerTokenType.Serverlist:
case LexerTokenType.Xml: case LexerTokenType.Xml: