[Adapdev-commits] Adapdev/src/Adapdev.Data AbstractDAO.cs,1.8,1.9 CommandTextViewer.cs,1.6,1.7 DataReaderDebugger.cs,1.5,1.6 ProviderInfoManager.cs,1.6,1.7

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213/src/Adapdev.Data

Modified Files:
	AbstractDAO.cs CommandTextViewer.cs DataReaderDebugger.cs 
	ProviderInfoManager.cs 
Log Message:


Index: DataReaderDebugger.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DataReaderDebugger.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataReaderDebugger.cs	16 Nov 2005 07:01:47 -0000	1.5
--- DataReaderDebugger.cs	1 Mar 2006 01:38:50 -0000	1.6
***************
*** 10,49 ****
  	public class DataReaderDebugger
  	{
! 		private IDataReader _reader = null;
! 
! 		public DataReaderDebugger(IDataReader reader)
! 		{
! 			this._reader = reader;
! 		}
  
! 		public string Text
  		{
! 			get
  			{
! 				StringBuilder sb = new StringBuilder();
! 				do
  				{
! 					int i = _reader.FieldCount;
! 					for(int j = 0; j < i; j++)
! 					{
! 						sb.Append(this._reader.GetName(j) + "|");
! 					}
! 					sb.Append(Environment.NewLine);
  
  
! 					while(this._reader.Read())
  					{
! 						for(int j = 0; j < i; j++)
! 						{
! 							sb.Append(this._reader.GetValue(j).ToString() + "|");
! 						}
! 						sb.Append(Environment.NewLine);
  					}
  					sb.Append(Environment.NewLine);
  				}
! 				while(this._reader.NextResult());
! 
! 				return sb.ToString();
  			}
  		}
  	}
--- 10,41 ----
  	public class DataReaderDebugger
  	{
! 		private DataReaderDebugger(){}
  
! 		public static string ToString(IDataReader reader)
  		{
! 			StringBuilder sb = new StringBuilder();
! 			do
  			{
! 				int i = reader.FieldCount;
! 				for(int j = 0; j < i; j++)
  				{
! 					sb.Append(reader.GetName(j) + "|");
! 				}
! 				sb.Append(Environment.NewLine);
  
  
! 				while(reader.Read())
! 				{
! 					for(int j = 0; j < i; j++)
  					{
! 						sb.Append(reader.GetValue(j).ToString() + "|");
  					}
  					sb.Append(Environment.NewLine);
  				}
! 				sb.Append(Environment.NewLine);
  			}
+ 			while(reader.NextResult());
+ 
+ 			return sb.ToString();
  		}
  	}

Index: ProviderInfoManager.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/ProviderInfoManager.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ProviderInfoManager.cs	16 Nov 2005 07:01:47 -0000	1.6
--- ProviderInfoManager.cs	1 Mar 2006 01:38:50 -0000	1.7
***************
*** 68,99 ****
  		/// Gets the prefix by name
  		/// </summary>
- 		/// <param name="name">Name.</param>
- 		/// <param name="typeName">Name of the type.</param>
- 		/// <returns></returns>
- 		public string GetPrefixByName(string name, string typeName)
- 		{
- 			return this.GetTypeRowByName(name, typeName).Prefix;
- 		}
- 
- 		/// <summary>
- 		/// Gets the prefix by name
- 		/// </summary>
- 		/// <param name="ct">Ct.</param>
- 		/// <param name="typeName">Name of the type.</param>
- 		/// <returns></returns>
- 		public string GetPrefixByName(DbProviderType ct, string typeName)
- 		{
- 			return this.GetPrefixByName(ct.ToString(), typeName);
- 		}
- 
- 		/// <summary>
- 		/// Gets the postfix by name
- 		/// </summary>
- 		/// <param name="name">Name.</param>
  		/// <param name="typeName">Name of the type.</param>
  		/// <returns></returns>
! 		public string GetPostfixByName(string name, string typeName)
  		{
! 			return this.GetTypeRowByName(name, typeName).Postfix;
  		}
  
--- 68,76 ----
  		/// Gets the prefix by name
  		/// </summary>
  		/// <param name="typeName">Name of the type.</param>
  		/// <returns></returns>
! 		public string GetPrefixByName(string typeName)
  		{
! 			return this.GetTypeRowByName("dbtype", typeName).Prefix;
  		}
  
***************
*** 101,110 ****
  		/// Gets the postfix by name
  		/// </summary>
- 		/// <param name="ct">Ct.</param>
  		/// <param name="typeName">Name of the type.</param>
  		/// <returns></returns>
! 		public string GetPostfixByName(DbProviderType ct, string typeName)
  		{
! 			return this.GetPostfixByName(ct.ToString(), typeName);
  		}
  
--- 78,86 ----
  		/// Gets the postfix by name
  		/// </summary>
  		/// <param name="typeName">Name of the type.</param>
  		/// <returns></returns>
! 		public string GetPostfixByName(string typeName)
  		{
! 			return this.GetTypeRowByName("dbtype", typeName).Postfix;
  		}
  

Index: CommandTextViewer.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/CommandTextViewer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandTextViewer.cs	16 Nov 2005 07:01:47 -0000	1.6
--- CommandTextViewer.cs	1 Mar 2006 01:38:50 -0000	1.7
***************
*** 63,67 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("dbtype_oledb", ptype);
  					string newValue = prefix + pvalue + prefix;
  					//					Console.WriteLine(newValue);
--- 63,67 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  					//					Console.WriteLine(newValue);
***************
*** 95,99 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("dbtype_oledb", ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";
--- 95,99 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";
***************
*** 139,143 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("dbtype_sqlclient", ptype);
  					string newValue = prefix + pvalue + prefix;
  
--- 139,143 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  
***************
*** 165,169 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("dbtype_sqlclient", ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";
--- 165,169 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";
***************
*** 204,208 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("oracle", ptype);
  					string newValue = prefix + pvalue + prefix;
  
--- 204,208 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  
***************
*** 226,230 ****
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName("oracle", ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";
--- 226,230 ----
  					string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString();
  
! 					string prefix = dp.GetPrefixByName(ptype);
  					string newValue = prefix + pvalue + prefix;
  					string comma = ",";

Index: AbstractDAO.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/AbstractDAO.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractDAO.cs	26 Nov 2005 08:09:22 -0000	1.8
--- AbstractDAO.cs	1 Mar 2006 01:38:50 -0000	1.9
***************
*** 527,530 ****
--- 527,531 ----
  		/// </summary>
  		/// <returns></returns>
+ 		[Obsolete("Use SelectAllDataSet")]
  		public DataSet SelectAllDS()
  		{
***************
*** 533,536 ****
--- 534,546 ----
  
  		/// <summary>
+ 		/// Selects all data set.
+ 		/// </summary>
+ 		/// <returns></returns>
+ 		public DataSet SelectAllDataSet()
+ 		{
+ 			return this.CreateDataSet(this.CreateSelectAllCommand());
+ 		}
+ 
+ 		/// <summary>
  		/// Selects all records
  		/// </summary>