Author: gbayon
Date: Wed Mar 15 09:21:42 2006
New Revision: 386119
URL: http://svn.apache.org/viewcvs?rev=386119&view=rev
Log:
- Remove add of allowPreparingCommands attribute
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt
ibatis/trunk/cs/mapper/IBatisNet.Common/DbProvider.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/IDbProvider.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/ProviderDeSerializer.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/IPropertyAccessor.cs
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/PropertyAccessorFactory.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/DefaultPreparedCommand.cs
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt Wed Mar 15 09:21:42
2006
@@ -3,7 +3,7 @@
------------------------------
1.4 - xx/xx/xxxx
------------------------------
-- Added "allowPreparingCommands" attribute on pronvider tag in providers.config
+
------------------------------
1.3 - 15/12/2005
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/DbProvider.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/DbProvider.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/DbProvider.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/DbProvider.cs Wed Mar 15 09:21:42
2006
@@ -100,8 +100,7 @@
private bool _setDbParameterScale = true;
[NonSerialized]
private bool _useDeriveParameters = true;
- [NonSerialized]
- private bool _supportsPreparingCommands = true;
+
// private static readonly ILog _connectionLogger =
LogManager.GetLogger("System.Data.IDbConnection");
@@ -109,25 +108,6 @@
#region Properties
- /// <summary>
- /// Does this Driver support IDbCommand.Prepare().
- /// </summary>
- /// <remarks>
- /// <para>
- /// A value of <c>false</c> indicates that an exception would be
thrown or the
- /// company that produces the Driver we are wrapping does not
recommend using
- /// IDbCommand.Prepare().
- /// </para>
- /// <para>
- /// A value of <c>true</c> indicates that calling IDbCommand.Prepare()
will function
- /// fine on this Driver.
- /// </para>
- /// </remarks>
- public bool SupportsPreparingCommands
- {
- get { return _supportsPreparingCommands; }
- set { _supportsPreparingCommands = value; }
- }
/// <summary>
/// The name of the assembly which conatins the definition of
the provider.
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/IDbProvider.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/IDbProvider.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/IDbProvider.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/IDbProvider.cs Wed Mar 15 09:21:42
2006
@@ -223,21 +223,6 @@
/// <returns>An object.</returns>
Type ParameterDbType { get; }
- /// <summary>
- /// Does this Driver support IDbCommand.Prepare().
- /// </summary>
- /// <remarks>
- /// <para>
- /// A value of <c>false</c> indicates that an exception would be
thrown or the
- /// company that produces the Driver we are wrapping does not
recommend using
- /// IDbCommand.Prepare().
- /// </para>
- /// <para>
- /// A value of <c>true</c> indicates that calling IDbCommand.Prepare()
will function
- /// fine on this Driver.
- /// </para>
- /// </remarks>
- bool SupportsPreparingCommands { get; set; }
/// <summary>
/// Change the parameterName into the correct format
IDbCommand.CommandText
Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/ProviderDeSerializer.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/ProviderDeSerializer.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/ProviderDeSerializer.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/ProviderDeSerializer.cs Wed Mar 15
09:21:42 2006
@@ -1,11 +1,11 @@
#region Apache Notice
/*****************************************************************************
- * $Header: $
* $Revision$
- * $Date$
+ * $LastChangedDate$
+ * $LastChangedBy$
*
* iBATIS.NET Data Mapper
- * Copyright (C) 2004 - Gilles Bayon
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,7 +66,6 @@
provider.UseParameterPrefixInParameter =
NodeUtils.GetBooleanAttribute(prop, "useParameterPrefixInParameter", true);
provider.UseParameterPrefixInSql =
NodeUtils.GetBooleanAttribute(prop, "useParameterPrefixInSql", true);
provider.UsePositionalParameters =
NodeUtils.GetBooleanAttribute(prop, "usePositionalParameters", false);
- provider.SupportsPreparingCommands =
NodeUtils.GetBooleanAttribute(prop, "allowPreparingCommands", false);
return provider;
}
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/IPropertyAccessor.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/IPropertyAccessor.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/IPropertyAccessor.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/IPropertyAccessor.cs
Wed Mar 15 09:21:42 2006
@@ -23,9 +23,6 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-
namespace IBatisNet.Common.Utilities.Objects
{
/// <summary>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/PropertyAccessorFactory.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/PropertyAccessorFactory.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/PropertyAccessorFactory.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Objects/PropertyAccessorFactory.cs
Wed Mar 15 09:21:42 2006
@@ -1,3 +1,28 @@
+#region Apache Notice
+/*****************************************************************************
+ * $Revision: 374175 $
+ * $LastChangedDate$
+ * $LastChangedBy$
+ *
+ * iBATIS.NET Data Mapper
+ * Copyright (C) 2006/2005 - The Apache Software Foundation
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+
********************************************************************************/
+#endregion
+
using System;
using System.Collections;
using System.Collections.Specialized;
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
Wed Mar 15 09:21:42 2006
@@ -18,7 +18,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="true"
parameterPrefix="@"
/>
<provider
@@ -37,7 +36,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix="@"
/>
<provider
@@ -55,7 +53,6 @@
usePositionalParameters = "false"
useParameterPrefixInSql = "true"
useParameterPrefixInParameter = "true"
- allowPreparingCommands="true"
parameterPrefix="@"
/>
<provider name="OleDb1.1"
@@ -72,7 +69,6 @@
usePositionalParameters="true"
useParameterPrefixInSql="false"
useParameterPrefixInParameter="false"
- allowPreparingCommands="true"
parameterPrefix=""
/>
<provider name="OleDb2.0"
@@ -89,7 +85,6 @@
usePositionalParameters="true"
useParameterPrefixInSql="false"
useParameterPrefixInParameter="false"
- allowPreparingCommands="true"
parameterPrefix=""
/>
<provider
@@ -107,7 +102,6 @@
usePositionalParameters="true"
useParameterPrefixInSql="false"
useParameterPrefixInParameter="false"
- allowPreparingCommands="true"
parameterPrefix="@"
/>
<provider
@@ -125,7 +119,6 @@
usePositionalParameters="true"
useParameterPrefixInSql="false"
useParameterPrefixInParameter="false"
- allowPreparingCommands="true"
parameterPrefix="@"
/>
<provider
@@ -143,7 +136,6 @@
useParameterPrefixInSql="true"
useParameterPrefixInParameter="false"
parameterPrefix=":"
- allowPreparingCommands="true"
useDeriveParameters="false"
/>
<provider
@@ -161,7 +153,6 @@
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
parameterPrefix=":"
- allowPreparingCommands="true"
useDeriveParameters="false"
/>
<provider
@@ -178,7 +169,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="false"
- allowPreparingCommands="true"
parameterPrefix=":"
/>
<provider
@@ -195,7 +185,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix="@"
/>
<provider
@@ -212,7 +201,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix="?"
/>
<provider name="SQLite3"
@@ -232,7 +220,6 @@
parameterPrefix="@"
setDbParameterPrecision="false"
setDbParameterScale="false"
- allowPreparingCommands="false"
/>
<provider
name="Firebird1.7"
@@ -248,7 +235,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix="@"
/>
<provider
@@ -266,7 +252,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix=":"
/>
<provider
@@ -284,7 +269,6 @@
usePositionalParameters="false"
useParameterPrefixInSql="true"
useParameterPrefixInParameter="true"
- allowPreparingCommands="false"
parameterPrefix=":"
/>
<provider
@@ -301,7 +285,6 @@
usePositionalParameters="true"
useParameterPrefixInSql="false"
useParameterPrefixInParameter="false"
- allowPreparingCommands="false"
parameterPrefix=""
/>
<provider
@@ -320,6 +303,5 @@
useParameterPrefixInSql = "false"
useParameterPrefixInParameter = "false"
useDeriveParameters="false"
- allowPreparingCommands="false"
/>
</providers>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/DefaultPreparedCommand.cs
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/DefaultPreparedCommand.cs?rev=386119&r1=386118&r2=386119&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/DefaultPreparedCommand.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Commands/DefaultPreparedCommand.cs
Wed Mar 15 09:21:42 2006
@@ -2,7 +2,7 @@
#region Apache Notice
/*****************************************************************************
* $Header: $
- * $Revision: 384614 $
+ * $Revision$
* $Date$
*
* iBATIS.NET Data Mapper
@@ -71,10 +71,6 @@
{
// the IDbConnection & the IDbTransaction are assign in
the CreateCommand
request.IDbCommand =
session.CreateCommand(statement.CommandType);
- if (session.DataSource.DbProvider.SupportsPreparingCommands)
- {
- request.IDbCommand.Prepare();
- }
request.IDbCommand.CommandText =
request.PreparedStatement.PreparedSql;
