Merge pull request #706 from Curlack/feature/oracle-support

Merging changes from private feature branch to collaboratively address known failing integration tests. See #699 (comment) for details.
CollaboratingPlatypus · Oct 21, 2023 · 7975531 · 7975531
2 parents eaf8e5f + 67f0dc3
commit 7975531
Show file tree

Hide file tree

Showing 13 changed files with 384 additions and 17 deletions.
diff --git a/PetaPoco.Tests.Integration/Databases/ExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/ExecuteTests.cs
@@ -45,7 +45,7 @@ public virtual void Execute_GivenSqlAndParameterAffectsOneRow_ShouldReturnOne()
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                     $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} = @0", 1);
             var afterCount = CountNotes();
 
@@ -60,7 +60,7 @@ public virtual void Execute_GivenSqlAndParametersAffectsTwoRows_ShouldReturnTwo(
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                     $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(@0,@1)", 1, 2);
             var afterCount = CountNotes();
 
@@ -75,7 +75,7 @@ public virtual void Execute_GivenSqlAffectsOneRow_ShouldReturnOne()
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                     $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} = 1");
             var afterCount = CountNotes();
 
@@ -90,7 +90,7 @@ public virtual void Execute_GivenSqlAffectsTwoRows_ShouldReturnTwo()
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = DB.Execute($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                     $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(1,2)");
             var afterCount = CountNotes();
 
@@ -105,7 +105,7 @@ public virtual async Task ExecuteAsync_GivenSqlAndParameterAffectsOneRow_ShouldR
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                                $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} = @0", 1);
             var afterCount = CountNotes();
 
@@ -120,7 +120,7 @@ public virtual async Task ExecuteAsync_GivenSqlAndParametersAffectsTwoRows_Shoul
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                                $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(@0,@1)", 1, 2);
             var afterCount = CountNotes();
 
@@ -135,7 +135,7 @@ public virtual async Task ExecuteAsync_GivenSqlAffectsOneRow_ShouldReturnOne()
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                                $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} = 1");
             var afterCount = CountNotes();
 
@@ -150,7 +150,7 @@ public virtual async Task ExecuteAsync_GivenSqlAffectsTwoRows_ShouldReturnTwo()
             InsertNotes(5);
 
             var beforeCount = CountNotes();
-            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            var result = await DB.ExecuteAsync($"DELETE FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                                $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(1,2)");
             var afterCount = CountNotes();
 
@@ -172,7 +172,7 @@ public virtual void ExecuteScalar_GivenSqlAndParameter_ReturnShouldBeValid()
         {
             InsertNotes(4);
 
-            DB.ExecuteScalar<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            DB.ExecuteScalar<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                   $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} <= @0", 2)
                                   .ShouldBe(2);
         }
@@ -182,7 +182,7 @@ public virtual void ExecuteScalar_GivenSqlAndParameters_ReturnShouldBeValid()
         {
             InsertNotes(5);
 
-            DB.ExecuteScalar<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            DB.ExecuteScalar<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                   $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(@0, @1)", 1, 2)
                                   .ShouldBe(2);
         }
@@ -200,7 +200,7 @@ public virtual async Task ExecuteScalarAsync_GivenSqlAndParameter_ReturnShouldBe
         {
             InsertNotes(4);
 
-            (await DB.ExecuteScalarAsync<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            (await DB.ExecuteScalarAsync<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                               $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} <= @0", 2))
                                               .ShouldBe(2);
         }
@@ -210,7 +210,7 @@ public virtual async Task ExecuteScalarAsync_GivenSqlAndParameters_ReturnShouldB
         {
             InsertNotes(5);
 
-            (await DB.ExecuteScalarAsync<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)}" +
+            (await DB.ExecuteScalarAsync<int>($"SELECT COUNT(*) FROM {DB.Provider.EscapeTableName(_pd.TableInfo.TableName)} " +
                                               $"WHERE {DB.Provider.EscapeSqlIdentifier(_pd.TableInfo.PrimaryKey)} IN(@0, @1)", 1, 2))
                                               .ShouldBe(2);
         }

diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OracleDeleteTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OracleDeleteTests.cs
@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OracleDeleteTests : DeleteTests
+    {
+        public OracleDeleteTests()
+            : base(new OracleTestProvider())
+        {
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OracleExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OracleExecuteTests.cs
@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OracleExecuteTests : ExecuteTests
+    {
+        public OracleExecuteTests()
+            : base(new OracleTestProvider())
+        {
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OracleInsertTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OracleInsertTests.cs
@@ -0,0 +1,16 @@
+using PetaPoco.Tests.Integration.Models.Postgres;
+using PetaPoco.Tests.Integration.Providers;
+using Shouldly;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OracleInsertTests : InsertTests
+    {
+        public OracleInsertTests()
+            : base(new OracleTestProvider())
+        {
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OracleMiscellaneousTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OracleMiscellaneousTests.cs
@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OracleMiscellaneousTests : MiscellaneousTests
+    {
+        public OracleMiscellaneousTests()
+            : base(new OracleTestProvider())
+        {
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OraclePreExecuteTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OraclePreExecuteTests.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OraclePreExecuteTests : PreExecuteTests
+    {
+        protected override IPreExecuteDatabaseProvider Provider => DB.Provider as PreExecuteDatabaseProvider;
+
+        public OraclePreExecuteTests()
+            : base(new PreExecuteTestProvider())
+        {
+            Provider.ThrowExceptions = true;
+        }
+
+        protected class PreExecuteTestProvider : OracleTestProvider
+        {
+            protected override IDatabase LoadFromConnectionName(string name)
+                => BuildFromConnectionName(name).UsingProvider<PreExecuteDatabaseProvider>().Create();
+        }
+
+        protected class PreExecuteDatabaseProvider : PetaPoco.Providers.OracleDatabaseProvider, IPreExecuteDatabaseProvider
+        {
+            public bool ThrowExceptions { get; set; }
+            public List<IDataParameter> Parameters { get; set; } = new List<IDataParameter>();
+
+            public override void PreExecute(IDbCommand cmd)
+            {
+                Parameters.Clear();
+
+                if (ThrowExceptions)
+                {
+                    Parameters = cmd.Parameters.Cast<IDataParameter>().ToList();
+                    throw new PreExecuteException();
+                }
+            }
+        }
+    }
+}
diff --git a/PetaPoco.Tests.Integration/Databases/OracleTests/OracleQueryLinqTests.cs b/PetaPoco.Tests.Integration/Databases/OracleTests/OracleQueryLinqTests.cs
@@ -0,0 +1,14 @@
+using PetaPoco.Tests.Integration.Providers;
+using Xunit;
+
+namespace PetaPoco.Tests.Integration.Databases.Oracle
+{
+    [Collection("Oracle")]
+    public class OracleQueryLinqTests : QueryLinqTests
+    {
+        public OracleQueryLinqTests()
+            : base(new OracleTestProvider())
+        {
+        }
+    }
+}