Changeset 24161

Timestamp:

May 12, 2009, 7:46:14 PM (17 years ago)

Author:

Paul Price

Message:

With the WHEREs implemented inside the sub-select, the final WHERE was
destroying the result for the merge part (since the 'node' is set to
the dependents, not the node name).

File:

• branches/pap_magic/ippTools/src/magictool.c (modified) (3 diffs)

branches/pap_magic/ippTools/src/magictool.c

@@ -614 +614 @@
     psMetadata *templatesWhere = psMetadataAlloc(); // WHERE for selecting template
     psMetadata *magicWhere = psMetadataAlloc();     // WHERE for selecting magic runs
-    psMetadata *finalWhere = psMetadataAlloc();     // WHERE at end
 
     PXOPT_COPY_S64(config->args, templatesWhere, "-magic_id", "magicRun.magic_id", "==");
@@ -621 +620 @@
     PXOPT_COPY_S64(config->args, magicWhere, "-magic_id", "magicRun.magic_id", "==");
     PXOPT_COPY_STR(config->args, magicWhere, "-node", "magicTree.node", "==");
-
-    PXOPT_COPY_S64(config->args, finalWhere, "-magic_id", "magicRun.magic_id", "==");
-    PXOPT_COPY_STR(config->args, finalWhere, "-node", "magicInputs.node", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -650 +646 @@
     }
     psFree(magicWhere);
-
-    if (psListLength(finalWhere->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(finalWhere, NULL);
-        psStringAppend(&query, "\nWHERE %s", whereClause);
-        psFree(whereClause);
-    }
-    psFree(finalWhere);
 
     // treat limit == 0 as "no limit"