Author: borisk
Date: 2005-11-27 11:47:07 -0500 (Sun, 27 Nov 2005)
New Revision: 53526
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
Log:
merge -r 53523:53525
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
2005-11-27 16:21:58 UTC (rev 53525)
+++
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
2005-11-27 16:47:07 UTC (rev 53526)
@@ -441,10 +441,15 @@
if (trimedProcedureName.Length > 0 &&
trimedProcedureName[trimedProcedureName.Length-1] == ')')
addParas = false;
- AbstractDbParameter derivedParam =
(derivedParams.Count > 0) ? (AbstractDbParameter)derivedParams[curDerivedPos++]
: null;
+ AbstractDbParameter derivedParam =
(derivedParams.Count > 0) ? (AbstractDbParameter)derivedParams[curDerivedPos] :
null;
+ if (derivedParam != null) {
+ if (derivedParam.Direction ==
ParameterDirection.ReturnValue)
+ curDerivedPos++;
+ else
+ derivedParam = null; //play as
if there is no retval parameter
+ }
AbstractDbParameter returnValueParameter =
GetReturnParameter (userParams);
if (returnValueParameter != null) {
-
curUserPos++;
InternalParameters.Add(returnValueParameter);
sb.Append("{? = call ");
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
2005-11-27 16:21:58 UTC (rev 53525)
+++
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
2005-11-27 16:47:07 UTC (rev 53526)
@@ -1,3 +1,7 @@
+2005-27-11 Boris Kirzner <[EMAIL PROTECTED]>
+ AbstractDBCommand.cs: TARGET_JVM fix. Proper handle of return value
+ parameter and corresponding user parameter.
+
2006-22-11 Konstantin Triger <[EMAIL PROTECTED]>
* AbstractTransaction.cs: set inner exception.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
