From 899c60773f1d4aa6a06371385211460f23eb3c20 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 28 Feb 2023 12:50:40 -0600 Subject: [PATCH 1/6] fix --- Csg.Data.Sql.Tests/DbQueryBuilderTests.cs | 35 ++++++++++++++++++++++- Csg.Data/DbQueryBuilderExtensions.cs | 1 - global.json | 6 ---- 3 files changed, 34 insertions(+), 8 deletions(-) delete mode 100644 global.json diff --git a/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs b/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs index 46f3457..374639f 100644 --- a/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs +++ b/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs @@ -23,12 +23,43 @@ public void TestCreateCommandPopulatesCommandParameters() query.Parameters.Add(new DbParameterValue() { - ParameterName = "@Param1", + ParameterName = "@Param1", + DbType = System.Data.DbType.Int32, + Size = 4, + Value = 123 + }); + + var stmt = query.Render(); + + Assert.AreEqual(1, stmt.Parameters.Count); + Assert.AreEqual(System.Data.DbType.Int32, stmt.Parameters.First().DbType); + Assert.AreEqual(4, stmt.Parameters.First().Size); + Assert.AreEqual(123, stmt.Parameters.First().Value); + + var cmd = stmt.CreateCommand(conn); + + Assert.AreEqual(conn, cmd.Connection); + Assert.AreEqual(1, cmd.Parameters.Count); + Assert.AreEqual(System.Data.DbType.Int32, ((IDbDataParameter)cmd.Parameters[0]).DbType); + Assert.AreEqual(4, ((IDbDataParameter)cmd.Parameters[0]).Size); + Assert.AreEqual(123, ((IDbDataParameter)cmd.Parameters[0]).Value); + } + + [TestMethod] + public void TestCreateCommandPopulatesCommandParametersAndPrefix() + { + var conn = new MockConnection(); + var query = new DbQueryBuilder("dbo.TableName", conn); + + query.Parameters.Add(new DbParameterValue() + { + ParameterName = "@Param1", DbType = System.Data.DbType.Int32, Size = 4, Value = 123 }); + query.Prefix("test"); var stmt = query.Render(); Assert.AreEqual(1, stmt.Parameters.Count); @@ -43,6 +74,8 @@ public void TestCreateCommandPopulatesCommandParameters() Assert.AreEqual(System.Data.DbType.Int32, ((IDbDataParameter)cmd.Parameters[0]).DbType); Assert.AreEqual(4, ((IDbDataParameter)cmd.Parameters[0]).Size); Assert.AreEqual(123, ((IDbDataParameter)cmd.Parameters[0]).Value); + Assert.AreEqual("test;SELECT * FROM [dbo].[TableName] AS [t0];", cmd.CommandText); + } [TestMethod] diff --git a/Csg.Data/DbQueryBuilderExtensions.cs b/Csg.Data/DbQueryBuilderExtensions.cs index 8e0ccbf..2a79983 100644 --- a/Csg.Data/DbQueryBuilderExtensions.cs +++ b/Csg.Data/DbQueryBuilderExtensions.cs @@ -423,7 +423,6 @@ public static IDbQueryBuilder Limit(this IDbQueryBuilder query, int limit=0, int /// public static IDbQueryBuilder Prefix(this IDbQueryBuilder query, string prefix) { - query = query.Fork(); query.Prefix = prefix; return query; } diff --git a/global.json b/global.json deleted file mode 100644 index 3aa42c3..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "3.1.0", - "rollForward": "latestMinor" - } -} \ No newline at end of file From 77a5816eaa98072942feb25c1144c2658d4e2280 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 28 Feb 2023 12:55:52 -0600 Subject: [PATCH 2/6] change version --- version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.json b/version.json index 07ae3f0..86cd05d 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { - "version": "3.3", // required (unless the "inherit" field is set to true and a parent version.json file sets this.) - "assemblyVersion": "3.3", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property. + "version": "3.4", // required (unless the "inherit" field is set to true and a parent version.json file sets this.) + "assemblyVersion": "3.4", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property. "nugetPackageVersion": { "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. }, From 4692004551c810eeb95e645b475d4063a4507d3b Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 28 Feb 2023 13:31:45 -0600 Subject: [PATCH 3/6] add back --- global.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..3aa42c3 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "3.1.0", + "rollForward": "latestMinor" + } +} \ No newline at end of file From a4ecc50c69a4528baf06161c16fc87db15e32fee Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Wed, 1 Mar 2023 08:26:56 -0600 Subject: [PATCH 4/6] updates --- Csg.Data/Csg.Data.csproj | 2 +- version.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Csg.Data/Csg.Data.csproj b/Csg.Data/Csg.Data.csproj index 0a656d5..549f1fd 100644 --- a/Csg.Data/Csg.Data.csproj +++ b/Csg.Data/Csg.Data.csproj @@ -2,7 +2,7 @@ Tools for data access and database query generation. - net461;net451;net472;netstandard2.0 + net472;netstandard2.0 Csg.Data icon.png Csg.Data diff --git a/version.json b/version.json index 86cd05d..cbc3031 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { - "version": "3.4", // required (unless the "inherit" field is set to true and a parent version.json file sets this.) - "assemblyVersion": "3.4", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property. + "version": "4.0", // required (unless the "inherit" field is set to true and a parent version.json file sets this.) + "assemblyVersion": "4.0", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property. "nugetPackageVersion": { "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. }, From bee99f623289b7f484530831cdf1491754e8b300 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Wed, 1 Mar 2023 20:19:39 -0600 Subject: [PATCH 5/6] fix --- Csg.Data/Csg.Data.csproj | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Csg.Data/Csg.Data.csproj b/Csg.Data/Csg.Data.csproj index 549f1fd..2e1fa76 100644 --- a/Csg.Data/Csg.Data.csproj +++ b/Csg.Data/Csg.Data.csproj @@ -16,7 +16,7 @@ icon.png - + 1701;1702; @@ -24,21 +24,6 @@ - - - - - - - - - - - - - - - From 4ed4e08c8730de27442e085cc6b875a4ce4ee37d Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Wed, 1 Mar 2023 20:31:36 -0600 Subject: [PATCH 6/6] dont want 461 --- Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj b/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj index cb4d97b..bdee001 100644 --- a/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj +++ b/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj @@ -2,7 +2,7 @@ 3.1.6 - net461 + net471 portable Csg.Data.Sql.Tests ../build/key.snk @@ -33,7 +33,7 @@ - +