Make a few tests work on Oracle

Author: BruceCowan-AI

tests/ServiceStack.OrmLite.Tests/EnumTests.cs

@@ -69,7 +69,7 @@ public void CanQueryByEnumValue_using_select_with_string()
                 db.Save(new TypeWithEnum { Id = 3, EnumValue = SomeEnum.Value2 });
 
                 var target = db.Select<TypeWithEnum>(
-                    "EnumValue".SqlColumn() + " = @value", new { value = SomeEnum.Value1 });
+                    "EnumValue".SqlColumn() + " = @value".PreNormalizeSql(db), new { value = SomeEnum.Value1 });
 
                 Assert.AreEqual(2, target.Count());
             }
@@ -252,7 +252,7 @@ public void CanQueryByEnumValue_using_select_with_string_enum_flags()
                 db.Save(new TypeWithFlagsEnum { Id = 3, Flags = FlagsEnum.FlagTwo });
 
                 var target = db.Select<TypeWithFlagsEnum>(
-                    "Flags".SqlColumn() + " = @value", new { value = FlagsEnum.FlagOne });
+                    "Flags".SqlColumn() + " = @value".PreNormalizeSql(db), new { value = FlagsEnum.FlagOne });
                 db.GetLastSql().Print();
                 Assert.That(target.Count, Is.EqualTo(2));
             }
@@ -269,7 +269,7 @@ public void CanQueryByEnumValue_using_select_with_string_EnumAsInt()
                 db.Save(new TypeWithEnumAsInt { Id = 3, EnumValue = SomeEnumAsInt.Value2 });
 
                 var target = db.Select<TypeWithEnumAsInt>(
-                    "EnumValue".SqlColumn() + " = @value", new { value = SomeEnumAsInt.Value1 });
+                    "EnumValue".SqlColumn() + " = @value".PreNormalizeSql(db), new { value = SomeEnumAsInt.Value1 });
                 db.GetLastSql().Print();
                 Assert.That(target.Count, Is.EqualTo(2));
             }
@@ -336,7 +336,7 @@ public void Can_save_Enum_as_Integers()
                 db.Insert(new TypeWithTreatEnumAsInt { Id = 2, EnumValue = SomeEnumTreatAsInt.Value2 });
 
                 var row = db.Single<TypeWithTreatEnumAsInt>(
-                    "EnumValue".SqlColumn() + " = @value", new { value = "2" });
+                    "EnumValue".SqlColumn() + " = @value".PreNormalizeSql(db), new { value = "2" });
 
                 Assert.That(row.Id, Is.EqualTo(2));
             }

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

@@ -421,10 +421,10 @@ public void Can_select_RowCount_with_db_params()
 
                 var table = typeof(LetterFrequency).Name.SqlTable();
 
-                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".Fmt(table), new { p1 = "B" });
+                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".PreNormalizeSql(db).Fmt(table), new { p1 = "B" });
                 Assert.That(rowCount, Is.EqualTo(4));
 
-                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".Fmt(table),
+                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".PreNormalizeSql(db).Fmt(table),
                     new[] { db.CreateParam("p1", "B") });
                 Assert.That(rowCount, Is.EqualTo(4));
             }

tests/ServiceStack.OrmLite.Tests/ShippersExample.cs

@@ -97,16 +97,16 @@ public void Shippers_UseCase()
                 var trainsAreUs = db.Single<Shipper>(q => q.ShipperTypeId == trainsType.Id);
                 Assert.That(trainsAreUs.CompanyName, Is.EqualTo("Trains R Us"));
 
-                trainsAreUs = db.Single<Shipper>("ShipperTypeId".SqlColumn() + " = @Id", new { trainsType.Id });
+                trainsAreUs = db.Single<Shipper>("ShipperTypeId".SqlColumn() + " = @Id".PreNormalizeSql(db), new { trainsType.Id });
 				Assert.That(trainsAreUs.CompanyName, Is.EqualTo("Trains R Us"));
 
 
                 Assert.That(db.Select<Shipper>(q => q.CompanyName == "Trains R Us" || q.Phone == "555-UNICORNS"), Has.Count.EqualTo(2));
-                Assert.That(db.Select<Shipper>("CompanyName".SqlColumn() + " = @company OR Phone = @phone", 
+                Assert.That(db.Select<Shipper>("CompanyName".SqlColumn() + " = @company OR Phone = @phone".PreNormalizeSql(db), 
                     new { company = "Trains R Us", phone = "555-UNICORNS" }), Has.Count.EqualTo(2));
 
                 Assert.That(db.Select<Shipper>(q => q.ShipperTypeId == planesType.Id), Has.Count.EqualTo(2));
-                Assert.That(db.Select<Shipper>("ShipperTypeId".SqlColumn() + " = @Id", new { planesType.Id }), Has.Count.EqualTo(2));
+                Assert.That(db.Select<Shipper>("ShipperTypeId".SqlColumn() + " = @Id".PreNormalizeSql(db), new { planesType.Id }), Has.Count.EqualTo(2));
 
 				//Lets update a record
 				trainsAreUs.Phone = "666-TRAINS";
@@ -126,7 +126,7 @@ public void Shippers_UseCase()
                 var partialColumns = db.Select<SubsetOfShipper>(db.From<Shipper>().Where(q => q.ShipperTypeId == planesType.Id));
                 Assert.That(partialColumns, Has.Count.EqualTo(2));
 
-                partialColumns = db.Select<SubsetOfShipper>(typeof(Shipper), "ShipperTypeId".SqlColumn() + " = @Id", new { planesType.Id });
+                partialColumns = db.Select<SubsetOfShipper>(typeof(Shipper), "ShipperTypeId".SqlColumn() + " = @Id".PreNormalizeSql(db), new { planesType.Id });
 				Assert.That(partialColumns, Has.Count.EqualTo(2));
 
 				//Select into another POCO class that matches sql

tests/ServiceStack.OrmLite.Tests/TestHelpers.cs

@@ -1,3 +1,5 @@
+using System.Data;
+
 namespace ServiceStack.OrmLite.Tests
 {
     public enum Dialect
@@ -25,5 +27,13 @@ public static string NormalizeSql(this string sql)
                 .Replace("\n", " ")
                 .TrimEnd(); 
         }
+
+        public static string PreNormalizeSql(this string sql, IDbConnection db)
+        {
+            var paramString = db.GetDialectProvider().ParamString;
+            if (paramString.Equals("@"))
+                return sql;
+            return sql.Replace("@", paramString);
+        }
     }
 }

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

@@ -29,7 +29,7 @@ public void Simple_CRUD_example()
 				db.Insert(new User { Id = 2, Name = "B", CreatedDate = DateTime.Now });
 				db.Insert(new User { Id = 3, Name = "B", CreatedDate = DateTime.Now });
 
-				var rowsB = db.Select<User>("Name = @name", new { name = "B" });
+				var rowsB = db.Select<User>("Name = @name".PreNormalizeSql(db), new { name = "B" });
 
 				Assert.That(rowsB, Has.Count.EqualTo(2));
 
@@ -38,7 +38,7 @@ public void Simple_CRUD_example()
 
 				rowsB.ForEach(x => db.Delete(x));
 
-				rowsB = db.Select<User>("Name = @name", new { name = "B" });
+				rowsB = db.Select<User>("Name = @name".PreNormalizeSql(db), new { name = "B" });
 				Assert.That(rowsB, Has.Count.EqualTo(0));
 
 				var rowsLeft = db.Select<User>();