Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit d99d95b

Browse files
committed
Fix tests
1 parent 2fa8808 commit d99d95b

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

tests/ServiceStack.OrmLite.Tests/Issues/LoadSelectResultFilterIssue.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ public class Child
4545
public Parent Parent { get; set; }
4646
}
4747

48-
49-
5048
public class LoadSelectResultFilterIssue : OrmLiteTestBase
5149
{
5250
[Test]
5351
public void Can_use_results_filter_in_LoadSelect()
5452
{
5553
using (var db = OpenDbConnection())
5654
{
55+
db.DropTable<Parent>();
56+
db.DropTable<Child>();
57+
5758
db.CreateTable<Parent>();
5859
db.CreateTable<Child>();
5960

tests/ServiceStack.OrmLite.Tests/LoadReferencesJoinTests.cs

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -710,31 +710,35 @@ public void Can_load_select_with_join_and_same_name_columns()
710710
public void Can_load_references_with_OrderBy_and_Paging()
711711
{
712712
//This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'
713-
if (Dialect == Dialect.MySql) return;
713+
if (Dialect == Dialect.MySql)
714+
return;
715+
if (Dialect == Dialect.SqlServer) //Only one expression can be specified in the select list when the subquery is not introduced with EXISTS.
716+
return;
714717

715-
db.DropTable<Parent>();
716-
db.DropTable<Child>();
717-
db.CreateTable<Child>();
718-
db.CreateTable<Parent>();
718+
db.DropTable<ParentSelf>();
719+
db.DropTable<ChildSelf>();
719720

720-
db.Save(new Child { Id = 1, Value = "Lolz" });
721-
db.Insert(new Parent { Id = 1, ChildId = null });
722-
db.Insert(new Parent { Id = 2, ChildId = 1 });
721+
db.CreateTable<ChildSelf>();
722+
db.CreateTable<ParentSelf>();
723+
724+
db.Save(new ChildSelf { Id = 1, Value = "Lolz" });
725+
db.Insert(new ParentSelf { Id = 1, ChildId = null });
726+
db.Insert(new ParentSelf { Id = 2, ChildId = 1 });
723727

724728
// Select the Parent.Id == 2. LoadSelect should populate the child, but doesn't.
725-
var q = db.From<Parent>()
729+
var q = db.From<ParentSelf>()
726730
.Take(1)
727-
.OrderByDescending<Parent>(p => p.Id);
731+
.OrderByDescending<ParentSelf>(p => p.Id);
728732

729733
var results = db.LoadSelect(q);
730734

731735
Assert.That(results.Count, Is.EqualTo(1));
732736
Assert.That(results[0].Child, Is.Not.Null);
733737
Assert.That(results[0].Child.Value, Is.EqualTo("Lolz"));
734738

735-
q = db.From<Parent>()
739+
q = db.From<ParentSelf>()
736740
.Skip(1)
737-
.OrderBy<Parent>(p => p.Id);
741+
.OrderBy<ParentSelf>(p => p.Id);
738742

739743
results = db.LoadSelect(q);
740744

@@ -888,19 +892,19 @@ private static void AssertMultiCustomerOrderResults(StringBuilder sb)
888892
}
889893
}
890894

891-
public class Parent
895+
public class ParentSelf
892896
{
893897
[PrimaryKey]
894898
public int Id { get; set; }
895899

896-
[References(typeof(Child))]
900+
[References(typeof(ChildSelf))]
897901
public int? ChildId { get; set; }
898902

899903
[Reference]
900-
public Child Child { get; set; }
904+
public ChildSelf Child { get; set; }
901905
}
902906

903-
public class Child
907+
public class ChildSelf
904908
{
905909
[PrimaryKey]
906910
public int Id { get; set; }

tests/ServiceStack.OrmLite.Tests/UseCase/ParentChildCyclicalExample.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ public void Can_create_Parent_Child_Tables()
4040
{
4141
using (var db = OpenDbConnection())
4242
{
43-
db.DropAndCreateTable<Parent>();
44-
db.DropAndCreateTable<Child>();
43+
db.DropTable<Child>();
44+
db.DropTable<Parent>();
45+
46+
db.CreateTable<Parent>();
47+
db.CreateTable<Child>();
4548

4649
var parent = new Parent
4750
{

0 commit comments

Comments
 (0)