Cater for optional parameter prefix in Database.AddParameter instead …

…of "undoing" the pramPrefix modification in OracleDatabaseProvider.
CollaboratingPlatypus · Oct 23, 2023 · 0dfc8e8 · 0dfc8e8
1 parent 8d5b363
commit 0dfc8e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/PetaPoco/Database.cs b/PetaPoco/Database.cs
@@ -3161,14 +3161,22 @@ private void AddParameter(IDbCommand cmd, object value, PocoColumn pc)
                 if (cmd.CommandType == CommandType.Text)
                     idbParam.ParameterName = cmd.Parameters.Count.EnsureParamPrefix(_paramPrefix);
                 else if (idbParam.ParameterName?.StartsWith(_paramPrefix) != true)
-                    idbParam.ParameterName = idbParam.ParameterName.EnsureParamPrefix(_paramPrefix);
+                {
+                    // only add param prefix if it's not an Oracle stored procedures
+                    if (!(cmd.CommandType == CommandType.StoredProcedure && _provider is Providers.OracleDatabaseProvider))
+                        idbParam.ParameterName = idbParam.ParameterName.EnsureParamPrefix(_paramPrefix);
+                }
 
                 cmd.Parameters.Add(idbParam);
             }
             else
             {
                 var p = cmd.CreateParameter();
-                p.ParameterName = cmd.Parameters.Count.EnsureParamPrefix(_paramPrefix);
+
+                // only add param prefix if it's not an Oracle stored procedures
+                if (!(cmd.CommandType == CommandType.StoredProcedure && _provider is Providers.OracleDatabaseProvider))
+                    p.ParameterName = cmd.Parameters.Count.EnsureParamPrefix(_paramPrefix);
+
                 SetParameterProperties(p, value, pc);
 
                 cmd.Parameters.Add(p);

diff --git a/PetaPoco/Providers/OracleDatabaseProvider.cs b/PetaPoco/Providers/OracleDatabaseProvider.cs
@@ -35,23 +35,6 @@ public override void PreExecute(IDbCommand cmd)
         {
             cmd.GetType().GetProperty("BindByName")?.SetValue(cmd, true, null);
             cmd.GetType().GetProperty("InitialLONGFetchSize")?.SetValue(cmd, -1, null);
-
-            if (cmd.CommandType == CommandType.StoredProcedure)
-            {
-                //Oracle stored procedure parameter names do not use the parameter prefix
-                //They also need to match the db exactly, so it's up to the consumer to specify the correct name
-                //In Database.AddParameter, the parameter prefix is prepended and it didn't seem right to cater for this case there...
-                //...so we need to undo those changes here
-                var paramPrefix = GetParameterPrefix(null);
-                var enumerator = cmd.Parameters.GetEnumerator();
-                while (enumerator.MoveNext())
-                {
-                    var parameter = (IDataParameter)enumerator.Current;
-
-                    if (parameter.ParameterName.StartsWith(paramPrefix, StringComparison.OrdinalIgnoreCase))
-                        parameter.ParameterName = parameter.ParameterName.Substring(paramPrefix.Length);
-                }
-            }
         }
 
         /// <inheritdoc/>