Refactoring.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs

@@ -286,11 +286,7 @@ public override void Execute()
 				var executeResponse = _database.ReadResponse<GenericResponse>();
 				ProcessExecuteResponse(executeResponse);
 
-				if (ReturnRecordsAffected &&
-					(StatementType == DbStatementType.Insert ||
-					StatementType == DbStatementType.Delete ||
-					StatementType == DbStatementType.Update ||
-					StatementType == DbStatementType.StoredProcedure))
+				if (DoRecordsAffected)
 				{
 					SendInfoSqlToBuffer(RowsAffectedInfoItems, IscCodes.ROWS_AFFECTED_BUFFER_SIZE);
 					_database.XdrStream.Flush();

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs

@@ -115,12 +115,7 @@ public override void Execute()
 				SendExecuteToBuffer();
 
 				var readRowsAffectedResponse = false;
-				if (ReturnRecordsAffected &&
-					(StatementType == DbStatementType.Insert ||
-					StatementType == DbStatementType.Delete ||
-					StatementType == DbStatementType.Update ||
-					StatementType == DbStatementType.StoredProcedure ||
-					StatementType == DbStatementType.Select))
+				if (DoRecordsAffected)
 				{
 					SendInfoSqlToBuffer(RowsAffectedInfoItems, IscCodes.ROWS_AFFECTED_BUFFER_SIZE);
 

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsStatement.cs

@@ -80,12 +80,7 @@ public override void Execute()
 
 				// we need to split this in two, to allow server handle op_cancel properly
 
-				if (ReturnRecordsAffected &&
-					(StatementType == DbStatementType.Insert ||
-					StatementType == DbStatementType.Delete ||
-					StatementType == DbStatementType.Update ||
-					StatementType == DbStatementType.StoredProcedure ||
-					StatementType == DbStatementType.Select))
+				if (DoRecordsAffected)
 				{
 					SendInfoSqlToBuffer(RowsAffectedInfoItems, IscCodes.ROWS_AFFECTED_BUFFER_SIZE);
 

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesStatement.cs

@@ -620,11 +620,7 @@ private void Allocate()
 
 		private void UpdateRecordsAffected()
 		{
-			if (ReturnRecordsAffected &&
-				(StatementType == DbStatementType.Insert ||
-				StatementType == DbStatementType.Delete ||
-				StatementType == DbStatementType.Update ||
-				StatementType == DbStatementType.StoredProcedure))
+			if (DoRecordsAffected)
 			{
 				_recordsAffected = GetRecordsAffected();
 			}

Provider/src/FirebirdSql.Data.FirebirdClient/Common/StatementBase.cs

@@ -96,6 +96,13 @@ internal abstract class StatementBase : IDisposable
 		public abstract int FetchSize { get; set; }
 		public abstract bool ReturnRecordsAffected { get; set; }
 
+		public bool DoRecordsAffected => ReturnRecordsAffected
+			&& (StatementType == DbStatementType.Insert
+				|| StatementType == DbStatementType.Delete
+				|| StatementType == DbStatementType.Update
+				|| StatementType == DbStatementType.StoredProcedure
+				|| StatementType == DbStatementType.Select);
+
 		#endregion
 
 		#region IDisposable methods