Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source
In directory sc8-pr-cvs1:/tmp/cvs-serv21809
Modified Files:
PgCommand.cs PgCommandBuilder.cs PgDataReader.cs
Log Message:
Fixed some bugs introduced with latest commits
Index: PgCommand.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommand.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PgCommand.cs 7 Oct 2003 10:26:06 -0000 1.9
--- PgCommand.cs 9 Oct 2003 11:31:23 -0000 1.10
***************
*** 232,237 ****
{
this.CommandText = cmdText;
! this.Connection = connection;
! this.Transaction = transaction;
}
--- 232,237 ----
{
this.CommandText = cmdText;
! this.connection = connection;
! this.transaction = transaction;
}
Index: PgCommandBuilder.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommandBuilder.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PgCommandBuilder.cs 29 Sep 2003 14:37:14 -0000 1.8
--- PgCommandBuilder.cs 9 Oct 2003 11:31:23 -0000 1.9
***************
*** 359,368 ****
values.Append(separator);
}
-
- // Build Field name and append it to the string
- fields.Append(getQuotedIdentifier(schemaRow["BaseColumnName"]));
-
- // Build value name and append it to the string
- values.Append("@param_" + i.ToString());
PgParameter parameter = createParameter(schemaRow, i, false);
--- 359,362 ----
***************
*** 375,378 ****
--- 369,378 ----
i++;
+
+ // Build Field name and append it to the string
+ fields.Append(getQuotedIdentifier(schemaRow["BaseColumnName"]));
+
+ // Build value name and append it to the string
+ values.Append(parameter.ParameterName);
insertCommand.Parameters.Add(parameter);
Index: PgDataReader.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgDataReader.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PgDataReader.cs 7 Oct 2003 09:05:01 -0000 1.8
--- PgDataReader.cs 9 Oct 2003 11:31:23 -0000 1.9
***************
*** 182,190 ****
public bool Read()
{
! bool read = true;
! if (command.CommandBehavior == CommandBehavior.SingleRow && position != STARTPOS)
{
- read = false;
}
else
--- 182,190 ----
public bool Read()
{
! bool read = false;
! if ((command.CommandBehavior == CommandBehavior.SingleRow &&
! position != STARTPOS) || !command.Statement.HasRows)
{
}
else
|