From: <fab...@us...> - 2008-07-22 19:16:43
|
Revision: 3647 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3647&view=rev Author: fabiomaulo Date: 2008-07-22 19:16:52 +0000 (Tue, 22 Jul 2008) Log Message: ----------- re-fix NH-1254 to support the two drivers Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj Added Paths: ----------- trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs Modified: trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs 2008-07-22 19:12:25 UTC (rev 3646) +++ trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs 2008-07-22 19:16:52 UTC (rev 3647) @@ -3,14 +3,14 @@ namespace NHibernate.Dialect { /// <summary> - /// An SQL dialect for Sybase Adaptive Server Anywhere 10.0 + /// An SQL dialect for Sybase Adaptive Server Anywhere 9.0/10.0 /// </summary> /// <remarks> /// <p> /// This dialect probably will not work with schema-export. If anyone out there /// can fill in the ctor with DbTypes to Strings that would be helpful. /// </p> - /// The SybaseAnywhere10Dialect defaults the following configuration properties: + /// The SybaseAnywhereDialect defaults the following configuration properties: /// <list type="table"> /// <listheader> /// <term>Property</term> Added: trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs (rev 0) +++ trunk/nhibernate/src/NHibernate/Driver/ASA10ClientDriver.cs 2008-07-22 19:16:52 UTC (rev 3647) @@ -0,0 +1,41 @@ +namespace NHibernate.Driver +{ + /// <summary> + /// The ASAClientDriver Driver provides a database driver for Adaptive Server Anywhere 10.0. + /// </summary> + public class ASA10ClientDriver : ReflectionBasedDriver + { + /// <summary> + /// Initializes a new instance of the <see cref="ASAClientDriver"/> class. + /// </summary> + /// <exception cref="HibernateException"> + /// Thrown when the iAnywhere.Data.SQLAnywhere assembly is not and can not be loaded. + /// </exception> + public ASA10ClientDriver() + : base("iAnywhere.Data.SQLAnywhere", "iAnywhere.Data.SQLAnywhere.SAConnection", "iAnywhere.Data.SQLAnywhere.SACommand") + { + } + + /// <summary> + /// iAnywhere.Data.SQLAnywhere uses named parameters in the sql. + /// </summary> + /// <value><see langword="true" /> - Sybase uses <c>String.Empty</c> in the sql.</value> + public override bool UseNamedPrefixInSql + { + get { return false; } + } + + public override bool UseNamedPrefixInParameter + { + get { return false; } + } + + /// <summary> + /// iAnywhere.Data.SQLAnywhere use the <c>string.Empty</c> to locate parameters in sql. + /// </summary> + public override string NamedPrefix + { + get { return string.Empty; } + } + } +} Modified: trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs 2008-07-22 19:12:25 UTC (rev 3646) +++ trunk/nhibernate/src/NHibernate/Driver/ASAClientDriver.cs 2008-07-22 19:16:52 UTC (rev 3647) @@ -1,5 +1,3 @@ -using System; - namespace NHibernate.Driver { /// <summary> @@ -11,15 +9,15 @@ /// Initializes a new instance of the <see cref="ASAClientDriver"/> class. /// </summary> /// <exception cref="HibernateException"> - /// Thrown when the iAnywhere.Data.SQLAnywhere assembly is not and can not be loaded. + /// Thrown when the ASA.Data.AsaClient assembly is not and can not be loaded. /// </exception> public ASAClientDriver() - : base("iAnywhere.Data.SQLAnywhere", "iAnywhere.Data.SQLAnywhere.SAConnection", "iAnywhere.Data.SQLAnywhere.SACommand") + : base("iAnywhere.Data.AsaClient", "iAnywhere.Data.AsaClient.AsaConnection", "iAnywhere.Data.AsaClient.AsaCommand") { } /// <summary> - /// iAnywhere.Data.SQLAnywhere uses named parameters in the sql. + /// iAnywhere.Data.AsaClient uses named parameters in the sql. /// </summary> /// <value><see langword="true" /> - Sybase uses <c>String.Empty</c> in the sql.</value> public override bool UseNamedPrefixInSql @@ -33,7 +31,7 @@ } /// <summary> - /// iAnywhere.Data.SQLAnywhere use the <c>string.Empty</c> to locate parameters in sql. + /// iAnywhere.Data.AsaClient use the <c>string.Empty</c> to locate parameters in sql. /// </summary> public override string NamedPrefix { Modified: trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj =================================================================== --- trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj 2008-07-22 19:12:25 UTC (rev 3646) +++ trunk/nhibernate/src/NHibernate/NHibernate-2.0.csproj 2008-07-22 19:16:52 UTC (rev 3647) @@ -593,6 +593,7 @@ <Compile Include="Dialect\Schema\MsSqlMetaData.cs" /> <Compile Include="Dialect\Schema\OracleMetaData.cs" /> <Compile Include="Dialect\Sybase11Dialect.cs" /> + <Compile Include="Driver\ASA10ClientDriver.cs" /> <Compile Include="Driver\ISqlParameterFormatter.cs" /> <Compile Include="Driver\SqlStringFormatter.cs" /> <Compile Include="Criterion\SubqueryProjection.cs" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |