Set return parameter Size & DbType

richardhopton · richardhopton · commit 73e1d30dd244 · 2011-11-03T20:29:33.000Z
diff --git a/Simple.Data.Ado/ProcedureExecutor.cs b/Simple.Data.Ado/ProcedureExecutor.cs
@@ -97,8 +97,16 @@ private static IEnumerable<ResultSet> ExecuteNonQuery(IDbCommand command)
 
         private static void SetParameters(Procedure procedure, IDbCommand cmd, IDictionary<string, object> suppliedParameters)
         {
-            if (procedure.Parameters.Any(p => p.Direction == ParameterDirection.ReturnValue))
-                AddReturnParameter(cmd);
+            var returnParameter = procedure.Parameters.FirstOrDefault(p => p.Direction == ParameterDirection.ReturnValue);
+            if (returnParameter!=null)
+            {
+                var cmdParameter = cmd.CreateParameter();
+                cmdParameter.ParameterName = SimpleReturnParameterName;
+                cmdParameter.Size = returnParameter.Size;
+                cmdParameter.Direction = ParameterDirection.ReturnValue;
+                cmdParameter.DbType = returnParameter.Dbtype;
+                cmd.Parameters.Add(cmdParameter);
+            }
 
             int i = 0;
             
@@ -131,13 +139,5 @@ private static void SetParameters(Procedure procedure, IDbCommand cmd, IDictiona
             }
         }
 
-        private static void AddReturnParameter(IDbCommand cmd)
-        {
-            var returnParameter = cmd.CreateParameter();
-            returnParameter.ParameterName = SimpleReturnParameterName;
-            returnParameter.Direction = ParameterDirection.ReturnValue;
-            cmd.Parameters.Add(returnParameter);
-        }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,16 @@ private static IEnumerable<ResultSet> ExecuteNonQuery(IDbCommand command)`
`97`	`97`
`98`	`98`	`private static void SetParameters(Procedure procedure, IDbCommand cmd, IDictionary<string, object> suppliedParameters)`
`99`	`99`	`{`
`100`		`- if (procedure.Parameters.Any(p => p.Direction == ParameterDirection.ReturnValue))`
`101`		`- AddReturnParameter(cmd);`
	`100`	`+ var returnParameter = procedure.Parameters.FirstOrDefault(p => p.Direction == ParameterDirection.ReturnValue);`
	`101`	`+ if (returnParameter!=null)`
	`102`	`+ {`
	`103`	`+ var cmdParameter = cmd.CreateParameter();`
	`104`	`+ cmdParameter.ParameterName = SimpleReturnParameterName;`
	`105`	`+ cmdParameter.Size = returnParameter.Size;`
	`106`	`+ cmdParameter.Direction = ParameterDirection.ReturnValue;`
	`107`	`+ cmdParameter.DbType = returnParameter.Dbtype;`
	`108`	`+ cmd.Parameters.Add(cmdParameter);`
	`109`	`+ }`
`102`	`110`
`103`	`111`	`int i = 0;`
`104`	`112`
`@@ -131,13 +139,5 @@ private static void SetParameters(Procedure procedure, IDbCommand cmd, IDictiona`
`131`	`139`	`}`
`132`	`140`	`}`
`133`	`141`
`134`		`- private static void AddReturnParameter(IDbCommand cmd)`
`135`		`- {`
`136`		`- var returnParameter = cmd.CreateParameter();`
`137`		`- returnParameter.ParameterName = SimpleReturnParameterName;`
`138`		`- returnParameter.Direction = ParameterDirection.ReturnValue;`
`139`		`- cmd.Parameters.Add(returnParameter);`
`140`		`- }`
`141`		`-`
`142`	`142`	`}`
`143`	`143`	`}`