Changeset 4420

Timestamp:

05/12/08 04:54:37 (2 years ago)

Author:

henrik.paul@…

Message:

SQL queries fixed

Files:

• incubator/cms/src/com/itmill/incubator/examples/cms/ToXML.java (modified) (3 diffs)

incubator/cms/src/com/itmill/incubator/examples/cms/ToXML.java

@@ -81 +81 @@
                                 + "LEFT JOIN Person_Skill PS ON PS.skills_id = S.id "
                                 + "LEFT JOIN Person_skillLevel SL ON SL.mapkey_id = S.id "
-                                + "WHERE PS.persons_id = " + personId).list()) {
-            // + " AND SL.Person_id = " + personId).list()) {
+                                + "WHERE PS.persons_id = " + personId
+                                + " AND SL.Person_id = " + personId).list()) {
 
             Object[] o = (Object[]) row;
@@ -96 +96 @@
         for (Object row : sess
                 .createSQLQuery(
-                        "SELECT P.title, P.description, CONCAT(Role.element,''), Start.element, PEnd.element "
+                        "SELECT P.title, P.description, CONCAT(PRole.element,''), PStart.element, PEnd.element "
                                 + "FROM Project P "
                                 + "LEFT JOIN Person_Project PP ON PP.projects_id = P.id "
-                                + "LEFT JOIN Person_projectRole Role ON Role.mapkey_id = P.id "
-                                + "LEFT JOIN Person_projectStartDate Start ON Start.mapkey_id = P.id "
+                                + "LEFT JOIN Person_projectRole PRole ON PRole.mapkey_id = P.id "
+                                + "LEFT JOIN Person_projectStartDate PStart ON PStart.mapkey_id = P.id "
                                 + "LEFT JOIN Person_projectEndDate PEnd ON PEnd.mapkey_id = P.id "
-                                + "WHERE PP.persons_id = " + personId).list()) {
-            // + " AND Role.Person_id = "
-            // + personId
-            // + " AND Start.Person_id = "
-            // + personId
-            // + " AND PEnd.Person_id = " + personId).list()) {
+                                + "WHERE PP.persons_id = "
+                                + personId
+                                + " AND PStart.Person_id = "
+                                + personId
+                                + " AND PEnd.Person_id = "
+                                + personId
+                                + " AND PRole.Person_id = " + personId).list()) {
 
             Object[] o = (Object[]) row;
@@ -129 +130 @@
         for (Object row : sess
                 .createSQLQuery(
-                        "SELECT D.title, D.school, YEAR(Start.element), YEAR(DEnd.element), Ready.element "
+                        "SELECT D.title, D.school, YEAR(DStart.element), YEAR(DEnd.element), DReady.element "
                                 + "FROM Degree D "
                                 + "LEFT JOIN Person_Degree PD ON PD.degrees_id = D.id "
-                                + "LEFT JOIN Person_degreeStartDate Start ON Start.mapkey_id = D.id "
+                                + "LEFT JOIN Person_degreeStartDate DStart ON DStart.mapkey_id = D.id "
                                 + "LEFT JOIN Person_degreeEndDate DEnd ON DEnd.mapkey_id = D.id "
-                                + "LEFT JOIN Person_degreePercentReady Ready ON Ready.mapkey_id = D.id "
-                                + "WHERE PD.persons_id = " + personId).list()) {
-            // + " AND Start.Person_id = "
-            // + personId
-            // + " AND DEnd.Person_id = "
-            // + personId
-            // + " AND Ready.Person_id = " + personId).list()) {
+                                + "LEFT JOIN Person_degreePercentReady DReady ON DReady.mapkey_id = D.id "
+                                + "WHERE PD.persons_id = "
+                                + personId
+                                + " AND DStart.Person_id = "
+                                + personId
+                                + "AND DEnd.Person_id = "
+                                + personId
+                                + " AND DReady.Person_id = " + personId).list()) {
 
             Object[] o = (Object[]) row;