2002-03-27 Rodrigo Moya <rodrigo@ximian.com>

	* System.Data.Common/DataColumnMapping.cs:
	* System.Data.Common/DataColumnMappingCollection.cs:
	* System.Data.Common/DataAdapter.cs: created skeletons.

	* System.Data.build: exclude new directories from build.

svn path=/trunk/mcs/; revision=3407

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
index 53ef442e34aba2c366af6adf5c279018fd81d2f4..d8a56cf7d29c0533d85567102646fbebea2f56be 100644 (file)
--- a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
@@ -14,8 +14,6 @@ namespace System.Data.SqlClient
        /// </summary>
        public class SqlConnection : IDBConnection
        {
-               #region methods
-               
                public SqlTransaction BeginTransaction()
                {
                        return new SqlTransaction (this);
@@ -25,7 +23,7 @@ namespace System.Data.SqlClient
                {
                        SqlTransaction xaction = new SqlTransaction (cnc);
                        xaction.IsolationLevel = il;
-
+                       
                        return xaction;
                }
 
@@ -53,10 +51,6 @@ namespace System.Data.SqlClient
                        throw new NotImplementedException ();
                }
 
-               #endregion
-
-               #region properties
-
                [MonoTODO]
                public string ConnectionString
                {
@@ -81,7 +75,5 @@ namespace System.Data.SqlClient
                {
                        get { throw new NotImplementedException (); }
                }
-
-               #endregion
        }
 }

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
index 53ef442e34aba2c366af6adf5c279018fd81d2f4..d8a56cf7d29c0533d85567102646fbebea2f56be 100644 (file)
--- a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
@@ -14,8 +14,6 @@ namespace System.Data.SqlClient
        /// </summary>
        public class SqlConnection : IDBConnection
        {
-               #region methods
-               
                public SqlTransaction BeginTransaction()
                {
                        return new SqlTransaction (this);
@@ -25,7 +23,7 @@ namespace System.Data.SqlClient
                {
                        SqlTransaction xaction = new SqlTransaction (cnc);
                        xaction.IsolationLevel = il;
-
+                       
                        return xaction;
                }
 
@@ -53,10 +51,6 @@ namespace System.Data.SqlClient
                        throw new NotImplementedException ();
                }
 
-               #endregion
-
-               #region properties
-
                [MonoTODO]
                public string ConnectionString
                {
@@ -81,7 +75,5 @@ namespace System.Data.SqlClient
                {
                        get { throw new NotImplementedException (); }
                }
-
-               #endregion
        }
 }

diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
index 5a8931007d5547aec5f92c18c650201695bfd179..ca3672a669bfc8c3fddd6d8c4be07c06b6c92ebb 100644 (file)
--- a/mcs/class/System.Data/ChangeLog
+++ b/mcs/class/System.Data/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-27  Rodrigo Moya <rodrigo@ximian.com>
+
+       * System.Data.Common/DataColumnMapping.cs:
+       * System.Data.Common/DataColumnMappingCollection.cs:
+       * System.Data.Common/DataAdapter.cs: created skeletons.
+
+       * System.Data.build: exclude new directories from build.
+
 2002-03-27  Rodrigo Moya <rodrigo@ximian.com>
 
        * System.Data.SqlClient/SqlTransaction.cs: started implementation.

diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
new file mode 100644 (file)
index 0000000..8b51e35
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
@@ -0,0 +1,72 @@
+//
+// System.Data.Common.DataAdapter
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.Data.Common
+{
+       /// <summary>
+       /// Represents a set of data commands and a database connection that are used to fill the DataSet and update the data source.
+       /// </summary>
+       public abstract class DataAdapter : Component, IDataAdapter
+       {
+               [MonoTODO]
+               protected DataAdapter()
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               public abstract int Fill(DataSet dataSet);
+
+               public abstract DataTable[] FillSchema(DataSet dataSet,
+                                                      SchemaType schemaType);
+
+               public abstract IDataParameter[] GetFillParameters();
+
+               public abstract int Update(DataSet dataSet);
+
+               protected virtual DataAdapter CloneInternals();
+
+               protected virtual DataTableMappingCollection CreateTableMappings();
+
+               protected virtual bool ShouldSerializeTableMappings();
+               
+               [MonoTODO]
+               public bool AcceptChangesDuringFill
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public bool ContinueUpdateOnError
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public MissingMappingAction MissingMappingAction
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public MissingSchemaAction MissingSchemaAction
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public DataTableMappingCollection TableMappings
+               {
+                       get { throw new NotImplementedException (); }
+               }
+       }
+}

diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
new file mode 100644 (file)
index 0000000..f934d39
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
@@ -0,0 +1,51 @@
+//
+// System.Data.Common.DataColumnMapping
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.Data.Common
+{
+       /// <summary>
+       /// Contains a generic column mapping for an object that inherits from DataAdapter. This class cannot be inherited.
+       /// </summary>
+       public sealed class DataColumnMapping : MarshalByRefObject, IColumnMapping, ICloneable
+       {
+               [MonoTODO]
+               public DataColumnMapping()
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public DataColumnMapping(string src_column, string ds_column)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public DataColumn GetDataColumnBySchemaAction(DataTable dataTable,
+                                                             Type dataType,
+                                                             MissingSchemaAction schemaAction)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public string DataSetColumn
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public string SourceColumn
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+       }
+}

diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
new file mode 100644 (file)
index 0000000..4e7c0c8
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
@@ -0,0 +1,113 @@
+//
+// System.Data.Common.DataColumnCollection
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.Data.Common
+{
+       /// <summary>
+       /// Contains a collection of DataColumnMapping objects. This class cannot be inherited.
+       /// </summary>
+       public sealed class DataColumnMappingCollection :
+               MarshalByRefObject, IColumnMappingCollection, IList,
+               ICollection, IEnumerable
+       {
+               [MonoTODO]
+               public DataColumnMappingCollection()
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public int Add(object)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void AddRange(DataColumnMapping[] values)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void Clear()
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public bool Contains(object)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void CopyTo(Array array, int index)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public DataColumnMapping GetByDataSetColumn(string value)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public static DataColumnMapping GetColumnMappingBySchemaAction(
+                       DataColumnMappingCollection columnMappings,
+                       string sourceColumn,
+                       MissingMappingAction mappingAction)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public int IndexOf(object)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public int IndexOfDataSetColumn(string dataSetColumn)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void Insert(int index, object value)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void Remove(object value)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               public void RemoveAt(int index)
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               [MonoTODO]
+               public int Count
+               {
+                       get { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public DataColumnMapping this[int]
+               {
+                       get { throw new NotImplementedException (); }
+                       set { throw new NotImplementedException (); }
+               }
+       }
+}

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
index 53ef442e34aba2c366af6adf5c279018fd81d2f4..d8a56cf7d29c0533d85567102646fbebea2f56be 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
@@ -14,8 +14,6 @@ namespace System.Data.SqlClient
        /// </summary>
        public class SqlConnection : IDBConnection
        {
-               #region methods
-               
                public SqlTransaction BeginTransaction()
                {
                        return new SqlTransaction (this);
@@ -25,7 +23,7 @@ namespace System.Data.SqlClient
                {
                        SqlTransaction xaction = new SqlTransaction (cnc);
                        xaction.IsolationLevel = il;
-
+                       
                        return xaction;
                }
 
@@ -53,10 +51,6 @@ namespace System.Data.SqlClient
                        throw new NotImplementedException ();
                }
 
-               #endregion
-
-               #region properties
-
                [MonoTODO]
                public string ConnectionString
                {
@@ -81,7 +75,5 @@ namespace System.Data.SqlClient
                {
                        get { throw new NotImplementedException (); }
                }
-
-               #endregion
        }
 }

diff --git a/mcs/class/System.Data/System.Data.build b/mcs/class/System.Data/System.Data.build
index ecfad8c939046f053728c9d541eefb5cafa0e9d7..53c49e76491fd640934e7e7040111ab6d97fbe92 100644 (file)
--- a/mcs/class/System.Data/System.Data.build
+++ b/mcs/class/System.Data/System.Data.build
@@ -17,6 +17,7 @@
                                <excludes name="System.Data/DataTable.cs"/>
                                <excludes name="System.Data/DataSet.cs"/>
                                <excludes name="Test/**"/>
+                               <excludes name="System.Data.Common/*"/>
                                 <excludes name="System.Data.SqlClient/*"/>
                        </sources>
                        <references>