[Adapdev-commits] Adapdev/src/Adapdev.Data/Schema ColumnSchema.cs,1.12,1.13 DatabaseSchema.cs,1.9,1.10 ForeignKeyAssociation.cs,1.8,1.9 OleDbSchemaBuilder.cs,1.7,1.8 SaveDatabaseSchema.cs,1.6,1.7 TableSchema.cs,1.11,1.12

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

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

Modified Files:
	ColumnSchema.cs DatabaseSchema.cs ForeignKeyAssociation.cs 
	OleDbSchemaBuilder.cs SaveDatabaseSchema.cs TableSchema.cs 
Log Message:
Cleaned up several warnings
Restored some lingering files

Index: DatabaseSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/DatabaseSchema.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DatabaseSchema.cs	16 Nov 2005 07:01:48 -0000	1.9
--- DatabaseSchema.cs	26 Nov 2005 08:09:22 -0000	1.10
***************
*** 1,2 ****
--- 1,3 ----
+ using System.ComponentModel;
  using System.Xml.Serialization;
  
***************
*** 115,118 ****
--- 116,122 ----
  		/// </summary>
  		/// <returns>SortedList</returns>
+ 		/// 
+ 		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList SortedTables
  		{

Index: TableSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchema.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TableSchema.cs	16 Nov 2005 07:01:48 -0000	1.11
--- TableSchema.cs	26 Nov 2005 08:09:22 -0000	1.12
***************
*** 1,2 ****
--- 1,4 ----
+ using System.ComponentModel;
+ 
  namespace Adapdev.Data.Schema
  {
***************
*** 151,154 ****
--- 153,157 ----
  		/// <returns></returns>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList OrdinalColumns
  		{
***************
*** 169,172 ****
--- 172,176 ----
  		/// <returns></returns>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public SortedList SortedColumns
  		{
***************
*** 258,262 ****
--- 262,269 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "Columns")]
+ 		[SchemaDataRewritableAttribute(true)]
  		public ColumnSchemaDictionary Columns
  		{
***************
*** 269,272 ****
--- 276,281 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "PrimaryKeys")]
  		public ColumnSchemaDictionary PrimaryKeys
***************
*** 287,290 ****
--- 296,301 ----
  		/// </summary>
  		/// <returns></returns>
+ 		/// 
+ 		[Browsable(false)]
  		[XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "ForeignKeys")]
  		public ColumnSchemaDictionary ForeignKeys
***************
*** 301,304 ****
--- 312,316 ----
  		}
  
+ 		[Browsable(false)]
  		public override string ToString()
  		{

Index: ForeignKeyAssociation.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ForeignKeyAssociation.cs	16 Nov 2005 07:01:48 -0000	1.8
--- ForeignKeyAssociation.cs	26 Nov 2005 08:09:22 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.ComponentModel;
  
  namespace Adapdev.Data.Schema
***************
*** 10,13 ****
--- 11,15 ----
  	public class ForeignKeyAssociation
  	{
+ 		private TableSchema _table = null;
  		private ColumnSchema _foreignColumn = null;
  		private TableSchema _foreignTable = null;
***************
*** 15,18 ****
--- 17,21 ----
  		private AssociationType _association = AssociationType.OneToMany;
  		
+ 		[Browsable(false)]
  		public ColumnSchema ForeignColumn
  		{
***************
*** 26,29 ****
--- 29,33 ----
  		}
  
+ 		[Browsable(false)]
  		public ColumnSchema Column
  		{
***************
*** 37,40 ****
--- 41,45 ----
  		}
  
+ 		[Browsable(false)]
  		public TableSchema ForeignTable
  		{
***************
*** 50,54 ****
  		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;}
  		}
  
***************
*** 59,64 ****
  		}
  
! 		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;
***************
*** 66,70 ****
  		}
  
! 
  		public override string ToString()
  		{
--- 72,76 ----
  		}
  
! 		[Browsable(false)]
  		public override string ToString()
  		{

Index: SaveDatabaseSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SaveDatabaseSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SaveDatabaseSchema.cs	16 Nov 2005 07:01:48 -0000	1.6
--- SaveDatabaseSchema.cs	26 Nov 2005 08:09:22 -0000	1.7
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using Adapdev.Serialization;
  
  namespace Adapdev.Data.Schema
***************
*** 27,34 ****
  		{	
  			schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName);
! 			XmlSerializer dbSerializer = new XmlSerializer(typeof(DatabaseSchema));
! 			StreamWriter schemaWriter = new StreamWriter(schemaFile);
! 			dbSerializer.Serialize(schemaWriter, _dbSchema);
! 			schemaWriter.Close();
  		}
  	}
--- 28,32 ----
  		{	
  			schemaFile = System.IO.Path.Combine(SchemaConstants.SCHEMAPATH,_savedSchemaName);
! 			Serializer.SerializeToXmlFile(this._dbSchema, schemaFile);
  		}
  	}

Index: ColumnSchema.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ColumnSchema.cs	16 Nov 2005 07:01:48 -0000	1.12
--- ColumnSchema.cs	26 Nov 2005 08:09:22 -0000	1.13
***************
*** 1,2 ****
--- 1,4 ----
+ using System.ComponentModel;
+ 
  namespace Adapdev.Data.Schema
  {
***************
*** 31,35 ****
  		private string _defaultTestValue = String.Empty;
  		private ArrayList _fkReferences = new ArrayList();
- 		private TableSchema _parent = null;
  
  		/// <summary>
--- 33,36 ----
***************
*** 185,189 ****
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string Alias
  		{
--- 186,190 ----
  		/// </summary>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string Alias
  		{
***************
*** 212,216 ****
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string DefaultValue
  		{
--- 213,217 ----
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string DefaultValue
  		{
***************
*** 224,228 ****
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(false)]
  		public string DefaultTestValue
  		{
--- 225,229 ----
  		/// <value></value>
  		[XmlAttribute]
! 		[SchemaDataRewritableAttribute(true)]
  		public string DefaultTestValue
  		{
***************
*** 236,239 ****
--- 237,241 ----
  		/// <value></value>
  		[XmlIgnore]
+ 		[Browsable(false)]
  		public ArrayList ForeignKeyTables
  		{
***************
*** 280,283 ****
--- 282,286 ----
  		}
  
+ 		[Browsable(false)]
  		public override string ToString()
  		{

Index: OleDbSchemaBuilder.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/OleDbSchemaBuilder.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OleDbSchemaBuilder.cs	16 Nov 2005 07:01:48 -0000	1.7
--- OleDbSchemaBuilder.cs	26 Nov 2005 08:09:22 -0000	1.8
***************
*** 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));
  								}
  							}