Menu
▾
▴
[H2-commits] r1437 - in humano2/branches/viewtools/components: tests viewTools
|
From: <sv...@de...> - 2005-06-30 18:53:39
|
Author: pcamacho
Date: 2005-06-30 14:53:44 -0400 (Thu, 30 Jun 2005)
New Revision: 1437
Modified:
humano2/branches/viewtools/components/tests/viewTools.cs
humano2/branches/viewtools/components/viewTools/ViewTools.cs
Log:
CHANGE: basic queries with multiple attributes pertinence to same class w=
orking (only columns of select),
Modified: humano2/branches/viewtools/components/tests/viewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/branches/viewtools/components/tests/viewTools.cs 2005-06-30 1=
8:36:00 UTC (rev 1436)
+++ humano2/branches/viewtools/components/tests/viewTools.cs 2005-06-30 1=
8:53:44 UTC (rev 1437)
@@ -167,7 +167,7 @@
"FROM \"d10160cTicket\" inner join \"entity\" on \"d=
10160cTicket\".id_entity =3D \"entity\".id_entity and entity.\"delDate\" =
is null LEFT JOIN \"user\" user0 ON \"d10160cTicket\".\"c10162Assigned =
to3\" =3D user0.id_entity LEFT JOIN entity e1 ON \"user\".id_entity =3D e=
1.id_entity LEFT JOIN \"user\" user1 ON \"d10160cTicket\".\"c10162Reques=
t by1\" =3D user1.id_entity LEFT JOIN \"d10160cTicket Status\" d10160cTic=
ketStatus2 ON \"d10160cTicket\".\"c10162Status\" =3D d10160cTicketStatus2=
.id_entity LEFT JOIN entity e2 ON \"d10160cTicket Status\".id_entity =3D =
e2.id_entity");
}
=20
- //[Test]
+ [Test]
public void ParseQuery()
{
init(); =20
@@ -177,17 +177,15 @@
DataTable dtParam =3D this.makeDataTableInViewTools();
DataRow dr =3D dtParam.NewRow();
=20
- dr["columna"] =3D "0,10181,10208,10231^18,10209";
- dr["filtros"] =3D "10187^10179|7|'closed'|0|0";
- //dr["group"] =3D "";
- //dr["having"] =3D "";
- dr["order"] =3D "10231^18|0";
-
+ //Basic query with double pert attribute
+ dr["columna"] =3D "0,10231^18,10229^18,10187^10179";
+ dr["filtros"] =3D "";
+ =09
dtParam.Rows.Add(dr);
vt.GetSQLDataTable(dtParam); //Don't get result, only to hav=
e the query
string strQuery =3D vt.GetLastExecutedQuery();
Logger.Log("strQuery=3D " + strQuery,LogLevel.Trace);
- Assert.IsTrue(strQuery.Trim() =3D=3D "SELECT \"d10160cTicket=
\".id_entity, \"d10160cTicket\".\"c10162Title\", \"d10160cTicket\".\"c101=
62Date\", \"user\".\"email\", \"d10160cTicket\".\"c10162Resolution Date\"=
FROM \"d10160cTicket\" inner join \"entity\" on \"d10160cTicket\".id_ent=
ity =3D \"entity\".id_entity and entity.\"delDate\" is null LEFT JOIN \=
"user\" ON \"d10160cTicket\".\"c10162Assigned to3\" =3D \"user\".id_entit=
y LEFT JOIN entity e1 ON \"user\".id_entity =3D e1.id_entity LEFT JOIN \=
"d10160cTicket Status\" ON \"d10160cTicket\".\"c10162Status\" =3D \"d1016=
0cTicket Status\".id_entity LEFT JOIN entity e2 ON \"d10160cTicket Status=
\".id_entity =3D e2.id_entity WHERE e1.\"delDate\" IS NULL AND e2.\"delD=
ate\" IS NULL and \"d10160cTicket Status\".\"c10163Status Name\" ILIKE '=
%closed%' ORDER BY upper(\"user\".\"email\") asc".Trim());
+ Assert.IsTrue(strQuery.Trim() =3D=3D "SELECT \"d10160cTicket=
\".id_entity, user0.\"email\", user1.\"email\" as \"email2\", d10160cTick=
etStatus2.\"c10163Status Name\" FROM \"d10160cTicket\" inner join \"entit=
y\" on \"d10160cTicket\".id_entity =3D \"entity\".id_entity and entity.\"=
delDate\" is null LEFT JOIN \"user\" user0 ON \"d10160cTicket\".\"c1016=
2Assigned to3\" =3D user0.id_entity LEFT JOIN entity e1 ON user0.id_entit=
y =3D e1.id_entity LEFT JOIN \"user\" user1 ON \"d10160cTicket\".\"c1016=
2Request by1\" =3D user1.id_entity LEFT JOIN \"d10160cTicket Status\" d10=
160cTicketStatus2 ON \"d10160cTicket\".\"c10162Status\" =3D d10160cTicket=
Status2.id_entity LEFT JOIN entity e2 ON d10160cTicketStatus2.id_entity =3D=
e2.id_entity WHERE e1.\"delDate\" IS NULL AND e2.\"delDate\" IS NULL".T=
rim());
}
=20
[Test]
Modified: humano2/branches/viewtools/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/branches/viewtools/components/viewTools/ViewTools.cs 2005-06-=
30 18:36:00 UTC (rev 1436)
+++ humano2/branches/viewtools/components/viewTools/ViewTools.cs 2005-06-=
30 18:53:44 UTC (rev 1437)
@@ -610,11 +610,12 @@
Query.Append(" ON " + relation.IniTableName + "." + relation.Primar=
yKeyName);
Query.Append(" =3D " + SQLVar + "." + relation.ForeignKeyName);
=20
+ =20
if(tableDictionary.IndexOf(relation.EndTableName) =3D=3D -1)
{
tableDictionary.Add(relation.EndTableName);
Query.Append(" LEFT JOIN entity e" + counter + " ON ");
- Query.Append(relation.EndTableName + ".id_entity =3D e" + counter =
+ ".id_entity ");
+ Query.Append(SQLVar + ".id_entity =3D e" + counter + ".id_entity "=
);
_whereInit =3D _whereInit + "e" + counter + ".\"delDate\" IS NULL =
AND ";
counter++;
}
|
