[Adapdev-commits] Adapdev/src/Adapdev.Data/Sql OracleSelectQuery.cs,1.2,1.3

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28688/src/Adapdev.Data/Sql

Modified Files:
	OracleSelectQuery.cs 
Log Message:
Fixed SetLimit (again!)

Index: OracleSelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/OracleSelectQuery.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OracleSelectQuery.cs	2 Jun 2005 03:26:00 -0000	1.2
--- OracleSelectQuery.cs	3 Jun 2005 00:28:23 -0000	1.3
***************
*** 23,29 ****
  		{
  			string sql = "SELECT " + this.GetLimit() + this.GetColumns() + " FROM " + this._table + this._join + this.GetCriteria();
! 			if(sql.ToLower().IndexOf("where") < 1) sql+= " WHERE ";
! 			else sql += " AND ";
! 			sql += this.GetLimit() + this.GetOrderBy() + this.GetGroupBy();
  			return sql;
  		}
--- 23,34 ----
  		{
  			string sql = "SELECT " + this.GetLimit() + this.GetColumns() + " FROM " + this._table + this._join + this.GetCriteria();
! 			if(this.maxRecords > 0)
! 			{
! 				if(sql.ToLower().IndexOf("where") < 1) sql+= " WHERE ";
! 				else sql += " AND ";
! 
! 				sql += this.GetLimit();
! 			}
! 			sql += this.GetOrderBy() + this.GetGroupBy();
  			return sql;
  		}