diff options
author | Christopher Podurgiel <cpodu@mono-cvs.ximian.com> | 2002-02-10 22:06:03 +0300 |
---|---|---|
committer | Christopher Podurgiel <cpodu@mono-cvs.ximian.com> | 2002-02-10 22:06:03 +0300 |
commit | 639a9979823f89f90991e91d9b2f028055e3b5ad (patch) | |
tree | ba742520e871bb9438311dff370341ed30a7a782 | |
parent | a77709aad58b4efb8bb240a4b8b4038635c27a05 (diff) |
* Updated all Enums, Interfaces, and Delegates in System.Data
* IDbDataParameter.cs : Added -- New class in .NET 1.0
svn path=/trunk/mcs/; revision=2301
42 files changed, 383 insertions, 661 deletions
diff --git a/mcs/class/System.Data/System.Data/AcceptRejectRule.cs b/mcs/class/System.Data/System.Data/AcceptRejectRule.cs index 9c94415da07..bb98d27cf03 100644 --- a/mcs/class/System.Data/System.Data/AcceptRejectRule.cs +++ b/mcs/class/System.Data/System.Data/AcceptRejectRule.cs @@ -13,10 +13,11 @@ namespace System.Data /// <summary> /// Determines the action that occurs when the AcceptChanges or RejectChanges method is invoked on a DataTable with a ForeignKeyConstraint. /// </summary> + [Serializable] public enum AcceptRejectRule { - Cascade, - None + Cascade = 1, + None = 0 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/CommandBehavior.cs b/mcs/class/System.Data/System.Data/CommandBehavior.cs index d0f71d19efc..918722e1937 100644 --- a/mcs/class/System.Data/System.Data/CommandBehavior.cs +++ b/mcs/class/System.Data/System.Data/CommandBehavior.cs @@ -14,13 +14,17 @@ namespace System.Data /// Specifies a description of the results and the affect on the database of the query command. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values. /// </summary> + [Flags] + [Serializable] public enum CommandBehavior { - CloseConnection, - KeyInfo, - SchemaOnly, - SequentialAccess, - SingleResult, - SingleRow + Default = 0, + SingleResult = 1, + SchemaOnly = 2, + KeyInfo = 4, + SingleRow = 8, + SequentialAccess = 16, + CloseConnection = 32 + } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/CommandType.cs b/mcs/class/System.Data/System.Data/CommandType.cs index 9f8ed3acceb..ab1b6fe72d1 100644 --- a/mcs/class/System.Data/System.Data/CommandType.cs +++ b/mcs/class/System.Data/System.Data/CommandType.cs @@ -7,15 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies how a command string is interpreted. /// </summary> + [Serializable] public enum CommandType { - StoredProcedure, - TableDirect, - Text + Text = 1, + StoredProcedure = 4, + TableDirect = 512 + } } diff --git a/mcs/class/System.Data/System.Data/ConnectionState.cs b/mcs/class/System.Data/System.Data/ConnectionState.cs index 9dded5170db..50d50c8a6d4 100644 --- a/mcs/class/System.Data/System.Data/ConnectionState.cs +++ b/mcs/class/System.Data/System.Data/ConnectionState.cs @@ -7,20 +7,24 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Returns the current state of the connection to a data source. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values. /// </summary> + [Flags] + [Serializable] public enum ConnectionState { - Broken, - Closed, - Connecting, - Executing, - Fetching, - Open + Closed = 0, + Open = 1, + Connecting = 2, + Executing = 4, + Fetching = 8, + Broken = 16 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs b/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs index 56e0a11ff2f..1932d38f2fe 100644 --- a/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs +++ b/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs @@ -12,6 +12,7 @@ namespace System.Data /// <summary> /// Represents the method that will handle the the ColumnChanging event. /// </summary> + [Serializable] public delegate void DataColumnChangeEventHandler(object sender, DataColumnChangeEventArgs e); }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataRowAction.cs b/mcs/class/System.Data/System.Data/DataRowAction.cs index 5c5ce5b6d6a..b6423b374ca 100644 --- a/mcs/class/System.Data/System.Data/DataRowAction.cs +++ b/mcs/class/System.Data/System.Data/DataRowAction.cs @@ -13,14 +13,16 @@ namespace System.Data /// Describes the action taken on a DataRow. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values. /// </summary> + [Flags] + [Serializable] public enum DataRowAction { - Add, - Change, - Commit, - Delete, - Nothing, - Rollback + Nothing = 0, + Delete = 1, + Change = 2, + Rollback = 4, + Commit = 8, + Add = 16 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs b/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs index 27bc694405e..4959e38f3bf 100644 --- a/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs +++ b/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs @@ -12,6 +12,7 @@ namespace System.Data /// <summary> /// Represents the method that will handle the RowChanging, RowChanged, RowDeleting, and RowDeleted events of a DataTable. /// </summary> + [Serializable] public delegate void DataRowChangeEventHandler(object sender, DataRowChangeEventArgs e); }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataRowState.cs b/mcs/class/System.Data/System.Data/DataRowState.cs index 1c52f945416..4e77e406203 100644 --- a/mcs/class/System.Data/System.Data/DataRowState.cs +++ b/mcs/class/System.Data/System.Data/DataRowState.cs @@ -12,13 +12,15 @@ namespace System.Data /// <summary> /// Gets the state of a DataRow object. /// </summary> + [Flags] + [Serializable] public enum DataRowState { - Added, - Deleted, - Detached, - Modified, - Unchanged + Detached = 1, + Unchanged = 2, + Added = 4, + Deleted = 8, + Modified = 16 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataRowVersion.cs b/mcs/class/System.Data/System.Data/DataRowVersion.cs index b738b086f93..ad757946bcb 100644 --- a/mcs/class/System.Data/System.Data/DataRowVersion.cs +++ b/mcs/class/System.Data/System.Data/DataRowVersion.cs @@ -12,11 +12,12 @@ namespace System.Data /// <summary> /// Describes the version of a DataRow. /// </summary> + [Serializable] public enum DataRowVersion { - Current, - Default, - Original, - Proposed + Original = 256, + Current = 512, + Proposed = 1024, + Default = 1536 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DataViewRowState.cs b/mcs/class/System.Data/System.Data/DataViewRowState.cs index 8bd78611ad2..2768fbe0e0f 100644 --- a/mcs/class/System.Data/System.Data/DataViewRowState.cs +++ b/mcs/class/System.Data/System.Data/DataViewRowState.cs @@ -13,15 +13,17 @@ namespace System.Data /// Describes the version of data in a DataRow. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values. /// </summary> + [Flags] + [Serializable] public enum DataViewRowState { - Added, - CurrentRows, - Deleted, - ModifiedCurrent, - ModifiedOriginal, - None, - OriginalRows, - Unchanged + None = 0, + Unchanged = 2, + Added = 4, + Deleted = 8, + ModifiedCurrent = 16, + CurrentRows = 22, + ModifiedOriginal = 32, + OriginalRows = 42 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/DbType.cs b/mcs/class/System.Data/System.Data/DbType.cs index f6efc0cf6cb..9a0cad9a631 100644 --- a/mcs/class/System.Data/System.Data/DbType.cs +++ b/mcs/class/System.Data/System.Data/DbType.cs @@ -12,30 +12,33 @@ namespace System.Data /// <summary> /// Gets the data type of a field, a property, or a Parameter object of a .NET data provider. /// </summary> + [Serializable] public enum DbType { - AnsiString, - Binary, - Boolean, - Byte, - Currency, - Date, - DateTime, - Decimal, - Double, - Guid, - Int16, - Int32, - Int64, - Object, - SByte, - Single, - String, - Time, - UInt16, - UInt32, - UInt64, - VarNumeric + AnsiString = 0, + Binary = 1, + Byte = 2, + Boolean = 3, + Currency = 4, + Date = 5, + DateTime = 6, + Decimal = 7, + Double = 8, + Guid = 9, + Int16 = 10, + Int32 = 11, + Int64 = 12, + Object = 13, + SByte = 14, + Single = 15, + String = 16, + Time = 17, + UInt16 = 18, + UInt32 = 19, + UInt64 = 20, + VarNumeric = 21, + AnsiStringFixedLength = 22, + StringFixedLength = 23 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs b/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs index adc2008b2d3..8f63a935cdb 100644 --- a/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs +++ b/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs @@ -12,6 +12,7 @@ namespace System.Data /// <summary> /// Represents the method that will handle the FillError event. /// </summary> + [Serializable] public delegate void FillErrorEventHandler(object sender, FillErrorEventArgs e); }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IColumnMapping.cs b/mcs/class/System.Data/System.Data/IColumnMapping.cs index 3f7919cdd6e..2e307763533 100644 --- a/mcs/class/System.Data/System.Data/IColumnMapping.cs +++ b/mcs/class/System.Data/System.Data/IColumnMapping.cs @@ -14,24 +14,22 @@ namespace System.Data /// </summary> public interface IColumnMapping { + /// <summary> + /// Gets or sets the name of the column within the DataSet to map to. + /// </summary> string DataSetColumn { - get - { - } - set - { - } + get; + set; } + /// <summary> + /// Gets or sets the name of the column within the data source to map from. The name is case-sensitive. + /// </summary> string SourceColumn { - get - { - } - set - { - } + get; + set; } } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs b/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs index b6f9b6556a1..a23a2ae6056 100644 --- a/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs +++ b/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs @@ -16,34 +16,20 @@ namespace System.Data /// </summary> public interface IColumnMappingCollection : IList, ICollection, IEnumerable { - IColumnMapping Add(string sourceColumnName, string dataSetColumnName) - { - } + IColumnMapping Add(string sourceColumnName, string dataSetColumnName); - bool Contains(string sourceColumnName) - { - } + bool Contains(string sourceColumnName); - IColumnMapping GetByDataSetColumn(string dataSetColumnName) - { - } + IColumnMapping GetByDataSetColumn(string dataSetColumnName); - int IndexOf(string sourceColumnName) - { - } + int IndexOf(string sourceColumnName); - void RemoveAt(string sourceColumnName) - { - } + void RemoveAt(string sourceColumnName); object this[string index] { - get - { - } - set - { - } + get; + set; } } } diff --git a/mcs/class/System.Data/System.Data/IDataAdapter.cs b/mcs/class/System.Data/System.Data/IDataAdapter.cs index 2e4010d80ea..be6f09036b0 100644 --- a/mcs/class/System.Data/System.Data/IDataAdapter.cs +++ b/mcs/class/System.Data/System.Data/IDataAdapter.cs @@ -14,49 +14,19 @@ namespace System.Data /// </summary> public interface IDataAdapter { - int Fill(DataSet dataSet) - { - } + int Fill(DataSet dataSet); - DataTable[] FillSchema(DataSet dataSet, SchemaType schemaType) - { - } + DataTable[] FillSchema(DataSet dataSet, SchemaType schemaType); IDataParameter[] GetFillParameters(); - int Update(DataSet dataSet) - { - } + int Update(DataSet dataSet); - MissingMappingAction MissingMappingAction - { - get - { - } - set - { - } - } - - MissingSchemaAction MissingSchemaAction - { - get - { - } - set - { - } - } - - ITableMappingCollection TableMappings - { - get - { - } - set - { - } - } + MissingMappingAction MissingMappingAction{get;set;} + + MissingSchemaAction MissingSchemaAction{get;set;} + + ITableMappingCollection TableMappings{get;} } diff --git a/mcs/class/System.Data/System.Data/IDataParameter.cs b/mcs/class/System.Data/System.Data/IDataParameter.cs index 4fea04b684f..1cfdbafcbec 100644 --- a/mcs/class/System.Data/System.Data/IDataParameter.cs +++ b/mcs/class/System.Data/System.Data/IDataParameter.cs @@ -15,62 +15,19 @@ namespace System.Data public interface IDataParameter { - DbType DbType - { - get - { - } - set - { - } - } + DbType DbType{get;set;} - ParameterDirection Direction - { - get - { - } - set - { - } - } + ParameterDirection Direction{get;set;} - bool IsNullable - { - get - { - } - } + bool IsNullable{get;} - string ParameterName - { - get - { - } - set - { - } - } + string ParameterName{get;set;} - string SourceColumn - { - get - { - } - set - { - } - } + string SourceColumn{get;set;} - DataRowVersion SourceVersion - { - get - { - } - set - { - } - } + DataRowVersion SourceVersion {get;set;} + + object Value {get;set;} } diff --git a/mcs/class/System.Data/System.Data/IDataParameterCollection.cs b/mcs/class/System.Data/System.Data/IDataParameterCollection.cs index 97eb2c83068..0e77604550d 100644 --- a/mcs/class/System.Data/System.Data/IDataParameterCollection.cs +++ b/mcs/class/System.Data/System.Data/IDataParameterCollection.cs @@ -16,26 +16,12 @@ namespace System.Data /// </summary> public interface IDataParameterCollection : IList, ICollection, IEnumerable { - void RemoveAt(string parameterName) - { - } + void RemoveAt(string parameterName); - int IndexOf(string parameterName) - { - } + int IndexOf(string parameterName); - bool Contains(string parameterName) - { - } + bool Contains(string parameterName); - object this[string parameterName] - { - get - { - } - set - { - } - } + object this[string parameterName]{get; set;} } } diff --git a/mcs/class/System.Data/System.Data/IDataReader.cs b/mcs/class/System.Data/System.Data/IDataReader.cs index 8a91c649485..746d0d72ed6 100644 --- a/mcs/class/System.Data/System.Data/IDataReader.cs +++ b/mcs/class/System.Data/System.Data/IDataReader.cs @@ -12,44 +12,21 @@ namespace System.Data /// <summary> /// Provides a means of reading one or more forward-only streams of result sets obtained by executing a command at a data source, and is implemented by .NET data providers that access relational databases. /// </summary> - public interface IDataReader : IDataRecord + public interface IDataReader : IDisposable, IDataRecord { - void Close() - { - } + void Close(); - DataTable GetSchemaTable() - { - } + DataTable GetSchemaTable(); - bool NextResult() - { - } + bool NextResult(); - bool Read() - { - } + bool Read(); - int Depth - { - get - { - } - } + int Depth{get;} - bool IsClosed - { - get - { - } - } + bool IsClosed{get;} - int RecordsAffected - { - get - { - } - } + int RecordsAffected{get;} } diff --git a/mcs/class/System.Data/System.Data/IDataRecord.cs b/mcs/class/System.Data/System.Data/IDataRecord.cs index 74177f56581..7221603ae38 100644 --- a/mcs/class/System.Data/System.Data/IDataRecord.cs +++ b/mcs/class/System.Data/System.Data/IDataRecord.cs @@ -14,113 +14,54 @@ namespace System.Data /// </summary> public interface IDataRecord { - bool GetBoolean(int i) - { - } - - byte GetByte(int i) - { - } - - long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferOffset, int length) - { - } - - char GetChar(int i) - { - } - - long GetChars(int i, long fieldOffset, char[] buffer, int bufferOffset, int length) - { - } - - IDataReader GetDate(int i) - { - } - - string GetDataTypeName(int i) - { - } - - DateTime GetDateTime(int i) - { - } - - decimal GetDecimal(int i) - { - } - - double GetDouble(int i) - { - } - - Type GetFieldType(int i) - { - } - - float GetFloat(int i) - { - } - - Guid GetGuid(int i) - { - } - - short GetInt16(int i) - { - } - - int GetInt32(int i) - { - } - - long GetInt64(int i) - { - } - - string GetName(int i) - { - } - - int GetOrdinal(string name) - { - } - - string GetString(int i) - { - } - - object GetValue(int i) - { - } - - int GetValues(object[] values) - { - } - - bool IsDBNull(int i) - { - } - - int FieldCount - { - get - { - } - } - - object this[string name] - { - get - { - } - } + bool GetBoolean(int i); + + byte GetByte(int i); + + long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferOffset, int length); + + char GetChar(int i); + + long GetChars(int i, long fieldOffset, char[] buffer, int bufferOffset, int length); + + IDataReader GetData(int i); + + string GetDataTypeName(int i); + + DateTime GetDateTime(int i); + + decimal GetDecimal(int i); + + double GetDouble(int i); + + Type GetFieldType(int i); + + float GetFloat(int i); + + Guid GetGuid(int i); + + short GetInt16(int i); + + int GetInt32(int i); + + long GetInt64(int i); + + string GetName(int i); + + int GetOrdinal(string name); + + string GetString(int i); + + object GetValue(int i); + + int GetValues(object[] values); + + bool IsDBNull(int i); + + int FieldCount{get;} + + object this[string name]{get;} - object this[int i] - { - get - { - } - } + object this[int i]{get;} } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IDbCommand.cs b/mcs/class/System.Data/System.Data/IDbCommand.cs index a14f3647a66..203fc8f60e5 100644 --- a/mcs/class/System.Data/System.Data/IDbCommand.cs +++ b/mcs/class/System.Data/System.Data/IDbCommand.cs @@ -14,100 +14,33 @@ namespace System.Data /// </summary> public interface IDBCommand { - void Cancel() - { - } + void Cancel(); - IDataParameter CreateParameter() - { - } + IDbDataParameter CreateParameter(); - int ExecuteNonQuery() - { - } + int ExecuteNonQuery(); - IDataReader ExecuteReader() - { - } + IDataReader ExecuteReader(); - IDataReader ExecuteReader(CommandBehavior behavior) - { - } + IDataReader ExecuteReader(CommandBehavior behavior); - object ExecuteScalar() - { - } + object ExecuteScalar(); - void Prepare() - { - } + void Prepare(); - string CommandText - { - get - { - } - set - { - } - } + string CommandText{get; set;} - int CommandTimeout - { - get - { - } - set - { - } - } + int CommandTimeout{get; set;} - CommandType CommandType - { - get - { - } - set - { - } - } + CommandType CommandType{get; set;} - IDbConnection Connection - { - get - { - } - set - { - } - } + IDbConnection Connection{get; set;} - IDataParameterCollection Parameters - { - get - { - } - } + IDataParameterCollection Parameters{get;} - IDbTransaction Transaction - { - get - { - } - set - { - } - } + IDbTransaction Transaction{get; set;} - UpdateRowSource UpdatedRowSource - { - get - { - } - set - { - } - } + UpdateRowSource UpdatedRowSource{get; set;} } } diff --git a/mcs/class/System.Data/System.Data/IDbConnection.cs b/mcs/class/System.Data/System.Data/IDbConnection.cs index 764c87e6617..b439251df6f 100644 --- a/mcs/class/System.Data/System.Data/IDbConnection.cs +++ b/mcs/class/System.Data/System.Data/IDbConnection.cs @@ -14,61 +14,26 @@ namespace System.Data /// </summary> public interface IDBConnection { - IDbTransaction BeginTransaction() - { - } + IDbTransaction BeginTransaction(); - IDbTransaction BeginTransaction(IsolationLevel il) - { - } + IDbTransaction BeginTransaction(IsolationLevel il); - void ChangeDatabase(string databaseName) - { - } + void ChangeDatabase(string databaseName); - void Close() - { - } + void Close(); - IDbCommand CreateCommand() - { - } + IDbCommand CreateCommand(); - void Open() - { - } + void Open(); - string ConnectionString - { - get - { - } - set - { - } - } + string ConnectionString{get; set;} - int ConnectionTimeout - { - get - { - } - } + int ConnectionTimeout{get;} - string Database - { - get - { - } - } + string Database{get;} - ConnectionState State - { - get - { - } - } + ConnectionState State{get;} } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IDbDataAdapter.cs b/mcs/class/System.Data/System.Data/IDbDataAdapter.cs index 2c798951d5b..78c1173da09 100644 --- a/mcs/class/System.Data/System.Data/IDbDataAdapter.cs +++ b/mcs/class/System.Data/System.Data/IDbDataAdapter.cs @@ -14,48 +14,12 @@ namespace System.Data /// </summary> public interface IDbDataAdapter : IDataAdapter { + IDbCommand DeleteCommand{get; set;} - IDbCommand DeleteCommand - { - get - { - } - set - { - } - } + IDbCommand InsertCommand{get; set;} - IDbCommand InsertCommand - { - get - { - } - set - { - } - } - - IDbCommand SelectCommand - { - get - { - } - set - { - } - } - - IDbCommand UpdateCommand - { - get - { - } - set - { - } - } - - + IDbCommand SelectCommand{get; set;} + IDbCommand UpdateCommand{get; set;} } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IDbDataParameter.cs b/mcs/class/System.Data/System.Data/IDbDataParameter.cs new file mode 100644 index 00000000000..91705098707 --- /dev/null +++ b/mcs/class/System.Data/System.Data/IDbDataParameter.cs @@ -0,0 +1,23 @@ +// +// System.Data.IDbDataParameter.cs +// +// Author: +// Christopher Podurgiel (cpodurgiel@msn.com) +// +// (C) Chris Podurgiel +// + +namespace System.Data +{ + /// <summary> + /// Used by the Visual Basic .NET Data Designers to represent a parameter to a Command object, and optionally, its mapping to DataSet columns. + /// </summary> + public interface IDbDataParameter + { + byte Precision{get; set;} + + byte Scale{get; set;} + + int Size{get; set;} + } +}
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/IDbTransaction.cs b/mcs/class/System.Data/System.Data/IDbTransaction.cs index 1af31cdf0cd..5eef2933469 100644 --- a/mcs/class/System.Data/System.Data/IDbTransaction.cs +++ b/mcs/class/System.Data/System.Data/IDbTransaction.cs @@ -14,20 +14,12 @@ namespace System.Data /// </summary> public interface IDbTransaction { + void Commit(); - void Commit() - { - } - - void Rollback() - { - } + void Rollback(); - IsolationLevel IsolationLevel - { - get - { - } - } + IDbConnection Connection{get;} + + IsolationLevel IsolationLevel{get;} } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/ITableMapping.cs b/mcs/class/System.Data/System.Data/ITableMapping.cs index 37bbc991a6b..82f5329b083 100644 --- a/mcs/class/System.Data/System.Data/ITableMapping.cs +++ b/mcs/class/System.Data/System.Data/ITableMapping.cs @@ -14,32 +14,10 @@ namespace System.Data /// </summary> public interface ITableMapping { - - IColumnMappingCollection ColumnMappings - { - get - { - } - } + IColumnMappingCollection ColumnMappings{get;} - string DataSetTable - { - get - { - } - set - { - } - } + string DataSetTable{get; set;} - string SourceTable - { - get - { - } - set - { - } - } + string SourceTable{get; set;} } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/ITableMappingCollection.cs b/mcs/class/System.Data/System.Data/ITableMappingCollection.cs index 6f161916cdc..5ca052f94ab 100644 --- a/mcs/class/System.Data/System.Data/ITableMappingCollection.cs +++ b/mcs/class/System.Data/System.Data/ITableMappingCollection.cs @@ -16,34 +16,16 @@ namespace System.Data /// </summary> public interface ITableMappingCollection : IList, ICollection, IEnumerable { - ITableMapping Add(string sourceTableName, string dataSetTableName) - { - } + ITableMapping Add(string sourceTableName, string dataSetTableName); - bool Contains(string sourceTableName) - { - } + bool Contains(string sourceTableName); - ITableMapping GetByDataSetTable(string dataSetTableName) - { - } + ITableMapping GetByDataSetTable(string dataSetTableName); - int IndexOf(string sourceTableName) - { - } + int IndexOf(string sourceTableName); - void RemoveAt(string sourceTableName) - { - } + void RemoveAt(string sourceTableName); - object this[string index] - { - get - { - } - set - { - } - } + object this[string index]{get; set;} } } diff --git a/mcs/class/System.Data/System.Data/IsolationLevel.cs b/mcs/class/System.Data/System.Data/IsolationLevel.cs index 6a880a83f75..3a25ef9cc0e 100644 --- a/mcs/class/System.Data/System.Data/IsolationLevel.cs +++ b/mcs/class/System.Data/System.Data/IsolationLevel.cs @@ -13,14 +13,15 @@ namespace System.Data /// Specifies the transaction locking behavior for the connection. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values. /// </summary> + [Flags] + [Serializable] public enum IsolationLevel { - Chaos, - ReadCommitted, - ReadUnCommitted, - RepeatableRead, - Serializable, - Unspecified - + Unspecified = -1, + Chaos = 16, + ReadUncommitted = 256, + ReadCommitted = 4096, + RepeatableRead = 65536, + Serializable = 1048576 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/MappingType.cs b/mcs/class/System.Data/System.Data/MappingType.cs index 4f65cf40c24..0a4d3a4870f 100644 --- a/mcs/class/System.Data/System.Data/MappingType.cs +++ b/mcs/class/System.Data/System.Data/MappingType.cs @@ -7,16 +7,20 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies how a DataColumn is mapped. /// </summary> + [Serializable] public enum MappingType { - Attribute, - Element, - Hidden, - SimpleContent + Element = 1, + Attribute = 2, + SimpleContent = 3, + Hidden = 4 + } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs b/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs index 318b761938a..3ec7962496a 100644 --- a/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs +++ b/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs @@ -12,6 +12,7 @@ namespace System.Data /// <summary> /// Represents the method that will handle the MergeFailed event. /// </summary> + [Serializable] public delegate void MergeFailedEventHandler(object sender, MergeFailedEventArgs e); }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/MissingMappingAction.cs b/mcs/class/System.Data/System.Data/MissingMappingAction.cs index f6586b8a90b..75cc7ed87ed 100644 --- a/mcs/class/System.Data/System.Data/MissingMappingAction.cs +++ b/mcs/class/System.Data/System.Data/MissingMappingAction.cs @@ -7,15 +7,18 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Determines the action that occurs when a mapping is missing from a source table or a source column. /// </summary> + [Serializable] public enum MissingMappingAction { - Error, - Ignore, - Passthrough + Passthrough = 1, + Ignore = 2, + Error = 3 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/MissingSchemaAction.cs b/mcs/class/System.Data/System.Data/MissingSchemaAction.cs index 9761b3414f2..c0b8f301398 100644 --- a/mcs/class/System.Data/System.Data/MissingSchemaAction.cs +++ b/mcs/class/System.Data/System.Data/MissingSchemaAction.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies the action to take when adding data to the DataSet and the required DataTable or DataColumn is missing. /// </summary> + [Serializable] public enum MissingSchemaAction { - Add, - AddWithKey, - Error, - Ignore + Add = 1, + Ignore = 2, + Error = 3, + AddWithKey = 4 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/ParameterDirection.cs b/mcs/class/System.Data/System.Data/ParameterDirection.cs index e7a8e67e4c9..1f24d6c3791 100644 --- a/mcs/class/System.Data/System.Data/ParameterDirection.cs +++ b/mcs/class/System.Data/System.Data/ParameterDirection.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies the type of a parameter within a query relative to the DataSet. /// </summary> + [Serializable] public enum ParameterDirection { - Input, - InputOutput, - Output, - ReturnValue + Input = 1, + Output = 2, + InputOutput = 3, + ReturnValue = 6 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/PropertyAttributes.cs b/mcs/class/System.Data/System.Data/PropertyAttributes.cs index 9f2d3d06f03..171771a485b 100644 --- a/mcs/class/System.Data/System.Data/PropertyAttributes.cs +++ b/mcs/class/System.Data/System.Data/PropertyAttributes.cs @@ -7,18 +7,22 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies the attributes of a property. /// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values /// </summary> + [Flags] + [Serializable] public enum PropertyAttributes { - NotSupported, - Optional, - Read, - Required, - Write + NotSupported = 0, + Required = 1, + Optional = 2, + Read = 512, + Write = 1024 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/Rule.cs b/mcs/class/System.Data/System.Data/Rule.cs index 773f05b938f..7895c915e61 100644 --- a/mcs/class/System.Data/System.Data/Rule.cs +++ b/mcs/class/System.Data/System.Data/Rule.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Indicates the action that occurs when a ForeignKeyConstraint is enforced. /// </summary> + [Serializable] public enum Rule { - Cascade, - None, - SetDefault, - SetNull + None = 0, + Cascade = 1, + SetNull = 2, + SetDefault = 3 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/SchemaType.cs b/mcs/class/System.Data/System.Data/SchemaType.cs index 96206e851f3..a1e4c6dbce9 100644 --- a/mcs/class/System.Data/System.Data/SchemaType.cs +++ b/mcs/class/System.Data/System.Data/SchemaType.cs @@ -7,14 +7,17 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies how to handle existing schema mappings when performing a FillSchema operation. /// </summary> + [Serializable] public enum SchemaType { - Mapped, - Source + Source = 1, + Mapped = 2 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/SqlDbType.cs b/mcs/class/System.Data/System.Data/SqlDbType.cs index e4fb25410d0..2cd9008b2a7 100644 --- a/mcs/class/System.Data/System.Data/SqlDbType.cs +++ b/mcs/class/System.Data/System.Data/SqlDbType.cs @@ -7,36 +7,39 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies SQL Server data types. /// </summary> + [Serializable] public enum SqlDbType { - BigInt, - Binary, - Bit, - Char, - DateTime, - Decimal, - Float, - Image, - Int, - Money, - NChar, - NText, - NVarChar, - Real, - SmallDateTime, - SmallInt, - SmallMoney, - Text, - Timestamp, - TinyInt, - UniqueIdentifier, - VarBinary, - VarChar, - Variant + BigInt = 0, + Binary = 1, + Bit = 2, + Char = 3, + DateTime = 4, + Decimal = 5, + Float = 6, + Image = 7, + Int = 8, + Money = 9, + NChar = 10, + NText = 11, + NVarChar = 12, + Real = 13, + UniqueIdentifier = 14, + SmallDateTime = 15, + SmallInt = 16, + SmallMoney = 17, + Text = 18, + Timestamp = 19, + TinyInt = 20, + VarBinary = 21, + VarChar = 22, + Variant = 23 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs b/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs index b8845b53642..29ad7703030 100644 --- a/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs +++ b/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs @@ -12,6 +12,7 @@ namespace System.Data /// <summary> /// Represents the method that will handle the StateChange event. /// </summary> + [Serializable] public delegate void StateChangeEventHandler(object sender, StateChangeEventArgs e); }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/StatementType.cs b/mcs/class/System.Data/System.Data/StatementType.cs index 301f89f7e91..ac307b13e54 100644 --- a/mcs/class/System.Data/System.Data/StatementType.cs +++ b/mcs/class/System.Data/System.Data/StatementType.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies the type of SQL query to be used by the OleDbRowUpdatedEventArgs, OleDbRowUpdatingEventArgs, SqlRowUpdatedEventArgs, or SqlRowUpdatingEventArgs class. /// </summary> + [Serializable] public enum StatementType { - Delete, - Insert, - Select, - Update + Select = 0, + Insert = 1, + Update = 2, + Delete = 3 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/UpdateRowSource.cs b/mcs/class/System.Data/System.Data/UpdateRowSource.cs index c854f2cf725..5ebd297aad1 100644 --- a/mcs/class/System.Data/System.Data/UpdateRowSource.cs +++ b/mcs/class/System.Data/System.Data/UpdateRowSource.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies how query command results are applied to the row being updated. /// </summary> + [Serializable] public enum UpdateRowSource { - Both, - FirstReturnedRecord, - None, - OutputParameters + None = 0, + OutputParameters = 1, + FirstReturnedRecord = 2, + Both = 3 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/UpdateStatus.cs b/mcs/class/System.Data/System.Data/UpdateStatus.cs index 076d7084945..b82b187d85d 100644 --- a/mcs/class/System.Data/System.Data/UpdateStatus.cs +++ b/mcs/class/System.Data/System.Data/UpdateStatus.cs @@ -7,16 +7,19 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies the action to take with regard to the current and remaining rows during an Update. /// </summary> + [Serializable] public enum UpdateStatus { - Continue, - ErrorsOccurred, - SkipAllRemainingRows, - SkipCurrentRow + Continue = 0, + ErrorsOccurred = 1, + SkipCurrentRow = 2, + SkipAllRemainingRows = 3 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/XmlReadMode.cs b/mcs/class/System.Data/System.Data/XmlReadMode.cs index fe04bbc732d..dad273758c8 100644 --- a/mcs/class/System.Data/System.Data/XmlReadMode.cs +++ b/mcs/class/System.Data/System.Data/XmlReadMode.cs @@ -7,18 +7,21 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Specifies how to read XML data and a relational schema into a DataSet. /// </summary> + [Serializable] public enum XmlReadMode { - Auto, - DiffGram, - Fragment, - IgnoreSchema, - InferSchema, - ReadSchema + Auto = 0, + ReadSchema = 1, + IgnoreSchema = 2, + InferSchema = 3, + DiffGram = 4, + Fragment = 5 } }
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/XmlWriteMode.cs b/mcs/class/System.Data/System.Data/XmlWriteMode.cs index de1d0ad3786..e1877dae362 100644 --- a/mcs/class/System.Data/System.Data/XmlWriteMode.cs +++ b/mcs/class/System.Data/System.Data/XmlWriteMode.cs @@ -7,15 +7,18 @@ // (C) Chris Podurgiel // -namespace System.Data +using System; + +namespace mono.System.Data { /// <summary> /// Use the members of this enumeration when setting the WriteMode parameter of the WriteXml method. /// </summary> + [Serializable] public enum XmlWriteMode { - DiffGram, - IgnoreSchema, - WriteSchema + WriteSchema = 0, + IgnoreSchema = 1, + DiffGram = 2 } }
\ No newline at end of file |