Sync Repos: porting commits for release 161.91.09

SqlScriptDom/Parser/TSql/Ast.xml

@@ -686,7 +686,7 @@
   </Class>
   <Class Name="ParameterlessCall" Base="PrimaryExpression" Summary="Represents calls without the parenthesis and parameters.">
     <InheritedClass Name="PrimaryExpression" />
-    <Member Name="ParameterlessCallType" Type="ParameterlessCallType" GenerateUpdatePositionInfoCall="false" Summary="An enum that can be User, CurrentUser, SessionUser, SystemUser or CurrentTimestamp."/>
+    <Member Name="ParameterlessCallType" Type="ParameterlessCallType" GenerateUpdatePositionInfoCall="false" Summary="An enum that can be User, CurrentUser, SessionUser, SystemUser, CurrentTimestamp or CurrentDate."/>
   </Class>
   <Class Name="ScalarSubquery" Base="PrimaryExpression" Summary="Represents the subquery.">
     <InheritedClass Name="PrimaryExpression" />

SqlScriptDom/Parser/TSql/ParameterlessCallType.cs

@@ -38,7 +38,11 @@ public enum ParameterlessCallType
         /// <summary>
         /// The CURRENT_TIMESTAMP keyword was used.
         /// </summary>
-        CurrentTimestamp = 4
+        CurrentTimestamp = 4,
+        /// <summary>
+        /// The CURRENT_DATE keyword was used.
+        /// </summary>
+        CurrentDate = 5
     }
 
 #pragma warning restore 1591

SqlScriptDom/Parser/TSql/SqlDataTypeOption.cs

@@ -245,6 +245,11 @@ public enum SqlDataTypeOption
         /// </summary>
         Rowversion = 33,
 
+        /// <summary>
+        /// JSON data type
+        /// </summary>
+        Json = 34,
+
         #endregion
 
     }

SqlScriptDom/Parser/TSql/TSql100.g

@@ -20772,6 +20772,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql110.g

@@ -23628,6 +23628,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql120.g

@@ -24377,6 +24377,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql130.g

@@ -29188,6 +29188,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql140.g

@@ -29975,6 +29975,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql150.g

@@ -31121,6 +31121,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql160.g

@@ -31707,6 +31707,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 expressionList [TSqlFragment vParent, IList<ScalarExpression> expressions]

SqlScriptDom/Parser/TSql/TSql80.g

@@ -9062,6 +9062,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 identifierBuiltInFunctionCall returns [FunctionCall vResult = FragmentFactory.CreateFragment<FunctionCall>()]

SqlScriptDom/Parser/TSql/TSql90.g

@@ -16466,6 +16466,12 @@ parameterlessCall returns [ParameterlessCall vResult = this.FragmentFactory.Crea
             UpdateTokenInfo(vResult,tCurrentTimestamp);
             vResult.ParameterlessCallType = ParameterlessCallType.CurrentTimestamp;
         }
+    |
+        tCurrentDate:CurrentDate
+        {
+            UpdateTokenInfo(vResult,tCurrentDate);
+            vResult.ParameterlessCallType = ParameterlessCallType.CurrentDate;
+        }
     ;
 
 overClause returns [OverClause vResult]

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

@@ -18,6 +18,7 @@ partial class SqlScriptGeneratorVisitor
             {ParameterlessCallType.SessionUser, new KeywordGenerator(TSqlTokenType.SessionUser)},
             {ParameterlessCallType.SystemUser, new KeywordGenerator(TSqlTokenType.SystemUser)},
             {ParameterlessCallType.User, new KeywordGenerator(TSqlTokenType.User)},
+            {ParameterlessCallType.CurrentDate, new KeywordGenerator(TSqlTokenType.CurrentDate)},
         };
 
         public override void ExplicitVisit(ParameterlessCall node)

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

@@ -45,6 +45,7 @@ partial class SqlScriptGeneratorVisitor
                 { SqlDataTypeOption.DateTime2, new IdentifierGenerator(CodeGenerationSupporter.DateTime2) },
                 { SqlDataTypeOption.DateTimeOffset, new IdentifierGenerator(CodeGenerationSupporter.DateTimeOffset) },
                 { SqlDataTypeOption.Rowversion, new IdentifierGenerator(CodeGenerationSupporter.Rowversion) },
+                { SqlDataTypeOption.Json, new IdentifierGenerator(CodeGenerationSupporter.Json) },
         };
 
         public override void ExplicitVisit(SqlDataTypeReference node)

Test/SqlDom/BaselinesCommon/ExpressionTests.sql

@@ -63,7 +63,8 @@ SELECT USER,
        CURRENT_USER,
        SESSION_USER,
        SYSTEM_USER,
-       CURRENT_TIMESTAMP;
+       CURRENT_TIMESTAMP,
+       CURRENT_DATE;
 
 SELECT USER COLLATE SQL_Latin1_General_CP1_CI_AS,
        CURRENT_USER;

Test/SqlDom/TestScripts/ExpressionTests.sql

@@ -65,7 +65,7 @@ SELECT CONVERT(decimal(10,5), CONVERT(varbinary(20), @myval))
 select convert(datetime, @date, 101)
 
 -- test parameterless calls
-select user, current_user, session_user, system_user, current_timestamp
+select user, current_user, session_user, system_user, current_timestamp, current_date
 select user collate SQL_Latin1_General_CP1_CI_AS, current_user
 
 -- test UniqueRowFilterCall

release-notes/161.91/161.9109.0.md

@@ -0,0 +1,28 @@
+# Release Notes
+
+## Microsoft.SqlServer.TransactSql.ScriptDom 161.9109.0
+This update brings the below changes over the previous release:
+
+### Target Platform Support
+
+* .NET Framework 4.6.2 (Windows x86, Windows x64)
+* .NET 6 (Windows x86, Windows x64, Linux, macOS)
+* .NET Standard 2.0+ (Windows x86, Windows x64, Linux, macOS)
+
+### Dependencies
+
+#### .NET Framework
+#### .NET Core
+#### .NET Standard
+
+### New Features
+* Adds support for CURRENT_DATE keyword.
+* Adds support for native JSON type. 
+### Fixed
+* Fixes parsing OPENROWSET with numeric codepage as string.
+* Adding quotes around invalid keyword in error messages.
+
+### Changes
+* Adds a static method to create a parser.
+
+### Known Issues