Merge pull request #408 from BruceCowan-AI/FixOracleOnCustomSerializedEnums

Fix Oracle provider on custom serialized enums, fix custom serialize tes...

Author: mythz

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -265,6 +265,18 @@ public override string GetQuotedValue(object value, Type fieldType)
                 return "'" + s + "'"; // when quoted exception is more clear!
             }
 
+            if (fieldType.IsEnum)
+            {
+                var enumValue = OrmLiteConfig.DialectProvider.StringSerializer.SerializeToString(value);
+                // Oracle stores empty strings in varchar columns as null so match that behavior here
+                if (enumValue == null)
+                    return null;
+                enumValue = GetQuotedValue(enumValue.Trim('"'));
+                return enumValue == "''"
+                    ? "null"
+                    : enumValue;
+            }
+
             return base.GetQuotedValue(value, fieldType);
         }
 

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

@@ -38,6 +38,8 @@ public class ExpressionUsingCustomSerializedEnumTests : ExpressionsTestBase
         [TestCase(2)]
         public void Can_select_on_custom_default_null_serialized_enum(int index)
         {
+            if (Dialect == Dialect.Oracle) Assert.Ignore("Can't work on Oracle because Oracle does not allow empty strings in a varchar column");
+
             EnumSerializerWithNullDefaults.Configure();
 
             using (var db = OpenDbConnection())
@@ -71,6 +73,8 @@ private static Activity Init(IDbConnection db, int index)
         [TestCase(2)]
         public void Can_select_on_custom_default_empty_serialized_enum(int index)
         {
+            if (Dialect == Dialect.Oracle) Assert.Ignore("Can't work on Oracle because Oracle does not allow empty strings in a varchar column");
+
             EnumSerializerWithEmptyDefaults.Configure();
 
             using (var db = OpenDbConnection())
@@ -115,7 +119,7 @@ public void Can_select_on_custom_default_null_serialized_nullable_enum(int index
             {
                 var expected = InitNullable(db, index);
 
-                var unknownActivities = db.Select<Activity>(
+                var unknownActivities = db.Select<NullableActivity>(
                     s => s.ActivityType == expected.ActivityType
                       && s.Comment == expected.Comment);
 
@@ -134,7 +138,7 @@ public void Can_select_on_custom_default_empty_serialized_nullable_enum(int inde
             {
                 var expected = InitNullable(db, index);
 
-                var unknownActivities = db.Select<Activity>(
+                var unknownActivities = db.Select<NullableActivity>(
                     s => s.ActivityType == expected.ActivityType
                       && s.Comment == expected.Comment);
 
@@ -167,7 +171,7 @@ public void Can_select_on_custom_prefix_serialized_nullable_enum(int index)
             {
                 var expected = InitNullable(db, index);
 
-                var unknownActivities = db.Select<Activity>(
+                var unknownActivities = db.Select<NullableActivity>(
                     s => s.ActivityType == expected.ActivityType
                       && s.Comment == expected.Comment);