[Adapdev-commits] Adapdev/src/Adapdev.Data/Sql ISqlQuery.cs,NONE,1.1 Criteria.cs,1.7,1.8 ICriteria.cs,1.7,1.8 INonSelectQuery.cs,1.5,1.6 ISelectQuery.cs,1.9,1.10

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

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

Modified Files:
	Criteria.cs ICriteria.cs INonSelectQuery.cs ISelectQuery.cs 
Added Files:
	ISqlQuery.cs 
Log Message:
Separated IQuery and ISqlQuery
Fixed issue with empty Criterias

Index: INonSelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/INonSelectQuery.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** INonSelectQuery.cs	16 Nov 2005 07:01:48 -0000	1.5
--- INonSelectQuery.cs	21 Jan 2006 19:42:48 -0000	1.6
***************
*** 4,8 ****
  	/// Represents a query that does not return records
  	/// </summary>
! 	public interface INonSelectQuery : IQuery
  	{
  	}
--- 4,8 ----
  	/// Represents a query that does not return records
  	/// </summary>
! 	public interface INonSelectQuery : ISqlQuery
  	{
  	}

Index: Criteria.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Criteria.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Criteria.cs	30 Dec 2005 20:42:11 -0000	1.7
--- Criteria.cs	21 Jan 2006 19:42:48 -0000	1.8
***************
*** 106,110 ****
  		}
  
! 		public virtual void AddExists(IQuery subQuery)
  		{
  		}
--- 106,110 ----
  		}
  
! 		public virtual void AddExists(ISqlQuery subSqlQuery)
  		{
  		}
***************
*** 134,141 ****
  		}
  
! 		public virtual void AddIn(string columnName, IQuery subQuery)
  		{
  			sb.Append(" IN (");
! 			sb.Append(subQuery.GetText());
  			sb.Append(") ");
  			this.initialized = true;
--- 134,141 ----
  		}
  
! 		public virtual void AddIn(string columnName, ISqlQuery subSqlQuery)
  		{
  			sb.Append(" IN (");
! 			sb.Append(subSqlQuery.GetText());
  			sb.Append(") ");
  			this.initialized = true;
***************
*** 229,235 ****
  		}
  
! 		public virtual void AddNotExists(IQuery subQuery)
  		{
! 			sb.Append(" EXISTS (" + subQuery.GetText() + ") ");
  			this.initialized = true;
  		}
--- 229,235 ----
  		}
  
! 		public virtual void AddNotExists(ISqlQuery subSqlQuery)
  		{
! 			sb.Append(" EXISTS (" + subSqlQuery.GetText() + ") ");
  			this.initialized = true;
  		}
***************
*** 249,255 ****
  		}
  
! 		public virtual void AddNotIn(string columnName, IQuery subQuery)
  		{
! 			sb.Append(" NOT IN (" + subQuery.GetText() + ") ");
  			this.initialized = true;
  		}
--- 249,255 ----
  		}
  
! 		public virtual void AddNotIn(string columnName, ISqlQuery subSqlQuery)
  		{
! 			sb.Append(" NOT IN (" + subSqlQuery.GetText() + ") ");
  			this.initialized = true;
  		}

--- NEW FILE: ISqlQuery.cs ---
namespace Adapdev.Data.Sql
{
	using System;

	/// <summary>
	/// Represents a query
	/// </summary>
	public interface ISqlQuery : IQuery
	{
		/// <summary>
		/// Sets the criteria to use for the query
		/// </summary>
		/// <param name="c"></param>
		void SetCriteria(ICriteria c);
		/// <summary>
		/// Specifies the table to use for the query
		/// </summary>
		/// <param name="tableName"></param>
		void SetTable(string tableName);
		/// <summary>
		/// Returns a datastore specific ICriteria implementation
		/// </summary>
		/// <returns></returns>
		ICriteria CreateCriteria();
		/// <summary>
		/// The DbProviderType for this query.  Necessary to determine how to
		/// represent dates, parameters, etc.
		/// </summary>
		DbProviderType DbProviderType { get; set; }
		ICriteria Criteria{get;}
	}
}
Index: ICriteria.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ICriteria.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ICriteria.cs	30 Dec 2005 20:42:11 -0000	1.7
--- ICriteria.cs	21 Jan 2006 19:42:48 -0000	1.8
***************
*** 15,22 ****
  		void AddEqualTo(string tableName, string columnName, object columnValue);
  		void AddEqualTo(string columnName);
! 		void AddExists(IQuery subQuery);
  		void AddGreaterThanOrEqualTo(string columnName, object columnValue);
  		void AddGreaterThan(string columnName, object columnValue);
! 		void AddIn(string columnName, IQuery subQuery);
  		void AddIn(string columnName, ICollection values);
  		void AddIsNull(string columnName);
--- 15,22 ----
  		void AddEqualTo(string tableName, string columnName, object columnValue);
  		void AddEqualTo(string columnName);
! 		void AddExists(ISqlQuery subSqlQuery);
  		void AddGreaterThanOrEqualTo(string columnName, object columnValue);
  		void AddGreaterThan(string columnName, object columnValue);
! 		void AddIn(string columnName, ISqlQuery subSqlQuery);
  		void AddIn(string columnName, ICollection values);
  		void AddIsNull(string columnName);
***************
*** 26,32 ****
  		void AddNotBetween(string columnName, object value1, object value2);
  		void AddNotEqualTo(string columnName, object columnValue);
! 		void AddNotExists(IQuery subQuery);
  		void AddNotIn(string columnName, ICollection values);
! 		void AddNotIn(string columnName, IQuery subQuery);
  		void AddNotLike(string columnName, object columnValue);
  		void AddNotNull(string columnName);
--- 26,32 ----
  		void AddNotBetween(string columnName, object value1, object value2);
  		void AddNotEqualTo(string columnName, object columnValue);
! 		void AddNotExists(ISqlQuery subSqlQuery);
  		void AddNotIn(string columnName, ICollection values);
! 		void AddNotIn(string columnName, ISqlQuery subSqlQuery);
  		void AddNotLike(string columnName, object columnValue);
  		void AddNotNull(string columnName);

Index: ISelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ISelectQuery.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ISelectQuery.cs	26 Nov 2005 09:08:59 -0000	1.9
--- ISelectQuery.cs	21 Jan 2006 19:42:48 -0000	1.10
***************
*** 4,8 ****
  	/// Summary description for ISelectQuery.
  	/// </summary>
! 	public interface ISelectQuery : IQuery
  	{
  		/// <summary>
--- 4,8 ----
  	/// Summary description for ISelectQuery.
  	/// </summary>
! 	public interface ISelectQuery : ISqlQuery
  	{
  		/// <summary>