fixing the parser

Author: llali

SqlScriptDom/Parser/TSql/OptionsHelper.cs

@@ -135,7 +135,7 @@ internal SqlVersionFlags MapSqlVersionToSqlVersionFlags(SqlVersion sqlVersion)
             }
         }
 
-        internal OptionType ParseOption(antlr.IToken token, SqlVersionFlags version)
+        internal virtual OptionType ParseOption(antlr.IToken token, SqlVersionFlags version)
         {
             OptionInfo optionInfo;
             if (_stringToOptionInfo.TryGetValue(token.getText(), out optionInfo) &&

SqlScriptDom/Parser/TSql/TSql170.g

@@ -27724,22 +27724,23 @@ xmlCompressionOption returns [XmlCompressionOption vResult = FragmentFactory.Cre
     ;
 
 vectorMetricOption returns [VectorMetricIndexOption vResult = FragmentFactory.CreateFragment<VectorMetricIndexOption>()]
-    : tMetric:Identifier EqualsSign tMetricValue:StringLiteral
+    : tMetric:Identifier EqualsSign tMetricValue:AsciiStringLiteral
         {
             Match(tMetric, CodeGenerationSupporter.Metric);
             vResult.OptionKind = IndexOptionKind.VectorMetric;
             vResult.MetricType = VectorMetricTypeHelper.Instance.ParseOption(tMetricValue);
-            UpdateTokenInfo(vResult, tMetricValue);
+
+            UpdateTokenInfo(vResult, tMetric);
         }
     ;
 
 vectorTypeOption returns [VectorTypeIndexOption vResult = FragmentFactory.CreateFragment<VectorTypeIndexOption>()]
-    : tType:Identifier EqualsSign tTypeValue:StringLiteral
+    : tType:Identifier EqualsSign tTypeValue:AsciiStringLiteral
         {
             Match(tType, CodeGenerationSupporter.Type);
             vResult.OptionKind = IndexOptionKind.VectorType;
             vResult.VectorType = VectorIndexTypeHelper.Instance.ParseOption(tTypeValue);
-            UpdateTokenInfo(vResult, tTypeValue);
+            UpdateTokenInfo(vResult, tType);
         }
     ;
 

SqlScriptDom/Parser/TSql/VectorIndexTypeHelper.cs

@@ -13,7 +13,7 @@ internal class VectorIndexTypeHelper : OptionsHelper<VectorIndexType>
     {
         private VectorIndexTypeHelper()
         {
-            AddOptionMapping(VectorIndexType.DiskANN, CodeGenerationSupporter.DiskANN);
+            AddOptionMapping(VectorIndexType.DiskANN, "'" + CodeGenerationSupporter.DiskANN + "'");
         }
 
         public static readonly VectorIndexTypeHelper Instance = new VectorIndexTypeHelper();

SqlScriptDom/Parser/TSql/VectorMetricTypeHelper.cs

@@ -6,16 +6,18 @@
 
 
 
+using static Microsoft.SqlServer.TransactSql.ScriptDom.SensitivityClassification;
+
 namespace Microsoft.SqlServer.TransactSql.ScriptDom
 {
 
     internal class VectorMetricTypeHelper : OptionsHelper<VectorMetricType>
     {
         private VectorMetricTypeHelper()
         {
-            AddOptionMapping(VectorMetricType.Cosine, CodeGenerationSupporter.Cosine);
-            AddOptionMapping(VectorMetricType.Dot, CodeGenerationSupporter.Dot);
-            AddOptionMapping(VectorMetricType.Euclidean, CodeGenerationSupporter.Euclidean);
+            AddOptionMapping(VectorMetricType.Cosine, "'" + CodeGenerationSupporter.Cosine + "'");
+            AddOptionMapping(VectorMetricType.Dot, "'" + CodeGenerationSupporter.Dot + "'");
+            AddOptionMapping(VectorMetricType.Euclidean, "'" + CodeGenerationSupporter.Euclidean + "'");
         }
 
         public static readonly VectorMetricTypeHelper Instance = new VectorMetricTypeHelper();

SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.VectorMetricIndexOption.cs

@@ -13,9 +13,7 @@ public override void ExplicitVisit(VectorMetricIndexOption node)
             IndexOptionHelper.Instance.GenerateSourceForOption(_writer, node.OptionKind);
             GenerateSpaceAndSymbol(TSqlTokenType.EqualsSign);
             GenerateSpace();
-            GenerateSymbol(TSqlTokenType.SingleQuote);
             VectorMetricTypeHelper.Instance.GenerateSourceForOption(_writer, node.MetricType);
-            GenerateSymbol(TSqlTokenType.SingleQuote);
         }
     }
 }

SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.VectorTypeIndexOption.cs

@@ -13,9 +13,7 @@ public override void ExplicitVisit(VectorTypeIndexOption node)
             IndexOptionHelper.Instance.GenerateSourceForOption(_writer, node.OptionKind);
             GenerateSpaceAndSymbol(TSqlTokenType.EqualsSign);
             GenerateSpace();
-            GenerateSymbol(TSqlTokenType.SingleQuote);
             VectorIndexTypeHelper.Instance.GenerateSourceForOption(_writer, node.VectorType);
-            GenerateSymbol(TSqlTokenType.SingleQuote);
         }
     }
 }

Test/SqlDom/Only170SyntaxTests.cs

@@ -11,7 +11,7 @@ public partial class SqlDomTests
         {
             new ParserTest170("RegexpTVFTests170.sql", nErrors80: 1, nErrors90: 1, nErrors100: 0, nErrors110: 0, nErrors120: 0, nErrors130: 0, nErrors140: 0, nErrors150: 0, nErrors160: 0),
             new ParserTest170("JsonIndexTests170.sql", nErrors80: 2, nErrors90: 8, nErrors100: 8, nErrors110: 8, nErrors120: 8, nErrors130: 8, nErrors140: 8, nErrors150: 8, nErrors160: 8),
-            new ParserTest170("VectorIndexTests170.sql", nErrors80: 12, nErrors90: 12, nErrors100: 12, nErrors110: 12, nErrors120: 12, nErrors130: 12, nErrors140: 12, nErrors150: 12, nErrors160: 12),
+            new ParserTest170("VectorIndexTests170.sql", nErrors80: 2, nErrors90: 12, nErrors100: 12, nErrors110: 12, nErrors120: 12, nErrors130: 12, nErrors140: 12, nErrors150: 12, nErrors160: 12),
             new ParserTest170("AlterDatabaseManualCutoverTests170.sql", nErrors80: 4, nErrors90: 4, nErrors100: 4, nErrors110: 4, nErrors120: 4, nErrors130: 4, nErrors140: 4, nErrors150: 4, nErrors160: 4),
             new ParserTest170("CreateColumnStoreIndexTests170.sql", nErrors80: 3, nErrors90: 3, nErrors100: 3, nErrors110: 3, nErrors120: 3, nErrors130: 0, nErrors140: 0, nErrors150: 0, nErrors160: 0)
         };