Merge pull request #368 from BruceCowan-AI/UpdateOracleProviderForLatestChanges

Fix Oracle provider problems pointed out by recent changes.

Author: mythz

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -16,14 +16,15 @@ public class OracleOrmLiteDialectProvider : OrmLiteDialectProviderBase<OracleOrm
         public const string OdpProvider = "Oracle.DataAccess.Client";
         public const string MicrosoftProvider = "System.Data.OracleClient";
 
-		protected readonly List<string> ReservedNames = new List<string> {
-			"USER","ORDER","PASSWORD", "ACTIVE","LEFT","DOUBLE", "FLOAT", "DECIMAL","STRING", "DATE",
-            "DATETIME", "TYPE","TIMESTAMP", "COMMENT"
+		protected readonly List<string> ReservedNames = new List<string>
+        {
+			"USER", "ORDER", "PASSWORD", "ACTIVE", "LEFT", "DOUBLE", "FLOAT", "DECIMAL", "STRING", "DATE",
+            "DATETIME", "TYPE","TIMESTAMP", "COMMENT", "LONG"
 		};
 
         protected readonly List<string> ReservedParameterNames = new List<string>
             {
-                "COMMENT", "DATE", "DECIMAL", "FLOAT", "ORDER", "USER"
+                "COMMENT", "DATE", "DECIMAL", "FLOAT", "ORDER", "USER", "LONG"
             };
 
         protected const int MaxNameLength = 30;
@@ -177,6 +178,42 @@ public override object ConvertDbValue(object value, Type type)
     		return base.ConvertDbValue(value, type);
 		}
 
+        public override GetValueDelegate GetReaderGuidDelegate(IDataRecord reader)
+        {
+            if (CompactGuid)
+            {
+                return i =>
+                {
+                    var guid = reader.GetValue(i);
+                    return new Guid((byte[])guid);
+                };
+            }
+            return i =>
+            {
+                var guid = reader.GetValue(i);
+                return new Guid(guid.ToString());
+            };
+        }
+
+        public override GetValueDelegate GetReaderNullableGuidDelegate(IDataRecord reader)
+        {
+            if (CompactGuid)
+            {
+                return i =>
+                {
+                    if (reader.IsDBNull(i)) return null;
+                    var guid = reader.GetValue(i);
+                    return new Guid((Byte[])guid);
+                };
+            }
+            return i =>
+            {
+                if (reader.IsDBNull(i)) return null;
+                var guid = reader.GetValue(i);
+                return new Guid(guid.ToString());
+            };
+        }
+
         public override string GetQuotedValue(object value, Type fieldType)
 		{
 			if (value == null) return "NULL";
@@ -740,12 +777,9 @@ public override string GetColumnDefinition (string fieldName, Type fieldType,
                 sql.AppendFormat(DefaultValueFormat, defaultValue);
             }
 
-            if (!isNullable)
-            {
-                sql.Append(" NOT NULL");
-            }
+		    sql.Append(isNullable ? " NULL" : " NOT NULL");
 
-            return sql.ToString();
+		    return sql.ToString();
 		}
 
 

src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs

@@ -41,6 +41,9 @@ public interface IOrmLiteDialectProvider
 
         object ConvertDbValue(object value, Type type);
 
+        GetValueDelegate GetReaderGuidDelegate(IDataRecord reader);
+        GetValueDelegate GetReaderNullableGuidDelegate(IDataRecord reader);
+
         string GetQuotedValue(object value, Type fieldType);
 
         IDbConnection CreateConnection(string filePath, Dictionary<string, string> options);

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -368,6 +368,16 @@ public virtual object ConvertDbValue(object value, Type type)
             }
         }
 
+        public virtual GetValueDelegate GetReaderGuidDelegate(IDataRecord reader)
+        {
+            return i => reader.GetGuid(i);
+        }
+
+        public virtual GetValueDelegate GetReaderNullableGuidDelegate(IDataRecord reader)
+        {
+            return i => reader.IsDBNull(i) ? null : (Guid?)reader.GetGuid(i);
+        }
+
         public virtual string GetQuotedValue(object value, Type fieldType)
         {
             if (value == null) return "NULL";

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -114,8 +114,8 @@ public static GetValueDelegate GetValueFn<T>(IDataRecord reader)
                         return i => reader.GetDateTime(i);
                 }
 
-                if (typeof(T) == typeof(Guid))
-                    return i => reader.GetGuid(i);
+                if (typeof (T) == typeof(Guid))
+                    return OrmLiteConfig.DialectProvider.GetReaderGuidDelegate(reader);
             }
             else
             {
@@ -143,7 +143,7 @@ public static GetValueDelegate GetValueFn<T>(IDataRecord reader)
                 }
 
                 if (typeof(T) == typeof(Guid))
-                    return i => reader.IsDBNull(i) ? null : (Guid?)reader.GetGuid(i);
+                    return OrmLiteConfig.DialectProvider.GetReaderNullableGuidDelegate(reader);
             }
 
             return reader.GetValue;