Merge commits for release 161.8834.0

Directory.Build.props

@@ -49,11 +49,28 @@
 
     <!-- put obj files in a mirror tree off the root to keep the src folder tree cleaner -->
     <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(EnlistmentRoot)\obj\$([MSBuild]::MakeRelative('$(EnlistmentRoot)\', $(MSBuildProjectDirectory)))</BaseIntermediateOutputPath>
-    
+
     <AntlrSourceUrl>https://www.antlr2.org/download/antlr-2.7.5.exe</AntlrSourceUrl>
     <AntlrLocation>$(BaseIntermediateOutputPath)\antlr-2.7.5.exe</AntlrLocation>
   </PropertyGroup>
 
+    <!-- Don't enable localization when we are inside VS -->
+  <PropertyGroup Condition="'$(BuildingInsideVisualStudio)'=='true'">
+    <EnableLocalization>false</EnableLocalization>
+  </PropertyGroup>
+
+  <!-- Localization is not enabled by default. Pass /p:EnableLocalization=true to override that.
+       For some details, see: https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/341/Localization-in-MSBuild-Retail
+   -->
+  <PropertyGroup>
+    <EnableLocalization Condition="'$(EnableLocalization)' == ''">false</EnableLocalization>
+    <PostBuildLocalization>$(EnableLocalization)</PostBuildLocalization>
+    <!-- This corresponds to the APEX13 languages: Tier1 + CSY/TRK/PLK
+         For language sets details, see: https://ceapex.visualstudio.com/CEINTL/_git/SoftwareLocalization?path=%2Fsrc%2FOneBranchPackages%2FLocalization.Languages%2FLocalization.Languages.props&_a=contents&version=GBmain
+    -->
+    <LanguageSet Condition="'$(EnableLocalization)' == 'true'">VS_Main_Languages</LanguageSet>
+  </PropertyGroup>
+
   <PropertyGroup>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>

SqlScriptDom/Parser/TSql/Ast.xml

@@ -107,7 +107,8 @@
   </Class>
   <Class Name="ViewHashDistributionPolicy" Base="ViewDistributionPolicy" Summary="Representation of the HASH option for a materialized view distribution policy.">
     <InheritedClass Name="ViewDistributionPolicy"/>
-    <Member Name="DistributionColumn" Type="Identifier" GenerateUpdatePositionInfoCall="false" Summary="The column reference in the HASH option for a view distribution policy."/>
+    <Member Name="DistributionColumn" Type="Identifier" CollectionFirstItem="true" GenerateUpdatePositionInfoCall="false" Summary="The column reference in the HASH option for a view distribution policy."/>
+    <Member Name="DistributionColumns" Type="Identifier" Collection="true" GenerateUpdatePositionInfoCall="false" Summary="The columns reference in the HASH option for a view distribution policy."/>
   </Class>
   <Class Name="TriggerObject" Summary="Information on what trigger is being created/altered" >
     <Member Name="Name" Type="SchemaObjectName" Summary="The object to create the trigger on."/>

SqlScriptDom/Parser/TSql/ExternalFileFormatOptionHelper.cs

@@ -23,6 +23,7 @@ private ExternalFileFormatOptionHelper()
             AddOptionMapping(ExternalFileFormatOptionKind.DataCompression, CodeGenerationSupporter.DataCompression);
             AddOptionMapping(ExternalFileFormatOptionKind.FirstRow, CodeGenerationSupporter.FirstRow2);
             AddOptionMapping(ExternalFileFormatOptionKind.Encoding, CodeGenerationSupporter.Encoding);
+            AddOptionMapping(ExternalFileFormatOptionKind.ParserVersion, CodeGenerationSupporter.ParserVersion);
         }
 
         internal static readonly ExternalFileFormatOptionHelper Instance = new ExternalFileFormatOptionHelper();

SqlScriptDom/Parser/TSql/ExternalFileFormatOptionKind.cs

@@ -21,7 +21,8 @@ public enum ExternalFileFormatOptionKind
         UseTypeDefault = 5,
         DataCompression = 6,
         FirstRow = 7,
-        Encoding = 8
+        Encoding = 8,
+        ParserVersion = 9
     }
 
 #pragma warning restore 1591

SqlScriptDom/Parser/TSql/TSql100.g

@@ -11984,7 +11984,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 

SqlScriptDom/Parser/TSql/TSql110.g

@@ -13994,7 +13994,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 

SqlScriptDom/Parser/TSql/TSql120.g

@@ -14396,7 +14396,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 

SqlScriptDom/Parser/TSql/TSql130.g

@@ -15640,7 +15640,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
@@ -23118,12 +23117,20 @@ viewHashDistributionPolicy returns [ViewHashDistributionPolicy vResult = Fragmen
     Identifier vIdentifier;
 }
     :
-        tHash:Identifier LeftParenthesis vIdentifier = identifier
+        tHash:Identifier
         {
             Match(tHash, CodeGenerationSupporter.Hash);
-            vResult.DistributionColumn = vIdentifier;
             UpdateTokenInfo(vResult, tHash);
         }
+        LeftParenthesis vIdentifier = identifier
+        {
+            AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+        }
+        (Comma vIdentifier = identifier
+            {
+                AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+            }
+        )*
         tRParen:RightParenthesis
         {
             UpdateTokenInfo(vResult, tRParen);

SqlScriptDom/Parser/TSql/TSql140.g

@@ -16025,7 +16025,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
@@ -23687,12 +23686,20 @@ viewHashDistributionPolicy returns [ViewHashDistributionPolicy vResult = Fragmen
     Identifier vIdentifier;
 }
     :
-        tHash:Identifier LeftParenthesis vIdentifier = identifier
+        tHash:Identifier
         {
             Match(tHash, CodeGenerationSupporter.Hash);
-            vResult.DistributionColumn = vIdentifier;
             UpdateTokenInfo(vResult, tHash);
         }
+        LeftParenthesis vIdentifier = identifier
+        {
+            AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+        }
+        (Comma vIdentifier = identifier
+            {
+                AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+            }
+        )*
         tRParen:RightParenthesis
         {
             UpdateTokenInfo(vResult, tRParen);

SqlScriptDom/Parser/TSql/TSql150.g

@@ -16695,7 +16695,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
@@ -24433,12 +24432,20 @@ viewHashDistributionPolicy returns [ViewHashDistributionPolicy vResult = Fragmen
     Identifier vIdentifier;
 }
     :
-        tHash:Identifier LeftParenthesis vIdentifier = identifier
+        tHash:Identifier
         {
             Match(tHash, CodeGenerationSupporter.Hash);
-            vResult.DistributionColumn = vIdentifier;
             UpdateTokenInfo(vResult, tHash);
         }
+        LeftParenthesis vIdentifier = identifier
+        {
+            AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+        }
+        (Comma vIdentifier = identifier
+            {
+                AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+            }
+        )*
         tRParen:RightParenthesis
         {
             UpdateTokenInfo(vResult, tRParen);

SqlScriptDom/Parser/TSql/TSql160.g

@@ -16741,7 +16741,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 
@@ -24102,7 +24101,8 @@ externalDataFormatLiteralOption returns [ExternalFileFormatLiteralOption vResult
                 if (vResult.OptionKind != ExternalFileFormatOptionKind.FieldTerminator &&
                     vResult.OptionKind != ExternalFileFormatOptionKind.StringDelimiter &&
                     vResult.OptionKind != ExternalFileFormatOptionKind.DateFormat &&
-                    vResult.OptionKind != ExternalFileFormatOptionKind.Encoding)
+                    vResult.OptionKind != ExternalFileFormatOptionKind.Encoding &&
+                    vResult.OptionKind != ExternalFileFormatOptionKind.ParserVersion)
                 {
                     throw GetUnexpectedTokenErrorException(tOption);
                 }
@@ -24655,12 +24655,20 @@ viewHashDistributionPolicy returns [ViewHashDistributionPolicy vResult = Fragmen
     Identifier vIdentifier;
 }
     :
-        tHash:Identifier LeftParenthesis vIdentifier = identifier
+        tHash:Identifier
         {
             Match(tHash, CodeGenerationSupporter.Hash);
-            vResult.DistributionColumn = vIdentifier;
             UpdateTokenInfo(vResult, tHash);
         }
+        LeftParenthesis vIdentifier = identifier
+        {
+            AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+        }
+        (Comma vIdentifier = identifier
+            {
+                AddAndUpdateTokenInfo(vResult, vResult.DistributionColumns, vIdentifier);
+            }
+        )*
         tRParen:RightParenthesis
         {
             UpdateTokenInfo(vResult, tRParen);

SqlScriptDom/Parser/TSql/TSql80.g

@@ -3898,7 +3898,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 

SqlScriptDom/Parser/TSql/TSql90.g

@@ -9640,7 +9640,6 @@ cursorOption returns [CursorOption vResult = FragmentFactory.CreateFragment<Curs
     : tOption:Identifier
         {
             vResult.OptionKind=CursorOptionsHelper.Instance.ParseOption(tOption);
-            UpdateTokenInfo(vResult, tOption);
         }
     ;
 

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

@@ -12,7 +12,12 @@ public override void ExplicitVisit(ViewHashDistributionPolicy node)
         {
             GenerateIdentifier(CodeGenerationSupporter.Hash);
             GenerateSymbol(TSqlTokenType.LeftParenthesis);
-            GenerateFragmentIfNotNull(node.DistributionColumn);
+
+            if (node.DistributionColumns?.Count > 0)
+            {
+                GenerateCommaSeparatedList(node.DistributionColumns);
+            }
+
             GenerateSymbol(TSqlTokenType.RightParenthesis);
         }
     }

Test/SqlDom/Baselines130/MaterializedViewTests130.sql

@@ -93,3 +93,40 @@ AS
 BEGIN
     ALTER MATERIALIZED VIEW View1 DISABLE;
 END
+
+
+GO
+CREATE MATERIALIZED VIEW View1MCD
+WITH (DISTRIBUTION = HASH(Col4, Col5), FOR_APPEND)
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View2MCD
+WITH (FOR_APPEND, DISTRIBUTION = HASH(Col3, Col5))
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View3MCD
+WITH (DISTRIBUTION = HASH(Col3, Col4, Col5))
+AS
+SELECT Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;

Test/SqlDom/Baselines140/MaterializedViewTests140.sql

@@ -0,0 +1,34 @@
+CREATE MATERIALIZED VIEW View1MCD
+WITH (DISTRIBUTION = HASH(Col4, Col5), FOR_APPEND)
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View2MCD
+WITH (FOR_APPEND, DISTRIBUTION = HASH(Col3, Col5))
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View3MCD
+WITH (DISTRIBUTION = HASH(Col3, Col4, Col5))
+AS
+SELECT Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;

Test/SqlDom/Baselines150/MaterializedViewTests150.sql

@@ -0,0 +1,34 @@
+CREATE MATERIALIZED VIEW View1MCD
+WITH (DISTRIBUTION = HASH(Col4, Col5), FOR_APPEND)
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View2MCD
+WITH (FOR_APPEND, DISTRIBUTION = HASH(Col3, Col5))
+AS
+SELECT MAX(Col1) AS Max_Col1,
+       MIN(Col2) AS Min_Col2,
+       Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;
+
+
+GO
+CREATE MATERIALIZED VIEW View3MCD
+WITH (DISTRIBUTION = HASH(Col3, Col4, Col5))
+AS
+SELECT Col3,
+       Col4,
+       Col5
+FROM dbo.Table1
+GROUP BY Col3, Col4, Col5;

Test/SqlDom/Baselines160/CreateExternalFileFormatStatementTests160.sql

@@ -1,4 +1,10 @@
 CREATE EXTERNAL FILE FORMAT eff1
     WITH (
     FORMAT_TYPE = DELTA
+    );
+
+CREATE EXTERNAL FILE FORMAT eff2
+    WITH (
+    FORMAT_TYPE = DELIMITEDTEXT,
+    FORMAT_OPTIONS (PARSER_VERSION = '2.0')
     );