[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient PgCharSetCollecti
Status: Inactive
Brought to you by:
carlosga_fb
Menu
▾
▴
[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient PgCharSetCollection.cs,1.6,1.7 PgClientErrorCollection.cs,1.6,1.7 PgDbClient.cs,1.51,1.52 PgOutputPacket.cs,1.28,1.29 PgResponsePacket.cs,1.27,1.28 PgStatement.cs,1.25,1.26 PgType.cs,1.13,1.14 PgTypeCollection.cs,1.11,1.12
|
From: Carlos G. Á. <car...@us...> - 2004-07-22 10:59:08
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20328 Modified Files: PgCharSetCollection.cs PgClientErrorCollection.cs PgDbClient.cs PgOutputPacket.cs PgResponsePacket.cs PgStatement.cs PgType.cs PgTypeCollection.cs Log Message: 2004-07-22 Carlos Guzman Alvarez <car...@te...> * USe PascalCase naming for private methods in all classes. Index: PgResponsePacket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgResponsePacket.cs,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** PgResponsePacket.cs 20 Jul 2004 18:41:43 -0000 1.27 --- PgResponsePacket.cs 22 Jul 2004 10:58:58 -0000 1.28 *************** *** 242,246 **** if (type.FormatCode == 0) { ! return this.readStringArray(type, length); } else --- 242,246 ---- if (type.FormatCode == 0) { ! return this.ReadStringArray(type, length); } else *************** *** 276,285 **** if (type.SystemType.IsPrimitive) { ! return this.readPrimitiveArray(elementType, length, dimensions, flags, lengths, lowerBounds); } else { ! return this.readNonPrimitiveArray(elementType, length, dimensions, flags, lengths, lowerBounds); } --- 276,285 ---- if (type.SystemType.IsPrimitive) { ! return this.ReadPrimitiveArray(elementType, length, dimensions, flags, lengths, lowerBounds); } else { ! return this.ReadNonPrimitiveArray(elementType, length, dimensions, flags, lengths, lowerBounds); } *************** *** 564,568 **** #region Array Handling Methods ! private Array readPrimitiveArray(PgType elementType, int length, int dimensions, int flags, int[] lengths, int[] lowerBounds) { --- 564,568 ---- #region Array Handling Methods ! private Array ReadPrimitiveArray(PgType elementType, int length, int dimensions, int flags, int[] lengths, int[] lowerBounds) { *************** *** 570,574 **** // Read array data ! byte[] sourceArray = this.decodeArrayData(elementType, data.Length, length); Buffer.BlockCopy(sourceArray, 0, data, 0, sourceArray.Length); --- 570,574 ---- // Read array data ! byte[] sourceArray = this.DecodeArrayData(elementType, data.Length, length); Buffer.BlockCopy(sourceArray, 0, data, 0, sourceArray.Length); *************** *** 577,581 **** } ! private Array readNonPrimitiveArray(PgType elementType, int length, int dimensions, int flags, int[] lengths, int[] lowerBounds) { --- 577,581 ---- } ! private Array ReadNonPrimitiveArray(PgType elementType, int length, int dimensions, int flags, int[] lengths, int[] lowerBounds) { *************** *** 591,595 **** } ! private Array readStringArray(PgType type, int length) { PgType elementType = PgDbClient.Types[type.ElementType]; --- 591,595 ---- } ! private Array ReadStringArray(PgType type, int length) { PgType elementType = PgDbClient.Types[type.ElementType]; *************** *** 611,615 **** } ! private byte[] decodeArrayData(PgType type, int elementCount, int length) { byte[] data = new byte[length]; --- 611,615 ---- } ! private byte[] DecodeArrayData(PgType type, int elementCount, int length) { byte[] data = new byte[length]; Index: PgTypeCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgTypeCollection.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PgTypeCollection.cs 20 Jul 2004 18:41:43 -0000 1.11 --- PgTypeCollection.cs 22 Jul 2004 10:58:58 -0000 1.12 *************** *** 77,81 **** foreach(PgType item in this) { ! if (this.cultureAwareCompare(item.Name, name)) { return index; --- 77,81 ---- foreach(PgType item in this) { ! if (this.CultureAwareCompare(item.Name, name)) { return index; *************** *** 107,112 **** return type; } ! ! private bool cultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( --- 107,116 ---- return type; } ! ! #endregion ! ! #region Private methods ! ! private bool CultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( Index: PgType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgType.cs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PgType.cs 20 Jul 2004 18:41:43 -0000 1.13 --- PgType.cs 22 Jul 2004 10:58:58 -0000 1.14 *************** *** 101,105 **** this.formatCode = formatCode; this.size = size; ! this.systemType = this.inferSystemType(); } --- 101,105 ---- this.formatCode = formatCode; this.size = size; ! this.systemType = this.InferSystemType(); } *************** *** 143,147 **** #region Private Methods ! private Type inferSystemType() { switch (this.dataType) --- 143,147 ---- #region Private Methods ! private Type InferSystemType() { switch (this.dataType) Index: PgCharSetCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgCharSetCollection.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PgCharSetCollection.cs 10 Apr 2004 20:16:07 -0000 1.6 --- PgCharSetCollection.cs 22 Jul 2004 10:58:58 -0000 1.7 *************** *** 55,59 **** foreach (PgCharSet item in this) { ! if (this.cultureAwareCompare(item.CharSet, charset)) { return index; --- 55,59 ---- foreach (PgCharSet item in this) { ! if (this.CultureAwareCompare(item.CharSet, charset)) { return index; *************** *** 93,99 **** return charSet; ! } ! private bool cultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( --- 93,103 ---- return charSet; ! } ! #endregion ! ! #region Private Methods ! ! private bool CultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( Index: PgDbClient.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgDbClient.cs,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** PgDbClient.cs 21 Jul 2004 08:03:30 -0000 1.51 --- PgDbClient.cs 22 Jul 2004 10:58:58 -0000 1.52 *************** *** 292,296 **** PgDbClient.InitializeCharSets(); ! this.initializeSocket(); lock (this) --- 292,296 ---- PgDbClient.InitializeCharSets(); ! this.InitializeSocket(); lock (this) *************** *** 351,360 **** catch (IOException ex) { ! this.detach(); throw new PgClientException(ex.Message); } catch (PgClientException ex) { ! this.detach(); throw ex; } --- 351,360 ---- catch (IOException ex) { ! this.Detach(); throw new PgClientException(ex.Message); } catch (PgClientException ex) { ! this.Detach(); throw ex; } *************** *** 369,373 **** this.SendPacket(packet, PgFrontEndCodes.TERMINATE); ! this.detach(); } catch (IOException ex) --- 369,373 ---- this.SendPacket(packet, PgFrontEndCodes.TERMINATE); ! this.Detach(); } catch (IOException ex) *************** *** 855,859 **** #region Private Methods ! private void initializeSocket() { IPAddress hostadd = Dns.Resolve(settings.ServerName).AddressList[0]; --- 855,859 ---- #region Private Methods ! private void InitializeSocket() { IPAddress hostadd = Dns.Resolve(settings.ServerName).AddressList[0]; *************** *** 891,895 **** } ! private void detach() { // Close streams --- 891,895 ---- } ! private void Detach() { // Close streams Index: PgStatement.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgStatement.cs,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** PgStatement.cs 20 Jul 2004 18:41:43 -0000 1.25 --- PgStatement.cs 22 Jul 2004 10:58:58 -0000 1.26 *************** *** 253,257 **** { response = this.db.ReceiveResponsePacket(); ! this.processSqlPacket(response); } --- 253,257 ---- { response = this.db.ReceiveResponsePacket(); ! this.ProcessSqlPacket(response); } *************** *** 343,347 **** { response = this.db.ReceiveResponsePacket(); ! this.processSqlPacket(response); } --- 343,347 ---- { response = this.db.ReceiveResponsePacket(); ! this.ProcessSqlPacket(response); } *************** *** 414,418 **** { response = this.db.ReceiveResponsePacket(); ! this.processSqlPacket(response); } --- 414,418 ---- { response = this.db.ReceiveResponsePacket(); ! this.ProcessSqlPacket(response); } *************** *** 456,460 **** { response = this.db.ReceiveResponsePacket(); ! this.processSqlPacket(response); if (this.hasRows && --- 456,460 ---- { response = this.db.ReceiveResponsePacket(); ! this.ProcessSqlPacket(response); if (this.hasRows && *************** *** 562,566 **** { response = this.db.ReceiveResponsePacket(); ! this.processSqlPacket(response); } --- 562,566 ---- { response = this.db.ReceiveResponsePacket(); ! this.ProcessSqlPacket(response); } *************** *** 627,631 **** #region Response Methods ! private void processSqlPacket(PgResponsePacket packet) { switch (packet.Message) --- 627,631 ---- #region Response Methods ! private void ProcessSqlPacket(PgResponsePacket packet) { switch (packet.Message) *************** *** 636,649 **** 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; --- 636,649 ---- 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; *************** *** 656,664 **** case PgBackendCodes.COMMAND_COMPLETE: ! this.processTag(packet); break; case PgBackendCodes.PARAMETER_DESCRIPTION: ! this.processParameterDescription(packet); break; --- 656,664 ---- case PgBackendCodes.COMMAND_COMPLETE: ! this.ProcessTag(packet); break; case PgBackendCodes.PARAMETER_DESCRIPTION: ! this.ProcessParameterDescription(packet); break; *************** *** 670,674 **** } ! private void processTag(PgResponsePacket packet) { string[] elements = null; --- 670,674 ---- } ! private void ProcessTag(PgResponsePacket packet) { string[] elements = null; *************** *** 697,701 **** } ! private void processFunctionResult(PgResponsePacket packet) { int length = packet.ReadInt(); --- 697,701 ---- } ! private void ProcessFunctionResult(PgResponsePacket packet) { int length = packet.ReadInt(); *************** *** 704,708 **** } ! private void processRowDescription(PgResponsePacket packet) { this.rowDescriptor = new PgRowDescriptor(packet.ReadShort()); --- 704,708 ---- } ! private void ProcessRowDescription(PgResponsePacket packet) { this.rowDescriptor = new PgRowDescriptor(packet.ReadShort()); *************** *** 722,726 **** } ! private void processParameterDescription(PgResponsePacket packet) { this.parameters = new PgParameter[packet.ReadShort()]; --- 722,726 ---- } ! private void ProcessParameterDescription(PgResponsePacket packet) { this.parameters = new PgParameter[packet.ReadShort()]; *************** *** 732,736 **** } ! private void processDataRow(PgResponsePacket packet) { int fieldCount = packet.ReadShort(); --- 732,736 ---- } ! private void ProcessDataRow(PgResponsePacket packet) { int fieldCount = packet.ReadShort(); Index: PgOutputPacket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgOutputPacket.cs,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** PgOutputPacket.cs 21 Jul 2004 11:00:38 -0000 1.28 --- PgOutputPacket.cs 22 Jul 2004 10:58:58 -0000 1.29 *************** *** 260,264 **** foreach (object element in array) { ! this.writeParameter(packet, elementType.DataType, size, element); } --- 260,264 ---- foreach (object element in array) { ! this.WriteParameter(packet, elementType.DataType, size, element); } *************** *** 270,410 **** else { ! this.writeParameter(this, parameter.DataType.DataType, size, parameter.Value); ! } ! } ! } ! ! #endregion ! ! #region Private Methods ! ! private void writeParameter(PgOutputPacket packet, PgDataType dataType, int size, object value) ! { ! switch (dataType) ! { ! case PgDataType.Binary: ! packet.WriteInt(((byte[])value).Length); ! packet.Write((byte[])value); ! break; ! ! case PgDataType.Byte: ! packet.WriteInt(size); ! packet.Write((byte)value); ! break; ! ! case PgDataType.Int2: ! packet.WriteInt(size); ! packet.WriteShort(Convert.ToInt16(value)); ! break; ! ! case PgDataType.Int4: ! packet.WriteInt(size); ! packet.WriteInt(Convert.ToInt32(value)); ! break; ! ! case PgDataType.Int8: ! packet.WriteInt(size); ! packet.WriteLong(Convert.ToInt64(value)); ! break; ! ! case PgDataType.Interval: ! packet.WriteInt(size); ! packet.WriteInterval(TimeSpan.Parse(value.ToString())); ! break; ! ! case PgDataType.Decimal: ! { ! string paramValue = value.ToString(); ! packet.WriteInt(encoding.GetByteCount(paramValue)); ! packet.Write(paramValue.ToCharArray()); ! } ! break; ! ! case PgDataType.Double: ! packet.WriteInt(size); ! packet.WriteDouble(Convert.ToDouble(value)); ! break; ! ! case PgDataType.Float: ! packet.WriteInt(size); ! packet.WriteFloat(Convert.ToSingle(value)); ! break; ! ! case PgDataType.Currency: ! packet.WriteInt(size); ! packet.WriteInt(Convert.ToInt32(Convert.ToSingle(value)*100)); ! break; ! ! case PgDataType.Date: ! packet.WriteInt(size); ! packet.WriteDate(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Time: ! // packet.WriteInt(size); ! packet.WriteTime(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.TimeWithTZ: ! // packet.WriteInt(size); ! packet.WriteTimeWithTZ(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Timestamp: ! // packet.WriteInt(size); ! packet.WriteTimestamp(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.TimestampWithTZ: ! // packet.WriteInt(size); ! packet.WriteTimestampWithTZ(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Char: ! case PgDataType.VarChar: ! { ! string paramValue = value.ToString() + PgCodes.NULL_TERMINATOR; ! packet.WriteString(paramValue); } - break; - - case PgDataType.Point: - packet.WriteInt(size); - packet.WritePoint((PgPoint)value); - break; - - case PgDataType.Circle: - packet.WriteInt(size); - packet.WriteCircle((PgCircle)value); - break; - - case PgDataType.Line: - packet.WriteInt(size); - packet.WriteLine((PgLine)value); - break; - - case PgDataType.LSeg: - packet.WriteInt(size); - packet.WriteLSeg((PgLSeg)value); - break; - - case PgDataType.Box: - packet.WriteInt(size); - packet.WriteBox((PgBox)value); - break; - - case PgDataType.Polygon: - PgPolygon polygon = (PgPolygon)value; - - packet.WriteInt((size*polygon.Points.Length) + 4); - packet.WritePolygon(polygon); - break; - - case PgDataType.Path: - PgPath path = (PgPath)value; - - packet.WriteInt((size*path.Points.Length) + 5); - packet.WritePath(path); - break; } } --- 270,275 ---- else { ! this.WriteParameter(this, parameter.DataType.DataType, size, parameter.Value); } } } *************** *** 457,460 **** #endregion ! } } \ No newline at end of file --- 322,460 ---- #endregion ! ! #region Private Methods ! ! private void WriteParameter(PgOutputPacket packet, PgDataType dataType, int size, object value) ! { ! switch (dataType) ! { ! case PgDataType.Binary: ! packet.WriteInt(((byte[])value).Length); ! packet.Write((byte[])value); ! break; ! ! case PgDataType.Byte: ! packet.WriteInt(size); ! packet.Write((byte)value); ! break; ! ! case PgDataType.Int2: ! packet.WriteInt(size); ! packet.WriteShort(Convert.ToInt16(value)); ! break; ! ! case PgDataType.Int4: ! packet.WriteInt(size); ! packet.WriteInt(Convert.ToInt32(value)); ! break; ! ! case PgDataType.Int8: ! packet.WriteInt(size); ! packet.WriteLong(Convert.ToInt64(value)); ! break; ! ! case PgDataType.Interval: ! packet.WriteInt(size); ! packet.WriteInterval(TimeSpan.Parse(value.ToString())); ! break; ! ! case PgDataType.Decimal: ! { ! string paramValue = value.ToString(); ! packet.WriteInt(encoding.GetByteCount(paramValue)); ! packet.Write(paramValue.ToCharArray()); ! } ! break; ! ! case PgDataType.Double: ! packet.WriteInt(size); ! packet.WriteDouble(Convert.ToDouble(value)); ! break; ! ! case PgDataType.Float: ! packet.WriteInt(size); ! packet.WriteFloat(Convert.ToSingle(value)); ! break; ! ! case PgDataType.Currency: ! packet.WriteInt(size); ! packet.WriteInt(Convert.ToInt32(Convert.ToSingle(value) * 100)); ! break; ! ! case PgDataType.Date: ! packet.WriteInt(size); ! packet.WriteDate(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Time: ! // packet.WriteInt(size); ! packet.WriteTime(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.TimeWithTZ: ! // packet.WriteInt(size); ! packet.WriteTimeWithTZ(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Timestamp: ! // packet.WriteInt(size); ! packet.WriteTimestamp(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.TimestampWithTZ: ! // packet.WriteInt(size); ! packet.WriteTimestampWithTZ(Convert.ToDateTime(value)); ! break; ! ! case PgDataType.Char: ! case PgDataType.VarChar: ! { ! string paramValue = value.ToString() + PgCodes.NULL_TERMINATOR; ! packet.WriteString(paramValue); ! } ! break; ! ! case PgDataType.Point: ! packet.WriteInt(size); ! packet.WritePoint((PgPoint)value); ! break; ! ! case PgDataType.Circle: ! packet.WriteInt(size); ! packet.WriteCircle((PgCircle)value); ! break; ! ! case PgDataType.Line: ! packet.WriteInt(size); ! packet.WriteLine((PgLine)value); ! break; ! ! case PgDataType.LSeg: ! packet.WriteInt(size); ! packet.WriteLSeg((PgLSeg)value); ! break; ! ! case PgDataType.Box: ! packet.WriteInt(size); ! packet.WriteBox((PgBox)value); ! break; ! ! case PgDataType.Polygon: ! PgPolygon polygon = (PgPolygon)value; ! ! packet.WriteInt((size * polygon.Points.Length) + 4); ! packet.WritePolygon(polygon); ! break; ! ! case PgDataType.Path: ! PgPath path = (PgPath)value; ! ! packet.WriteInt((size * path.Points.Length) + 5); ! packet.WritePath(path); ! break; ! } ! } ! ! #endregion ! } } \ No newline at end of file Index: PgClientErrorCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientErrorCollection.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PgClientErrorCollection.cs 10 Apr 2004 20:16:07 -0000 1.6 --- PgClientErrorCollection.cs 22 Jul 2004 10:58:58 -0000 1.7 *************** *** 54,58 **** foreach(PgClientError item in this) { ! if (this.cultureAwareCompare(item.Message, errorMessage)) { return index; --- 54,58 ---- foreach(PgClientError item in this) { ! if (this.CultureAwareCompare(item.Message, errorMessage)) { return index; *************** *** 83,87 **** } ! private bool cultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( --- 83,91 ---- } ! #endregion ! ! #region Private Methods ! ! private bool CultureAwareCompare(string strA, string strB) { return CultureInfo.CurrentCulture.CompareInfo.Compare( |
