Solution for DNET-770 issue.

INSERT (...) RETURNING (...) statement: * Works fine when using ExecuteScalar () * Does not work when using Executereader () http://tracker.firebirdsql.org/browse/DNET-770
cincuranet · Sep 1, 2017 · 70d99c6 · 70d99c6
1 parent be47d81
commit 70d99c6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs
@@ -314,8 +314,14 @@ public override DbValue[] Fetch()
 			{
 				throw new InvalidOperationException("Statement is not correctly created.");
 			}
-			if (_statementType != DbStatementType.Select &&
-				_statementType != DbStatementType.SelectForUpdate)
+			if (_statementType == DbStatementType.StoredProcedure
+								&& !_allRowsFetched && _state == StatementState.Executed
+								&& _outputParams.Count > 0 && _fields.Count > 0)
+			{
+				_allRowsFetched = true;
+				return GetOutputParameters();
+			}
+			else if (_statementType != DbStatementType.Select && _statementType != DbStatementType.SelectForUpdate)
 			{
 				return null;
 			}

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesStatement.cs
@@ -365,8 +365,14 @@ public override DbValue[] Fetch()
 			{
 				throw new InvalidOperationException("Statement is not correctly created.");
 			}
-			if (_statementType != DbStatementType.Select &&
-				_statementType != DbStatementType.SelectForUpdate)
+			if (_statementType == DbStatementType.StoredProcedure
+								&& !_allRowsFetched && _state == StatementState.Executed
+								&& _outputParams.Count > 0 && _fields.Count > 0)
+			{
+				_allRowsFetched = true;
+				return GetOutputParameters();
+			}
+			else if (_statementType != DbStatementType.Select && _statementType != DbStatementType.SelectForUpdate)
 			{
 				return null;
 			}

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs
@@ -287,7 +287,11 @@ internal bool HasImplicitTransaction
 
 		internal bool IsSelectCommand
 		{
-			get { return _statement != null && (_statement.StatementType == DbStatementType.Select || _statement.StatementType == DbStatementType.SelectForUpdate); }
+			get
+			{
+				return _statement != null && (_statement.StatementType == DbStatementType.Select || _statement.StatementType == DbStatementType.SelectForUpdate
+											 || (_statement.StatementType == DbStatementType.StoredProcedure && _statement.Fields.Count > 0));
+			}
 		}
 
 		internal bool IsDDLCommand