[Adapdev-commits] Adapdev/src/Adapdev.Data/Sql Criteria.cs,1.1.1.1,1.2 ICriteria.cs,1.1.1.1,1.2 ISelectQuery.cs,1.1.1.1,1.2 SelectQuery.cs,1.1.1.1,1.2

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

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

Modified Files:
	Criteria.cs ICriteria.cs ISelectQuery.cs SelectQuery.cs 
Log Message:
MIgrated reusable Perseus components
Added SmartTreeView
Added new caching framework
Several Sql fixes
Added business rule validation classes
Added FieldAccessor for IL generation

Index: Criteria.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/Criteria.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Criteria.cs	28 Feb 2005 01:31:48 -0000	1.1.1.1
--- Criteria.cs	25 May 2005 05:17:47 -0000	1.2
***************
*** 34,38 ****
  		{
  			this.AddAnd();
! 			sb.Append("(" + c.GetText() + ")");
  		}
  
--- 34,40 ----
  		{
  			this.AddAnd();
! 			sb.Append("(");
! 			sb.Append(c.GetText());
! 			sb.Append(") ");
  		}
  
***************
*** 45,59 ****
  		public virtual void AddBetween(string columnName, object value1, object value2)
  		{
! 			sb.Append(" " + columnName + " BETWEEN " + QueryHelper.DressUp(value1,this.type) + " AND " + QueryHelper.DressUp(value2,this.type));
  		}
  
  		public virtual void AddEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " = " + QueryHelper.DressUp(columnValue,this.type));
  		}
  
  		public void AddEqualTo(string columnName)
  		{
! 			sb.Append(" " + columnName + " = " + QueryHelper.GetParameterName(columnName, this.DbProviderType));
  		}
  
--- 47,96 ----
  		public virtual void AddBetween(string columnName, object value1, object value2)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" BETWEEN ");
! 			sb.Append(QueryHelper.DressUp(value1,this.type));
! 			sb.Append(" AND ");
! 			sb.Append(QueryHelper.DressUp(value2,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" = ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
! 		}
! 
! 		public virtual void AddEqualTo(string tableName, string columnName, object columnValue)
! 		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(tableName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(".");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" = ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public void AddEqualTo(string columnName)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" = ");
! 			sb.Append(QueryHelper.GetParameterName(columnName, this.DbProviderType));
! 			sb.Append(" ");
  		}
  
***************
*** 64,78 ****
  		public virtual void AddGreaterThanOrEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " >= " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddGreaterThan(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " > " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddIn(string columnName, IQuery subQuery)
  		{
! 			sb.Append(" IN (" + subQuery.GetText() + ") ");
  		}
  
--- 101,129 ----
  		public virtual void AddGreaterThanOrEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" >= ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddGreaterThan(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" > ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddIn(string columnName, IQuery subQuery)
  		{
! 			sb.Append(" IN (");
! 			sb.Append(subQuery.GetText());
! 			sb.Append(") ");
  		}
  
***************
*** 88,122 ****
  			}
  			sb.Append(StringUtil.RemoveFinalComma(sbo.ToString()));
! 			sb.Append(")");
  		}
  
  		public virtual void AddIsNull(string columnName)
  		{
! 			sb.Append(" " + columnName + " IS NULL");
  		}
  
  		public virtual void AddLessThanOrEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " <= " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddLessThan(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " < " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddLike(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " LIKE " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddNotBetween(string columnName, object value1, object value2)
  		{
! 			sb.Append(" " + columnName + " NOT BETWEEN " + QueryHelper.DressUp(value1, this.type) + " AND " + QueryHelper.DressUp(value2, this.type));
  		}
  
  		public virtual void AddNotEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " <> " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
--- 139,209 ----
  			}
  			sb.Append(StringUtil.RemoveFinalComma(sbo.ToString()));
! 			sb.Append(") ");
  		}
  
  		public virtual void AddIsNull(string columnName)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" IS NULL ");
  		}
  
  		public virtual void AddLessThanOrEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" <= ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddLessThan(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" < ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddLike(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" LIKE ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddNotBetween(string columnName, object value1, object value2)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" NOT BETWEEN ");
! 			sb.Append(QueryHelper.DressUp(value1, this.type));
! 			sb.Append(" AND ");
! 			sb.Append(QueryHelper.DressUp(value2, this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddNotEqualTo(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" <> ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
***************
*** 146,155 ****
  		public virtual void AddNotLike(string columnName, object columnValue)
  		{
! 			sb.Append(" " + columnName + " NOT LIKE " + QueryHelper.DressUp(columnValue, this.type));
  		}
  
  		public virtual void AddNotNull(string columnName)
  		{
! 			sb.Append(" " + columnName + " NOT IS NULL");
  		}
  
--- 233,252 ----
  		public virtual void AddNotLike(string columnName, object columnValue)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" NOT LIKE ");
! 			sb.Append(QueryHelper.DressUp(columnValue,this.type));
! 			sb.Append(" ");
  		}
  
  		public virtual void AddNotNull(string columnName)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" NOT IS NULL ");
  		}
  

Index: SelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/SelectQuery.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SelectQuery.cs	28 Feb 2005 01:31:48 -0000	1.1.1.1
--- SelectQuery.cs	25 May 2005 05:17:47 -0000	1.2
***************
*** 37,41 ****
  		public void Add(string columnName)
  		{
! 			sb.Append(" " + QueryHelper.GetPreDelimeter(this.type) + columnName + QueryHelper.GetPostDelimeter(this.type) + ",");
  		}
  
--- 37,84 ----
  		public void Add(string columnName)
  		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(",");
! 		}
! 
! 		public void Add(string tableName, string columnName)
! 		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(tableName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(".");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(",");
! 		}
! 
! 		public void AddColumnAlias(string columnName, string alias)
! 		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" AS ");
! 			sb.Append(alias);
! 			sb.Append(",");
! 		}
! 
! 		public void AddColumnAlias(string tableName, string columnName, string alias)
! 		{
! 			sb.Append(" ");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(tableName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(".");
! 			sb.Append(QueryHelper.GetPreDelimeter(this.type));
! 			sb.Append(columnName);
! 			sb.Append(QueryHelper.GetPostDelimeter(this.type));
! 			sb.Append(" AS ");
! 			sb.Append(alias);
! 			sb.Append(",");
  		}
  
***************
*** 83,87 ****
  		public virtual void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, JoinType type)
  		{
! 			this._join = String.Format(" {0} {1} ON {2} = {3} ", this.GetJoinType(type), secondTable, firstTableColumn, secondTableColumn);
  		}
  
--- 126,135 ----
  		public virtual void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, JoinType type)
  		{
! 			this._join = String.Format(" {0} {1} ON {2}.{3} = {4}.{5} ",	this.GetJoinType(type), 
! 																			QueryHelper.GetPreDelimeter(this.type) + secondTable + QueryHelper.GetPostDelimeter(this.type), 
! 																			this._table, 
! 																			QueryHelper.GetPreDelimeter(this.type) + firstTableColumn + QueryHelper.GetPostDelimeter(this.type),
! 																			QueryHelper.GetPreDelimeter(this.type) + secondTable + QueryHelper.GetPostDelimeter(this.type),
! 																			QueryHelper.GetPreDelimeter(this.type) + secondTableColumn + QueryHelper.GetPostDelimeter(this.type));
  		}
  
***************
*** 93,97 ****
  		public virtual string GetText()
  		{
! 			return "SELECT " + this.GetLimit() + this.GetColumns() + " FROM " + this._table + this.GetCriteria() + this.GetOrderBy() + this.GetGroupBy();
  		}
  
--- 141,145 ----
  		public virtual string GetText()
  		{
! 			return "SELECT " + this.GetLimit() + this.GetColumns() + " FROM " + this._table + this._join + this.GetCriteria() + this.GetOrderBy() + this.GetGroupBy();
  		}
  
***************
*** 183,189 ****
  					return "INNER JOIN";
  				case JoinType.LEFT:
! 					return "LEFT JOIN";
  				case JoinType.RIGHT:
! 					return "RIGHT JOIN";
  				default:
  					throw new Exception("JoinType " + type + " not supported.");
--- 231,237 ----
  					return "INNER JOIN";
  				case JoinType.LEFT:
! 					return "LEFT OUTER JOIN";
  				case JoinType.RIGHT:
! 					return "RIGHT OUTER JOIN";
  				default:
  					throw new Exception("JoinType " + type + " not supported.");

Index: ICriteria.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ICriteria.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ICriteria.cs	28 Feb 2005 01:31:48 -0000	1.1.1.1
--- ICriteria.cs	25 May 2005 05:17:47 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  		void AddBetween(string columnName, object value1, object value2);
  		void AddEqualTo(string columnName, object columnValue);
+ 		void AddEqualTo(string tableName, string columnName, object columnValue);
  		void AddEqualTo(string columnName);
  		void AddExists(IQuery subQuery);

Index: ISelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ISelectQuery.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ISelectQuery.cs	28 Feb 2005 01:31:48 -0000	1.1.1.1
--- ISelectQuery.cs	25 May 2005 05:17:47 -0000	1.2
***************
*** 12,15 ****
--- 12,34 ----
  		void Add(string columnName);
  		/// <summary>
+ 		/// Adds the specified table.column
+ 		/// </summary>
+ 		/// <param name="tableName">Name of the table.</param>
+ 		/// <param name="columnName">Name of the column.</param>
+ 		void Add(string tableName, string columnName);
+ 		/// <summary>
+ 		/// Adds the column alias.
+ 		/// </summary>
+ 		/// <param name="tableName">Name of the table.</param>
+ 		/// <param name="columnName">Name of the column.</param>
+ 		/// <param name="alias">Alias.</param>
+ 		void AddColumnAlias(string tableName, string columnName, string alias);
+ 		/// <summary>
+ 		/// Adds the column alias.
+ 		/// </summary>
+ 		/// <param name="columnName">Name of the column.</param>
+ 		/// <param name="alias">Alias.</param>
+ 		void AddColumnAlias(string columnName, string alias);
+ 		/// <summary>
  		/// Creates a SELECT * FROM statement, so that individual column names
  		/// don't have to be added