Thread: [pgsqlclient-checkins] pgsqlclient/PostgreSql.Data.PGSqlClient/source PGCommand.cs,1.3,1.4 PGParamet

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source
In directory sc8-pr-cvs1:/tmp/cvs-serv2528

Modified Files:
	PGCommand.cs PGParameter.cs 
Log Message:
* source/PGParameter.cs:

	- Added better use of design time attributes.

	- Added new constructor.

* source/PGCommand.cs:

	- Added better use of design time attributes.

Index: PGCommand.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PGCommand.cs	14 Jul 2003 11:59:06 -0000	1.3
--- PGCommand.cs	16 Jul 2003 14:09:12 -0000	1.4
***************
*** 52,56 ****
  		#region PROPERTIES

! 		[Category("Data"), DefaultValue("")]
  		public string CommandText
  		{
--- 52,58 ----
  		#region PROPERTIES

! 		[Category("Data"),
! 		DefaultValue(""),
! 		RefreshProperties(RefreshProperties.All)]
  		public string CommandText
  		{
***************
*** 67,70 ****
--- 69,81 ----
  			}
  		}
+ 
+ 		[Category("Data"),
+ 		DefaultValue(CommandType.Text),
+ 		RefreshProperties(RefreshProperties.All)]		
+ 		public CommandType CommandType
+ 		{
+ 			get { return commandType; }
+ 			set { commandType = value; }
+ 		}

  		[DefaultValue(30)]
***************
*** 85,95 ****
  		}

- 		[Category("Data"), DefaultValue(CommandType.Text)]
- 		public CommandType CommandType
- 		{
- 			get { return commandType; }
- 			set { commandType = value; }
- 		}
- 
  		IDbConnection IDbCommand.Connection
  		{
--- 96,99 ----
***************
*** 122,126 ****
  		}

! 		[DefaultValue(true)]
  		public bool DesignTimeVisible
  		{
--- 126,132 ----
  		}

! 		[Browsable(false),
! 		DesignOnly(true),
! 		DefaultValue(true)]
  		public bool DesignTimeVisible
  		{
***************
*** 134,139 ****
  		}

! 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content),
! 		Category("Data")]
  		public PGParameterCollection Parameters
  		{
--- 140,145 ----
  		}

! 		[Category("Data"),
! 		DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]		
  		public PGParameterCollection Parameters
  		{
***************
*** 147,151 ****
  		}

! 		[Browsable(false)]
  		public PGTransaction Transaction
  		{
--- 153,159 ----
  		}

! 		[Browsable(false),
! 		DataSysDescription("Tansaction context used by the command."),
! 		DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]		
  		public PGTransaction Transaction
  		{

Index: PGParameter.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGParameter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGParameter.cs	14 Jul 2003 10:28:49 -0000	1.2
--- PGParameter.cs	16 Jul 2003 14:09:12 -0000	1.3
***************
*** 29,40 ****
  		ParameterDirection	direction;
  		DataRowVersion		sourceVersion;
! 		bool				nullable;
! 		string				name;
  		string				sourceColumn;
! 		object				pValue;
  		byte				precision;
  		byte				scale;
  		int					size;
! 		PGDbType			pgType;

  		#endregion
--- 29,40 ----
  		ParameterDirection	direction;
  		DataRowVersion		sourceVersion;
! 		bool				isNullable;
! 		string				parameterName;
  		string				sourceColumn;
! 		object				value;
  		byte				precision;
  		byte				scale;
  		int					size;
! 		PGDbType			pgDbType;

  		#endregion
***************
*** 42,59 ****
  		#region PROPERTIES

! 		public string ParameterName 
  		{
! 			get { return name; }
! 			set { name = value; }
  		}

! 		[Category("Data"), DefaultValue("")]
! 		public string SourceColumn
  		{
! 			get { return sourceColumn; }
! 			set { sourceColumn = value; }
  		}

! 		[Category("Data"), DefaultValue(0)]
  		public byte Precision
  		{
--- 42,59 ----
  		#region PROPERTIES

! 		string IDataParameter.ParameterName
  		{
! 			get { return ParameterName; }
! 			set { ParameterName = value; }
  		}

! 		[DefaultValue("")]
! 		public string ParameterName 
  		{
! 			get { return parameterName; }
! 			set { parameterName = value; }
  		}

! 		[Category("Data"), DefaultValue((byte)0)]
  		public byte Precision
  		{
***************
*** 62,66 ****
  		}

! 		[Category("Data"), DefaultValue(0)]
  		public byte Scale
  		{
--- 62,66 ----
  		}

! 		[Category("Data"), DefaultValue((byte)0)]
  		public byte Scale
  		{
***************
*** 76,91 ****
  		}

! 		[Browsable(false)]
  		public DbType DbType 
  		{
! 			get { return pgTypeToDbType(pgType); }
! 			set { pgType = dbTypeToPGType(value); }
  		}

! 		[Category("Data"), DefaultValue(PGDbType.VarChar), RefreshProperties(RefreshProperties.All)]
  		public PGDbType PGType
  		{
! 			get { return pgType; }
! 			set { pgType = value; }
  		}

--- 76,96 ----
  		}

! 		[Browsable(false),
! 		Category("Data"),
! 		RefreshProperties(RefreshProperties.All),
! 		DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
  		public DbType DbType 
  		{
! 			get { return pgDbTypeToDbType(pgDbType); }
! 			set { pgDbType = dbTypeToPGType(value); }
  		}

! 		[RefreshProperties(RefreshProperties.All),
! 		Category("Data"),
! 		DefaultValue(PGDbType.VarChar)]
  		public PGDbType PGType
  		{
! 			get { return pgDbType; }
! 			set { pgDbType = value; }
  		}

***************
*** 97,105 ****
  		}

! 		[Browsable(false)]
! 		public bool IsNullable 
  		{
! 			get { return nullable; }
! 			set { nullable = value; }  
  		}

--- 102,120 ----
  		}

! 		[Browsable(false), 
! 		DesignOnly(true), 
! 		DefaultValue(false),
! 		EditorBrowsable(EditorBrowsableState.Advanced)]
! 		public bool IsNullable
  		{
! 			get { return isNullable; }
! 			set { isNullable = value; }  
! 		}
! 
! 		[Category("Data"), DefaultValue("")]
! 		public string SourceColumn
! 		{
! 			get { return sourceColumn; }
! 			set { sourceColumn = value; }
  		}

***************
*** 114,122 ****
  		public object Value 
  		{
! 			get { return pValue; }
  			set
! 			{ 
! 				pValue = value;
! 				setPGTypeFromValue(pValue); 
  			}
  		}
--- 129,137 ----
  		public object Value 
  		{
! 			get { return this.value; }
  			set
! 			{
! 				this.value = value;
! 				setPGTypeFromValue(this.value);
  			}
  		}
***************
*** 130,162 ****
  			direction		= ParameterDirection.Input;
  			sourceVersion	= DataRowVersion.Current;
! 			nullable		= false;
! 			pgType			= PGDbType.VarChar;
  		}

! 		public PGParameter(string parameterName, PGDbType pgType) : this()
  		{
! 			this.name	= parameterName;
! 			this.pgType	= pgType;
  		}

! 		public PGParameter(string parameterName, object paramValue)  : this()
  		{
! 			this.name	= parameterName;
! 			this.Value	= paramValue;
  		}

! 		public PGParameter(string parameterName, PGDbType pgType, string sourceColumn) : this()
  		{
! 			this.name			= parameterName;
! 			this.pgType			= pgType;
  			this.sourceColumn	= sourceColumn;
  		}

! 		public PGParameter(string parameterName, PGDbType pgType, int size, string sourceColumn) : this()
  		{
! 			this.name			= parameterName;
  			this.sourceColumn	= sourceColumn;
! 			this.pgType			= pgType;
  			this.size			= size;
  		}

--- 145,201 ----
  			direction		= ParameterDirection.Input;
  			sourceVersion	= DataRowVersion.Current;
! 			isNullable		= false;
! 			pgDbType		= PGDbType.VarChar;
  		}

! 		public PGParameter(string parameterName, PGDbType dbType) : this()
  		{
! 			this.parameterName	= parameterName;
! 			this.pgDbType		= dbType;
  		}

! 		public PGParameter(string parameterName, object value)  : this()
  		{
! 			this.parameterName	= parameterName;
! 			this.value			= value;
  		}

! 		public PGParameter(string parameterName, PGDbType dbType, string sourceColumn) : this()
  		{
! 			this.parameterName	= parameterName;
! 			this.pgDbType		= dbType;
  			this.sourceColumn	= sourceColumn;
  		}

! 		public PGParameter(string parameterName, PGDbType dbType, int size, string sourceColumn) : this()
  		{
! 			this.parameterName	= parameterName;
  			this.sourceColumn	= sourceColumn;
! 			this.pgDbType		= dbType;
! 			this.size			= size;
! 		}
! 
! 		[EditorBrowsable(EditorBrowsableState.Advanced)]
! 		public PGParameter(string parameterName,
! 							PGDbType dbType,
! 							int size,
! 							ParameterDirection direction,
! 							bool isNullable,
! 							byte precision,
! 							byte scale,
! 							string sourceColumn,
! 							DataRowVersion sourceVersion,
! 							object value)
! 		{
! 			this.parameterName	= parameterName;
! 			this.pgDbType		= dbType;
  			this.size			= size;
+ 			this.direction		= direction;
+ 			this.isNullable		= isNullable;
+ 			this.precision		= precision;
+ 			this.scale			= scale;
+ 			this.sourceColumn	= sourceColumn;
+ 			this.sourceVersion	= sourceVersion;
+ 			this.value			= value;
  		}

***************
*** 167,181 ****
  		object ICloneable.Clone()
  		{
! 			PGParameter parameter = new PGParameter(name, pgType, size, sourceColumn);
! 			
! 			parameter.SourceVersion = this.SourceVersion;
! 			parameter.Direction		= this.Direction;
! 			parameter.DbType		= this.DbType;
! 			parameter.IsNullable	= this.IsNullable;
! 			parameter.Precision		= this.Precision;
! 			parameter.Scale			= this.Scale;
! 			parameter.Value			= this.Value;
! 
! 			return parameter;
  		}

--- 206,219 ----
  		object ICloneable.Clone()
  		{
! 			return new PGParameter(parameterName,
! 							pgDbType,
! 							size,
! 							direction,
! 							isNullable,
! 							precision,
! 							scale,
! 							sourceColumn,
! 							sourceVersion,
! 							value);
  		}

***************
*** 189,234 ****
  			{
  				case TypeCode.Byte:
! 					pgType = PGDbType.Byte;
  					break;

  				case TypeCode.Boolean:
! 					pgType = PGDbType.Boolean;
  					break;

  				case TypeCode.Object:
! 					pgType = PGDbType.Binary;
  					break;

  				case TypeCode.String:
  				case TypeCode.Char:
! 					pgType = PGDbType.Char;
  					break;

  				case TypeCode.Int16:
! 					pgType = PGDbType.Int2;
  					break;

  				case TypeCode.Int32:
! 					pgType = PGDbType.Int4;
  					break;

  				case TypeCode.Int64:
! 					pgType = PGDbType.Int8;
  					break;

  				case TypeCode.Single:
! 					pgType = PGDbType.Float;
  					break;

  				case TypeCode.Double:
! 					pgType = PGDbType.Double;
  					break;

  				case TypeCode.Decimal:
! 					pgType = PGDbType.Decimal;
  					break;

  				case TypeCode.DateTime:
! 					pgType = PGDbType.TimeStamp;
  					break;

--- 227,272 ----
  			{
  				case TypeCode.Byte:
! 					pgDbType = PGDbType.Byte;
  					break;

  				case TypeCode.Boolean:
! 					pgDbType = PGDbType.Boolean;
  					break;

  				case TypeCode.Object:
! 					pgDbType = PGDbType.Binary;
  					break;

  				case TypeCode.String:
  				case TypeCode.Char:
! 					pgDbType = PGDbType.Char;
  					break;

  				case TypeCode.Int16:
! 					pgDbType = PGDbType.Int2;
  					break;

  				case TypeCode.Int32:
! 					pgDbType = PGDbType.Int4;
  					break;

  				case TypeCode.Int64:
! 					pgDbType = PGDbType.Int8;
  					break;

  				case TypeCode.Single:
! 					pgDbType = PGDbType.Float;
  					break;

  				case TypeCode.Double:
! 					pgDbType = PGDbType.Double;
  					break;

  				case TypeCode.Decimal:
! 					pgDbType = PGDbType.Decimal;
  					break;

  				case TypeCode.DateTime:
! 					pgDbType = PGDbType.TimeStamp;
  					break;

***************
*** 246,252 ****
  		}

! 		private DbType pgTypeToDbType(PGDbType pgType)
  		{
! 			switch(pgType)
  			{
  				case PGDbType.Boolean:
--- 284,290 ----
  		}

! 		private DbType pgDbTypeToDbType(PGDbType pgDbType)
  		{
! 			switch(pgDbType)
  			{
  				case PGDbType.Boolean: