|
From: <fab...@us...> - 2011-06-17 12:03:48
|
Revision: 5940
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5940&view=rev
Author: fabiomaulo
Date: 2011-06-17 12:03:42 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Removed no more needed code
Modified Paths:
--------------
trunk/nhibernate/releasenotes.txt
trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs
trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs
trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs
Modified: trunk/nhibernate/releasenotes.txt
===================================================================
--- trunk/nhibernate/releasenotes.txt 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/releasenotes.txt 2011-06-17 12:03:42 UTC (rev 5940)
@@ -12,6 +12,7 @@
* [NH-2605] Refactorize MultiQuery/MultiCriteria implementation to delegate responsibility to IDrive (IDrive changed).
* For users who don't look at Log-ERROR, to prevent wrong behavior when lazy-properties are used the DynamicProxyValidator validates the accessability of properties setters.
* For those implementing IDrive without inherit from DriveBase: IDrive.AdjustCommand
+ * Dialect base: removed some no more needed properties
Build 3.2.0.Beta1 (rev5839)
=============================
Modified: trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/DB2Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -194,12 +194,6 @@
}
/// <summary></summary>
- public override bool BindLimitParametersInReverseOrder
- {
- get { return false; }
- }
-
- /// <summary></summary>
public override bool UseMaxForLimit
{
get { return true; }
Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -1639,27 +1639,6 @@
get { return SupportsLimit; }
}
- /// <summary>
- /// Does the <c>LIMIT</c> clause specify arguments in the "reverse" order
- /// limit, offset instead of offset, limit?
- /// </summary>
- /// <value>False, unless overridden.</value>
- /// <remarks>Inheritors should return true if the correct order is limit, offset</remarks>
- public virtual bool BindLimitParametersInReverseOrder
- {
- get { return false; }
- }
-
- /// <summary>
- /// Does the <c>LIMIT</c> clause come at the start of the
- /// <c>SELECT</c> statement rather than at the end?
- /// </summary>
- /// <value>false, unless overridden</value>
- public virtual bool BindLimitParametersFirst
- {
- get { return false; }
- }
-
/// <summary>
/// Does the <tt>LIMIT</tt> clause take a "maximum" row number instead
/// of a total number of returned rows?
Modified: trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/InformixDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -366,16 +366,6 @@
get { return false; }
}
- /// <summary>
- /// Does the <c>LIMIT</c> clause come at the start of the
- /// <c>SELECT</c> statement rather than at the end?
- /// </summary>
- /// <value>false, unless overridden</value>
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
{
/*
Modified: trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/MsSql2005Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -205,21 +205,11 @@
get { return true; }
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override bool SupportsVariableLimit
{
get { return true; }
}
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
protected override string GetSelectExistingObject(string name, Table table)
{
string schema = table.GetQuotedSchemaName(this);
Modified: trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/Oracle8iDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -394,11 +394,6 @@
return ForUpdateString + " of " + aliases + " nowait";
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override bool UseMaxForLimit
{
get { return true; }
Modified: trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -128,11 +128,6 @@
get { return true; }
}
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
public override SqlString GetLimitString(SqlString queryString, SqlString offset, SqlString limit)
{
SqlStringBuilder pagingBuilder = new SqlStringBuilder();
Modified: trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Dialect/SybaseSQLAnywhere10Dialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -415,23 +415,6 @@
get { return true; }
}
- /// <summary>
- /// SQL Anywhere syntax is SELECT TOP n START AT m
- /// </summary>
- public override bool BindLimitParametersInReverseOrder
- {
- get { return true; }
- }
-
- /// <summary>
- /// SQL Anywhere 11 uses SELECT TOP n START AT m [ select list items ]
- /// for LIMIT/OFFSET support.
- /// </summary>
- public override bool BindLimitParametersFirst
- {
- get { return true; }
- }
-
private static int GetAfterSelectInsertPoint(SqlString sql)
{
// Assume no common table expressions with the statement.
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -1189,42 +1189,7 @@
return dialect.GetLimitValue(firstRow, rowCount);
}
- private int GetFirstLimitParameterCount(Dialect.Dialect dialect, bool useLimit, bool hasFirstRow, bool useOffset)
- {
- if (!useLimit) return 0;
- if (!dialect.SupportsVariableLimit) return 0;
- if (!dialect.BindLimitParametersFirst) return 0;
- return (hasFirstRow && useOffset) ? 2 : 1;
- }
-
/// <summary>
- /// Bind parameters needed by the dialect-specific LIMIT clause
- /// </summary>
- /// <returns>The number of parameters bound</returns>
- internal int BindLimitParameters(IDbCommand st, int index, RowSelection selection, ISessionImplementor session)
- {
- Dialect.Dialect dialect = session.Factory.Dialect;
- if (!dialect.SupportsVariableLimit)
- {
- return 0;
- }
-
- int firstRow = GetFirstRow(selection);
- int lastRow = GetMaxOrLimit(dialect, selection);
-
- bool hasFirstRow = firstRow > 0 && dialect.SupportsLimitOffset;
- bool reverse = dialect.BindLimitParametersInReverseOrder;
-
- if (hasFirstRow)
- {
- ((IDataParameter) st.Parameters[index + (reverse ? 1 : 0)]).Value = firstRow;
- }
- ((IDataParameter) st.Parameters[index + ((reverse || !hasFirstRow) ? 0 : 1)]).Value = lastRow;
-
- return hasFirstRow ? 2 : 1;
- }
-
- /// <summary>
/// Limits the number of rows returned by the Sql query if necessary.
/// </summary>
/// <param name="st">The IDbCommand to limit.</param>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2467/NH2467Test.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -20,7 +20,7 @@
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect.SupportsLimit && !dialect.BindLimitParametersFirst;
+ return dialect.SupportsLimit;
}
protected override void OnTearDown()
Modified: trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs 2011-06-16 17:32:25 UTC (rev 5939)
+++ trunk/nhibernate/src/NHibernate.Test/Pagination/CustomMsSqlDialect.cs 2011-06-17 12:03:42 UTC (rev 5940)
@@ -11,7 +11,6 @@
public bool ForcedBindLimitParameterFirst;
public bool ForcedSupportsVariableLimit;
- public override bool BindLimitParametersFirst { get { return ForcedBindLimitParameterFirst; } }
public override bool SupportsVariableLimit { get { return ForcedSupportsVariableLimit; } }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|