Fixed problem that SqlServer-unicode fix changed DefaultStringLength …

…for Oracle
Sword-Breaker · Feb 5, 2013 · 24a344b · 24a344b
1 parent 67a0802
commit 24a344b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -163,6 +163,24 @@ public override bool DoesTableExist(IDbCommand dbCmd, string tableName)
 			var result = dbCmd.GetLongScalar();
 
 			return result > 0;
-		}
+		}
+
+        public override bool UseUnicode
+        {
+            get
+            {
+                return useUnicode;
+            }
+            set
+            {
+                useUnicode = value;
+                if (useUnicode && this.DefaultStringLength > 4000)
+                {
+                    this.DefaultStringLength = 4000;
+                }
+
+                // UpdateStringColumnDefinitions(); is called by changing DefaultStringLength 
+            }
+        }
 	}
 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -149,7 +149,7 @@ public string ParamString
             set { paramString = value; }
         }
 
-        private bool useUnicode;
+        protected bool useUnicode;
         public virtual bool UseUnicode
         {
             get
@@ -182,11 +182,6 @@ private void UpdateStringColumnDefinitions()
                 ? StringLengthUnicodeColumnDefinitionFormat
                 : StringLengthNonUnicodeColumnDefinitionFormat;
 
-
-            this.defaultStringLength = useUnicode
-                ? 4000
-                : 8000;
-
             this.StringColumnDefinition = string.Format(
                 this.StringLengthColumnDefinitionFormat, DefaultStringLength);