Merge pull request #409 from BruceCowan-AI/FixSingleOnOracleTableWithCompositeKey

Fix single extension method on Oracle

Author: mythz

src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj

@@ -75,6 +75,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\CompositeKeyTests.cs">
+      <Link>CompositeKeyTests.cs</Link>
+    </Compile>
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\CustomSqlTests.cs">
       <Link>CustomSqlTests.cs</Link>
     </Compile>

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -1061,13 +1061,25 @@ public override string ToSelectStatement(ModelDefinition modelDef,
             if (!offset.HasValue)
                 offset = 0;
 
-            if (string.IsNullOrEmpty(orderByExpression))
+            if (string.IsNullOrEmpty(orderByExpression) && rows.HasValue)
             {
-                if (modelDef.PrimaryKey == null)
-                    throw new ApplicationException("Malformed model, no PrimaryKey defined");
-
-                orderByExpression = string.Format("ORDER BY {0}",
-                    OrmLiteConfig.DialectProvider.GetQuotedColumnName(modelDef.PrimaryKey.FieldName));
+                var primaryKey = modelDef.FieldDefinitions.FirstOrDefault(x => x.IsPrimaryKey);
+                if (primaryKey == null)
+                {
+                    if (rows.Value == 1 && offset.Value == 0)
+                    {
+                        // Probably used Single<> extension method on a table with a composite key so let it through.
+                        // Lack of an orderby expression will mean it returns a random matching row, but that is OK.
+                        orderByExpression = "";
+                    }
+                    else
+                        throw new ApplicationException("Malformed model, no PrimaryKey defined");
+                }
+                else
+                {
+                    orderByExpression = string.Format("ORDER BY {0}",
+                        OrmLiteConfig.DialectProvider.GetQuotedColumnName(primaryKey.FieldName));
+                }
             }
             sbInner.Append(" " + orderByExpression);
 

tests/ServiceStack.OrmLite.Tests/CompositeKeyTests.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Data;
+using NUnit.Framework;
+
+namespace ServiceStack.OrmLite.Tests
+{
+    [TestFixture]
+    public class CompositeKeyTests : OrmLiteTestBase
+    {
+        const long SubId1Value = 1;
+        const long SubId2Value = 1;
+
+        [Test]
+        public void Can_select_single_from_empty_composite_key_table()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<CompositeKey>();
+
+                var result = db.Single<CompositeKey>(ck => ck.SubId1 == SubId1Value && ck.SubId2 == SubId2Value);
+                Assert.That(result, Is.Null);
+            }
+        }
+
+        [Test]
+        public void Can_select_single_from_composite_key_table_with_one_matching_row()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<CompositeKey>();
+                InsertData(db, 1);
+
+                var result = db.Single<CompositeKey>(ck => ck.SubId1 == SubId1Value && ck.SubId2 == SubId2Value);
+                Assert.That(result.SubId1, Is.EqualTo(SubId1Value));
+                Assert.That(result.SubId2, Is.EqualTo(SubId2Value));
+            }
+        }
+
+        private void InsertData(IDbConnection db, int count)
+        {
+            for (var i = 0; i < count; i++)
+            {
+                var data = new CompositeKey {SubId1 = SubId1Value, SubId2 = SubId2Value, Data = Guid.NewGuid().ToString()};
+                db.Insert(data);
+            }
+        }
+
+        [Test]
+        public void Can_select_single_from_composite_key_table_with_several_matching_rows()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<CompositeKey>();
+                InsertData(db, 4);
+
+                var result = db.Single<CompositeKey>(ck => ck.SubId1 == SubId1Value && ck.SubId2 == SubId2Value);
+                Assert.That(result.SubId1, Is.EqualTo(SubId1Value));
+                Assert.That(result.SubId2, Is.EqualTo(SubId2Value));
+            }
+        }
+
+        public class CompositeKey
+        {
+            [DataAnnotations.Ignore]
+            public string Id { get { return SubId1 + "/" + SubId2; } }
+            public long SubId1 { get; set; }
+            public long SubId2 { get; set; }
+            public string Data { get; set; }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -117,6 +117,7 @@
     <Compile Include="ApiSqlServerTests.cs" />
     <Compile Include="ApiSqliteTests.cs" />
     <Compile Include="CaptureSqlFilterTests.cs" />
+    <Compile Include="CompositeKeyTests.cs" />
     <Compile Include="CustomSqlTests.cs" />
     <Compile Include="DateTimeOffsetTests.cs" />
     <Compile Include="Expression\ExpressionUsingCustomSerializedEnumTests.cs" />