Fix a few VistaDB tests

Author: mythz

src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
+using ServiceStack.DataAnnotations;
 
 namespace ServiceStack.OrmLite.VistaDB
 {
@@ -40,15 +41,13 @@ public VistaDbDialectProvider()
             base.IntColumnDefinition = "INT";
             base.DefaultValueFormat = " DEFAULT {0}";
             base.TimeColumnDefinition = "BIGINT"; //TIME"; //SQLSERVER 2008+
+            base.MaxStringColumnDefinition = "VARCHAR(MAX)";
 
             base.InitColumnTypeMap();           
         }
 
         public override void OnAfterInitColumnTypeMap()
         {
-            DbTypeMap.ColumnTypeMap.Remove(typeof(object));
-            DbTypeMap.ColumnDbTypeMap.Remove(typeof(object));
-            
             DbTypeMap.Set<TimeSpan>(DbType.DateTime, TimeColumnDefinition);
             DbTypeMap.Set<TimeSpan?>(DbType.DateTime, TimeColumnDefinition);
         }
@@ -156,10 +155,16 @@ public override string GetColumnDefinition(string fieldName, Type fieldType,
             int? fieldLength, int? scale, string defaultValue, string customFieldDefinition)
         {
             string fieldDefinition;
-            if (fieldType == typeof(string))
-                fieldDefinition = string.Format(this.StringLengthColumnDefinitionFormat, fieldLength.GetValueOrDefault(this.DefaultStringLength));
+            if (fieldType == typeof (string))
+            {
+                fieldDefinition = fieldLength == StringLengthAttribute.MaxText
+                    ? MaxStringColumnDefinition
+                    : string.Format(StringLengthColumnDefinitionFormat, fieldLength.GetValueOrDefault(DefaultStringLength));
+            }
             else if (!this.DbTypeMap.ColumnTypeMap.TryGetValue(fieldType, out fieldDefinition))
+            {
                 fieldDefinition = this.GetUndefinedColumnDefinition(fieldType, fieldLength);
+            }
 
             var sql = new StringBuilder();
             sql.AppendFormat("{0} {1}", this.GetQuotedColumnName(fieldName), fieldDefinition);

tests/ServiceStack.OrmLite.Tests/CaptureSqlFilterTests.cs

@@ -118,7 +118,8 @@ public void Can_capture_all_Single_Apis()
 
                 Assert.That(captured.SqlStatements.Last().NormalizeSql(),
                     Is.EqualTo("select id, firstname, lastname, age  from person where (age = 42) limit 1").
-                    Or.EqualTo("select top 1 id, firstname, lastname, age  from person where (age = 42)"));
+                    Or.EqualTo("select top 1 id, firstname, lastname, age  from person where (age = 42)").
+                    Or.EqualTo("select id, firstname, lastname, age  from person where (age = 42) order by 1 offset 0 rows fetch next 1 rows only")); //VistaDB
 
                 i++; db.ExistsFmt<Person>("Age = {0}", 42);
                 i++; db.Single(db.From<Person>().Where(x => x.Age == 42));

tests/ServiceStack.OrmLite.Tests/ShippersExample.cs

@@ -129,7 +129,7 @@ public void Shippers_UseCase()
 
 				//Select into another POCO class that matches sql
 				var rows = db.SqlList<ShipperTypeCount>(
-                    "SELECT {0}, COUNT(*) AS Total FROM Shippers GROUP BY {0} ORDER BY COUNT(*)".Fmt("ShipperTypeId".SqlColumn()));
+                    "SELECT {0}, COUNT(*) AS Total FROM Shippers GROUP BY {0} ORDER BY Total".Fmt("ShipperTypeId".SqlColumn()));
 
 				Assert.That(rows, Has.Count.EqualTo(2));
 				Assert.That(rows[0].ShipperTypeId, Is.EqualTo(trainsType.Id));

tests/ServiceStack.OrmLite.Tests/TestHelpers.cs

@@ -8,6 +8,7 @@ public enum Dialect
         MySql,
         SqlServerMdf,
         Oracle,
+        VistaDb,
     }
 
     public static class TestHelpers