From c22df1eec065da6e6be8014221d8b4515e90db75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:38:15 -0600 Subject: [PATCH] Bump NUnit.Analyzers from 3.9.0 to 3.10.0 (#229) * Bump NUnit.Analyzers from 3.9.0 to 3.10.0 Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/nunit/nunit.analyzers/releases) - [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.txt) - [Commits](https://github.com/nunit/nunit.analyzers/compare/3.9.0...3.10.0) --- updated-dependencies: - dependency-name: NUnit.Analyzers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * NUnit update 2 - no more string.Format --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jas88 --- FAnsiSql/FAnsi.csproj | 2 +- .../Aggregation/AggregationTests.cs | 2 +- .../CalendarWithPivotAggregationTests.cs | 2 +- Tests/FAnsiTests/All.cs | 12 +-- Tests/FAnsiTests/CrossPlatformTests.cs | 102 +++++++++--------- .../FAnsiTests/Database/DatabaseLevelTests.cs | 2 +- .../Database/DiscoverTablesTests.cs | 32 +++--- Tests/FAnsiTests/DatabaseTests.cs | 2 +- Tests/FAnsiTests/FAnsiTests.csproj | 68 ++++++------ Tests/FAnsiTests/Table/BadNamesTests.cs | 14 +-- Tests/FAnsiTests/Table/BasicInsertTests.cs | 15 ++- Tests/FAnsiTests/Table/BigIntTests.cs | 4 +- Tests/FAnsiTests/Table/BulkInsertTest.cs | 88 +++++++-------- Tests/FAnsiTests/Table/CreateTableTests.cs | 54 +++++----- .../FAnsiTests/Table/DataTypeAdjusterTests.cs | 6 +- Tests/FAnsiTests/Table/ForeignKeyTests.cs | 64 ++++++----- Tests/FAnsiTests/Table/LongNamesTests.cs | 2 +- Tests/FAnsiTests/Table/TestRename.cs | 2 +- .../TypeTranslation/TypeTranslaterTests.cs | 4 +- 19 files changed, 227 insertions(+), 250 deletions(-) diff --git a/FAnsiSql/FAnsi.csproj b/FAnsiSql/FAnsi.csproj index b4b52b75..208d3bcd 100644 --- a/FAnsiSql/FAnsi.csproj +++ b/FAnsiSql/FAnsi.csproj @@ -40,7 +40,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/FAnsiTests/Aggregation/AggregationTests.cs b/Tests/FAnsiTests/Aggregation/AggregationTests.cs index 1f0c2fc9..dc0a538c 100644 --- a/Tests/FAnsiTests/Aggregation/AggregationTests.cs +++ b/Tests/FAnsiTests/Aggregation/AggregationTests.cs @@ -88,7 +88,7 @@ private void SetupDatabaseTable(bool easy, string name) protected void AssertHasRow(DataTable dt, params object[] cells) { - Assert.That(dt.Rows.Cast().Any(r=>IsMatch(r,cells)),"Did not find expected row:{0}", string.Join("|",cells)); + Assert.That(dt.Rows.Cast().Any(r => IsMatch(r, cells)),$"Did not find expected row:{string.Join("|", cells)}"); } /// diff --git a/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs b/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs index c1e3dfdb..b42fe9ba 100644 --- a/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs +++ b/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs @@ -74,7 +74,7 @@ 2010 0 0 0 0 Assert.That(dt.Rows, Has.Count.EqualTo(10)); //there are 10 years between 2001 and 2010 even though not all years are represented in the data - // only validate hard output, we got rows on easy thats enough for now + // only validate hard output, we got rows on easy that's enough for now if (easy) return; diff --git a/Tests/FAnsiTests/All.cs b/Tests/FAnsiTests/All.cs index 0d9946a1..67840987 100644 --- a/Tests/FAnsiTests/All.cs +++ b/Tests/FAnsiTests/All.cs @@ -8,18 +8,18 @@ public class All /// /// for tests that should run on all DBMS /// - public static DatabaseType[] DatabaseTypes = { + public static DatabaseType[] DatabaseTypes = [ DatabaseType.MicrosoftSQLServer, DatabaseType.MySql, DatabaseType.Oracle, DatabaseType.PostgreSql - }; + ]; /// /// for tests that should run on all DBMS /// with both permutations of true/false. Matches exhaustively method signature (DatabaseType,bool) /// - public static object[] DatabaseTypesWithBoolFlags = { + public static object[] DatabaseTypesWithBoolFlags = [ new object[] {DatabaseType.MicrosoftSQLServer,true}, new object[] {DatabaseType.MySql,true}, new object[] {DatabaseType.Oracle,true}, @@ -28,14 +28,14 @@ public class All new object[] {DatabaseType.MySql,false}, new object[] {DatabaseType.Oracle,false}, new object[] {DatabaseType.PostgreSql,false} - }; + ]; /// /// for tests that should run on all DBMS /// with all permutations of true/false for 2 args. Matches exhaustively method signature (DatabaseType,bool,bool) /// - public static object[] DatabaseTypesWithTwoBoolFlags = { + public static object[] DatabaseTypesWithTwoBoolFlags = [ new object[] {DatabaseType.MicrosoftSQLServer,true,true}, new object[] {DatabaseType.MicrosoftSQLServer,true,false}, new object[] {DatabaseType.MicrosoftSQLServer,false,true}, @@ -56,5 +56,5 @@ public class All new object[] {DatabaseType.PostgreSql,true,false}, new object[] {DatabaseType.PostgreSql,false,true}, new object[] {DatabaseType.PostgreSql,false,false} - }; + ]; } \ No newline at end of file diff --git a/Tests/FAnsiTests/CrossPlatformTests.cs b/Tests/FAnsiTests/CrossPlatformTests.cs index 72c6af74..ea3e4140 100644 --- a/Tests/FAnsiTests/CrossPlatformTests.cs +++ b/Tests/FAnsiTests/CrossPlatformTests.cs @@ -38,7 +38,7 @@ public void TestTableCreation_NullTableName(DatabaseType type) public void DateColumnTests_NoTime(DatabaseType type, object input) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable",new []{new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))}); + var tbl = db.CreateTable("MyTable",[new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))]); tbl.Insert(new Dictionary { { "MyDate", input } }); @@ -71,7 +71,7 @@ public void DateColumnTests_NoTime(DatabaseType type, object input) public void DateColumnTests_UkUsFormat_Explicit(DatabaseType type, object input, string culture) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable",new []{new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))}); + var tbl = db.CreateTable("MyTable",[new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))]); var cultureInfo = new CultureInfo (culture); @@ -112,10 +112,10 @@ public void DateColumnTests_UkUsFormat_Explicit(DatabaseType type, object input, public void DateColumnTests_PrimaryKeyColumn(DatabaseType type, object input, string culture) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable",new []{ + var tbl = db.CreateTable("MyTable",[ new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime))) {IsPrimaryKey = true } - }); + ]); //then bulk insert, both need to work using (var blk = tbl.BeginBulkInsert(new CultureInfo(culture))) @@ -149,7 +149,7 @@ public void DateColumnTests_PrimaryKeyColumn(DatabaseType type, object input, st public void DateColumnTests_TimeOnly_Midnight(DatabaseType type, object input) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable", new[] { new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan))) }); + var tbl = db.CreateTable("MyTable", [new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan)))]); tbl.Insert(new Dictionary { { "MyTime", input } }); @@ -170,7 +170,7 @@ public void DateColumnTests_TimeOnly_Midnight(DatabaseType type, object input) type == DatabaseType.Oracle ? new[] { (DateTime)result.Rows[0][0], (DateTime)result.Rows[1][0] }.Select(dt => dt.TimeOfDay) .Cast().ToArray() - : new[] { result.Rows[0][0], result.Rows[1][0] }; + : [result.Rows[0][0], result.Rows[1][0]]; Assert.Multiple(() => { @@ -224,7 +224,7 @@ public void TestOracleTimespans() public void DateColumnTests_TimeOnly_Afternoon(DatabaseType type, object input) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable", new[] { new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan))) }); + var tbl = db.CreateTable("MyTable", [new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan)))]); tbl.Insert(new Dictionary { { "MyTime", input } }); @@ -318,21 +318,21 @@ public void ForeignKeyCreationTest(DatabaseType type) { var database = GetTestDatabase(type); - var tblParent = database.CreateTable("Parent", new[] - { + var tblParent = database.CreateTable("Parent", + [ new DatabaseColumnRequest("ID",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true}, new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),10)) //varchar(10) - }); + ]); var parentIdPkCol = tblParent.DiscoverColumn("ID"); var parentIdFkCol = new DatabaseColumnRequest("Parent_ID", new DatabaseTypeRequest(typeof (int))); - var tblChild = database.CreateTable("Child", new[] - { + var tblChild = database.CreateTable("Child", + [ parentIdFkCol, new DatabaseColumnRequest("ChildName",new DatabaseTypeRequest(typeof(string),10)) //varchar(10) - }, new Dictionary + ], new Dictionary { {parentIdFkCol, parentIdPkCol} },true); @@ -398,12 +398,12 @@ public void ForeignKeyCreationTest_TwoColumns(DatabaseType type, bool cascadeDel { var database = GetTestDatabase(type); - var tblParent = database.CreateTable("Parent", new[] - { + var tblParent = database.CreateTable("Parent", + [ new DatabaseColumnRequest("ID1",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true}, //varchar(10) new DatabaseColumnRequest("ID2",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true}, //varchar(10) new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),10)) //varchar(10) - }); + ]); var parentIdPkCol1 = tblParent.DiscoverColumn("ID1"); var parentIdPkCol2 = tblParent.DiscoverColumn("ID2"); @@ -411,12 +411,12 @@ public void ForeignKeyCreationTest_TwoColumns(DatabaseType type, bool cascadeDel var parentIdFkCol1 = new DatabaseColumnRequest("Parent_ID1", new DatabaseTypeRequest(typeof(int))); var parentIdFkCol2 = new DatabaseColumnRequest("Parent_ID2", new DatabaseTypeRequest(typeof(int))); - var tblChild = database.CreateTable("Child", new[] - { + var tblChild = database.CreateTable("Child", + [ parentIdFkCol1, parentIdFkCol2, new DatabaseColumnRequest("ChildName",new DatabaseTypeRequest(typeof(string),10)) //varchar(10) - }, new Dictionary + ], new Dictionary { {parentIdFkCol1,parentIdPkCol1}, {parentIdFkCol2,parentIdPkCol2} @@ -483,15 +483,15 @@ public void CreateMaxVarcharColumns(DatabaseType type) { var database = GetTestDatabase(type); - var tbl = database.CreateTable("TestDistincting", new[] - { + var tbl = database.CreateTable("TestDistincting", + [ new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),int.MaxValue)), //varchar(max) new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(string))), //varchar(???) new DatabaseColumnRequest("Field3",new DatabaseTypeRequest(typeof(string),1000)), //varchar(???) new DatabaseColumnRequest("Field4",new DatabaseTypeRequest(typeof(string),5000)), //varchar(???) new DatabaseColumnRequest("Field5",new DatabaseTypeRequest(typeof(string),10000)), //varchar(???) new DatabaseColumnRequest("Field6",new DatabaseTypeRequest(typeof(string),10)) //varchar(10) - }); + ]); Assert.Multiple(() => { @@ -556,10 +556,10 @@ public void AddColumnTest(DatabaseType type,bool useTransaction) var database = GetTestDatabase(type); //create a single column table with primary key - var tbl = database.CreateTable("TestDistincting", new[] - { + var tbl = database.CreateTable("TestDistincting", + [ new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),100)){IsPrimaryKey = true} //varchar(max) - }); + ]); Assert.Multiple(() => { @@ -646,12 +646,12 @@ public void TestDistincting(DatabaseType type,bool useTransaction, bool dodgyNam var database = GetTestDatabase(type); // JS 2023-05-11 4000 characters, because SELECT DISTINCT doesn't work on CLOB (Oracle) - var tbl = database.CreateTable(dodgyNames?",,":"Field3",new [] - { + var tbl = database.CreateTable(dodgyNames?",,":"Field3", + [ new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),4000)), //varchar(max) new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(DateTime))), new DatabaseColumnRequest(dodgyNames?",,,,":"Field3",new DatabaseTypeRequest(typeof(int))) - }); + ]); using var dt = new DataTable(); dt.Columns.Add("Field1"); @@ -802,12 +802,12 @@ public void HorribleDatabaseAndTableNames(DatabaseType type,string horribleDatab try { - var tbl = database.CreateTable(horribleTableName, new[] - { + var tbl = database.CreateTable(horribleTableName, + [ new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),int.MaxValue)), //varchar(max) new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(DateTime))), new DatabaseColumnRequest("Field3",new DatabaseTypeRequest(typeof(int))){AllowNulls=false} - }); + ]); using var dt = new DataTable(); dt.Columns.Add("Field1"); @@ -882,19 +882,19 @@ public void UnsupportedEntityNames(DatabaseType type, string horribleDatabaseNam //CreateTable with illegal name StringAssert.IsMatch( "Table .* contained unsupported .* characters", - Assert.Throws(()=> database.CreateTable(horribleTableName, new DatabaseColumnRequest[] - { + Assert.Throws(()=> database.CreateTable(horribleTableName, + [ new("a", new DatabaseTypeRequest(typeof(string), 10)) - })) + ])) ?.Message); //CreateTable with (column) illegal name StringAssert.IsMatch( "Column .* contained unsupported .* characters", - Assert.Throws(()=> database.CreateTable("f", new DatabaseColumnRequest[] - { + Assert.Throws(()=> database.CreateTable("f", + [ new(columnName, new DatabaseTypeRequest(typeof(string), 10)) - })) + ])) ?.Message); AssertCanCreateDatabases(); @@ -959,8 +959,8 @@ public void CreateTable_AutoIncrementColumnTest(DatabaseType type) { var database = GetTestDatabase(type); - var tbl = database.CreateTable("MyTable", new[] - { + var tbl = database.CreateTable("MyTable", + [ new DatabaseColumnRequest("IdColumn", new DatabaseTypeRequest(typeof (int))) { AllowNulls = false, @@ -969,7 +969,7 @@ public void CreateTable_AutoIncrementColumnTest(DatabaseType type) }, new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),100)) - }); + ]); using var dt = new DataTable(); dt.Columns.Add("Name"); @@ -999,15 +999,15 @@ public void CreateTable_DefaultTest_Date(DatabaseType type) { var database = GetTestDatabase(type); - var tbl = database.CreateTable("MyTable", new[] - { + var tbl = database.CreateTable("MyTable", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100)), new DatabaseColumnRequest("myDt", new DatabaseTypeRequest(typeof (DateTime))) { AllowNulls = false, Default = MandatoryScalarFunctions.GetTodaysDate } - }); + ]); DateTime currentValue; using (var insert = tbl.BeginBulkInsert()) @@ -1055,15 +1055,15 @@ public void CreateTable_DefaultTest_Guid(DatabaseType type) } } - var tbl = database.CreateTable("MyTable", new[] - { + var tbl = database.CreateTable("MyTable", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100)), new DatabaseColumnRequest("MyGuid", new DatabaseTypeRequest(typeof (string))) { AllowNulls = false, Default = MandatoryScalarFunctions.GetGuid } - }); + ]); using (var insert = tbl.BeginBulkInsert()) { @@ -1088,12 +1088,12 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type) var culture = new CultureInfo("en-gb"); var db = GetTestDatabase(type); - var tbl = db.CreateTable("LotsOfDatesTest",new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("LotsOfDatesTest", + [ new("ID",new DatabaseTypeRequest(typeof(int))), new("MyDate",new DatabaseTypeRequest(typeof(DateTime))), new("MyString",new DatabaseTypeRequest(typeof(string),int.MaxValue)) - }); + ]); //test basic insert foreach(var s in someDates) @@ -1127,7 +1127,7 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type) Assert.That(tbl.GetRowCount(), Is.EqualTo(someDates.Length*2)); } - private readonly string [] someDates = { + private readonly string [] someDates = [ "22\\5\\19", "22/5/19", "22-5-19", @@ -1368,7 +1368,7 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type) "08:59:36 AM", "08:59:36", "08:59:36 AM" - }; + ]; diff --git a/Tests/FAnsiTests/Database/DatabaseLevelTests.cs b/Tests/FAnsiTests/Database/DatabaseLevelTests.cs index b1f4a2f1..ae193549 100644 --- a/Tests/FAnsiTests/Database/DatabaseLevelTests.cs +++ b/Tests/FAnsiTests/Database/DatabaseLevelTests.cs @@ -41,7 +41,7 @@ public void Test_CreateSchema(DatabaseType type) if (type is DatabaseType.MicrosoftSQLServer or DatabaseType.PostgreSql) { var tbl = db.CreateTable("Heyyy", - new[] {new DatabaseColumnRequest("fff", new DatabaseTypeRequest(typeof(string), 10))},"Fr ank"); + [new DatabaseColumnRequest("fff", new DatabaseTypeRequest(typeof(string), 10))],"Fr ank"); Assert.That(tbl.Exists()); diff --git a/Tests/FAnsiTests/Database/DiscoverTablesTests.cs b/Tests/FAnsiTests/Database/DiscoverTablesTests.cs index bcb9d35c..6b33f014 100644 --- a/Tests/FAnsiTests/Database/DiscoverTablesTests.cs +++ b/Tests/FAnsiTests/Database/DiscoverTablesTests.cs @@ -16,16 +16,14 @@ public void Test_DiscoverTables_Normal(DatabaseType dbType) var db = GetTestDatabase(dbType); db.CreateTable("AA", - new DatabaseColumnRequest[] - { + [ new("F",new DatabaseTypeRequest(typeof(int))) - }); + ]); db.CreateTable("BB", - new DatabaseColumnRequest[] - { + [ new("F",new DatabaseTypeRequest(typeof(int))) - }); + ]); var tbls = db.DiscoverTables(false); @@ -54,17 +52,15 @@ public void Test_DiscoverTables_WithInvalidNames_Skipped(DatabaseType dbType) //FAnsi shouldn't let us create a table with an invalid name Assert.Throws(() => db.CreateTable("FF (troll)", - new DatabaseColumnRequest[] - { + [ new("F", new DatabaseTypeRequest(typeof(int))) - })); + ])); //but we can create a table "FF" db.CreateTable("FF", - new DatabaseColumnRequest[] - { + [ new("F",new DatabaseTypeRequest(typeof(int))) - }); + ]); //even though there are 2 tables in the database [BB (ff)] and [FF] only [FF] should be returned var tbls = db.DiscoverTables(false); @@ -90,17 +86,15 @@ public void Test_DiscoverViews_WithInvalidNames_Skipped(DatabaseType dbType) //FAnsi shouldn't let us create a table with an invalid name Assert.Throws(() => db.CreateTable("FF (troll)", - new DatabaseColumnRequest[] - { + [ new("F", new DatabaseTypeRequest(typeof(int))) - })); + ])); //but we can create a table "FF" db.CreateTable("FF", - new DatabaseColumnRequest[] - { + [ new("F",new DatabaseTypeRequest(typeof(int))) - }); + ]); //even though there are 2 tables in the database [BB (ff)] and [FF] only [FF] should be returned var tbls = db.DiscoverTables(true); @@ -191,7 +185,7 @@ private void CreateBadView(DiscoveredDatabase db) //drop it if it exists DropBadView(db,true); - db.CreateTable("ABC",new DatabaseColumnRequest[]{new("A",new DatabaseTypeRequest(typeof(int)))}); + db.CreateTable("ABC",[new("A",new DatabaseTypeRequest(typeof(int)))]); using var con = db.Server.GetConnection(); con.Open(); diff --git a/Tests/FAnsiTests/DatabaseTests.cs b/Tests/FAnsiTests/DatabaseTests.cs index 13aefb5b..84bcae38 100644 --- a/Tests/FAnsiTests/DatabaseTests.cs +++ b/Tests/FAnsiTests/DatabaseTests.cs @@ -167,7 +167,7 @@ protected static void AssertAreEqual(DataTable dt1, DataTable dt2) foreach (DataRow row1 in dt1.Rows) { var match = dt2.Rows.Cast().Any(row2=> dt1.Columns.Cast().All(c => AreBasicallyEquals(row1[c.ColumnName], row2[c.ColumnName]))); - Assert.That(match, "Couldn't find match for row:{0}", string.Join(",", row1.ItemArray)); + Assert.That(match, $"Couldn't find match for row:{string.Join(",", row1.ItemArray)}"); } } diff --git a/Tests/FAnsiTests/FAnsiTests.csproj b/Tests/FAnsiTests/FAnsiTests.csproj index 7d154800..331e26f2 100644 --- a/Tests/FAnsiTests/FAnsiTests.csproj +++ b/Tests/FAnsiTests/FAnsiTests.csproj @@ -1,34 +1,34 @@ - - - net7.0 - FAnsiSqlTests - FAnsiSqlTests - Copyright © 2019 - false - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - PreserveNewest - Designer - - - - - - - - - + + + net7.0 + FAnsiSqlTests + FAnsiSqlTests + Copyright © 2019 + false + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + PreserveNewest + Designer + + + + + + + + + diff --git a/Tests/FAnsiTests/Table/BadNamesTests.cs b/Tests/FAnsiTests/Table/BadNamesTests.cs index 1773bde1..fb612284 100644 --- a/Tests/FAnsiTests/Table/BadNamesTests.cs +++ b/Tests/FAnsiTests/Table/BadNamesTests.cs @@ -36,11 +36,11 @@ private DiscoveredTable SetupBadNamesTable(DatabaseType dbType) var db = GetTestDatabase(dbType); var (badTableName,badColumnName,badColumnName2) = GetBadNames(dbType); - return db.CreateTable(badTableName,new[] - { + return db.CreateTable(badTableName, + [ new DatabaseColumnRequest(badColumnName,new DatabaseTypeRequest(typeof(string),100)), new DatabaseColumnRequest(badColumnName2,new DatabaseTypeRequest(typeof(int))) - }); + ]); } @@ -195,18 +195,18 @@ public void BadNames_DiscoverRelationships(DatabaseType dbType) var db = GetTestDatabase(dbType); - var tbl1 = db.CreateTable(badTableName,new[] - { + var tbl1 = db.CreateTable(badTableName, + [ new DatabaseColumnRequest(badColumnName,new DatabaseTypeRequest(typeof(string),100)){IsPrimaryKey = true }, new DatabaseColumnRequest("Frrrrr ##' ank",new DatabaseTypeRequest(typeof(int))) - }); + ]); var pk = tbl1.DiscoverColumns().Single(c=>c.IsPrimaryKey); DatabaseColumnRequest fk; var tbl2 = db.CreateTable(new CreateTableArgs(db, $"{badTableName}2",null) { - ExplicitColumnDefinitions = new []{fk = new DatabaseColumnRequest($"{badColumnName}2",new DatabaseTypeRequest(typeof(string),100)) }, + ExplicitColumnDefinitions = [fk = new DatabaseColumnRequest($"{badColumnName}2",new DatabaseTypeRequest(typeof(string),100))], ForeignKeyPairs = new Dictionary {{fk, pk} } }); diff --git a/Tests/FAnsiTests/Table/BasicInsertTests.cs b/Tests/FAnsiTests/Table/BasicInsertTests.cs index 42db21d1..6d8da808 100644 --- a/Tests/FAnsiTests/Table/BasicInsertTests.cs +++ b/Tests/FAnsiTests/Table/BasicInsertTests.cs @@ -31,10 +31,9 @@ public void CreateTableAndInsertAValue_ColumnOverload(DatabaseType type, object { var db = GetTestDatabase(type); var tbl = db.CreateTable("InsertTable", - new [] - { + [ new DatabaseColumnRequest("Name",new DatabaseTypeRequest(value.GetType(),100,new DecimalSize(5,5))) - }); + ]); var nameCol = tbl.DiscoverColumn("Name"); @@ -58,10 +57,9 @@ public void CreateTableAndInsertAValue_StringOverload(DatabaseType type, object { var db = GetTestDatabase(type); var tbl = db.CreateTable("InsertTable", - new[] - { + [ new DatabaseColumnRequest("Name",new DatabaseTypeRequest(value.GetType(),100,new DecimalSize(5,5))) - }); + ]); tbl.Insert(new Dictionary { @@ -80,11 +78,10 @@ public void CreateTableAndInsertAValue_ReturnsIdentity(DatabaseType type) { var db = GetTestDatabase(type); var tbl = db.CreateTable("InsertTable", - new[] - { + [ new DatabaseColumnRequest("myidentity",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true,IsAutoIncrement = true}, new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),100)) - }); + ]); var nameCol = tbl.DiscoverColumn("Name"); diff --git a/Tests/FAnsiTests/Table/BigIntTests.cs b/Tests/FAnsiTests/Table/BigIntTests.cs index 33dd675b..78e1cda4 100644 --- a/Tests/FAnsiTests/Table/BigIntTests.cs +++ b/Tests/FAnsiTests/Table/BigIntTests.cs @@ -12,7 +12,7 @@ public class BigIntTests : DatabaseTests public void TestBigInt_Insert(DatabaseType dbType) { var db = GetTestDatabase(dbType); - var tbl = db.CreateTable("MyBigIntTable", new []{ new DatabaseColumnRequest("Col1","bigint",false)}); + var tbl = db.CreateTable("MyBigIntTable", [new DatabaseColumnRequest("Col1","bigint",false)]); Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -30,7 +30,7 @@ public void TestBigInt_Insert(DatabaseType dbType) public void TestBigInt_InsertDataTable(DatabaseType dbType) { var db = GetTestDatabase(dbType); - var tbl = db.CreateTable("MyBigIntTable", new []{ new DatabaseColumnRequest("Col1","bigint",false)}); + var tbl = db.CreateTable("MyBigIntTable", [new DatabaseColumnRequest("Col1","bigint",false)]); Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); diff --git a/Tests/FAnsiTests/Table/BulkInsertTest.cs b/Tests/FAnsiTests/Table/BulkInsertTest.cs index c9f9b16c..7d22682a 100644 --- a/Tests/FAnsiTests/Table/BulkInsertTest.cs +++ b/Tests/FAnsiTests/Table/BulkInsertTest.cs @@ -22,11 +22,10 @@ public void TestBulkInsert_Basic(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -57,11 +56,10 @@ public void TestBulkInsert_SpacedOutNames(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Na me", new DatabaseTypeRequest(typeof(string), 10)), new DatabaseColumnRequest("A ge", new DatabaseTypeRequest(typeof(int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -102,11 +100,10 @@ public void TestBulkInsert_ColumnOrdinals(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -145,11 +142,10 @@ public void TestBulkInsert_Transaction(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -192,11 +188,10 @@ public void TestBulkInsert_AbandonTransaction(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -240,11 +235,10 @@ public void TestBulkInsert_AlterColumn_MidTransaction(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -293,11 +287,11 @@ public void BulkInsert_MixedCase(DatabaseType type) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new[] - { + var tbl = db.CreateTable("Test", + [ new DatabaseColumnRequest("bob", new DatabaseTypeRequest(typeof (string), 100)), new DatabaseColumnRequest("Frank", new DatabaseTypeRequest(typeof (string), 100)) - }); + ]); using (var dt = new DataTable()) { @@ -320,8 +314,8 @@ public void UnmatchedColumnsBulkInsertTest_UsesDefaultValues_Passes(DatabaseType { var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("Test", + [ new("bob", new DatabaseTypeRequest(typeof (string), 100)) { IsPrimaryKey = true, @@ -332,7 +326,7 @@ public void UnmatchedColumnsBulkInsertTest_UsesDefaultValues_Passes(DatabaseType Default = MandatoryScalarFunctions.GetTodaysDate }, new("peter", new DatabaseTypeRequest(typeof (string), 100)) {AllowNulls = false} - }); + ]); using (var dt = new DataTable()) { @@ -375,8 +369,8 @@ public void UnmatchedColumnsBulkInsertTest_UsesDefaultValues_TwoLargeBatches_Pas var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("Test", + [ new("bob", new DatabaseTypeRequest(typeof (string), 100)) { AllowNulls = false @@ -420,7 +414,7 @@ public void UnmatchedColumnsBulkInsertTest_UsesDefaultValues_TwoLargeBatches_Pas new("Column28", new DatabaseTypeRequest(typeof (int))) {AllowNulls = false}, new("Column29", new DatabaseTypeRequest(typeof (int))) {AllowNulls = false} - }); + ]); using (var dt = new DataTable()) { @@ -536,14 +530,14 @@ public void NullPrimaryKey_ThrowsException(DatabaseType type) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("Test", + [ new("bob", new DatabaseTypeRequest(typeof (string), 100)) { IsPrimaryKey = true, AllowNulls = false } - }); + ]); using var dt = new DataTable(); dt.Columns.Add("bob"); @@ -558,8 +552,8 @@ public void AutoIncrementPrimaryKey_Passes(DatabaseType type) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("Test", + [ new("bob", new DatabaseTypeRequest(typeof (int), 100)) { IsPrimaryKey = true, @@ -571,7 +565,7 @@ public void AutoIncrementPrimaryKey_Passes(DatabaseType type) IsPrimaryKey = true, AllowNulls = false } - }); + ]); using (var dt = new DataTable()) { @@ -607,13 +601,13 @@ public void TestBulkInsert_ScientificNotation(DatabaseType type) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("Test", new DatabaseColumnRequest[] - { + var tbl = db.CreateTable("Test", + [ new("num", new DatabaseTypeRequest(typeof (decimal), null,new DecimalSize(1,10))) { AllowNulls = false } - }); + ]); using (var dt = new DataTable()) { @@ -694,12 +688,11 @@ public void TestBulkInsert_SchemaTooNarrow_StringError(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Id", new DatabaseTypeRequest(typeof (int))){IsAutoIncrement = true, IsPrimaryKey = true}, new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -748,10 +741,9 @@ public void TestBulkInsert_ExplicitDateTimeFormats(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyDateTestTable", - new[] - { + [ new DatabaseColumnRequest("MyDate", new DatabaseTypeRequest(typeof (DateTime))){AllowNulls=false } - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -763,7 +755,7 @@ public void TestBulkInsert_ExplicitDateTimeFormats(DatabaseType type) using var bulk = tbl.BeginBulkInsert(); bulk.Timeout = 30; - bulk.DateTimeDecider.Settings.ExplicitDateFormats = new []{"yyyyMMdd" }; + bulk.DateTimeDecider.Settings.ExplicitDateFormats = ["yyyyMMdd"]; bulk.Upload(dt); } @@ -777,13 +769,12 @@ public void TestBulkInsert_SchemaTooNarrow_DecimalError(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Id", new DatabaseTypeRequest(typeof (int))){IsAutoIncrement = true, IsPrimaryKey = true}, new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Score", new DatabaseTypeRequest(typeof (decimal), null,new DecimalSize(2,1))), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); @@ -832,13 +823,12 @@ public void TestBulkInsert_BadDecimalFormat_DecimalError(DatabaseType type) var db = GetTestDatabase(type); var tbl = db.CreateTable("MyBulkInsertTest", - new[] - { + [ new DatabaseColumnRequest("Id", new DatabaseTypeRequest(typeof (int))){IsAutoIncrement = true, IsPrimaryKey = true}, new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)), new DatabaseColumnRequest("Score", new DatabaseTypeRequest(typeof (decimal), null,new DecimalSize(2,1))), new DatabaseColumnRequest("Age", new DatabaseTypeRequest(typeof (int))) - }); + ]); //There are no rows in the table yet Assert.That(tbl.GetRowCount(), Is.EqualTo(0)); diff --git a/Tests/FAnsiTests/Table/CreateTableTests.cs b/Tests/FAnsiTests/Table/CreateTableTests.cs index c6e62841..9d7d3e41 100644 --- a/Tests/FAnsiTests/Table/CreateTableTests.cs +++ b/Tests/FAnsiTests/Table/CreateTableTests.cs @@ -19,10 +19,10 @@ internal class CreateTableTests:DatabaseTests public void CreateSimpleTable_Exists(DatabaseType type) { var db = GetTestDatabase(type); - var table = db.CreateTable("People", new[] - { + var table = db.CreateTable("People", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)) - }); + ]); Assert.That(table.Exists()); @@ -43,8 +43,8 @@ public void TestTableCreation(DatabaseType type) var syntaxHelper = database.Server.GetQuerySyntaxHelper(); - database.CreateTable(tbl.GetRuntimeName(), new[] - { + database.CreateTable(tbl.GetRuntimeName(), + [ new DatabaseColumnRequest("name", new DatabaseTypeRequest(typeof(string),10), false){IsPrimaryKey=true}, new DatabaseColumnRequest("foreignName", new DatabaseTypeRequest(typeof(string),7)){IsPrimaryKey=true}, new DatabaseColumnRequest("address", new DatabaseTypeRequest(typeof (string), 500)), @@ -52,7 +52,7 @@ public void TestTableCreation(DatabaseType type) new DatabaseColumnRequest("score", new DatabaseTypeRequest(typeof (decimal), null, new DecimalSize(5, 3))) //<- e.g. 12345.123 - }); + ]); Assert.That(tbl.Exists()); @@ -116,7 +116,7 @@ public void Test_CreateTable_ProprietaryType() var table = database.CreateTable( "MyTable", - new [] {new DatabaseColumnRequest("Name", "VARCHAR2(10)")} + [new DatabaseColumnRequest("Name", "VARCHAR2(10)")] ); Assert.That(table.DiscoverColumn("Name").DataType.GetLengthIfString(), Is.EqualTo(10)); @@ -128,10 +128,10 @@ public void Test_CreateTable_ProprietaryType() public void CreateSimpleTable_VarcharTypeCorrect(DatabaseType type) { var db = GetTestDatabase(type); - var table = db.CreateTable("People", new[] - { + var table = db.CreateTable("People", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 5)) - }); + ]); Assert.That(table.Exists()); @@ -184,13 +184,12 @@ public void CreateTable_PrimaryKey_FromColumnRequest(DatabaseType databaseType) var table = database.CreateTable( "PkTable", - new DatabaseColumnRequest[] - { + [ new("Name",new DatabaseTypeRequest(typeof(string),10)) { IsPrimaryKey = true } - }); + ]); Assert.That(table.DiscoverColumn("Name").IsPrimaryKey); @@ -205,14 +204,14 @@ public void CreateTable_CollationTest(DatabaseType type, string collation) { var database = GetTestDatabase(type); - var tbl = database.CreateTable("MyTable", new[] - { + var tbl = database.CreateTable("MyTable", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100)) { AllowNulls = false, Collation = collation } - }); + ]); Assert.That(tbl.DiscoverColumn("Name").Collation, Is.EqualTo(collation)); } @@ -250,14 +249,14 @@ public void OracleRaceCondition() { var db = GetTestDatabase(DatabaseType.Oracle); - var tbl = db.CreateTable("RaceTable", new[] - { + var tbl = db.CreateTable("RaceTable", + [ new DatabaseColumnRequest("A", "int"), new DatabaseColumnRequest("B", "int"), new DatabaseColumnRequest("C", "int"), new DatabaseColumnRequest("D", "int"), new DatabaseColumnRequest("E", "int") - }); + ]); Assert.That(tbl.GetDataTable().Columns, Has.Count.EqualTo(5)); @@ -273,12 +272,12 @@ public void Test_DropColumn(DatabaseType dbType) { var db = GetTestDatabase(dbType); - var tbl = db.CreateTable("RaceTable", new[] - { + var tbl = db.CreateTable("RaceTable", + [ new DatabaseColumnRequest("A", "int"){IsPrimaryKey = true}, new DatabaseColumnRequest("B", "int") - }); + ]); Assert.That(tbl.GetDataTable().Columns, Has.Count.EqualTo(2)); @@ -294,10 +293,9 @@ public void Test_OracleBit_IsNotStringAnyMore() { var db = GetTestDatabase(DatabaseType.Oracle); var table = db.CreateTable("MyTable", - new[] - { + [ new DatabaseColumnRequest("MyCol", new DatabaseTypeRequest(typeof(bool))) - }); + ]); var col = table.DiscoverColumn("MyCol"); Assert.That(col.DataType.SQLType, Is.EqualTo("decimal(1,0)")); @@ -527,8 +525,8 @@ public void TestSomething(DatabaseType dbType) var db = GetTestDatabase(dbType); - var tbl = db.CreateTable("ScriptsRun", new[] - { + var tbl = db.CreateTable("ScriptsRun", + [ new DatabaseColumnRequest("cint", new DatabaseTypeRequest(typeof(int))) {IsAutoIncrement = true, IsPrimaryKey = true}, new DatabaseColumnRequest("clong", new DatabaseTypeRequest(typeof(long))), @@ -541,7 +539,7 @@ public void TestSomething(DatabaseType dbType) new DatabaseColumnRequest("modified_date", new DatabaseTypeRequest(typeof(DateTime))), new DatabaseColumnRequest("entered_by", new DatabaseTypeRequest(typeof(string), 50)) - }); + ]); Assert.Multiple(() => { diff --git a/Tests/FAnsiTests/Table/DataTypeAdjusterTests.cs b/Tests/FAnsiTests/Table/DataTypeAdjusterTests.cs index 550ce76d..70fcdc4d 100644 --- a/Tests/FAnsiTests/Table/DataTypeAdjusterTests.cs +++ b/Tests/FAnsiTests/Table/DataTypeAdjusterTests.cs @@ -12,10 +12,10 @@ internal class DataTypeAdjusterTests:DatabaseTests [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))] public void CreateTable_WithAdjuster(DatabaseType type) { - var tbl = GetTestDatabase(type).CreateTable("MyTable", new[] - { + var tbl = GetTestDatabase(type).CreateTable("MyTable", + [ new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10)) - }, null, new DataTypeAdjusterTestsPadder()); + ], null, new DataTypeAdjusterTestsPadder()); Assert.That(tbl.DiscoverColumn("Name").DataType.GetLengthIfString(), Is.EqualTo(12)); tbl.Drop(); diff --git a/Tests/FAnsiTests/Table/ForeignKeyTests.cs b/Tests/FAnsiTests/Table/ForeignKeyTests.cs index 73555243..f80116e1 100644 --- a/Tests/FAnsiTests/Table/ForeignKeyTests.cs +++ b/Tests/FAnsiTests/Table/ForeignKeyTests.cs @@ -18,23 +18,22 @@ public void TestForeignKey_OneColumnKey(DatabaseType dbType, bool cascade) var parentTable = db.CreateTable("Table1", - new[] - { + [ new DatabaseColumnRequest("Id", "int", false) { IsAutoIncrement = true, IsPrimaryKey = true } - }); + ]); var discovered_pkCol = parentTable.DiscoverColumn("Id"); var requested_fkCol = new DatabaseColumnRequest("Parent_Id", "int"); - var childTable = db.CreateTable("Child1", new[] - { + var childTable = db.CreateTable("Child1", + [ requested_fkCol, new DatabaseColumnRequest("SomeNumber", "int") - }, new Dictionary + ], new Dictionary { {requested_fkCol,discovered_pkCol} @@ -89,8 +88,7 @@ public void TestForeignKey_TwoColumnKey(DatabaseType dbType) var db = GetTestDatabase(dbType); var parentTable = db.CreateTable("Table2", - new[] - { + [ new DatabaseColumnRequest("Id1", "int", false) { IsPrimaryKey = true @@ -100,19 +98,19 @@ public void TestForeignKey_TwoColumnKey(DatabaseType dbType) IsPrimaryKey = true } - }); + ]); var discovered_pkCol1 = parentTable.DiscoverColumn("Id1"); var discovered_pkCol2 = parentTable.DiscoverColumn("Id2"); var requested_fkCol1 = new DatabaseColumnRequest("Parent_Id1", "int"); var requested_fkCol2 = new DatabaseColumnRequest("Parent_Id2", "int"); - var childTable = db.CreateTable("Child2", new[] - { + var childTable = db.CreateTable("Child2", + [ requested_fkCol1, requested_fkCol2 - }, new Dictionary + ], new Dictionary { {requested_fkCol1,discovered_pkCol1}, {requested_fkCol2,discovered_pkCol2} @@ -157,20 +155,20 @@ public void Test_ThreeTables_OnePrimary(DatabaseType dbType, bool useTransaction var db = GetTestDatabase(dbType); - var t2 = db.CreateTable("T2", new DatabaseColumnRequest[] - { + var t2 = db.CreateTable("T2", + [ new("c2", new DatabaseTypeRequest(typeof(int))) - }); + ]); - var t3 = db.CreateTable("T3", new DatabaseColumnRequest[] - { + var t3 = db.CreateTable("T3", + [ new("c3", new DatabaseTypeRequest(typeof(int))) - }); + ]); - var t1 = db.CreateTable("T1", new DatabaseColumnRequest[] - { + var t1 = db.CreateTable("T1", + [ new("c1", new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true} - }); + ]); var c1 = t1.DiscoverColumns().Single(); var c2 = t2.DiscoverColumns().Single(); @@ -221,20 +219,20 @@ public void Test_ThreeTables_TwoPrimary(DatabaseType dbType) var db = GetTestDatabase(dbType); - var t1 = db.CreateTable("T1", new DatabaseColumnRequest[] - { + var t1 = db.CreateTable("T1", + [ new("c1", new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true} - }); + ]); - var t2 = db.CreateTable("T2", new DatabaseColumnRequest[] - { + var t2 = db.CreateTable("T2", + [ new("c2", new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true} - }); + ]); - var t3 = db.CreateTable("T3", new DatabaseColumnRequest[] - { + var t3 = db.CreateTable("T3", + [ new("c3", new DatabaseTypeRequest(typeof(int))) - }); + ]); var c1 = t1.DiscoverColumns().Single(); var c2 = t2.DiscoverColumns().Single(); @@ -261,9 +259,9 @@ public void Test_RelationshipTopologicalSort_UnrelatedTables() { var db = GetTestDatabase(DatabaseType.MicrosoftSQLServer); - var cops = db.CreateTable("Cops", new[] {new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100))}); - var robbers = db.CreateTable("Robbers", new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 100)) }); - var lawyers = db.CreateTable("Lawyers", new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 100)) }); + var cops = db.CreateTable("Cops", [new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100))]); + var robbers = db.CreateTable("Robbers", [new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 100))]); + var lawyers = db.CreateTable("Lawyers", [new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 100))]); var sort = new RelationshipTopologicalSort(new[] {cops}); Assert.That(sort.Order.Single(), Is.EqualTo(cops)); diff --git a/Tests/FAnsiTests/Table/LongNamesTests.cs b/Tests/FAnsiTests/Table/LongNamesTests.cs index 7f4acd39..8eeffddd 100644 --- a/Tests/FAnsiTests/Table/LongNamesTests.cs +++ b/Tests/FAnsiTests/Table/LongNamesTests.cs @@ -17,7 +17,7 @@ public void Test_LongTableName_CreateAndReadBack(DatabaseType dbType) var tableName = new StringBuilder(db.Server.GetQuerySyntaxHelper().MaximumTableLength).Append('a', db.Server.GetQuerySyntaxHelper().MaximumTableLength).ToString(); var columnName = new StringBuilder(db.Server.GetQuerySyntaxHelper().MaximumColumnLength).Append('b', db.Server.GetQuerySyntaxHelper().MaximumColumnLength).ToString(); - var tbl = db.CreateTable(tableName,new DatabaseColumnRequest[]{new(columnName,new DatabaseTypeRequest(typeof(string),100))}); + var tbl = db.CreateTable(tableName,[new(columnName,new DatabaseTypeRequest(typeof(string),100))]); Assert.That(tbl.Exists()); StringAssert.AreEqualIgnoringCase(tableName,tbl.GetRuntimeName()); diff --git a/Tests/FAnsiTests/Table/TestRename.cs b/Tests/FAnsiTests/Table/TestRename.cs index 032553c0..f86e9a64 100644 --- a/Tests/FAnsiTests/Table/TestRename.cs +++ b/Tests/FAnsiTests/Table/TestRename.cs @@ -12,7 +12,7 @@ public void TestRenamingTable(DatabaseType type) { var db = GetTestDatabase(type); - var tbl = db.CreateTable("MyTable",new []{new DatabaseColumnRequest("Age",new DatabaseTypeRequest(typeof(int)) )}); + var tbl = db.CreateTable("MyTable",[new DatabaseColumnRequest("Age",new DatabaseTypeRequest(typeof(int)) )]); Assert.That(tbl.Exists()); diff --git a/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs b/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs index dc120754..a6fba067 100644 --- a/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs +++ b/Tests/FAnsiTests/TypeTranslation/TypeTranslaterTests.cs @@ -225,7 +225,7 @@ private void RunKnownTypeTest(DatabaseType type, string sqlType, Type expectedTy var tt = db.Server.GetQuerySyntaxHelper().TypeTranslater; //Create it in database (crashes here if it's an invalid datatype according to DBMS) - var tbl = db.CreateTable("TTT", new[] { new DatabaseColumnRequest("MyCol", sqlType) }); + var tbl = db.CreateTable("TTT", [new DatabaseColumnRequest("MyCol", sqlType)]); try { @@ -234,7 +234,7 @@ private void RunKnownTypeTest(DatabaseType type, string sqlType, Type expectedTy //What type does FAnsi think this is? var tBefore = tt.TryGetCSharpTypeForSQLDBType(sqlType); - Assert.That(tBefore, Is.Not.Null, "We asked to create a '{0}', DBMS created a '{1}'. FAnsi didn't recognise '{0}' as a supported Type",sqlType,col.DataType.SQLType); + Assert.That(tBefore, Is.Not.Null, $"We asked to create a '{sqlType}', DBMS created a '{col.DataType.SQLType}'. FAnsi didn't recognise '{sqlType}' as a supported Type"); //Does FAnsi understand the datatype that was actually created on the server (sometimes you specify something and it is an //alias for something else e.g. Oracle creates 'varchar2' when you ask for 'CHAR VARYING'