[Adapdev-commits] Adapdev/src/Adapdev.Data/Schema ColumnSchema.cs,1.6,1.7 DatabaseSchema.cs,1.3,1.4
Status: Beta
Brought to you by:
intesar66
From: Sean M. <int...@us...> - 2005-11-11 04:52:55
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25387/src/Adapdev.Data/Schema Modified Files: ColumnSchema.cs DatabaseSchema.cs ForeignKeyAssociation.cs SaveDatabaseSchema.cs TableSchema.cs Log Message: Added support for mutli-threaded tests (still buggy) and transactional tests Added new ISelectQuery.AddJoin method allowing for the joining of four tables Fixed bug w/ DatabaseSchema persistence Index: SaveDatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SaveDatabaseSchema.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SaveDatabaseSchema.cs 6 Nov 2005 09:44:09 -0000 1.1 --- SaveDatabaseSchema.cs 11 Nov 2005 04:52:46 -0000 1.2 *************** *** 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,36 ---- { 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(); ! Serializer.SerializeToXmlFile(this._dbSchema, schemaFile); } } Index: DatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/DatabaseSchema.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DatabaseSchema.cs 6 Nov 2005 09:50:49 -0000 1.3 --- DatabaseSchema.cs 11 Nov 2005 04:52:46 -0000 1.4 *************** *** 1,2 **** --- 1,4 ---- + using System.Xml.Serialization; + namespace Adapdev.Data.Schema { *************** *** 113,116 **** --- 115,120 ---- /// </summary> /// <returns>SortedList</returns> + /// + [XmlIgnore] public SortedList SortedTables { Index: TableSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchema.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TableSchema.cs 6 Nov 2005 09:47:18 -0000 1.5 --- TableSchema.cs 11 Nov 2005 04:52:46 -0000 1.6 *************** *** 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,261 **** --- 262,267 ---- /// </summary> /// <returns></returns> + /// + [Browsable(false)] [XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "Columns")] public ColumnSchemaDictionary Columns *************** *** 269,272 **** --- 275,280 ---- /// </summary> /// <returns></returns> + /// + [Browsable(false)] [XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "PrimaryKeys")] public ColumnSchemaDictionary PrimaryKeys *************** *** 287,290 **** --- 295,300 ---- /// </summary> /// <returns></returns> + /// + [Browsable(false)] [XmlElement(Type = typeof(ColumnSchemaDictionary), ElementName = "ForeignKeys")] public ColumnSchemaDictionary ForeignKeys *************** *** 301,304 **** --- 311,315 ---- } + [Browsable(false)] public override string ToString() { Index: ForeignKeyAssociation.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ForeignKeyAssociation.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ForeignKeyAssociation.cs 2 Nov 2005 13:45:13 -0000 1.2 --- ForeignKeyAssociation.cs 11 Nov 2005 04:52:46 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- using System; + using System.ComponentModel; namespace Adapdev.Data.Schema *************** *** 15,18 **** --- 16,20 ---- private AssociationType _association = AssociationType.OneToMany; + [Browsable(false)] public ColumnSchema ForeignColumn { *************** *** 26,29 **** --- 28,32 ---- } + [Browsable(false)] public ColumnSchema Column { *************** *** 37,40 **** --- 40,44 ---- } + [Browsable(false)] public TableSchema ForeignTable { *************** *** 66,70 **** } ! public override string ToString() { --- 70,74 ---- } ! [Browsable(false)] public override string ToString() { Index: ColumnSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ColumnSchema.cs 6 Nov 2005 09:41:27 -0000 1.6 --- ColumnSchema.cs 11 Nov 2005 04:52:46 -0000 1.7 *************** *** 1,2 **** --- 1,4 ---- + using System.ComponentModel; + namespace Adapdev.Data.Schema { *************** *** 236,239 **** --- 238,242 ---- /// <value></value> [XmlIgnore] + [Browsable(false)] public ArrayList ForeignKeyTables { *************** *** 280,283 **** --- 283,287 ---- } + [Browsable(false)] public override string ToString() { |