Add a new Sql Geo test and change existing tests to use more typed Queries

Author: mythz

src/ServiceStack.OrmLite.SqlServerTests/Converters/HierarchyIdTests.cs

@@ -26,7 +26,8 @@ public void Can_insert_and_retrieve_HierarchyId()
                 Assert.AreEqual(null, result[0].NullTreeId);
                 Assert.AreEqual(treeId, result[0].TreeId);
 
-                var parent = db.Column<SqlHierarchyId>("SELECT TreeId.GetAncestor(1) from HierarchyTestTable").First();
+                var parent = db.Scalar<SqlHierarchyId>(
+                    db.From<HierarchyTestTable>().Select("TreeId.GetAncestor(1)"));
                 var str = parent.ToString();
                 Assert.AreEqual("/1/1/", str);
             }

src/ServiceStack.OrmLite.SqlServerTests/Converters/SpatialsTests.cs

@@ -2,6 +2,7 @@
 using Microsoft.SqlServer.Types;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.SqlServerTests.Converters
 {
@@ -13,21 +14,23 @@ public void Can_insert_and_retrieve_SqlGeography()
         {
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<GeoTestTable>();
+                db.DropAndCreateTable<GeoTest>();
 
                 // Statue of Liberty
-                var geo = SqlGeography.Point(40.6898329,-74.0452177, 4326);
+                var geo = SqlGeography.Point(40.6898329, -74.0452177, 4326);
 
-                db.Insert(new GeoTestTable() { Location = geo, NullLocation = SqlGeography.Null });
+                db.Insert(new GeoTest {Id = 1, Location = geo, NullLocation = SqlGeography.Null});
 
-                var result = db.Select(db.From<GeoTestTable>()).First();
+                var result = db.SingleById<GeoTest>(1);
 
                 Assert.AreEqual(geo.Lat, result.Location.Lat);
                 Assert.AreEqual(geo.Long, result.Location.Long);
                 Assert.AreEqual(geo.STSrid, result.Location.STSrid);
 
                 // Converter always resolves to null even when Null property inserted into database
-                Assert.AreEqual(null, result.NullLocation);  
+                Assert.AreEqual(null, result.NullLocation);
+
+                result.PrintDump();
             }
         }
 
@@ -36,34 +39,59 @@ public void Can_insert_and_retrieve_SqlGeometry()
         {
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<GeoTestTable>();
+                db.DropAndCreateTable<GeoTest>();
 
                 // A simple line from (0,0) to (4,4)  Length = SQRT(2 * 4^2)
                 var wkt = new System.Data.SqlTypes.SqlChars("LINESTRING(0 0, 4 4)".ToCharArray());
                 var shape = SqlGeometry.STLineFromText(wkt, 0);
 
-                db.Insert(new GeoTestTable { Shape = shape });
+                db.Insert(new GeoTest { Id = 1, Shape = shape});
 
-                var result = db.Select(db.From<GeoTestTable>()).First().Shape;
+                var result = db.SingleById<GeoTest>(1).Shape;
 
-                var lengths = db.Column<double>("select Shape.STLength() AS Length from GeoTestTable");
+                var lengths = db.Column<double>("select Shape.STLength() AS Length from GeoTest");
 
-                Assert.AreEqual((double)result.STLength(), lengths.First());
+                Assert.AreEqual((double) result.STLength(), lengths.First());
 
                 Assert.AreEqual(shape.STStartPoint().STX, result.STStartPoint().STX);
                 Assert.AreEqual(shape.STStartPoint().STY, result.STStartPoint().STY);
 
                 Assert.AreEqual(shape.STEndPoint().STX, result.STEndPoint().STX);
                 Assert.AreEqual(shape.STEndPoint().STY, result.STEndPoint().STY);
 
-                Assert.AreEqual(2, (int)result.STNumPoints());
+                Assert.AreEqual(2, (int) result.STNumPoints());
+
+                result.PrintDump();
+            }
+        }
+
+        [Test]
+        public void Can_insert_SqlGeography_and_SqlGeometry()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<GeoTest>();
+
+                // Statue of Liberty
+                var geo = SqlGeography.Point(40.6898329, -74.0452177, 4326);
+
+                // A simple line from (0,0) to (4,4)  Length = SQRT(2 * 4^2)
+                var wkt = new System.Data.SqlTypes.SqlChars("LINESTRING(0 0, 4 4)".ToCharArray());
+                var shape = SqlGeometry.STLineFromText(wkt, 0);
+
+                db.Insert(new GeoTest { Id = 1, Location = geo, Shape = shape });
+
+                var result = db.SingleById<GeoTest>(1);
+
+                Assert.That(result, Is.Not.Null);
+
+                result.PrintDump();
             }
         }
     }
 
-    public class GeoTestTable
+    public class GeoTest
     {
-        [AutoIncrement]
         public long Id { get; set; }
 
         public SqlGeography Location { get; set; }