[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient PgCharSet.cs,1.3,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12209

Modified Files:
	PgCharSet.cs PgCharSetCollection.cs PgClientError.cs 
	PgClientErrorCollection.cs PgClientException.cs 
	PgClientMessageEventArgs.cs PgClientNotificationEventArgs.cs 
	PgConnectionParams.cs PgDbClient.cs PgFieldDescriptor.cs 
	PgOutputPacket.cs PgParameter.cs PgResponsePacket.cs 
	PgRowDescriptor.cs PgStatement.cs PgType.cs 
	PgTypeCollection.cs 
Log Message:
2004-04-10 Carlos Guzman Alvarez  <car...@te...>

	* Started cleanup and unification of this keyword usage tasks.

Index: PgResponsePacket.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgResponsePacket.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** PgResponsePacket.cs	9 Feb 2004 14:20:45 -0000	1.24
--- PgResponsePacket.cs	10 Apr 2004 20:16:07 -0000	1.25
***************
*** 41,62 ****
  		public char Message
  		{
! 			get { return message; }
! 			set { message = value; }
  		}

  		public Encoding Encoding
  		{
! 			get { return encoding; }
! 			set { encoding = value; }
  		}

  		public long Length
  		{
! 			get { return ((MemoryStream)BaseStream).Length; }
  		}

  		public long Position
  		{
! 			get { return ((MemoryStream)BaseStream).Position; }
  		}

--- 41,62 ----
  		public char Message
  		{
! 			get { return this.message; }
! 			set { this.message = value; }
  		}

  		public Encoding Encoding
  		{
! 			get { return this.encoding; }
! 			set { this.encoding = value; }
  		}

  		public long Length
  		{
! 			get { return ((MemoryStream)this.BaseStream).Length; }
  		}

  		public long Position
  		{
! 			get { return ((MemoryStream)this.BaseStream).Position; }
  		}

***************
*** 65,69 ****
  			get
  			{
! 				if (Position < Length)
  				{
  					return false;
--- 65,69 ----
  			get
  			{
! 				if (this.Position < this.Length)
  				{
  					return false;
***************
*** 78,82 ****
  		public long Pending
  		{
! 			get { return Length - Position; }
  		}

--- 78,82 ----
  		public long Pending
  		{
! 			get { return this.Length - this.Position; }
  		}

***************
*** 104,114 ****
  		public void Reset()
  		{
! 			((MemoryStream)BaseStream).SetLength(0);
! 			((MemoryStream)BaseStream).Position = 0;
  		}

  		public byte[] ToArray()
  		{
! 			return ((MemoryStream)BaseStream).ToArray();
  		}

--- 104,114 ----
  		public void Reset()
  		{
! 			((MemoryStream)this.BaseStream).SetLength(0);
! 			((MemoryStream)this.BaseStream).Position = 0;
  		}

  		public byte[] ToArray()
  		{
! 			return ((MemoryStream)this.BaseStream).ToArray();
  		}

***************
*** 134,140 ****
  			byte[] buffer = new byte[length];

! 			Read(buffer, 0, length);

! 			return encoding.GetString(buffer);
  		}

--- 134,140 ----
  			byte[] buffer = new byte[length];

! 			this.Read(buffer, 0, length);

! 			return this.encoding.GetString(buffer);
  		}

***************
*** 144,150 ****
  			byte[] buffer = new byte[length];

! 			Read(buffer, 0, length);

! 			return encoding.GetString(buffer);
  		}

--- 144,150 ----
  			byte[] buffer = new byte[length];

! 			this.Read(buffer, 0, length);

! 			return this.encoding.GetString(buffer);
  		}

***************
*** 182,186 ****
  		public float ReadCurrency()
  		{
! 			float val = (float)ReadInt();

  			return val/100;
--- 182,186 ----
  		public float ReadCurrency()
  		{
! 			float val = (float)this.ReadInt();

  			return val/100;
***************
*** 209,213 ****
  		public DateTime ReadDate()
  		{
! 			int days = ReadInt();

  			DateTime date = new DateTime(days);
--- 209,213 ----
  		public DateTime ReadDate()
  		{
! 			int days = this.ReadInt();

  			DateTime date = new DateTime(days);
***************
*** 228,232 ****
  		public DateTime ReadTime()
  		{
! 			double seconds = ReadDouble();

  			return PgCodes.BASE_DATE.AddSeconds(seconds);
--- 228,232 ----
  		public DateTime ReadTime()
  		{
! 			double seconds = this.ReadDouble();

  			return PgCodes.BASE_DATE.AddSeconds(seconds);
***************
*** 239,242 ****
--- 239,243 ----

  			string sbFormat = "{0:D2}{1}{2:D2}{3}{4:D2}{5:D2}";
+ 
  			if (timezone >= 0)
  			{
***************
*** 274,278 ****
  		public DateTime ReadTimestamp()
  		{
! 			double seconds = ReadDouble();

  			return PgCodes.BASE_DATE.AddSeconds(seconds);
--- 275,279 ----
  		public DateTime ReadTimestamp()
  		{
! 			double seconds = this.ReadDouble();

  			return PgCodes.BASE_DATE.AddSeconds(seconds);
***************
*** 503,507 ****

  				default:
! 					return ReadBytes(length);
  			}
  		}
--- 504,508 ----

  				default:
! 					return this.ReadBytes(length);
  			}
  		}
***************
*** 620,624 ****

  			// Read array data
! 			byte[] sourceArray = decodeArrayData(elementType, data.Length, length);

  			Buffer.BlockCopy(sourceArray, 0, data, 0, sourceArray.Length);
--- 621,625 ----

  			// Read array data
! 			byte[] sourceArray = this.decodeArrayData(elementType, data.Length, length);

  			Buffer.BlockCopy(sourceArray, 0, data, 0, sourceArray.Length);

Index: PgTypeCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgTypeCollection.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PgTypeCollection.cs	6 Mar 2004 14:52:50 -0000	1.9
--- PgTypeCollection.cs	10 Apr 2004 20:16:07 -0000	1.10
***************
*** 52,56 ****
  		public bool Contains(int oid)
  		{
! 			return(-1 != IndexOf(oid));
  		}

--- 52,56 ----
  		public bool Contains(int oid)
  		{
! 			return (-1 != this.IndexOf(oid));
  		}

***************
*** 58,62 ****
  		{
  			int index = 0;
! 			foreach(PgType item in this)
  			{
  				if (item.Oid == oid)
--- 58,63 ----
  		{
  			int index = 0;
! 
! 			foreach (PgType item in this)
  			{
  				if (item.Oid == oid)
***************
*** 66,69 ****
--- 67,71 ----
  				index++;
  			}
+ 
  			return -1;
  		}
***************
*** 72,78 ****
  		{
  			int index = 0;
  			foreach(PgType item in this)
  			{
! 				if (cultureAwareCompare(item.Name, name))
  				{
  					return index;
--- 74,81 ----
  		{
  			int index = 0;
+ 
  			foreach(PgType item in this)
  			{
! 				if (this.cultureAwareCompare(item.Name, name))
  				{
  					return index;
***************
*** 80,83 ****
--- 83,87 ----
  				index++;
  			}
+ 
  			return -1;
  		}
***************
*** 85,89 ****
  		public void RemoveAt(string typeName)
  		{
! 			RemoveAt(IndexOf(typeName));
  		}

--- 89,93 ----
  		public void RemoveAt(string typeName)
  		{
! 			this.RemoveAt(IndexOf(typeName));
  		}

Index: PgType.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgType.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PgType.cs	9 Feb 2004 14:20:45 -0000	1.11
--- PgType.cs	10 Apr 2004 20:16:07 -0000	1.12
***************
*** 40,59 ****
  		public int Oid
  		{
! 			get { return oid; }
  		}

  		public PgDataType DataType
  		{
! 			get { return dataType; }
  		}

  		public string Name
  		{
! 			get { return name; }
  		}

  		public Type SystemType
  		{
! 			get { return systemType; }
  		}

--- 40,59 ----
  		public int Oid
  		{
! 			get { return this.oid; }
  		}

  		public PgDataType DataType
  		{
! 			get { return this.dataType; }
  		}

  		public string Name
  		{
! 			get { return this.name; }
  		}

  		public Type SystemType
  		{
! 			get { return this.systemType; }
  		}

***************
*** 75,84 ****
  		public short FormatCode
  		{
! 			get { return formatCode; }
  		}

  		public int Size
  		{
! 			get { return size; }
  		}

--- 75,84 ----
  		public short FormatCode
  		{
! 			get { return this.formatCode; }
  		}

  		public int Size
  		{
! 			get { return this.size; }
  		}

***************
*** 110,116 ****
  				this.dataType == PgDataType.Int4		||
  				this.dataType == PgDataType.Int8		||
! 				this.dataType == PgDataType.Float	||
! 				this.dataType == PgDataType.Double	||
! 				this.dataType == PgDataType.Decimal	||
  				this.dataType == PgDataType.Byte)
  			{
--- 110,116 ----
  				this.dataType == PgDataType.Int4		||
  				this.dataType == PgDataType.Int8		||
! 				this.dataType == PgDataType.Float		||
! 				this.dataType == PgDataType.Double		||
! 				this.dataType == PgDataType.Decimal		||
  				this.dataType == PgDataType.Byte)
  			{

Index: PgParameter.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgParameter.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgParameter.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgParameter.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 30,45 ****
  		#endregion

! 		#region PARAMETERS

  		public PgType DataType
  		{
! 			get { return dataType; }
! 			set { dataType = value; }
  		}

  		public object Value
  		{
! 			get { return data; }
! 			set { data = value; }
  		}

--- 30,45 ----
  		#endregion

! 		#region Properties

  		public PgType DataType
  		{
! 			get { return this.dataType; }
! 			set { this.dataType = value; }
  		}

  		public object Value
  		{
! 			get { return this.data; }
! 			set { this.data = value; }
  		}

Index: PgDbClient.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgDbClient.cs,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** PgDbClient.cs	8 Mar 2004 17:16:18 -0000	1.46
--- PgDbClient.cs	10 Apr 2004 20:16:07 -0000	1.47
***************
*** 30,35 ****
--- 30,39 ----
  namespace PostgreSql.Data.NPgClient
  {
+ 	#region Delegates
+ 
  	internal delegate void SslConnectionCallback();

+ 	#endregion
+ 
  	internal class PgDbClient
  	{
***************
*** 85,129 ****
  		public int Handle
  		{
! 			get { return handle; }
! 			set { handle = value; }
  		}

  		public int SecretKey
  		{
! 			get { return secretKey; }
! 			set { secretKey = value; }
  		}

  		public Hashtable ParameterStatus
  		{
! 			get { return parameterStatus; }
! 			set { parameterStatus = value; }
  		}

! 		public BinaryReader Receive
  		{
! 			get { return receive; } 
  		}

! 		public BinaryWriter Send
  		{
! 			get { return send; } 
  		}

! 		public PgConnectionParams Settings
  		{
! 			get { return settings; }
! 			set { settings = value; }
  		}

! 		public SslClientStream SslClientStream
  		{
! 			get { return sslStream; }
  		}

! 		public SslConnectionCallback SslConnectionDelegate
  		{
! 			get { return this.SslConnection; }
! 			set { this.SslConnection = value; }
  		}

--- 89,137 ----
  		public int Handle
  		{
! 			get { return this.handle; }
! 			set { this.handle = value; }
  		}

  		public int SecretKey
  		{
! 			get { return this.secretKey; }
! 			set { this.secretKey = value; }
  		}

  		public Hashtable ParameterStatus
  		{
! 			get { return this.parameterStatus; }
! 			set { this.parameterStatus = value; }
  		}

! 		public PgConnectionParams Settings
  		{
! 			get { return this.settings; }
! 			set { this.settings = value; }
  		}

! 		public SslConnectionCallback SslConnectionDelegate
  		{
! 			get { return this.SslConnection; }
! 			set { this.SslConnection = value; }
  		}

! 		#endregion
! 
! 		#region Internal Properties
! 
! 		internal SslClientStream SslClientStream
  		{
! 			get { return this.sslStream; }
  		}

! 		internal BinaryReader Receive
  		{
! 			get { return this.receive; } 
  		}

! 		internal BinaryWriter Send
  		{
! 			get { return this.send; } 
  		}

***************
*** 289,293 ****

  						// Perform a sync
! 						Sync();

  						throw ex;
--- 297,301 ----

  						// Perform a sync
! 						this.Sync();

  						throw ex;
***************
*** 304,313 ****

  					case PgBackendCodes.NOTIFICATION_RESPONSE:
! 					{
! 						processNotificationResponse(responsePacket);
! 					}
! 					break;
! 
! 					default:
  						break;
  				}
--- 312,316 ----

  					case PgBackendCodes.NOTIFICATION_RESPONSE:
! 						this.processNotificationResponse(responsePacket);
  						break;
  				}
***************
*** 329,336 ****
--- 332,341 ----
  				byte[]	buffer		= new byte[length];
  				int		received	= 0;
+ 
  				while (received < length)
  				{
  					received += this.receive.Read(buffer, received, length - received);
  				}
+ 
  				responsePacket			= new PgResponsePacket(type, buffer);				
  				responsePacket.Encoding = Settings.Encoding;
***************
*** 349,367 ****
  			{
  				case PgBackendCodes.AUTHENTICATION:
! 					processAuthPacket(packet);
  					break;

  				case PgBackendCodes.PARAMETER_STATUS:
! 					processParameterStatus(packet);
  					break;

  				case PgBackendCodes.READY_FOR_QUERY:
! 					transactionStatus = packet.ReadChar();
  					break;

  				case PgBackendCodes.BACKEND_KEY_DATA:
  					// BackendKeyData					
! 					Handle		= packet.ReadInt();
! 					SecretKey	= packet.ReadInt();
  					break;
  			}
--- 354,372 ----
  			{
  				case PgBackendCodes.AUTHENTICATION:
! 					this.processAuthPacket(packet);
  					break;

  				case PgBackendCodes.PARAMETER_STATUS:
! 					this.processParameterStatus(packet);
  					break;

  				case PgBackendCodes.READY_FOR_QUERY:
! 					this.transactionStatus = packet.ReadChar();
  					break;

  				case PgBackendCodes.BACKEND_KEY_DATA:
  					// BackendKeyData					
! 					this.Handle		= packet.ReadInt();
! 					this.SecretKey	= packet.ReadInt();
  					break;
  			}
***************
*** 421,426 ****
  					// Second calculate md5 of password + user
  					string userHash = MD5Authentication.GetMD5Hash(
! 									settings.Encoding.GetBytes(settings.UserName), 
! 									settings.UserPassword);

  					// Third calculate real MD5 hash
--- 426,431 ----
  					// Second calculate md5 of password + user
  					string userHash = MD5Authentication.GetMD5Hash(
! 							settings.Encoding.GetBytes(settings.UserName), 
! 							settings.UserPassword);

  					// Third calculate real MD5 hash
***************
*** 505,510 ****
  			string	additional	= packet.ReadNullString();

! 			// Raise an event as an InfoMessage
! 			Notification(this, new PgClientNotificationEventArgs(processID, condition, additional));
  		}

--- 510,517 ----
  			string	additional	= packet.ReadNullString();

! 			if (this.Notification != null)
! 			{
! 				this.Notification(this, new PgClientNotificationEventArgs(processID, condition, additional));
! 			}
  		}

***************
*** 542,546 ****
  			}

! 			transactionStatus = stmt.TransactionStatus;
  		}

--- 549,553 ----
  			}

! 			this.transactionStatus = stmt.TransactionStatus;
  		}

***************
*** 555,559 ****
  			}

! 			transactionStatus = stmt.TransactionStatus;
  		}

--- 562,566 ----
  			}

! 			this.transactionStatus = stmt.TransactionStatus;
  		}

***************
*** 568,572 ****
  			}

! 			transactionStatus = stmt.TransactionStatus;
  		}

--- 575,579 ----
  			}

! 			this.transactionStatus = stmt.TransactionStatus;
  		}

***************
*** 608,613 ****
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = ReceiveResponsePacket();
! 						processResponsePacket(response);
  					}
  				}
--- 615,620 ----
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = this.ReceiveResponsePacket();
! 						this.processResponsePacket(response);
  					}
  				}
***************
*** 617,622 ****
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = ReceiveResponsePacket();
! 						processResponsePacket(response);
  					}

--- 624,629 ----
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = this.ReceiveResponsePacket();
! 						this.processResponsePacket(response);
  					}

***************
*** 807,813 ****
  		public void SendInfoMessage(PgClientException exception) 
  		{
! 			if (InfoMessage != null)
  			{
! 				InfoMessage(this, new PgClientMessageEventArgs(exception));
  			}
  		}
--- 814,820 ----
  		public void SendInfoMessage(PgClientException exception) 
  		{
! 			if (this.InfoMessage != null)
  			{
! 				this.InfoMessage(this, new PgClientMessageEventArgs(exception));
  			}
  		}
***************
*** 847,855 ****

  			// Set Receive Buffer size.
! 			socket.SetSocketOption(SocketOptionLevel.Socket,
  				SocketOptionName.ReceiveBuffer, settings.PacketSize);

  			// Set Send Buffer size.
! 			socket.SetSocketOption(SocketOptionLevel.Socket,
  				SocketOptionName.SendBuffer, settings.PacketSize);

--- 854,862 ----

  			// Set Receive Buffer size.
! 			this.socket.SetSocketOption(SocketOptionLevel.Socket,
  				SocketOptionName.ReceiveBuffer, settings.PacketSize);

  			// Set Send Buffer size.
! 			this.socket.SetSocketOption(SocketOptionLevel.Socket,
  				SocketOptionName.SendBuffer, settings.PacketSize);

***************
*** 866,880 ****
  		{
  			// Close streams
! 			if (sslStream != null)
  			{
! 				sslStream.Close();
  			}
! 			if (networkStream != null)
  			{
! 				networkStream.Close();
  			}
! 			if (socket != null)
  			{
! 				socket.Close();
  			}
  		}
--- 873,887 ----
  		{
  			// Close streams
! 			if (this.sslStream != null)
  			{
! 				this.sslStream.Close();
  			}
! 			if (this.networkStream != null)
  			{
! 				this.networkStream.Close();
  			}
! 			if (this.socket != null)
  			{
! 				this.socket.Close();
  			}
  		}

Index: PgRowDescriptor.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgRowDescriptor.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgRowDescriptor.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgRowDescriptor.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 33,38 ****
  		public PgFieldDescriptor[] Fields
  		{
! 			get { return fields; }
! 			set { fields = value; }
  		}

--- 33,38 ----
  		public PgFieldDescriptor[] Fields
  		{
! 			get { return this.fields; }
! 			set { this.fields = value; }
  		}

***************
*** 47,51 ****
  		public PgRowDescriptor(int count)
  		{
! 			fields = new PgFieldDescriptor[count];
  		}

--- 47,51 ----
  		public PgRowDescriptor(int count)
  		{
! 			this.fields = new PgFieldDescriptor[count];
  		}

Index: PgOutputPacket.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgOutputPacket.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PgOutputPacket.cs	9 Feb 2004 14:20:45 -0000	1.23
--- PgOutputPacket.cs	10 Apr 2004 20:16:07 -0000	1.24
***************
*** 40,49 ****
  		public long Position
  		{
! 			get { return ((MemoryStream)BaseStream).Position; }
  		}

  		public long Length
  		{
! 			get { return ((MemoryStream)BaseStream).Length; }
  		}

--- 40,49 ----
  		public long Position
  		{
! 			get { return ((MemoryStream)this.BaseStream).Position; }
  		}

  		public long Length
  		{
! 			get { return ((MemoryStream)this.BaseStream).Length; }
  		}

***************
*** 55,59 ****
  		{
  			this.encoding = Encoding.Default;
! 			Write(new byte[0]);
  		}

--- 55,59 ----
  		{
  			this.encoding = Encoding.Default;
! 			this.Write(new byte[0]);
  		}

***************
*** 74,78 ****
  				data += PgCodes.NULL_TERMINATOR;
  			}
! 			this.Write(encoding.GetBytes(data));
  		}

--- 74,79 ----
  				data += PgCodes.NULL_TERMINATOR;
  			}
! 
! 			this.Write(this.encoding.GetBytes(data));
  		}

***************
*** 222,225 ****
--- 223,227 ----
  		{
  			this.WriteInt(polygon.Points.Length);
+ 
  			for (int i = 0; i < polygon.Points.Length; i++)
  			{
***************
*** 232,235 ****
--- 234,238 ----
  			this.Write(path.IsClosedPath);
  			this.WriteInt(path.Points.Length);
+ 
  			for (int i = 0; i < path.Points.Length; i++)
  			{
***************
*** 444,459 ****
  		public int GetByteCount()
  		{
! 			return (int)((MemoryStream)BaseStream).Length;
  		}

  		public byte[] ToArray()
  		{
! 			return ((MemoryStream)BaseStream).ToArray();
  		}

  		public void Reset()
  		{
! 			((MemoryStream)BaseStream).SetLength(0);
! 			((MemoryStream)BaseStream).Position = 0;
  		}

--- 447,462 ----
  		public int GetByteCount()
  		{
! 			return (int)((MemoryStream)this.BaseStream).Length;
  		}

  		public byte[] ToArray()
  		{
! 			return ((MemoryStream)this.BaseStream).ToArray();
  		}

  		public void Reset()
  		{
! 			((MemoryStream)this.BaseStream).SetLength(0);
! 			((MemoryStream)this.BaseStream).Position = 0;
  		}

Index: PgClientErrorCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientErrorCollection.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgClientErrorCollection.cs	6 Mar 2004 14:51:43 -0000	1.5
--- PgClientErrorCollection.cs	10 Apr 2004 20:16:07 -0000	1.6
***************
*** 45,49 ****
  		public bool Contains(string errorMessage)
  		{
! 			return(-1 != IndexOf(errorMessage));
  		}

--- 45,49 ----
  		public bool Contains(string errorMessage)
  		{
! 			return (-1 != this.IndexOf(errorMessage));
  		}

***************
*** 51,57 ****
  		{
  			int index = 0;
  			foreach(PgClientError item in this)
  			{
! 				if (cultureAwareCompare(item.Message, errorMessage))
  				{
  					return index;
--- 51,58 ----
  		{
  			int index = 0;
+ 
  			foreach(PgClientError item in this)
  			{
! 				if (this.cultureAwareCompare(item.Message, errorMessage))
  				{
  					return index;
***************
*** 59,62 ****
--- 60,64 ----
  				index++;
  			}
+ 
  			return -1;
  		}
***************
*** 64,68 ****
  		public void RemoveAt(string errorMessage)
  		{
! 			RemoveAt(IndexOf(errorMessage));
  		}

--- 66,70 ----
  		public void RemoveAt(string errorMessage)
  		{
! 			this.RemoveAt(IndexOf(errorMessage));
  		}

Index: PgClientError.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientError.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgClientError.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgClientError.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 42,101 ****
  		public string Severity
  		{
! 			get { return severity; }
! 			set { severity = value; }
  		}

  		public string Message
  		{
! 			get { return message; }
! 			set { message = value; }
  		}

  		public string Code
  		{
! 			get { return code; }
! 			set { code = value; }
  		}

  		public string Detail
  		{
! 			get { return detail; }
! 			set { detail = value; }
  		}

  		public string Hint
  		{
! 			get { return hint; }
! 			set { hint = value; }
  		}

  		public string Where
  		{
! 			get { return where; }
! 			set { where = value; }
  		}

  		public string Position
  		{
! 			get { return position; }
! 			set { position = value; }
  		}

  		public string File
  		{
! 			get { return file; }
! 			set { file = value; }
  		}

  		public int Line
  		{
! 			get { return line; }
! 			set { line = value; }
  		}

  		public string Routine
  		{
! 			get { return routine; }
! 			set { routine = value; }
  		}

--- 42,101 ----
  		public string Severity
  		{
! 			get { return this.severity; }
! 			set { this.severity = value; }
  		}

  		public string Message
  		{
! 			get { return this.message; }
! 			set { this.message = value; }
  		}

  		public string Code
  		{
! 			get { return this.code; }
! 			set { this.code = value; }
  		}

  		public string Detail
  		{
! 			get { return this.detail; }
! 			set { this.detail = value; }
  		}

  		public string Hint
  		{
! 			get { return this.hint; }
! 			set { this.hint = value; }
  		}

  		public string Where
  		{
! 			get { return this.where; }
! 			set { this.where = value; }
  		}

  		public string Position
  		{
! 			get { return this.position; }
! 			set { this.position = value; }
  		}

  		public string File
  		{
! 			get { return this.file; }
! 			set { this.file = value; }
  		}

  		public int Line
  		{
! 			get { return this.line; }
! 			set { this.line = value; }
  		}

  		public string Routine
  		{
! 			get { return this.routine; }
! 			set { this.routine = value; }
  		}

***************
*** 110,114 ****
  		public PgClientError(string message)
  		{						
! 			this.message	= message;
  		}

--- 110,114 ----
  		public PgClientError(string message)
  		{						
! 			this.message = message;
  		}

***************
*** 121,128 ****

  		#endregion
- 
- 		#region Methods
- 
- 		#endregion
  	}
  }
--- 121,124 ----

Index: PgFieldDescriptor.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgFieldDescriptor.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgFieldDescriptor.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgFieldDescriptor.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 39,80 ****
  		public string FieldName
  		{
! 			get { return fieldName; }
! 			set { fieldName = value; }
  		}

  		public int OidTable
  		{
! 			get { return oidTable; }
! 			set { oidTable = value; }
  		}

  		public short OidNumber
  		{
! 			get { return oidNumber; }
! 			set { oidNumber = value; }
  		}

  		public PgType DataType
  		{
! 			get { return dataType; }
! 			set { dataType = value; }
  		}

  		public short DataTypeSize
  		{
! 			get { return dataTypeSize; }
! 			set { dataTypeSize = value; }
  		}

  		public int TypeModifier
  		{
! 			get { return typeModifier; }
! 			set { typeModifier = value; }
  		}

  		public short FormatCode
  		{
! 			get { return formatCode; }
! 			set { formatCode = value; }
  		}

--- 39,80 ----
  		public string FieldName
  		{
! 			get { return this.fieldName; }
! 			set { this.fieldName = value; }
  		}

  		public int OidTable
  		{
! 			get { return this.oidTable; }
! 			set { this.oidTable = value; }
  		}

  		public short OidNumber
  		{
! 			get { return this.oidNumber; }
! 			set { this.oidNumber = value; }
  		}

  		public PgType DataType
  		{
! 			get { return this.dataType; }
! 			set { this.dataType = value; }
  		}

  		public short DataTypeSize
  		{
! 			get { return this.dataTypeSize; }
! 			set { this.dataTypeSize = value; }
  		}

  		public int TypeModifier
  		{
! 			get { return this.typeModifier; }
! 			set { this.typeModifier = value; }
  		}

  		public short FormatCode
  		{
! 			get { return this.formatCode; }
! 			set { this.formatCode = value; }
  		}

Index: PgCharSetCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgCharSetCollection.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgCharSetCollection.cs	6 Mar 2004 14:51:43 -0000	1.5
--- PgCharSetCollection.cs	10 Apr 2004 20:16:07 -0000	1.6
***************
*** 46,50 ****
  		public bool Contains(string charset)
  		{
! 			return(-1 != IndexOf(charset));
  		}

--- 46,50 ----
  		public bool Contains(string charset)
  		{
! 			return (-1 != this.IndexOf(charset));
  		}

***************
*** 52,58 ****
  		{
  			int index = 0;
! 			foreach(PgCharSet item in this)
  			{
! 				if (cultureAwareCompare(item.CharSet, charset))
  				{
  					return index;
--- 52,59 ----
  		{
  			int index = 0;
! 			
! 			foreach (PgCharSet item in this)
  			{
! 				if (this.cultureAwareCompare(item.CharSet, charset))
  				{
  					return index;
***************
*** 60,63 ****
--- 61,65 ----
  				index++;
  			}
+ 
  			return -1;
  		}
***************
*** 65,69 ****
  		public void RemoveAt(string charset)
  		{
! 			RemoveAt(IndexOf(charset));
  		}

--- 67,71 ----
  		public void RemoveAt(string charset)
  		{
! 			this.RemoveAt(IndexOf(charset));
  		}

Index: PgStatement.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgStatement.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PgStatement.cs	15 Feb 2004 00:17:53 -0000	1.23
--- PgStatement.cs	10 Apr 2004 20:16:07 -0000	1.24
***************
*** 59,62 ****
--- 59,63 ----
  		private int				recordsAffected;
  		private char			transactionStatus;
+ 
  		private PgStatementStatus status;

***************
*** 67,136 ****
  		public PgDbClient DbHandle
  		{
! 			get { return db; }
! 			set { db = value; }
  		}

  		public string StmtText
  		{
! 			get { return stmtText; }
! 			set { stmtText = value; }
  		}

  		public bool HasRows
  		{
! 			get { return hasRows; }
  		}

  		public string Tag		
  		{
! 			get { return tag; }
  		}

  		public string ParseName
  		{
! 			get { return parseName; }
! 			set { parseName = value; }
  		}

  		public string PortalName
  		{
! 			get { return portalName; }
! 			set { portalName = value; }
  		}

  		public PgRowDescriptor RowDescriptor
  		{
! 			get { return rowDescriptor; }
  		}

  		public object[] Rows
  		{
! 			get { return rows; }
  		}

  		public PgParameter[] Parameters
  		{
! 			get { return parameters; }
  		}

  		public PgParameter OutParameter
  		{
! 			get { return outParameter; }
! 			set { outParameter = value; }
  		}

  		public int RecordsAffected
  		{
! 			get { return recordsAffected; }
  		}

  		public PgStatementStatus Status
  		{
! 			get { return status; }
  		}

  		public char TransactionStatus
  		{
! 			get { return transactionStatus; }
  		}

--- 68,137 ----
  		public PgDbClient DbHandle
  		{
! 			get { return this.db; }
! 			set { this.db = value; }
  		}

  		public string StmtText
  		{
! 			get { return this.stmtText; }
! 			set { this.stmtText = value; }
  		}

  		public bool HasRows
  		{
! 			get { return this.hasRows; }
  		}

  		public string Tag		
  		{
! 			get { return this.tag; }
  		}

  		public string ParseName
  		{
! 			get { return this.parseName; }
! 			set { this.parseName = value; }
  		}

  		public string PortalName
  		{
! 			get { return this.portalName; }
! 			set { this.portalName = value; }
  		}

  		public PgRowDescriptor RowDescriptor
  		{
! 			get { return this.rowDescriptor; }
  		}

  		public object[] Rows
  		{
! 			get { return this.rows; }
  		}

  		public PgParameter[] Parameters
  		{
! 			get { return this.parameters; }
  		}

  		public PgParameter OutParameter
  		{
! 			get { return this.outParameter; }
! 			set { this.outParameter = value; }
  		}

  		public int RecordsAffected
  		{
! 			get { return this.recordsAffected; }
  		}

  		public PgStatementStatus Status
  		{
! 			get { return this.status; }
  		}

  		public char TransactionStatus
  		{
! 			get { return this.transactionStatus; }
  		}

***************
*** 183,206 ****
  		public void Parse()
  		{
! 			lock (db)
  			{
  				try
  				{
  					// Clear actual row list
! 					rows		= null;
! 					rowIndex	= 0;

  					// Initialize RowDescriptor and Parameters
! 					rowDescriptor	= new PgRowDescriptor(0);
! 					parameters		= new PgParameter[0];

! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

! 					packet.WriteString(ParseName);
! 					packet.WriteString(stmtText);
  					packet.WriteShort(0);

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.PARSE);

  					// Update status
--- 184,207 ----
  		public void Parse()
  		{
! 			lock (this.db)
  			{
  				try
  				{
  					// Clear actual row list
! 					this.rows		= null;
! 					this.rowIndex	= 0;

  					// Initialize RowDescriptor and Parameters
! 					this.rowDescriptor	= new PgRowDescriptor(0);
! 					this.parameters		= new PgParameter[0];

! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

! 					packet.WriteString(this.ParseName);
! 					packet.WriteString(this.stmtText);
  					packet.WriteShort(0);

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.PARSE);

  					// Update status
***************
*** 219,239 ****
  		public void Describe()
  		{
! 			describe('S');
  		}

  		public void DescribePortal()
  		{
! 			describe('P');
  		}

  		private void describe(char stmtType)
  		{
! 			lock (db)
  			{
  				try
  				{					
! 					string name = ((stmtType == 'S') ? ParseName : PortalName);

! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

  					packet.Write((byte)stmtType);
--- 220,240 ----
  		public void Describe()
  		{
! 			this.describe('S');
  		}

  		public void DescribePortal()
  		{
! 			this.describe('P');
  		}

  		private void describe(char stmtType)
  		{
! 			lock (this.db)
  			{
  				try
  				{					
! 					string name = ((stmtType == 'S') ? this.ParseName : this.PortalName);

! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

  					packet.Write((byte)stmtType);
***************
*** 241,248 ****

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.DESCRIBE);

  					// Flush pending messages
! 					db.Flush();

  					// Receive Describe response
--- 242,249 ----

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.DESCRIBE);

  					// Flush pending messages
! 					this.db.Flush();

  					// Receive Describe response
***************
*** 251,256 ****
  						response.Message != PgBackendCodes.NODATA))
  					{
! 						response = db.ReceiveResponsePacket();
! 						processSqlPacket(response);
  					}

--- 252,257 ----
  						response.Message != PgBackendCodes.NODATA))
  					{
! 						response = this.db.ReceiveResponsePacket();
! 						this.processSqlPacket(response);
  					}

***************
*** 270,283 ****
  		public void Bind()
  		{
! 			lock (db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

  					// Destination portal name
! 					packet.WriteString(PortalName);
  					// Prepared statement name
! 					packet.WriteString(ParseName);

  					// Send parameters format code.
--- 271,284 ----
  		public void Bind()
  		{
! 			lock (this.db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

  					// Destination portal name
! 					packet.WriteString(this.PortalName);
  					// Prepared statement name
! 					packet.WriteString(this.ParseName);

  					// Send parameters format code.
***************
*** 285,289 ****
  					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteShort(parameters[i].DataType.FormatCode);
  					}

--- 286,290 ----
  					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteShort(this.parameters[i].DataType.FormatCode);
  					}

***************
*** 292,307 ****
  					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteParameter(parameters[i]);
  					}

  					// Send column information
! 					packet.WriteShort((short)rowDescriptor.Fields.Length);
! 					for (int i = 0; i < rowDescriptor.Fields.Length; i++)
  					{
! 						packet.WriteShort(rowDescriptor.Fields[i].DataType.FormatCode);
  					}

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.BIND);

  					// Update status
--- 293,308 ----
  					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteParameter(this.parameters[i]);
  					}

  					// Send column information
! 					packet.WriteShort((short)this.rowDescriptor.Fields.Length);
! 					for (int i = 0; i < this.rowDescriptor.Fields.Length; i++)
  					{
! 						packet.WriteShort(this.rowDescriptor.Fields[i].DataType.FormatCode);
  					}

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.BIND);

  					// Update status
***************
*** 320,337 ****
  		public void Execute()
  		{
! 			lock (db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

! 					packet.WriteString(PortalName);
! 					packet.WriteInt(fetchSize);	// Rows to retrieve ( 0 = nolimit )

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.EXECUTE);

  					// Flush pending messages
! 					db.Flush();

  					// Receive response
--- 321,338 ----
  		public void Execute()
  		{
! 			lock (this.db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

! 					packet.WriteString(this.PortalName);
! 					packet.WriteInt(this.fetchSize);	// Rows to retrieve ( 0 = nolimit )

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.EXECUTE);

  					// Flush pending messages
! 					this.db.Flush();

  					// Receive response
***************
*** 341,346 ****
  						response.Message != PgBackendCodes.COMMAND_COMPLETE)
  					{
! 						response = db.ReceiveResponsePacket();
! 						processSqlPacket(response);
  					}

--- 342,347 ----
  						response.Message != PgBackendCodes.COMMAND_COMPLETE)
  					{
! 						response = this.db.ReceiveResponsePacket();
! 						this.processSqlPacket(response);
  					}

***************
*** 361,365 ****
  					if (!this.hasRows || this.allRowsFetched)
  					{
! 						db.Sync();
  					}

--- 362,366 ----
  					if (!this.hasRows || this.allRowsFetched)
  					{
! 						this.db.Sync();
  					}

***************
*** 379,387 ****
  		public void ExecuteFunction(int id)
  		{
! 			lock (db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

  					// Function id
--- 380,388 ----
  		public void ExecuteFunction(int id)
  		{
! 			lock (this.db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

  					// Function id
***************
*** 389,403 ****

  					// Send parameters format code.
! 					packet.WriteShort((short)parameters.Length);
! 					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteShort(parameters[i].DataType.FormatCode);
  					}

  					// Send parameter values
! 					packet.WriteShort((short)parameters.Length);
! 					for (int i = 0; i < parameters.Length; i++)
  					{
! 						packet.WriteParameter(parameters[i]);
  					}

--- 390,404 ----

  					// Send parameters format code.
! 					packet.WriteShort((short)this.parameters.Length);
! 					for (int i = 0; i < this.parameters.Length; i++)
  					{
! 						packet.WriteShort(this.parameters[i].DataType.FormatCode);
  					}

  					// Send parameter values
! 					packet.WriteShort((short)this.parameters.Length);
! 					for (int i = 0; i < this.parameters.Length; i++)
  					{
! 						packet.WriteParameter(this.parameters[i]);
  					}

***************
*** 406,410 ****

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.FUNCTION_CALL);

  					// Receive response
--- 407,411 ----

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.FUNCTION_CALL);

  					// Receive response
***************
*** 412,417 ****
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = db.ReceiveResponsePacket();
! 						processSqlPacket(response);
  					}

--- 413,418 ----
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = this.db.ReceiveResponsePacket();
! 						this.processSqlPacket(response);
  					}

***************
*** 433,446 ****
  			ArrayList innerRows = new ArrayList();

! 			lock (db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

! 					packet.WriteString(stmtText);

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.QUERY);

  					// Update Status
--- 434,447 ----
  			ArrayList innerRows = new ArrayList();

! 			lock (this.db)
  			{
  				try
  				{
! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

! 					packet.WriteString(this.stmtText);

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.QUERY);

  					// Update Status
***************
*** 454,459 ****
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = db.ReceiveResponsePacket();
! 						processSqlPacket(response);

  						if (this.hasRows && 
--- 455,460 ----
  					while (response.Message != PgBackendCodes.READY_FOR_QUERY)
  					{
! 						response = this.db.ReceiveResponsePacket();
! 						this.processSqlPacket(response);

  						if (this.hasRows && 
***************
*** 529,549 ****
  		public void Close()
  		{
! 			close('S');
  		}

  		public void ClosePortal()
  		{
! 			close('P');
  		}

  		private void close(char stmtType)
  		{
! 			lock (db)
  			{
  				try
  				{
! 					string name = ((stmtType == 'S') ? ParseName : PortalName);

! 					PgOutputPacket packet = new PgOutputPacket(db.Settings.Encoding);

  					packet.Write((byte)stmtType);
--- 530,550 ----
  		public void Close()
  		{
! 			this.close('S');
  		}

  		public void ClosePortal()
  		{
! 			this.close('P');
  		}

  		private void close(char stmtType)
  		{
! 			lock (this.db)
  			{
  				try
  				{
! 					string name = ((stmtType == 'S') ? this.ParseName : this.PortalName);

! 					PgOutputPacket packet = new PgOutputPacket(this.db.Settings.Encoding);

  					packet.Write((byte)stmtType);
***************
*** 551,558 ****

  					// Send packet to the server
! 					db.SendPacket(packet, PgFrontEndCodes.CLOSE);

  					// Sync server and client
! 					db.Flush();

  					// Read until CLOSE COMPLETE message is received
--- 552,559 ----

  					// Send packet to the server
! 					this.db.SendPacket(packet, PgFrontEndCodes.CLOSE);

  					// Sync server and client
! 					this.db.Flush();

  					// Read until CLOSE COMPLETE message is received
***************
*** 560,578 ****
  					while (response.Message != PgBackendCodes.CLOSE_COMPLETE)
  					{
! 						response = db.ReceiveResponsePacket();
! 						processSqlPacket(response);
  					}

  					// Clear rows
! 					rows		= null;
! 					rowIndex	= 0;

  					// Update Status
! 					status = PgStatementStatus.Initial;
  				}
  				catch (Exception ex)
  				{
  					// Update Status
! 					status = PgStatementStatus.Error;
  					// Throw exception
  					throw ex;
--- 561,580 ----
  					while (response.Message != PgBackendCodes.CLOSE_COMPLETE)
  					{
! 						response = this.db.ReceiveResponsePacket();
! 						this.processSqlPacket(response);
  					}

  					// Clear rows
! 					this.rows		= null;
! 					this.rowIndex	= 0;

  					// Update Status
! 					this.status = PgStatementStatus.Initial;
  				}
  				catch (Exception ex)
  				{
  					// Update Status
! 					this.status = PgStatementStatus.Error;
! 
  					// Throw exception
  					throw ex;
***************
*** 630,647 ****
  			{
  				case PgBackendCodes.READY_FOR_QUERY:
! 					transactionStatus = packet.ReadChar();
  					break;

  				case PgBackendCodes.FUNCTION_CALL_RESPONSE:
! 					processFunctionResult(packet);
  					break;

  				case PgBackendCodes.ROW_DESCRIPTION:
! 					processRowDescription(packet);
  					break;

  				case PgBackendCodes.DATAROW:
  					this.hasRows = true;
! 					processDataRow(packet);
  					break;

--- 632,649 ----
  			{
  				case PgBackendCodes.READY_FOR_QUERY:
! 					this.transactionStatus = packet.ReadChar();
  					break;

  				case PgBackendCodes.FUNCTION_CALL_RESPONSE:
! 					this.processFunctionResult(packet);
  					break;

  				case PgBackendCodes.ROW_DESCRIPTION:
! 					this.processRowDescription(packet);
  					break;

  				case PgBackendCodes.DATAROW:
  					this.hasRows = true;
! 					this.processDataRow(packet);
  					break;

***************
*** 654,662 ****

  				case PgBackendCodes.COMMAND_COMPLETE:
! 					processTag(packet);
  					break;

  				case PgBackendCodes.PARAMETER_DESCRIPTION:
! 					processParameterDescription(packet);
  					break;

--- 656,664 ----

  				case PgBackendCodes.COMMAND_COMPLETE:
! 					this.processTag(packet);
  					break;

  				case PgBackendCodes.PARAMETER_DESCRIPTION:
! 					this.processParameterDescription(packet);
  					break;

***************
*** 680,688 ****
  				case "FETCH":
  				case "SELECT":
! 					recordsAffected = -1;
  					break;

  				case "INSERT":
! 					recordsAffected = Int32.Parse(elements[2]);
  					break;

--- 682,690 ----
  				case "FETCH":
  				case "SELECT":
! 					this.recordsAffected = -1;
  					break;

  				case "INSERT":
! 					this.recordsAffected = Int32.Parse(elements[2]);
  					break;

***************
*** 690,694 ****
  				case "DELETE":
  				case "MOVE":
! 					recordsAffected = Int32.Parse(elements[1]);
  					break;
  			}
--- 692,696 ----
  				case "DELETE":
  				case "MOVE":
! 					this.recordsAffected = Int32.Parse(elements[1]);
  					break;
  			}
***************
*** 704,720 ****
  		private void processRowDescription(PgResponsePacket packet)
  		{
! 			rowDescriptor = new PgRowDescriptor(packet.ReadShort());

  			for (int i = 0; i < rowDescriptor.Fields.Length; i++)
  			{
! 				rowDescriptor.Fields[i] = new PgFieldDescriptor();

! 				rowDescriptor.Fields[i].FieldName		= packet.ReadNullString();
! 				rowDescriptor.Fields[i].OidTable		= packet.ReadInt();
! 				rowDescriptor.Fields[i].OidNumber		= packet.ReadShort();
! 				rowDescriptor.Fields[i].DataType		= PgDbClient.Types[packet.ReadInt()];
! 				rowDescriptor.Fields[i].DataTypeSize	= packet.ReadShort();
! 				rowDescriptor.Fields[i].TypeModifier	= packet.ReadInt();
! 				rowDescriptor.Fields[i].FormatCode		= packet.ReadShort();
  			}
  		}
--- 706,722 ----
  		private void processRowDescription(PgResponsePacket packet)
  		{
! 			this.rowDescriptor = new PgRowDescriptor(packet.ReadShort());

  			for (int i = 0; i < rowDescriptor.Fields.Length; i++)
  			{
! 				this.rowDescriptor.Fields[i] = new PgFieldDescriptor();

! 				this.rowDescriptor.Fields[i].FieldName		= packet.ReadNullString();
! 				this.rowDescriptor.Fields[i].OidTable		= packet.ReadInt();
! 				this.rowDescriptor.Fields[i].OidNumber		= packet.ReadShort();
! 				this.rowDescriptor.Fields[i].DataType		= PgDbClient.Types[packet.ReadInt()];
! 				this.rowDescriptor.Fields[i].DataTypeSize	= packet.ReadShort();
! 				this.rowDescriptor.Fields[i].TypeModifier	= packet.ReadInt();
! 				this.rowDescriptor.Fields[i].FormatCode		= packet.ReadShort();
  			}
  		}
***************
*** 722,730 ****
  		private void processParameterDescription(PgResponsePacket packet)
  		{
! 			parameters = new PgParameter[packet.ReadShort()];

  			for (int i = 0; i < parameters.Length; i++)
  			{
! 				parameters[i] = new PgParameter(packet.ReadInt());
  			}
  		}
--- 724,732 ----
  		private void processParameterDescription(PgResponsePacket packet)
  		{
! 			this.parameters = new PgParameter[packet.ReadShort()];

  			for (int i = 0; i < parameters.Length; i++)
  			{
! 				this.parameters[i] = new PgParameter(packet.ReadInt());
  			}
  		}
***************
*** 755,759 ****
  						{
  							values[i] = packet.ReadValueFromString(
! 								rowDescriptor.Fields[i].DataType,
  								length);
  						}
--- 757,761 ----
  						{
  							values[i] = packet.ReadValueFromString(
! 								this.rowDescriptor.Fields[i].DataType,
  								length);
  						}
***************
*** 761,765 ****
  						{
  							values[i] = packet.ReadValue(
! 								rowDescriptor.Fields[i].DataType,
  								length);
  						}
--- 763,767 ----
  						{
  							values[i] = packet.ReadValue(
! 								this.rowDescriptor.Fields[i].DataType,
  								length);
  						}

Index: PgCharSet.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgCharSet.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgCharSet.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgCharSet.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 35,44 ****
  		public string CharSet
  		{
! 			get { return charSet; }
  		}

  		public Encoding Encoding
  		{
! 			get { return encoding; }
  		}

--- 35,44 ----
  		public string CharSet
  		{
! 			get { return this.charSet; }
  		}

  		public Encoding Encoding
  		{
! 			get { return this.encoding; }
  		}

Index: PgConnectionParams.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgConnectionParams.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgConnectionParams.cs	12 Feb 2004 19:52:05 -0000	1.5
--- PgConnectionParams.cs	10 Apr 2004 20:16:07 -0000	1.6
***************
*** 36,40 ****
  		private Encoding	encoding;
  		private	bool		ssl;
- 		private bool		simpleQueryMode;

  		#endregion
--- 36,39 ----
***************
*** 44,109 ****
  		public string ServerName
  		{
! 			get { return serverName; }
! 			set { serverName = value; }
  		}

  		public string Database
  		{
! 			get { return database; }
! 			set { database = value; }
  		}

  		public string UserName
  		{
! 			get { return userName; }
! 			set { userName = value; }
  		}

  		public string UserPassword
  		{
! 			get { return userPassword; }
! 			set { userPassword = value; }
  		}

  		public int PacketSize
  		{
! 			get { return packetSize; }
! 			set { packetSize = value; }
  		}

  		public int ServerPort
  		{
! 			get { return serverPort; }
! 			set { serverPort = value; }
  		}

  		public Encoding Encoding
  		{
! 			get { return encoding; }
! 			set { encoding = value; }
  		}

  		public int Timeout
  		{
! 			get { return timeout; }
! 			set { timeout = value; }
  		}

  		public bool Pooling
  		{
! 			get { return pooling; }
! 			set { pooling = value; }
  		}

  		public bool SSL
  		{
! 			get { return ssl; }
! 			set { ssl = value; }
! 		}
! 
! 		public bool SimpleQueryMode
! 		{
! 			get { return simpleQueryMode; }
! 			set { simpleQueryMode = value; }
  		}

--- 43,102 ----
  		public string ServerName
  		{
! 			get { return this.serverName; }
! 			set { this.serverName = value; }
  		}

  		public string Database
  		{
! 			get { return this.database; }
! 			set { this.database = value; }
  		}

  		public string UserName
  		{
! 			get { return this.userName; }
! 			set { this.userName = value; }
  		}

  		public string UserPassword
  		{
! 			get { return this.userPassword; }
! 			set { this.userPassword = value; }
  		}

  		public int PacketSize
  		{
! 			get { return this.packetSize; }
! 			set { this.packetSize = value; }
  		}

  		public int ServerPort
  		{
! 			get { return this.serverPort; }
! 			set { this.serverPort = value; }
  		}

  		public Encoding Encoding
  		{
! 			get { return this.encoding; }
! 			set { this.encoding = value; }
  		}

  		public int Timeout
  		{
! 			get { return this.timeout; }
! 			set { this.timeout = value; }
  		}

  		public bool Pooling
  		{
! 			get { return this.pooling; }
! 			set { this.pooling = value; }
  		}

  		public bool SSL
  		{
! 			get { return this.ssl; }
! 			set { this.ssl = value; }
  		}

***************
*** 114,126 ****
  		public PgConnectionParams()
  		{
! 			serverName		= "localhost";			
! 			userName		= "postgres";
! 			userPassword	= "postgres";
! 			serverPort		= 5432;
! 			packetSize		= 8192;
! 			pooling			= true;
! 			timeout			= 15;
! 			encoding		= Encoding.Default;
! 			simpleQueryMode	= false;
  		}

--- 107,118 ----
  		public PgConnectionParams()
  		{
! 			this.serverName		= "localhost";			
! 			this.userName		= "postgres";
! 			this.userPassword	= "postgres";
! 			this.serverPort		= 5432;
! 			this.packetSize		= 8192;
! 			this.pooling		= true;
! 			this.timeout		= 15;
! 			this.encoding		= Encoding.Default;
  		}

Index: PgClientMessageEventArgs.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientMessageEventArgs.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgClientMessageEventArgs.cs	9 Feb 2004 14:20:45 -0000	1.2
--- PgClientMessageEventArgs.cs	10 Apr 2004 20:16:07 -0000	1.3
***************
*** 23,41 ****
  namespace PostgreSql.Data.NPgClient
  {
  	internal delegate void PgClientMessageEventHandler(object sender, PgClientMessageEventArgs e);

  	internal sealed class PgClientMessageEventArgs : EventArgs
  	{
  		private PgClientException exception;

  		public PgClientException Exception
  		{
! 			get { return exception; }
  		}

  		public PgClientMessageEventArgs(PgClientException exception)
  		{
  			this.exception = exception;
  		}
  	}
  }
--- 23,57 ----
  namespace PostgreSql.Data.NPgClient
  {
+ 	#region Delegates
+ 
  	internal delegate void PgClientMessageEventHandler(object sender, PgClientMessageEventArgs e);

+ 	#endregion
+ 
  	internal sealed class PgClientMessageEventArgs : EventArgs
  	{
+ 		#region Fields
+ 
  		private PgClientException exception;

+ 		#endregion
+ 
+ 		#region Properties
+ 
  		public PgClientException Exception
  		{
! 			get { return this.exception; }
  		}

+ 		#endregion
+ 
+ 		#region Constructors
+ 
  		public PgClientMessageEventArgs(PgClientException exception)
  		{
  			this.exception = exception;
  		}
+ 
+ 		#endregion
  	}
  }

Index: PgClientNotificationEventArgs.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientNotificationEventArgs.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgClientNotificationEventArgs.cs	9 Feb 2004 14:20:45 -0000	1.2
--- PgClientNotificationEventArgs.cs	10 Apr 2004 20:16:07 -0000	1.3
***************
*** 23,50 ****
  namespace PostgreSql.Data.NPgClient
  {
  	internal delegate void PgClientNotificationEventHandler(object sender, PgClientNotificationEventArgs e);

  	internal sealed class PgClientNotificationEventArgs : EventArgs
  	{
  		private int		processID;
  		private string	condition;
  		private string	aditional;

  		public int ProcessID
  		{
! 			get { return processID; }
  		}

  		public string Condition
  		{
! 			get { return condition; }
  		}

  		public string Aditional
  		{
! 			get { return aditional; }
  		}

! 		public PgClientNotificationEventArgs(int processID, string condition, string addtional)
  		{
  			this.processID	= processID;
--- 23,67 ----
  namespace PostgreSql.Data.NPgClient
  {
+ 	#region Delegates
+ 
  	internal delegate void PgClientNotificationEventHandler(object sender, PgClientNotificationEventArgs e);

+ 	#endregion
+ 
  	internal sealed class PgClientNotificationEventArgs : EventArgs
  	{
+ 		#region Fields
+ 
  		private int		processID;
  		private string	condition;
  		private string	aditional;

+ 		#endregion
+ 
+ 		#region Properties
+ 
  		public int ProcessID
  		{
! 			get { return this.processID; }
  		}

  		public string Condition
  		{
! 			get { return this.condition; }
  		}

  		public string Aditional
  		{
! 			get { return this.aditional; }
  		}

! 		#endregion
! 
! 		#region Constructors
! 
! 		public PgClientNotificationEventArgs(
! 			int processID, 
! 			string condition, 
! 			string addtional)
  		{
  			this.processID	= processID;
***************
*** 52,55 ****
--- 69,74 ----
  			this.aditional	= aditional;
  		}
+ 
+ 		#endregion
  	}
  }

Index: PgClientException.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientException.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgClientException.cs	9 Feb 2004 14:20:45 -0000	1.3
--- PgClientException.cs	10 Apr 2004 20:16:07 -0000	1.4
***************
*** 35,44 ****
  		public new string Message
  		{
! 			get { return message; }
  		}

  		public PgClientErrorCollection Errors
  		{
! 			get { return errors; }
  		}

--- 35,44 ----
  		public new string Message
  		{
! 			get { return this.message; }
  		}

  		public PgClientErrorCollection Errors
  		{
! 			get { return this.errors; }
  		}

***************
*** 46,57 ****

  		#region Constructors
- 
- 		public PgClientException() : base()
- 		{
- 			errors = new PgClientErrorCollection();
- 		}

! 		public PgClientException(string message) : this()
  		{
  			this.message = message;
  		}
--- 46,53 ----

  		#region Constructors

! 		public PgClientException(string message) : base(message)
  		{
+ 			this.errors = new PgClientErrorCollection();
  			this.message = message;
  		}