From 325b32f99b637ed31adc93811ae8ab7a895f40b6 Mon Sep 17 00:00:00 2001 From: Bruce Dunwiddie Date: Fri, 15 Jul 2022 10:49:42 -0500 Subject: [PATCH] Updating release package. --- TSQL_Parser/TSQL_Parser/Properties/AssemblyInfo.cs | 4 ++-- TSQL_Parser/TSQL_Parser/Push.bat | 4 ++-- TSQL_Parser/TSQL_Parser/TSQL_Parser.nuspec | 4 ++-- .../TSQL_Parser/TSQL_Parser_NetStandard.csproj | 6 +++--- .../Tests/Statements/SelectStatementTests.cs | 13 ++++++++++++- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/TSQL_Parser/TSQL_Parser/Properties/AssemblyInfo.cs b/TSQL_Parser/TSQL_Parser/Properties/AssemblyInfo.cs index 48c43df..453991e 100644 --- a/TSQL_Parser/TSQL_Parser/Properties/AssemblyInfo.cs +++ b/TSQL_Parser/TSQL_Parser/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.0.0")] -[assembly: AssemblyFileVersion("2.3.0.0")] +[assembly: AssemblyVersion("2.4.0.0")] +[assembly: AssemblyFileVersion("2.4.0.0")] [assembly: InternalsVisibleTo("Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100793625650b945744f8a2c57bc75da89cd4d2c551636aa180c3020b7a15b815c10e983e83c312eb02f131c6fcf18aaffd6c8d9af6c4353c91ca0e9206b0fb8fb7805fc07b510a47ff40705ae56977ae8893e2d247d166aa400926582840e8a5602df055762bc3479dd14c9621a77946b6e6b0a00a77204c78fb52c65121bd75ba")] \ No newline at end of file diff --git a/TSQL_Parser/TSQL_Parser/Push.bat b/TSQL_Parser/TSQL_Parser/Push.bat index 0a3c997..ccdbae9 100644 --- a/TSQL_Parser/TSQL_Parser/Push.bat +++ b/TSQL_Parser/TSQL_Parser/Push.bat @@ -1,4 +1,4 @@ nuget SetApiKey %NUGET_KEY% -nuget push TSQL.Parser.2.3.0.snupkg -Source https://api.nuget.org/v3/index.json -nuget push TSQL.Parser.2.3.0.nupkg -Source https://api.nuget.org/v3/index.json +nuget push TSQL.Parser.2.4.0.snupkg -Source https://api.nuget.org/v3/index.json +nuget push TSQL.Parser.2.4.0.nupkg -Source https://api.nuget.org/v3/index.json pause \ No newline at end of file diff --git a/TSQL_Parser/TSQL_Parser/TSQL_Parser.nuspec b/TSQL_Parser/TSQL_Parser/TSQL_Parser.nuspec index 7e132aa..7d08247 100644 --- a/TSQL_Parser/TSQL_Parser/TSQL_Parser.nuspec +++ b/TSQL_Parser/TSQL_Parser/TSQL_Parser.nuspec @@ -2,7 +2,7 @@ TSQL.Parser - 2.3.0 + 2.4.0 TSQL.Parser Bruce Dunwiddie shriop @@ -10,7 +10,7 @@ https://github.com/bruce-dunwiddie/tsql-parser false Library for Parsing SQL Server T-SQL Scripts - Fixed handling of asterisks within SELECT, as both multiplication and multicolumn expression. + Fixed handling of NULL in SELECT, and DISTINCT in COUNT(). Copyright © 2022 sql parser sql-server tsql diff --git a/TSQL_Parser/TSQL_Parser/TSQL_Parser_NetStandard.csproj b/TSQL_Parser/TSQL_Parser/TSQL_Parser_NetStandard.csproj index d1328e9..2c99c6e 100644 --- a/TSQL_Parser/TSQL_Parser/TSQL_Parser_NetStandard.csproj +++ b/TSQL_Parser/TSQL_Parser/TSQL_Parser_NetStandard.csproj @@ -4,9 +4,9 @@ netstandard2.0 TSQL_Parser TSQL_Parser - 2.3.0.0 - 2.3.0.0 - 2.3.0.0 + 2.4.0.0 + 2.4.0.0 + 2.4.0.0 Library for Parsing SQL Server TSQL Scripts Copyright © 2022 diff --git a/TSQL_Parser/Tests/Statements/SelectStatementTests.cs b/TSQL_Parser/Tests/Statements/SelectStatementTests.cs index 923aed6..e37a5a6 100644 --- a/TSQL_Parser/Tests/Statements/SelectStatementTests.cs +++ b/TSQL_Parser/Tests/Statements/SelectStatementTests.cs @@ -860,7 +860,18 @@ public void SelectStatement_SELECT_DISTINCT() Assert.AreEqual(11, select.Tokens.Count); Assert.AreEqual(1, select.Select.Columns.Count); Assert.AreEqual("AssetId_changes", select.Select.Columns[0].ColumnAlias.Name); - Assert.AreEqual("id", select.Select.Columns[0].Expression.AsDuplicateSpecification.InnerExpression.AsColumn.Column.Name) + Assert.AreEqual("id", + select + .Select + .Columns[0] + .Expression + .AsFunction + .Arguments[0] + .AsDuplicateSpecification + .InnerExpression + .AsColumn + .Column + .Name); } [Test]