Sync repos: Merged PR 1067391: Add token info for CursorOption (microsoft#37) (microsoft#45)

llali · web-flow · commit 714ef041979c · 2023-06-19T09:39:58.000-07:00
* Merged PR 1067391: Add token info for CursorOption (microsoft#37) Add token info for CursorOption (microsoft#37) * Add token info for CursorOption Fixes microsoft#26 * Add additional asserts in test case for CursorOption * merging back another commit ---------
diff --git a/SqlScriptDom/Parser/TSql/TSql100.g b/SqlScriptDom/Parser/TSql/TSql100.g
@@ -11984,6 +11984,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
     
diff --git a/SqlScriptDom/Parser/TSql/TSql110.g b/SqlScriptDom/Parser/TSql/TSql110.g
@@ -13994,6 +13994,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql120.g b/SqlScriptDom/Parser/TSql/TSql120.g
@@ -14396,6 +14396,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql130.g b/SqlScriptDom/Parser/TSql/TSql130.g
@@ -15640,6 +15640,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql140.g b/SqlScriptDom/Parser/TSql/TSql140.g
@@ -16025,6 +16025,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql150.g b/SqlScriptDom/Parser/TSql/TSql150.g
@@ -16695,6 +16695,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql160.g b/SqlScriptDom/Parser/TSql/TSql160.g
@@ -16741,6 +16741,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
diff --git a/SqlScriptDom/Parser/TSql/TSql80.g b/SqlScriptDom/Parser/TSql/TSql80.g
@@ -3898,6 +3898,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
     
diff --git a/SqlScriptDom/Parser/TSql/TSql90.g b/SqlScriptDom/Parser/TSql/TSql90.g
@@ -9640,6 +9640,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
+            UpdateTokenInfo(vResult, tOption);
         }
     ;
     
diff --git a/Test/SqlDom/RegressionTests.cs b/Test/SqlDom/RegressionTests.cs
@@ -157,6 +157,40 @@ INSERT INTO [dbo].[UrlTable] (Col1, Url) VALUES ('1', '2')
             Parse(scriptReader);
         }
 
+        /// <summary>
+        /// Regression test to verify token info (start line, start column, etc.) are correctly populated for CursorOption
+        /// See https://github.com/microsoft/SqlScriptDOM/issues/26 for details on the issue.
+        /// </summary>
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void CursorOptionTokenInfoTest()
+        {
+            ParserTestUtils.ExecuteTestForAllParsers(delegate (TSqlParser parser)
+            {
+                string script = @"-- Single line comment
+        DECLARE MyCursor scroll CURSOR FOR
+        SELECT * FROM ANYTHING";
+
+                using (var scriptReader = new StringReader(script))
+                {
+                    var fragment = parser.Parse(scriptReader, out IList<ParseError> errors) as TSqlScript;
+                    Assert.AreEqual(0, errors.Count);
+
+                    Assert.IsTrue(fragment is TSqlScript);
+                    Assert.IsTrue(fragment.Batches[0].Statements[0] is DeclareCursorStatement);
+
+                    var declCursorStmt = fragment.Batches[0].Statements[0] as DeclareCursorStatement;
+
+                    Assert.AreEqual(3, declCursorStmt.CursorDefinition.Select.StartLine);
+                    Assert.AreEqual(9, declCursorStmt.CursorDefinition.Select.StartColumn);
+
+                    Assert.AreEqual(2, declCursorStmt.CursorDefinition.Options[0].StartLine);
+                    Assert.AreEqual(26, declCursorStmt.CursorDefinition.Options[0].StartColumn);
+                }
+            }, true);
+        }
+
         #region Private Methods
 
         private static string GenerateScript(TSqlFragment fragment)

Original file line number	Diff line number	Diff line change
`@@ -11984,6 +11984,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`11984`	`11984`	`: tOption:Identifier`
`11985`	`11985`	`{`
`11986`	`11986`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`11987`	`+ UpdateTokenInfo(vResult, tOption);`
`11987`	`11988`	`}`
`11988`	`11989`	`;`
`11989`	`11990`
Original file line number	Diff line number	Diff line change
`@@ -13994,6 +13994,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`13994`	`13994`	`: tOption:Identifier`
`13995`	`13995`	`{`
`13996`	`13996`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`13997`	`+ UpdateTokenInfo(vResult, tOption);`
`13997`	`13998`	`}`
`13998`	`13999`	`;`
`13999`	`14000`
Original file line number	Diff line number	Diff line change
`@@ -14396,6 +14396,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`14396`	`14396`	`: tOption:Identifier`
`14397`	`14397`	`{`
`14398`	`14398`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`14399`	`+ UpdateTokenInfo(vResult, tOption);`
`14399`	`14400`	`}`
`14400`	`14401`	`;`
`14401`	`14402`
Original file line number	Diff line number	Diff line change
`@@ -15640,6 +15640,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`15640`	`15640`	`: tOption:Identifier`
`15641`	`15641`	`{`
`15642`	`15642`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`15643`	`+ UpdateTokenInfo(vResult, tOption);`
`15643`	`15644`	`}`
`15644`	`15645`	`;`
`15645`	`15646`
Original file line number	Diff line number	Diff line change
`@@ -16025,6 +16025,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`16025`	`16025`	`: tOption:Identifier`
`16026`	`16026`	`{`
`16027`	`16027`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`16028`	`+ UpdateTokenInfo(vResult, tOption);`
`16028`	`16029`	`}`
`16029`	`16030`	`;`
`16030`	`16031`
Original file line number	Diff line number	Diff line change
`@@ -16695,6 +16695,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`16695`	`16695`	`: tOption:Identifier`
`16696`	`16696`	`{`
`16697`	`16697`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`16698`	`+ UpdateTokenInfo(vResult, tOption);`
`16698`	`16699`	`}`
`16699`	`16700`	`;`
`16700`	`16701`
Original file line number	Diff line number	Diff line change
`@@ -16741,6 +16741,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`16741`	`16741`	`: tOption:Identifier`
`16742`	`16742`	`{`
`16743`	`16743`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`16744`	`+ UpdateTokenInfo(vResult, tOption);`
`16744`	`16745`	`}`
`16745`	`16746`	`;`
`16746`	`16747`
Original file line number	Diff line number	Diff line change
`@@ -3898,6 +3898,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`3898`	`3898`	`: tOption:Identifier`
`3899`	`3899`	`{`
`3900`	`3900`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`3901`	`+ UpdateTokenInfo(vResult, tOption);`
`3901`	`3902`	`}`
`3902`	`3903`	`;`
`3903`	`3904`
Original file line number	Diff line number	Diff line change
`@@ -9640,6 +9640,7 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs`
`9640`	`9640`	`: tOption:Identifier`
`9641`	`9641`	`{`
`9642`	`9642`	`vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);`
	`9643`	`+ UpdateTokenInfo(vResult, tOption);`
`9643`	`9644`	`}`
`9644`	`9645`	`;`
`9645`	`9646`