Merge pull request #372 from BruceCowan-AI/FixJoinSqlBuilderUseWithOracle

Fix join sql builder use with oracle

Author: mythz

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

@@ -52,6 +52,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\tests\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="ServiceStack">
+      <HintPath>..\..\lib\ServiceStack.dll</HintPath>
+    </Reference>
     <Reference Include="ServiceStack.Common">
       <HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
     </Reference>
@@ -321,6 +324,9 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="WrappedCommandTests.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="DateTimeColumnTest.cs" />
     <Compile Include="ForeignKeyAttributeTests.cs" />
     <Compile Include="OracleParamTests.cs">

src/ServiceStack.OrmLite.Oracle.Tests/WrappedCommandTests.cs

@@ -0,0 +1,81 @@
+using System.Data;
+using System.Data.Common;
+using NUnit.Framework;
+using ServiceStack.MiniProfiler;
+using ServiceStack.MiniProfiler.Data;
+using ServiceStack.OrmLite.Oracle;
+
+namespace ServiceStack.OrmLite.Tests
+{
+    [TestFixture]
+    public class WrappedCommandTests : OrmLiteTestBase
+    {
+        [Test]
+        public void WrappingWithMiniProfilerSucceeds()
+        {
+            var factory = new OrmLiteConnectionFactory(ConnectionString, OracleDialect.Provider)
+            {
+                ConnectionFilter = x => new ProfiledDbConnection(x, Profiler.Current)
+            };
+
+            using (var db = factory.OpenDbConnection())
+            {
+                DoInsertUpdate(db);
+            }
+        }
+
+        private static void DoInsertUpdate(IDbConnection db)
+        {
+            db.CreateTable<ParamPassword>(true);
+
+            var row = new ParamPassword { Id = 2, Password = 6 };
+            db.Insert(row);
+
+            row.Password = 335;
+            db.Update(row);
+        }
+
+        [Test]
+        public void WrappingWithSpecializedMiniProfilerSucceeds()
+        {
+            var factory = new OrmLiteConnectionFactory(ConnectionString, OracleDialect.Provider)
+            {
+                ConnectionFilter = x => new SpecializedProfiledDbConnection(x, Profiler.Current)
+            };
+
+            using (var db = factory.OpenDbConnection())
+            {
+                DoInsertUpdate(db);
+            }
+        }
+    }
+
+    public class ParamPassword
+    {
+        public int Id { get; set; }
+        public int Password { get; set; }
+    }
+
+    public class SpecializedProfiledDbConnection : ProfiledDbConnection
+    {
+        public SpecializedProfiledDbConnection(DbConnection connection, IDbProfiler profiler, bool autoDisposeConnection = true)
+            : base(connection, profiler, autoDisposeConnection)
+        { }
+
+        public SpecializedProfiledDbConnection(IDbConnection connection, IDbProfiler profiler, bool autoDisposeConnection = true)
+            : base(connection, profiler, autoDisposeConnection)
+        { }
+
+        protected override DbCommand CreateDbCommand()
+        {
+            return new SpecializedProfiledDbCommand(InnerConnection.CreateCommand(), InnerConnection, Profiler);
+        }
+    }
+
+    public class SpecializedProfiledDbCommand : ProfiledDbCommand
+    {
+        public SpecializedProfiledDbCommand(DbCommand cmd, DbConnection conn, IDbProfiler profiler)
+            : base(cmd, conn, profiler)
+        { }
+    }
+}

src/ServiceStack.OrmLite.Oracle/OracleExecFilter.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
+using System.Reflection.Emit;
 
 namespace ServiceStack.OrmLite.Oracle
 {
@@ -9,16 +12,37 @@ public override IDbCommand CreateCommand(IDbConnection dbConn)
         {
             var command = base.CreateCommand(dbConn);
 
-            // Doing comparison and set this way to avoid having a reference to the Oracle client
-            // so that customers can use a different version than we used to compile without
-            // requiring a version redirect in a config file somewhere.
-            var commandType = command.GetType();
-            if (commandType.FullName.StartsWith("Oracle.DataAccess.Client", StringComparison.InvariantCulture))
+            var action = GetBindByNameSetter(command.GetType());
+            if (action != null) action(command, true);
+
+            return command;
+        }
+
+        private static readonly Dictionary<Type, Action<IDbCommand, bool>> Cache = new Dictionary<Type, Action<IDbCommand, bool>>();
+        private static Action<IDbCommand, bool> GetBindByNameSetter(Type commandType)
+        {
+            if (commandType == null) return null;
+
+            Action<IDbCommand, bool> action;
+            if (Cache.TryGetValue(commandType, out action)) return action;
+
+            var prop = commandType.GetProperty("BindByName", BindingFlags.Public | BindingFlags.Instance);
+            MethodInfo setter;
+            if (prop != null && prop.CanWrite && prop.PropertyType == typeof(bool)
+                && prop.GetIndexParameters().Length == 0 && (setter = prop.GetSetMethod()) != null)
             {
-                var pi = commandType.GetProperty("BindByName");
-                pi.SetValue(command, true, null);
+                var methodName = commandType.GetOperationName() + "_BindByName";
+                var method = new DynamicMethod(methodName, null, new []{ typeof(IDbCommand), typeof(bool) });
+                var il = method.GetILGenerator();
+                il.Emit(OpCodes.Ldarg_0);
+                il.Emit(OpCodes.Castclass, commandType);
+                il.Emit(OpCodes.Ldarg_1);
+                il.EmitCall(OpCodes.Callvirt, setter, null);
+                il.Emit(OpCodes.Ret);
+                action = (Action<IDbCommand, bool>)method.CreateDelegate(typeof(Action<IDbCommand, bool>));
             }
-            return command;
+            Cache.Add(commandType, action);
+            return action;
         }
     }
 }

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -7,6 +7,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 namespace ServiceStack.OrmLite.Oracle
@@ -285,7 +286,8 @@ public override string ToSelectStatement(Type tableType,  string sqlFilter, para
 
 			if (isFullSelectStatement)
 			{
-			    if (!sqlFilter.Trim().ToUpperInvariant().Contains(" FROM ")) sqlFilter += " FROM DUAL";
+                if (Regex.Matches(sqlFilter.Trim().ToUpperInvariant(), @"(\b|\n)FROM(\b|\n)").Count < 1)
+                    sqlFilter += " FROM DUAL";
 			    return sqlFilter.SqlFmt(filterParams);
 			}
 

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

@@ -41,6 +41,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ServiceStack.Client">
+      <HintPath>..\..\lib\ServiceStack.Client.dll</HintPath>
+    </Reference>
     <Reference Include="ServiceStack.Text">
       <HintPath>..\..\lib\ServiceStack.Text.dll</HintPath>
     </Reference>

tests/ServiceStack.OrmLite.Tests/JoinSqlBuilderTests.cs

@@ -1,5 +1,5 @@
+using System.Text.RegularExpressions;
 using NUnit.Framework;
-using System;
 using ServiceStack.DataAnnotations;
 
 namespace ServiceStack.OrmLite.Tests
@@ -82,6 +82,9 @@ public void DoubleWhereLeftJoinTest ()
             var expectedNq = "SELECT \"User\".Id,\"User\".Name,\"User\".Age \nFROM \"User\" \n LEFT OUTER JOIN  Addresses ON \"User\".Id = Addresses.UserId  \nWHERE (\"User\".Age > 18) AND (Addresses.Countryalias = 'Italy') \n";
 
             Assert.That(joinQuery, Is.EqualTo(expected).Or.EqualTo(expectedNq));
+
+            var stmt = OrmLiteConfig.DialectProvider.ToSelectStatement(typeof(User), joinQuery);
+            Assert.That(Regex.Matches(stmt, @"(\b|\n)FROM(\b|\n)", RegexOptions.IgnoreCase).Count, Is.EqualTo(1));
         }
-	}
+    }
 }

tests/ServiceStack.OrmLite.Tests/ShippersExample.cs

@@ -120,7 +120,7 @@ public void Shippers_UseCase()
 
 				//Performing custom queries
 				//Select only a subset from the table
-                var partialColumns = db.Select<SubsetOfShipper>(db.From<Shipper>().Where(q => q.ShipperTypeId == 2));
+                var partialColumns = db.Select<SubsetOfShipper>(db.From<Shipper>().Where(q => q.ShipperTypeId == planesType.Id));
                 Assert.That(partialColumns, Has.Count.EqualTo(2));
 
                 partialColumns = db.SelectFmt<SubsetOfShipper>(typeof (Shipper), "ShipperTypeId = {0}", planesType.Id);