From: Michael D. <mik...@us...> - 2004-09-19 16:54:52
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16491/Dialect Modified Files: Dialect.cs Oracle9Dialect.cs PostgreSQLDialect.cs Log Message: Removed GetLimitString(string) in favor of GetLimitString(SqlString) Index: PostgreSQLDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PostgreSQLDialect.cs 19 Sep 2004 15:32:34 -0000 1.7 --- PostgreSQLDialect.cs 19 Sep 2004 16:54:43 -0000 1.8 *************** *** 83,91 **** } - public override string GetLimitString(String querySelect) - { - return querySelect + " limit ? offset ? "; - } - public override SqlString GetLimitString(SqlString querySqlString) { --- 83,86 ---- Index: Oracle9Dialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Oracle9Dialect.cs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Oracle9Dialect.cs 1 Sep 2004 00:17:08 -0000 1.13 --- Oracle9Dialect.cs 19 Sep 2004 16:54:43 -0000 1.14 *************** *** 125,137 **** } - public override string GetLimitString(String querySelect) - { - StringBuilder pagingSelect = new StringBuilder(100); - pagingSelect.Append("select * from ( select row_.*, rownum rownum_ from ( "); - pagingSelect.Append(querySelect); - pagingSelect.Append(" ) row_ where rownum <= ?) where rownum_ > ?"); - return pagingSelect.ToString(); - } - public override SqlString GetLimitString(SqlString querySqlString) { --- 125,128 ---- Index: Dialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Dialect.cs 13 Sep 2004 07:31:34 -0000 1.39 --- Dialect.cs 19 Sep 2004 16:54:42 -0000 1.40 *************** *** 412,428 **** /// <summary> - /// Add a <c>LIMIT</c> clause to the given SQL <c>SELECT</c> - /// </summary> - /// <param name="querySelect"></param> - /// <returns>The modified SQL</returns> - [Obsolete("Use the GetLimitString(SqlString) overload instead.")] - public virtual string GetLimitString(String querySelect) - { - //TODO: H2.0.3 - this might need to the a SqlString or an IDbCommand depending - // on when it comes in. Need to look at Loader to know for sure... - throw new NotSupportedException("Paged Queries not supported"); - } - - /// <summary> /// Add a <c>LIMIT</c> clause to the given SQL <c>SELECT</c> /// </summary> --- 412,415 ---- |