Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15710/src/Adapdev.Data/Schema
Modified Files:
ForeignKeyAssociation.cs OleDbSchemaBuilder.cs
Log Message:
Added new objects for multi-threading
Modified ForeignKeyAssociation to display the full foreign key name
Fixed some bugs w/ the unit test multi-threading
Index: OleDbSchemaBuilder.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/OleDbSchemaBuilder.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OleDbSchemaBuilder.cs 21 Oct 2005 04:59:20 -0000 1.2
--- OleDbSchemaBuilder.cs 14 Nov 2005 04:14:09 -0000 1.3
***************
*** 128,132 ****
{
// Add the association to the table and column containing the foreign key
! ci.ForeignKeyTables.Add(new ForeignKeyAssociation(ci, cf ,fk));
}
}
--- 128,132 ----
{
// Add the association to the table and column containing the foreign key
! ci.ForeignKeyTables.Add(new ForeignKeyAssociation(tif, ci, fk ,cf));
}
}
Index: ForeignKeyAssociation.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ForeignKeyAssociation.cs 11 Nov 2005 04:52:46 -0000 1.3
--- ForeignKeyAssociation.cs 14 Nov 2005 04:14:09 -0000 1.4
***************
*** 11,14 ****
--- 11,15 ----
public class ForeignKeyAssociation
{
+ private TableSchema _table = null;
private ColumnSchema _foreignColumn = null;
private TableSchema _foreignTable = null;
***************
*** 54,58 ****
public string ForeignKeyName
{
! get{return this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName;}
}
--- 55,59 ----
public string ForeignKeyName
{
! get{return this._table.Name + "." + this.ColumnName + "-" + this.ForeignTableName + "." + this.ForeignColumnName;}
}
***************
*** 63,68 ****
}
! public ForeignKeyAssociation(ColumnSchema columnSchema, ColumnSchema foreignColumn, TableSchema foreignTable)
{
this._columnSchema = columnSchema;
this._foreignColumn = foreignColumn;
--- 64,70 ----
}
! public ForeignKeyAssociation(TableSchema table, ColumnSchema columnSchema, TableSchema foreignTable, ColumnSchema foreignColumn)
{
+ this._table = table;
this._columnSchema = columnSchema;
this._foreignColumn = foreignColumn;
|