Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25387/src/Adapdev.Data/Sql
Modified Files:
ISelectQuery.cs SelectQuery.cs
Log Message:
Added support for mutli-threaded tests (still buggy) and transactional tests
Added new ISelectQuery.AddJoin method allowing for the joining of four tables
Fixed bug w/ DatabaseSchema persistence
Index: SelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/SelectQuery.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SelectQuery.cs 21 Oct 2005 04:59:20 -0000 1.4
--- SelectQuery.cs 11 Nov 2005 04:52:46 -0000 1.5
***************
*** 147,150 ****
--- 147,169 ----
}
+ public virtual void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, string thirdTable, string thirdTableColumn, string fourthTable, string fourthTableColumn, JoinType type)
+ {
+ this._join = String.Format(" {0} {1} ON {2}.{3} = {4}.{5} {6} {7} ON {8}.{9} = {10}.{11} ",
+ 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),
+ this.GetJoinType(type),
+ QueryHelper.GetPreDelimeter(this.type) + fourthTable + QueryHelper.GetPostDelimeter(this.type),
+ QueryHelper.GetPreDelimeter(this.type) + thirdTable + QueryHelper.GetPostDelimeter(this.type),
+ QueryHelper.GetPreDelimeter(this.type) + thirdTableColumn + QueryHelper.GetPostDelimeter(this.type),
+ QueryHelper.GetPreDelimeter(this.type) + fourthTable + QueryHelper.GetPostDelimeter(this.type),
+ QueryHelper.GetPreDelimeter(this.type) + fourthTableColumn + QueryHelper.GetPostDelimeter(this.type));
+
+ }
+
+
public void SetTable(string tableName)
{
Index: ISelectQuery.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/ISelectQuery.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ISelectQuery.cs 21 Oct 2005 04:59:20 -0000 1.3
--- ISelectQuery.cs 11 Nov 2005 04:52:46 -0000 1.4
***************
*** 78,81 ****
--- 78,83 ----
/// <param name="type">The join type</param>
void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, JoinType type);
+
+ void AddJoin(string secondTable, string firstTableColumn, string secondTableColumn, string thirdTable, string thirdTableColumn, string fourthTable, string fourtTableColumn, JoinType joinType);
/// <summary>
/// Set's the maximum number of records to retrieve
|