Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5188] trunk/nhibernate
|
From: <jul...@us...> - 2010-09-17 16:13:27
|
Revision: 5188
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5188&view=rev
Author: julian-maughan
Date: 2010-09-17 16:13:14 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Removed Sybase ASE dialects and drivers (deemed badly named, and poorly implemented). SybaseAnywhereDialect code merged into SybaseASA9Dialect, and then deleted. Marked the SybaseASA10Dialect obsolete with a comment suggesting users switch to SybaseSQLAnywhere10Dialect.
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate/Dialect/SybaseASA10Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/SybaseASA9Dialect.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/MasterDetailTest.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/MultiTableTest.cs
trunk/nhibernate/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Dialect/SybaseAdoNet12Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/SybaseDialect.cs
trunk/nhibernate/src/NHibernate/Driver/SybaseAdoNet12ClientDriver.cs
trunk/nhibernate/src/NHibernate/Driver/SybaseClientDriver.cs
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/releasenotes.txt 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,8 +1,9 @@
-Build 3.0.0.Alpha2
+Build 3.0.0.Alpha3
=============================
-** Known BREAKING CHANGES from NH2.1.1.GA to NH3.0.0.Alpha2
+** Known BREAKING CHANGES from NH2.1.1.GA to NH3.0.0.Alpha3
##### Run time #####
* (NH-2199) - null values in maps/dictionaries are no longer silenty ignored/deleted
+ * (NH-1894) - SybaseAnywhereDialect has been removed, and replaced with SybaseASA9Dialect
##### Possible Breaking Changes #####
* (NH-2251) - Signature change for GetLimitString in Dialect
Modified: trunk/nhibernate/src/NHibernate/Dialect/SybaseASA10Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseASA10Dialect.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseASA10Dialect.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,7 +1,9 @@
-using System.Data;
+using System;
+using System.Data;
namespace NHibernate.Dialect
{
+ [Obsolete("Please use SybaseSQLAnywhere10Dialect instead. This dialect will be removed in a future release.")]
public class SybaseASA10Dialect : SybaseASA9Dialect
{
public SybaseASA10Dialect()
Modified: trunk/nhibernate/src/NHibernate/Dialect/SybaseASA9Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseASA9Dialect.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseASA9Dialect.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,15 +1,44 @@
using System.Data;
using System.Data.Common;
+
+using NHibernate.Cfg;
using NHibernate.Dialect.Function;
using NHibernate.Dialect.Schema;
using NHibernate.SqlCommand;
namespace NHibernate.Dialect
{
- public class SybaseASA9Dialect : SybaseAnywhereDialect
+ /// <summary>
+ /// An SQL dialect for Sybase Adaptive Server Anywhere 9.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 dialect defaults the following configuration properties:
+ /// <list type="table">
+ /// <listheader>
+ /// <term>Property</term>
+ /// <description>Default Value</description>
+ /// </listheader>
+ /// <item>
+ /// <term>connection.driver_class</term>
+ /// <description><see cref="NHibernate.Driver.ASAClientDriver" /></description>
+ /// </item>
+ /// <item>
+ /// <term>prepare_sql</term>
+ /// <description><see langword="false" /></description>
+ /// </item>
+ /// </list>
+ /// </remarks>
+ public class SybaseASA9Dialect : Dialect
{
public SybaseASA9Dialect()
{
+ DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.ASAClientDriver";
+ DefaultProperties[Environment.PrepareSql] = "false";
+
RegisterColumnType(DbType.AnsiStringFixedLength, 255, "CHAR($l)");
RegisterColumnType(DbType.AnsiString, "VARCHAR(255)");
RegisterColumnType(DbType.AnsiString, 255, "VARCHAR($l)");
@@ -48,8 +77,10 @@
RegisterFunction("nullif", new StandardSafeSQLFunction("nullif", 2));
RegisterFunction("lower", new StandardSafeSQLFunction("lower", NHibernateUtil.String, 1));
RegisterFunction("upper", new StandardSafeSQLFunction("upper", NHibernateUtil.String, 1));
- ;
+
RegisterFunction("now", new StandardSQLFunction("now"));
+
+ RegisterKeyword("top");
}
public override bool SupportsLimit
@@ -73,7 +104,59 @@
{
return new SybaseAnywhereDataBaseMetaData(connection);
}
+
+ public override string AddColumnString
+ {
+ get { return "add"; }
+ }
+ public override string NullColumnString
+ {
+ get { return " null"; }
+ }
+
+ public override bool QualifyIndexName
+ {
+ get { return false; }
+ }
+
+ public override string ForUpdateString
+ {
+ get { return string.Empty; }
+ }
+
+ public override bool SupportsIdentityColumns
+ {
+ get { return true; }
+ }
+
+ public override string IdentitySelectString
+ {
+ get { return "select @@identity"; }
+ }
+
+ /// <summary></summary>
+ public override string IdentityColumnString
+ {
+ get { return "IDENTITY NOT NULL"; }
+ }
+
+ /// <summary></summary>
+ public override string NoColumnsInsertString
+ {
+ get { return "DEFAULT VALUES"; }
+ }
+
+ /// <summary>
+ /// ASA does not require to drop constraint before dropping tables, and DROP statement
+ /// syntax used by Hibernate to drop constraint is not compatible with ASA, so disable it.
+ /// Comments matchs SybaseAnywhereDialect from Hibernate-3.1 src
+ /// </summary>
+ public override bool DropConstraints
+ {
+ get { return false; }
+ }
+
private static int GetAfterSelectInsertPoint(SqlString sql)
{
string[] arrSelectStrings = {"select distinct", "select all", "select"};
Deleted: trunk/nhibernate/src/NHibernate/Dialect/SybaseAdoNet12Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseAdoNet12Dialect.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseAdoNet12Dialect.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,101 +0,0 @@
-using NHibernate.Cfg;
-
-namespace NHibernate.Dialect
-{
- /// <summary>
- /// An SQL dialect compatible with Sybase.
- /// </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 SybaseDialect defaults the following configuration properties:
- /// <list type="table">
- /// <listheader>
- /// <term>Property</term>
- /// <description>Default Value</description>
- /// </listheader>
- /// <item>
- /// <term>use_outer_join</term>
- /// <description><see langword="true" /></description>
- /// </item>
- /// <item>
- /// <term>connection.driver_class</term>
- /// <description><see cref="NHibernate.Driver.SybaseClientDriver" /></description>
- /// </item>
- /// <item>
- /// <term>prepare_sql</term>
- /// <description><see langword="false" /></description>
- /// </item>
- /// </list>
- /// </remarks>
- public class SybaseAdoNet12Dialect : Dialect
- {
- /// <summary></summary>
- public SybaseAdoNet12Dialect()
- {
- RegisterKeyword("top");
-
- DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseAdoNet12ClientDriver";
- DefaultProperties[Environment.PrepareSql] = "true";
- }
-
- /// <summary></summary>
- public override string AddColumnString
- {
- get { return "add"; }
- }
-
- /// <summary></summary>
- public override string NullColumnString
- {
- get { return " null"; }
- }
-
- /// <summary></summary>
- public override bool QualifyIndexName
- {
- get { return false; }
- }
-
- /// <summary></summary>
- public override string ForUpdateString
- {
- get { return string.Empty; }
- }
-
- /// <summary></summary>
- public override bool SupportsIdentityColumns
- {
- get { return true; }
- }
-
- /// <summary></summary>
- public override string IdentitySelectString
- {
- get { return "select @@identity"; }
- }
-
- /// <summary></summary>
- public override string IdentityColumnString
- {
- get { return "IDENTITY NOT NULL"; }
- }
-
- /// <summary></summary>
- public override string NoColumnsInsertString
- {
- get { return "DEFAULT VALUES"; }
- }
-
- /// <remarks>
- /// Sybase does not support quoted aliases, this function thus returns
- /// <c>aliasName</c> as is.
- /// </remarks>
- public override string QuoteForAliasName(string aliasName)
- {
- return aliasName;
- }
- }
-}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseAnywhereDialect.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,116 +0,0 @@
-using NHibernate.Cfg;
-
-namespace NHibernate.Dialect
-{
- /// <summary>
- /// 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 SybaseAnywhereDialect defaults the following configuration properties:
- /// <list type="table">
- /// <listheader>
- /// <term>Property</term>
- /// <description>Default Value</description>
- /// </listheader>
- /// <item>
- /// <term>use_outer_join</term>
- /// <description><see langword="true" /></description>
- /// </item>
- /// <item>
- /// <term>connection.driver_class</term>
- /// <description><see cref="NHibernate.Driver.SybaseClientDriver" /></description>
- /// </item>
- /// <item>
- /// <term>prepare_sql</term>
- /// <description><see langword="false" /></description>
- /// </item>
- /// </list>
- /// </remarks>
- public class SybaseAnywhereDialect : Dialect
- {
- /// <summary></summary>
- public SybaseAnywhereDialect() : base()
- {
- /* Java mapping was:
-
- Types.BIT, "TINYINT" );
- Types.BIGINT, "NUMERIC(19,0)" );
- Types.SMALLINT, "SMALLINT" );
- Types.TINYINT, "TINYINT" );
- Types.INTEGER, "INT" );
- Types.CHAR, "CHAR(1)" );
- Types.VARCHAR, "VARCHAR($l)" );
- Types.FLOAT, "FLOAT" );
- Types.DOUBLE, "DOUBLE PRECISION"
- Types.DATE, "DATETIME" );
- Types.TIME, "DATETIME" );
- Types.TIMESTAMP, "DATETIME" );
- Types.VARBINARY, "VARBINARY($l)"
- Types.NUMERIC, "NUMERIC(19,$l)"
- Types.BLOB, "IMAGE" );
- Types.CLOB, "TEXT" );
- */
-
- RegisterKeyword("top");
-
- DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.ASAClientDriver";
- DefaultProperties[Environment.PrepareSql] = "false";
- }
-
- public override string AddColumnString
- {
- get { return "add"; }
- }
-
- public override string NullColumnString
- {
- get { return " null"; }
- }
-
- public override bool QualifyIndexName
- {
- get { return false; }
- }
-
- public override string ForUpdateString
- {
- get { return string.Empty; }
- }
-
- public override bool SupportsIdentityColumns
- {
- get { return true; }
- }
-
- public override string IdentitySelectString
- {
- get { return "select @@identity"; }
- }
-
- /// <summary></summary>
- public override string IdentityColumnString
- {
- get { return "IDENTITY NOT NULL"; }
- }
-
- /// <summary></summary>
- public override string NoColumnsInsertString
- {
- get { return "DEFAULT VALUES"; }
- }
-
- /// <summary>
- /// ASA does not require to drop constraint before dropping tables, and DROP statement
- /// syntax used by Hibernate to drop constraint is not compatible with ASA, so disable it.
- /// Comments matchs SybaseAnywhereDialect from Hibernate-3.1 src
- /// </summary>
- public override bool DropConstraints
- {
- get { return false; }
- }
- }
-}
Deleted: trunk/nhibernate/src/NHibernate/Dialect/SybaseDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseDialect.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseDialect.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,192 +0,0 @@
-using System.Data;
-using NHibernate.Cfg;
-using NHibernate.Dialect.Function;
-
-namespace NHibernate.Dialect
-{
- /// <summary>
- /// An SQL dialect compatible with Sybase.
- /// </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 SybaseDialect defaults the following configuration properties:
- /// <list type="table">
- /// <listheader>
- /// <term>Property</term>
- /// <description>Default Value</description>
- /// </listheader>
- /// <item>
- /// <term>use_outer_join</term>
- /// <description><see langword="true" /></description>
- /// </item>
- /// <item>
- /// <term>connection.driver_class</term>
- /// <description><see cref="NHibernate.Driver.SybaseClientDriver" /></description>
- /// </item>
- /// <item>
- /// <term>prepare_sql</term>
- /// <description><see langword="false" /></description>
- /// </item>
- /// </list>
- /// </remarks>
- public class SybaseDialect : Dialect
- {
- /// <summary></summary>
- public SybaseDialect()
- {
- RegisterColumnType(DbType.Boolean, "tinyint"); //Sybase BIT type does not support null values
- RegisterColumnType(DbType.Int16, "smallint");
- RegisterColumnType(DbType.Int32, "int");
- RegisterColumnType(DbType.Int64, "numeric(19,0)");
- RegisterColumnType(DbType.UInt16, "smallint");
- RegisterColumnType(DbType.UInt32, "int");
- RegisterColumnType(DbType.UInt64, "numeric(19,0)");
-
- RegisterColumnType(DbType.Byte, "tinyint");
-
- RegisterColumnType(DbType.AnsiStringFixedLength, "char(255)");
- RegisterColumnType(DbType.AnsiStringFixedLength, 800, "char($l)");
- RegisterColumnType(DbType.AnsiString, "varchar(255)");
- RegisterColumnType(DbType.AnsiString, 8000, "varchar($l)");
-
- RegisterColumnType(DbType.String, "varchar(255)");
- RegisterColumnType(DbType.String, 8000, "varchar($l)");
- RegisterColumnType(DbType.String, "text");
-
- RegisterColumnType(DbType.Single, "float");
- RegisterColumnType(DbType.Double, "double precision");
- RegisterColumnType(DbType.Date, "datetime");
- RegisterColumnType(DbType.Time, "datetime");
- RegisterColumnType(DbType.DateTime, "datetime");
-
- RegisterColumnType(DbType.Binary, 8000, "varbinary($l)");
- RegisterColumnType(DbType.Binary, "varbinary(8000)");
- RegisterColumnType(DbType.Binary, int.MaxValue, "image");
-
- RegisterColumnType(DbType.Decimal, "numeric(19,6)");
- RegisterColumnType(DbType.Decimal, 19, "numeric($p,$s)");
-
- RegisterFunction("ascii", new StandardSQLFunction("ascii", NHibernateUtil.Int32));
- RegisterFunction("char", new StandardSQLFunction("char", NHibernateUtil.Character));
- RegisterFunction("len", new StandardSQLFunction("len", NHibernateUtil.Int64));
- RegisterFunction("lower", new StandardSQLFunction("lower"));
- RegisterFunction("upper", new StandardSQLFunction("upper"));
- RegisterFunction("str", new StandardSQLFunction("str", NHibernateUtil.String));
- RegisterFunction("ltrim", new StandardSQLFunction("ltrim"));
- RegisterFunction("rtrim", new StandardSQLFunction("rtrim"));
- RegisterFunction("reverse", new StandardSQLFunction("reverse"));
- RegisterFunction("space", new StandardSQLFunction("space", NHibernateUtil.String));
-
- RegisterFunction("user", new NoArgSQLFunction("user", NHibernateUtil.String));
-
- RegisterFunction("current_timestamp", new NoArgSQLFunction("getdate", NHibernateUtil.DateTime));
- RegisterFunction("current_time", new NoArgSQLFunction("getdate", NHibernateUtil.Time));
- RegisterFunction("current_date", new NoArgSQLFunction("getdate", NHibernateUtil.Date));
-
- RegisterFunction("getdate", new NoArgSQLFunction("getdate", NHibernateUtil.Timestamp));
- RegisterFunction("getutcdate", new NoArgSQLFunction("getutcdate", NHibernateUtil.Timestamp));
- RegisterFunction("day", new StandardSQLFunction("day", NHibernateUtil.Int32));
- RegisterFunction("month", new StandardSQLFunction("month", NHibernateUtil.Int32));
- RegisterFunction("year", new StandardSQLFunction("year", NHibernateUtil.Int32));
- RegisterFunction("datename", new StandardSQLFunction("datename", NHibernateUtil.String));
-
- RegisterFunction("abs", new StandardSQLFunction("abs"));
- RegisterFunction("sign", new StandardSQLFunction("sign", NHibernateUtil.Int32));
-
- RegisterFunction("acos", new StandardSQLFunction("acos", NHibernateUtil.Double));
- RegisterFunction("asin", new StandardSQLFunction("asin", NHibernateUtil.Double));
- RegisterFunction("atan", new StandardSQLFunction("atan", NHibernateUtil.Double));
- RegisterFunction("cos", new StandardSQLFunction("cos", NHibernateUtil.Double));
- RegisterFunction("cot", new StandardSQLFunction("cot", NHibernateUtil.Double));
- RegisterFunction("exp", new StandardSQLFunction("exp", NHibernateUtil.Double));
- RegisterFunction("log", new StandardSQLFunction("log", NHibernateUtil.Double));
- RegisterFunction("log10", new StandardSQLFunction("log10", NHibernateUtil.Double));
- RegisterFunction("sin", new StandardSQLFunction("sin", NHibernateUtil.Double));
- RegisterFunction("sqrt", new StandardSQLFunction("sqrt", NHibernateUtil.Double));
- RegisterFunction("tan", new StandardSQLFunction("tan", NHibernateUtil.Double));
- RegisterFunction("pi", new NoArgSQLFunction("pi", NHibernateUtil.Double));
- RegisterFunction("square", new StandardSQLFunction("square"));
- RegisterFunction("rand", new StandardSQLFunction("rand", NHibernateUtil.Single));
-
- RegisterFunction("radians", new StandardSQLFunction("radians", NHibernateUtil.Double));
- RegisterFunction("degrees", new StandardSQLFunction("degrees", NHibernateUtil.Double));
-
- RegisterFunction("round", new StandardSQLFunction("round"));
- RegisterFunction("ceiling", new StandardSQLFunction("ceiling"));
- RegisterFunction("floor", new StandardSQLFunction("floor"));
-
- RegisterFunction("isnull", new StandardSQLFunction("isnull"));
-
- RegisterFunction("concat", new VarArgsSQLFunction(NHibernateUtil.String, "(", "+", ")"));
-
- RegisterFunction("length", new StandardSQLFunction("len", NHibernateUtil.Int32));
- RegisterFunction("trim", new SQLFunctionTemplate(NHibernateUtil.String, "ltrim(rtrim(?1))"));
- RegisterFunction("locate", new CharIndexFunction());
-
- RegisterKeyword("top");
-
- DefaultProperties[Environment.ConnectionDriver] = "NHibernate.Driver.SybaseClientDriver";
- DefaultProperties[Environment.PrepareSql] = "false";
- }
-
- /// <summary></summary>
- public override string AddColumnString
- {
- get { return "add"; }
- }
-
- /// <summary></summary>
- public override string NullColumnString
- {
- get { return " null"; }
- }
-
- /// <summary></summary>
- public override bool QualifyIndexName
- {
- get { return false; }
- }
-
- /// <summary></summary>
- public override string ForUpdateString
- {
- get { return string.Empty; }
- }
-
- /// <summary></summary>
- public override bool SupportsIdentityColumns
- {
- get { return true; }
- }
-
- /// <summary></summary>
- public override string IdentitySelectString
- {
- get { return "select @@identity"; }
- }
-
- /// <summary></summary>
- public override string IdentityColumnString
- {
- get { return "IDENTITY NOT NULL"; }
- }
-
- /// <summary></summary>
- public override string NoColumnsInsertString
- {
- get { return "DEFAULT VALUES"; }
- }
-
- /// <remarks>
- /// Sybase does not support quoted aliases, this function thus returns
- /// <c>aliasName</c> as is.
- /// </remarks>
- public override string QuoteForAliasName(string aliasName)
- {
- return aliasName;
- }
- }
-}
Deleted: trunk/nhibernate/src/NHibernate/Driver/SybaseAdoNet12ClientDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/SybaseAdoNet12ClientDriver.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Driver/SybaseAdoNet12ClientDriver.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,50 +0,0 @@
-namespace NHibernate.Driver
-{
- /// <summary>
- /// The SybaseClientDriver Driver provides a database driver for Sybase.
- /// </summary>
- /// <remarks>
- /// It has been reported to work with the <see cref="Dialect.MsSql2000Dialect"/>.
- /// </remarks>
- public class SybaseAdoNet12ClientDriver : ReflectionBasedDriver
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="SybaseClientDriver"/> class.
- /// </summary>
- /// <exception cref="HibernateException">
- /// Thrown when the Sybase.Data.AseClient assembly can not be loaded.
- /// </exception>
- public SybaseAdoNet12ClientDriver()
- : base(
- "Sybase.Data.AseClient",
- "Sybase.AdoNet2.AseClient",
- "Sybase.Data.AseClient.AseConnection",
- "Sybase.Data.AseClient.AseCommand")
- {
- }
-
- /// <summary>
- /// Sybase.Data.AseClient uses named parameters in the sql.
- /// </summary>
- /// <value><see langword="true" /> - Sybase uses <c>@</c> in the sql.</value>
- public override bool UseNamedPrefixInSql
- {
- get { return true; }
- }
-
- /// <summary></summary>
- public override bool UseNamedPrefixInParameter
- {
- get { return true; }
- }
-
- /// <summary>
- /// Sybase.Data.AseClient use the <c>@</c> to locate parameters in sql.
- /// </summary>
- /// <value><c>@</c> is used to locate parameters in sql.</value>
- public override string NamedPrefix
- {
- get { return "@"; }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Driver/SybaseClientDriver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Driver/SybaseClientDriver.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/Driver/SybaseClientDriver.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -1,51 +0,0 @@
-using System;
-
-namespace NHibernate.Driver
-{
- /// <summary>
- /// The SybaseClientDriver Driver provides a database driver for Sybase.
- /// </summary>
- /// <remarks>
- /// It has been reported to work with the <see cref="Dialect.MsSql2000Dialect"/>.
- /// </remarks>
- public class SybaseClientDriver : ReflectionBasedDriver
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="SybaseClientDriver"/> class.
- /// </summary>
- /// <exception cref="HibernateException">
- /// Thrown when the Sybase.Data.AseClient assembly can not be loaded.
- /// </exception>
- public SybaseClientDriver() : base(
- "Sybase.Data.AseClient",
- "Sybase.Data.AseClient",
- "Sybase.Data.AseClient.AseConnection",
- "Sybase.Data.AseClient.AseCommand")
- {
- }
-
- /// <summary>
- /// Sybase.Data.AseClient uses named parameters in the sql.
- /// </summary>
- /// <value><see langword="true" /> - Sybase uses <c>@</c> in the sql.</value>
- public override bool UseNamedPrefixInSql
- {
- get { return true; }
- }
-
- /// <summary></summary>
- public override bool UseNamedPrefixInParameter
- {
- get { return true; }
- }
-
- /// <summary>
- /// Sybase.Data.AseClient use the <c>@</c> to locate parameters in sql.
- /// </summary>
- /// <value><c>@</c> is used to locate parameters in sql.</value>
- public override string NamedPrefix
- {
- get { return "@"; }
- }
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2010-09-17 16:13:14 UTC (rev 5188)
@@ -118,7 +118,6 @@
<Compile Include="Dialect\MySQLDialect.cs" />
<Compile Include="Dialect\PostgreSQLDialect.cs" />
<Compile Include="Dialect\SQLiteDialect.cs" />
- <Compile Include="Dialect\SybaseDialect.cs" />
<Compile Include="Dialect\SybaseSQLAnywhere10Dialect.cs" />
<Compile Include="Dialect\SybaseSQLAnywhere11Dialect.cs" />
<Compile Include="Dialect\TypeNames.cs" />
@@ -136,7 +135,6 @@
<Compile Include="Driver\OracleDataClientDriver.cs" />
<Compile Include="Driver\SqlClientDriver.cs" />
<Compile Include="Driver\SQLiteDriver.cs" />
- <Compile Include="Driver\SybaseClientDriver.cs" />
<Compile Include="Engine\Cascade.cs" />
<Compile Include="Engine\IBatcher.cs" />
<Compile Include="Engine\IMapping.cs" />
@@ -1022,13 +1020,10 @@
<Compile Include="Dialect\Schema\ITableMetadata.cs" />
<Compile Include="Dialect\Schema\MsSqlMetaData.cs" />
<Compile Include="Dialect\Schema\OracleMetaData.cs" />
- <Compile Include="Dialect\Sybase11Dialect.cs" />
- <Compile Include="Dialect\SybaseAdoNet12Dialect.cs" />
<Compile Include="Driver\ASA10ClientDriver.cs" />
<Compile Include="Driver\ISqlParameterFormatter.cs" />
<Compile Include="Driver\SqlStringFormatter.cs" />
<Compile Include="Criterion\SubqueryProjection.cs" />
- <Compile Include="Driver\SybaseAdoNet12ClientDriver.cs" />
<Compile Include="EmptyInterceptor.cs" />
<Compile Include="Engine\ActionQueue.cs" />
<Compile Include="Engine\AssociationKey.cs" />
@@ -1290,7 +1285,6 @@
<Compile Include="Dialect\IngresDialect.cs" />
<Compile Include="Dialect\MsSql2005Dialect.cs" />
<Compile Include="Dialect\PostgreSQL81Dialect.cs" />
- <Compile Include="Dialect\SybaseAnywhereDialect.cs" />
<Compile Include="Driver\ASAClientDriver.cs" />
<Compile Include="Driver\DB2400Driver.cs" />
<Compile Include="Driver\FirebirdClientDriver.cs" />
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/FooBarTest.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -473,7 +473,7 @@
.List();
}
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
s.CreateQuery("select baz from Baz as baz join baz.FooArray foo group by baz order by sum(foo.Float)").Enumerable();
}
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/MasterDetailTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/MasterDetailTest.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/MasterDetailTest.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -656,7 +656,7 @@
d2.Master = (m);
m.AddDetail(d1);
m.AddDetail(d2);
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
s.Save(d1);
}
@@ -748,7 +748,7 @@
d2.Master = m;
m.AddDetail(d1);
m.AddDetail(d2);
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
s.Save(d1);
s.Save(d2);
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/MultiTableTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/MultiTableTest.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/MultiTableTest.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -155,7 +155,7 @@
ISession s = OpenSession();
long id = 1L;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
id = (long) s.Save(new TrivialClass());
}
@@ -198,7 +198,7 @@
ITransaction t = s.BeginTransaction();
SubMulti sm = new SubMulti();
sm.Amount = 66.5f;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
s.Save(sm);
}
@@ -229,7 +229,7 @@
simp.Name = "simp";
object mid;
object sid;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
mid = s.Save(multi);
sid = s.Save(simp);
@@ -244,7 +244,7 @@
SubMulti sm = new SubMulti();
sm.Amount = 66.5f;
object smid;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
smid = s.Save(sm);
}
@@ -493,7 +493,7 @@
simp.Name = "simp";
object mid;
object sid;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
mid = s.Save(multi);
sid = s.Save(simp);
@@ -515,7 +515,7 @@
dict.Add(multi);
dict.Add(simp);
object id;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
id = s.Save(ls);
}
@@ -572,7 +572,7 @@
simp.Name = "simp";
object mid;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
mid = s.Save(multi);
}
@@ -587,7 +587,7 @@
ls.YetAnother = ls;
ls.Name = "Less Simple";
object id;
- if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
+ if (Dialect is MsSql2000Dialect)
{
id = s.Save(ls);
}
Modified: trunk/nhibernate/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs 2010-09-17 15:44:32 UTC (rev 5187)
+++ trunk/nhibernate/src/NHibernate.Test/Legacy/SQLFunctionsTest.cs 2010-09-17 16:13:14 UTC (rev 5188)
@@ -434,7 +434,7 @@
"from s in class Simple where not( upper(s.Name)='yada' or 1=2 or 'foo'='bar' or not('foo'='foo') or 'foo' like 'bar')")
.List().Count);
- if (!(Dialect is MySQLDialect) && !(Dialect is SybaseDialect) && !(Dialect is MsSql2000Dialect))
+ if (!(Dialect is MySQLDialect) && !(Dialect is MsSql2000Dialect))
{
// Dialect.MckoiDialect and Dialect.InterbaseDialect also included
// My Sql has a funny concatenation operator
@@ -442,13 +442,6 @@
s.CreateQuery("from s in class Simple where lower(s.Name || ' foo')='simple 1 foo'").List().Count);
}
- if ((Dialect is SybaseDialect))
- {
- Assert.AreEqual(1,
- s.CreateQuery("from s in class Simple where lower( concat(s.Name, ' foo') ) = 'simple 1 foo'").List
- ().Count);
- }
-
if ((Dialect is MsSql2000Dialect))
{
Assert.AreEqual(1,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
