[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source PgCommandBuilder.cs,1.9,1.1
Status: Inactive
Brought to you by:
carlosga_fb
|
From: <car...@us...> - 2003-10-09 11:59:13
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source
In directory sc8-pr-cvs1:/tmp/cvs-serv25497
Modified Files:
PgCommandBuilder.cs
Log Message:
Back to prior command text format
Index: PgCommandBuilder.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommandBuilder.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PgCommandBuilder.cs 9 Oct 2003 11:31:23 -0000 1.9
--- PgCommandBuilder.cs 9 Oct 2003 11:59:09 -0000 1.10
***************
*** 125,129 ****
sqlUpdate = "UPDATE {0} SET {1} WHERE ( {2} )";
sqlDelete = "DELETE FROM {0} WHERE ( {1} )";
! whereClausule1 = "(({0} IS NULL AND ${1} = NULL) OR ({0} = ${2}))";
whereClausule2 = "({0} = ${1})";
setClausule = "{0} = ${1}";
--- 125,129 ----
sqlUpdate = "UPDATE {0} SET {1} WHERE ( {2} )";
sqlDelete = "DELETE FROM {0} WHERE ( {1} )";
! whereClausule1 = "(({0} IS NULL AND ${1} = NULL) OR ({0} = ${2}))";
whereClausule2 = "({0} = ${1})";
setClausule = "{0} = ${1}";
***************
*** 437,441 ****
foreach (DataRow schemaRow in schemaTable.Rows)
{
! if (includedInWhereClause (schemaRow))
{
if (where.Length > 0)
--- 437,441 ----
foreach (DataRow schemaRow in schemaTable.Rows)
{
! if (includedInWhereClause(schemaRow))
{
if (where.Length > 0)
***************
*** 447,486 ****
string quotedId = getQuotedIdentifier(schemaRow["BaseColumnName"]);
- if ((bool)schemaRow["IsKey"])
- {
- PgParameter parameter = createParameter(schemaRow, i, true);
- where.AppendFormat(whereClausule2, quotedId, i);
! if (row != null)
! {
! parameter.Value = row[dsColumnName, DataRowVersion.Original];
! }
! updateCommand.Parameters.Add(parameter);
! }
! else
{
! // Create parameters for this field
! int paramIndex1 = i;
! PgParameter parameter1 = createParameter(schemaRow, paramIndex1, true);
! int paramIndex2 = ++i;
! PgParameter parameter2 = createParameter(schemaRow, paramIndex2, true);
!
! // Add where clausule for this field
! where.AppendFormat(whereClausule1,
! quotedId, paramIndex1, paramIndex2);
!
! // Set parameter values
! if (row != null)
! {
! parameter1.Value = row[dsColumnName, DataRowVersion.Original];
! parameter2.Value = row[dsColumnName, DataRowVersion.Original];
! }
!
! // Add parameters to command parameter collectionb
! updateCommand.Parameters.Add(parameter1);
! updateCommand.Parameters.Add(parameter2);
}
i++;
}
--- 447,461 ----
string quotedId = getQuotedIdentifier(schemaRow["BaseColumnName"]);
! PgParameter parameter = createParameter(schemaRow, i, true);
! where.AppendFormat(whereClausule2, quotedId, i);
! if (row != null)
{
! parameter.Value = row[dsColumnName, DataRowVersion.Original];
}
+ updateCommand.Parameters.Add(parameter);
+
i++;
}
***************
*** 526,565 ****
string quotedId = getQuotedIdentifier(schemaRow["BaseColumnName"]);
- if ((bool)schemaRow["IsKey"])
- {
- PgParameter parameter = createParameter(schemaRow, i, true);
- where.AppendFormat(whereClausule2, quotedId, i);
! if (row != null)
! {
! parameter.Value = row[dsColumnName, DataRowVersion.Original];
! }
! deleteCommand.Parameters.Add(parameter);
! }
! else
{
! // Create parameters for this field
! int paramIndex1 = i;
! PgParameter parameter1 = createParameter(schemaRow, paramIndex1, true);
! int paramIndex2 = ++i;
! PgParameter parameter2 = createParameter(schemaRow, paramIndex2, true);
!
! // Add where clausule for this field
! where.AppendFormat(whereClausule1,
! quotedId, paramIndex1, paramIndex2);
!
! // Set parameter values
! if (row != null)
! {
! parameter1.Value = row[dsColumnName, DataRowVersion.Original];
! parameter2.Value = row[dsColumnName, DataRowVersion.Original];
! }
!
! // Add parameters to command parameter collectionb
! deleteCommand.Parameters.Add(parameter1);
! deleteCommand.Parameters.Add(parameter2);
}
i++;
}
--- 501,515 ----
string quotedId = getQuotedIdentifier(schemaRow["BaseColumnName"]);
! PgParameter parameter = createParameter(schemaRow, i, true);
! where.AppendFormat(whereClausule2, quotedId, i);
! if (row != null)
{
! parameter.Value = row[dsColumnName, DataRowVersion.Original];
}
+ deleteCommand.Parameters.Add(parameter);
+
i++;
}
***************
*** 672,680 ****
private bool includedInWhereClause(DataRow schemaRow)
{
! if (!(bool)schemaRow["IsKey"])
! {
! // return false;
! }
!
PgDbType pgDbType= (PgDbType)schemaRow["ProviderType"];
--- 622,626 ----
private bool includedInWhereClause(DataRow schemaRow)
{
! /*
PgDbType pgDbType= (PgDbType)schemaRow["ProviderType"];
***************
*** 685,688 ****
--- 631,640 ----
if (pgDbType == PgDbType.Array)
+ {
+ return false;
+ }
+ */
+
+ if (!(bool)schemaRow["IsKey"])
{
return false;
|