Author: rgrabowski
Date: Sun Jun 14 01:53:23 2009
New Revision: 784499
URL: http://svn.apache.org/viewvc?rev=784499&view=rev
Log:
Removed unused DataAdapter provider items.
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DataConstants.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DbProvider.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/IDbProvider.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/ProviderDeSerializer.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/provider.xsd
Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DataConstants.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DataConstants.cs?rev=784499&r1=784498&r2=784499&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DataConstants.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DataConstants.cs Sun Jun
14 01:53:23 2009
@@ -56,10 +56,6 @@
/// </summary>
public const string ATTRIBUTE_CONNECTIONCLASS = "connectionClass";
/// <summary>
- /// Token for attribute dataAdapterClass.
- /// </summary>
- public const string ATTRIBUTE_DATAADAPTERCLASS = "dataAdapterClass";
- /// <summary>
/// Token for attribute description.
/// </summary>
public const string ATTRIBUTE_DESCRIPTION = "description";
Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DbProvider.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DbProvider.cs?rev=784499&r1=784498&r2=784499&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DbProvider.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/DbProvider.cs Sun Jun 14
01:53:23 2009
@@ -63,8 +63,6 @@
[NonSerialized]
private string _parameterDbTypeProperty = string.Empty;
[NonSerialized]
- private string _dataAdapterClass = string.Empty;
- [NonSerialized]
private string _commandBuilderClass = string.Empty;
[NonSerialized]
@@ -341,23 +339,6 @@
}
/// <summary>
- /// The dataAdapter class name to use.
- /// </summary>
- /// <example >
- /// "System.Data.SqlDbType"
- /// </example>
- [XmlAttribute("dataAdapterClass")]
- public string DataAdapterClass
- {
- get { return _dataAdapterClass; }
- set
- {
- CheckPropertyString("DataAdapterClass", value);
- _dataAdapterClass = value;
- }
- }
-
- /// <summary>
/// The commandBuilder class name to use.
/// </summary>
/// <example >
@@ -464,11 +445,6 @@
{
assembly = Assembly.Load(_assemblyName);
- // Build the DataAdapter template
- type = assembly.GetType(_dataAdapterClass,
true);
- CheckPropertyType("DataAdapterClass",
typeof(IDbDataAdapter), type);
- _templateDataAdapter =
(IDbDataAdapter)type.GetConstructor(Type.EmptyTypes).Invoke(null);
-
// Build the connection template
type = assembly.GetType(_connectionClass, true);
CheckPropertyType("DbConnectionClass",
typeof(IDbConnection), type);
@@ -486,7 +462,6 @@
}
_templateConnectionIsICloneable =
_templateConnection is ICloneable;
- _templateDataAdapterIsICloneable =
_templateDataAdapter is ICloneable;
}
catch(Exception e)
{
@@ -528,20 +503,6 @@
return _templateConnection.CreateCommand();
}
- /// <summary>
- /// Create a dataAdapter object for this provider.
- /// </summary>
- /// <returns>An 'IDbDataAdapter' object.</returns>
- public virtual IDbDataAdapter CreateDataAdapter()
- {
- if (_templateDataAdapterIsICloneable)
- {
- return (IDbDataAdapter)
((ICloneable)_templateDataAdapter).Clone();
- }
- return (IDbDataAdapter)
Activator.CreateInstance(_templateDataAdapter.GetType());
- }
-
-
/// <summary>
/// Create a IDbDataParameter object for this provider.
/// </summary>
Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/IDbProvider.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/IDbProvider.cs?rev=784499&r1=784498&r2=784499&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/IDbProvider.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/IDbProvider.cs Sun Jun 14
01:53:23 2009
@@ -150,15 +150,6 @@
string ParameterDbTypeProperty { get; set; }
/// <summary>
- /// The dataAdapter class name to use.
- /// </summary>
- /// <example >
- /// "System.Data.SqlDbType"
- /// </example>
- [XmlAttribute("dataAdapterClass")]
- string DataAdapterClass { get; set; }
-
- /// <summary>
/// The commandBuilder class name to use.
/// </summary>
/// <example >
@@ -208,12 +199,6 @@
IDbCommand CreateCommand();
/// <summary>
- /// Returns a new adapter objects for use with offline DataSets.
- /// </summary>
- /// <returns>An 'IDbDataAdapter' object.</returns>
- IDbDataAdapter CreateDataAdapter();
-
- /// <summary>
/// Returns a new parameter object for binding values to parameter
/// placeholders in SQL statements or Stored Procedure variables.
/// </summary>
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/ProviderDeSerializer.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/ProviderDeSerializer.cs?rev=784499&r1=784498&r2=784499&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/ProviderDeSerializer.cs
(original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Data/ProviderDeSerializer.cs
Sun Jun 14 01:53:23 2009
@@ -51,7 +51,6 @@
provider.CommandBuilderClass =
config.Attributes[DataConstants.ATTRIBUTE_COMMANDBUILDERCLASS];
provider.DbCommandClass =
config.Attributes[DataConstants.ATTRIBUTE_COMMANDCLASS];
provider.DbConnectionClass =
config.Attributes[DataConstants.ATTRIBUTE_CONNECTIONCLASS];
- provider.DataAdapterClass =
config.Attributes[DataConstants.ATTRIBUTE_DATAADAPTERCLASS];
provider.Description =
config.Attributes[DataConstants.ATTRIBUTE_DESCRIPTION];
provider.IsDefault =
ConfigurationUtils.GetBooleanAttribute(config.Attributes, "default", false);
provider.IsEnabled =
ConfigurationUtils.GetBooleanAttribute(config.Attributes, "enabled", true);
Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/provider.xsd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/provider.xsd?rev=784499&r1=784498&r2=784499&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/provider.xsd (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/provider.xsd Sun Jun 14
01:53:23 2009
@@ -28,7 +28,6 @@
<xs:attribute name="parameterClass" use="required"
type="xs:string" />
<xs:attribute name="parameterDbTypeClass" type="xs:string"
use="required"/>
<xs:attribute name="parameterDbTypeProperty" use="required"
type="xs:string" />
- <xs:attribute name="dataAdapterClass" use="required"
type="xs:string" />
<xs:attribute name="commandBuilderClass" use="required"
type="xs:string" />
<xs:attribute name="usePositionalParameters" use="required"
type="xs:string" />
<xs:attribute name="useParameterPrefixInSql" use="required"
type="xs:boolean"/>
