[Adapdev-commits] Adapdev/src/Adapdev.Data/Schema ColumnSchema.cs,1.16,1.17 CompareDatabaseSchemas.cs,1.8,1.9

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12218/src/Adapdev.Data/Schema

Modified Files:
	ColumnSchema.cs CompareDatabaseSchemas.cs 
Log Message:


Index: ColumnSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ColumnSchema.cs	15 Mar 2006 04:34:20 -0000	1.16
--- ColumnSchema.cs	19 Mar 2006 07:13:32 -0000	1.17
***************
*** 53,57 ****
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public bool IsActive
  		{
--- 53,57 ----
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public bool IsActive
  		{

Index: CompareDatabaseSchemas.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/CompareDatabaseSchemas.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CompareDatabaseSchemas.cs	27 Nov 2005 06:32:43 -0000	1.8
--- CompareDatabaseSchemas.cs	19 Mar 2006 07:13:32 -0000	1.9
***************
*** 98,103 ****
  				if(null == this._databaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name))
  				{
! 					this._savedDatabaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name).IsActive = false;
! 					this._savedDatabaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name).Name = SchemaConstants.REDUNDANT + column.Name;
  				}
  			}
--- 98,109 ----
  				if(null == this._databaseSchema.GetTable(tableNameToUpdate).GetColumn(column.Name))
  				{
! //					string newname = SchemaConstants.REDUNDANT + column.Name;
! 					string oldname = column.Name;
! //					ColumnSchema c = column;
! //					c.IsActive = false;
! //					c.Name = newname;
! 
! 					this._savedDatabaseSchema.GetTable(tableNameToUpdate).RemoveColumn(oldname);
! //					this._savedDatabaseSchema.GetTable(tableNameToUpdate).AddColumn(c);
  				}
  			}
***************
*** 113,118 ****
  				if(null == this._databaseSchema.GetTable(table.Name))
  				{
! 					this._savedDatabaseSchema.GetTable(table.Name).IsActive = false;
! 					this._savedDatabaseSchema.GetTable(table.Name).Name = SchemaConstants.REDUNDANT + table.Name;
  				}
  			}
--- 119,135 ----
  				if(null == this._databaseSchema.GetTable(table.Name))
  				{
! 					//					string newname = SchemaConstants.REDUNDANT + column.Name;
! 					string oldname = table.Name;
! 					//					ColumnSchema c = column;
! 					//					c.IsActive = false;
! 					//					c.Name = newname;
! 
! 					this._savedDatabaseSchema.Tables.Remove(table.Name);
! 					//					this._savedDatabaseSchema.GetTable(tableNameToUpdate).AddColumn(c);
! 
! 
! 
! //					this._savedDatabaseSchema.GetTable(table.Name).IsActive = false;
! //					this._savedDatabaseSchema.GetTable(table.Name).Name = SchemaConstants.REDUNDANT + table.Name;
  				}
  			}