Make some more tests work on Oracle

Author: BruceCowan-AI

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

@@ -49,11 +49,11 @@ private void GetIdStats(IDbConnection db)
             letterFrequencySumId = db.Scalar<int>(db.From<LetterFrequency>().Select(Sql.Sum("Id")));
         }
 
-        public static void InitLetters(IDbConnection db)
+        public static int InitLetters(IDbConnection db)
         {
             db.DropAndCreateTable<LetterFrequency>();
 
-            db.Insert(new LetterFrequency { Letter = "A" });
+            var firstId = db.Insert(new LetterFrequency { Letter = "A" }, selectIdentity: true);
             db.Insert(new LetterFrequency { Letter = "B" });
             db.Insert(new LetterFrequency { Letter = "B" });
             db.Insert(new LetterFrequency { Letter = "C" });
@@ -63,14 +63,15 @@ public static void InitLetters(IDbConnection db)
             db.Insert(new LetterFrequency { Letter = "D" });
             db.Insert(new LetterFrequency { Letter = "D" });
             db.Insert(new LetterFrequency { Letter = "D" });
+            return (int)firstId;
         }
 
         [Test]
         public void Can_select_Dictionary_with_SqlExpression()
         {
             using (var db = OpenDbConnection())
             {
-                InitLetters(db);
+                var firstId = InitLetters(db);
                 var expected = new Dictionary<string, int> {
                     { "A", 1 }, { "B", 2 }, { "C", 3 },
                 };
@@ -103,7 +104,7 @@ public void Can_select_Dictionary_with_SqlExpression()
                   .Select(x => new { x.Id });
 
                 var list = db.SqlList<int>(query);
-                Assert.That(list, Is.EquivalentTo(new[] { 1, 2, 3, 4, 5, 6 }));
+                Assert.That(list, Is.EquivalentTo(new[] { 0, 1, 2, 3, 4, 5 }.AdjustIds(firstId)));
             }
         }
 

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

@@ -31,7 +31,7 @@ public void Can_select_Guid()
                     Guid = Guid.NewGuid()
                 };
 
-                long id = db.Insert(dto);
+                long id = db.Insert(dto, selectIdentity: true);
                 var row = db.Single<PocoWithGuid>(r => r.Id == id);
 
                 Assert.That(row.Guid, Is.EqualTo(dto.Guid));

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

@@ -64,13 +64,13 @@ public void Can_Select_DateTime_with_SelectFmt()
                     ExpiryDate = DateTime.UtcNow.AddHours(1)
                 });
 
-                var result = db.Select<TestDate>("ExpiryDate".SqlColumn() + " > @date",
-                    new { date = DateTime.UtcNow });
+                var result = db.Select<TestDate>("ExpiryDate".SqlColumn() + " > @theDate".PreNormalizeSql(db),
+                    new { theDate = DateTime.UtcNow });
                 db.GetLastSql().Print();
                 Assert.That(result.Count, Is.EqualTo(1));
 
-                result = db.Select<TestDate>("ExpiryDate".SqlColumn() + " > @date",
-                    new { date = new DateTime(1999, 01, 02) });
+                result = db.Select<TestDate>("ExpiryDate".SqlColumn() + " > @theDate".PreNormalizeSql(db),
+                    new { theDate = new DateTime(1999, 01, 02) });
                 db.GetLastSql().Print();
                 Assert.That(result.Count, Is.EqualTo(2));
             }

tests/ServiceStack.OrmLite.Tests/LocalizationTests.cs

@@ -38,7 +38,7 @@ public class Point
         }
 
         [Test]
-        public void Can_query_using_float_in_alernate_culuture()
+        public void Can_query_using_float_in_alernate_culture()
         {
             using (var db = OpenDbConnection())
             {
@@ -47,7 +47,7 @@ public void Can_query_using_float_in_alernate_culuture()
                 db.Insert(new Point { Width = 4, Height = 1.123f, Top = 3.456d, Left = 2.345m });
                 db.GetLastSql().Print();
 
-                var sql = "Height = @height".NormalizeSql();
+                var sql = "Height = @height".PreNormalizeSql(db);
                 var points = db.Select<Point>(sql, new { height = 1.123 });
                 db.GetLastSql().Print();
 

tests/ServiceStack.OrmLite.Tests/OrmLiteSelectTests.cs

@@ -102,7 +102,7 @@ public void Can_select_with_filter_from_ModelWithOnlyStringFields_table()
 
                 db.Insert(filterRow);
 
-                var rows = db.Select<ModelWithOnlyStringFields>("AlbumName".SqlColumn() + " = @album", new { album = filterRow.AlbumName });
+                var rows = db.Select<ModelWithOnlyStringFields>("AlbumName".SqlColumn() + " = @album".PreNormalizeSql(db), new { album = filterRow.AlbumName });
                 var dbRowIds = rows.ConvertAll(x => x.Id);
 
                 Assert.That(dbRowIds, Has.Count.EqualTo(1));
@@ -187,7 +187,7 @@ public void Can_loop_each_with_filter_from_ModelWithOnlyStringFields_table()
                 db.Insert(filterRow);
 
                 var dbRowIds = new List<string>();
-                var rows = db.SelectLazy<ModelWithOnlyStringFields>("AlbumName".SqlColumn() + " = @AlbumName", new { filterRow.AlbumName });
+                var rows = db.SelectLazy<ModelWithOnlyStringFields>("AlbumName".SqlColumn() + " = @AlbumName".PreNormalizeSql(db), new { filterRow.AlbumName });
                 foreach (var row in rows)
                 {
                     dbRowIds.Add(row.Id);
@@ -331,7 +331,7 @@ public void Can_Select_In_for_string_value()
                 var rows = db.Select<ModelWithIdAndName>("Name IN ({0})".Fmt(selectInNames.SqlInParams()),
                     new { values = selectInNames.SqlInValues() });
                 Assert.That(rows.Count, Is.EqualTo(selectInNames.Length));
-                rows = db.Select<ModelWithIdAndName>("Name IN (@p1, @p2)", new { p1 = "Name1", p2 = "Name2" });
+                rows = db.Select<ModelWithIdAndName>("Name IN (@p1, @p2)".PreNormalizeSql(db), new { p1 = "Name1", p2 = "Name2" });
                 Assert.That(rows.Count, Is.EqualTo(selectInNames.Length));
             }
         }

tests/ServiceStack.OrmLite.Tests/StringSerializerTests.cs

@@ -151,7 +151,10 @@ public void Can_use_XmlSerializer_StringSerializer()
                 InsertModelWithComplexType(db);
 
                 var str = db.SqlScalar<string>(TestSql);
-                Assert.That(str, Is.EqualTo("<?xml version=\"1.0\" encoding=\"utf-8\"?><ComplexType xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><Id>2</Id><SubType><Name>Sub</Name></SubType></ComplexType>"));
+                Assert.That(str, Contains.Substring("<?xml version=\"1.0\" encoding=\"utf-8\"?><ComplexType "));
+                Assert.That(str, Contains.Substring("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""));
+                Assert.That(str, Contains.Substring("xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""));
+                Assert.That(str, Contains.Substring("<Id>2</Id><SubType><Name>Sub</Name></SubType></ComplexType>"));
 
                 var data = db.SingleById<ModelWithComplexType>(1);
                 Assert.That(data.ComplexType.SubType.Name, Is.EqualTo("Sub"));

tests/ServiceStack.OrmLite.Tests/TestHelpers.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Data;
 
 namespace ServiceStack.OrmLite.Tests
@@ -35,5 +36,13 @@ public static string PreNormalizeSql(this string sql, IDbConnection db)
                 return sql;
             return sql.Replace("@", paramString);
         }
+
+        public static List<int> AdjustIds(this IEnumerable<int> ids, int initialId)
+        {
+            var result = new List<int>();
+            foreach (var id in ids)
+                result.Add(id + initialId);
+            return result;
+        }
     }
 }